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

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Sun Dec 2 06:01:30 EST 2007


Author: tirelli
Date: 2007-12-02 06:01:29 -0500 (Sun, 02 Dec 2007)
New Revision: 16967

Added:
   labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/lang/descr/EvaluatorBasedRestrictionDescr.java
   labs/jbossrules/branches/temporal_rete/drools-compiler/src/test/resources/org/drools/lang/pluggable_operators.drl
   labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/ClockType.java
   labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/TemporalSession.java
   labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/reteoo/ReteooTemporalSession.java
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/DRLParser.java
   labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/lang/MVELDumper.java
   labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/lang/descr/ForallDescr.java
   labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/lang/descr/LiteralRestrictionDescr.java
   labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/lang/descr/PredicateDescr.java
   labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/lang/descr/QualifiedIdentifierRestrictionDescr.java
   labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/lang/descr/RestrictionConnectiveDescr.java
   labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/lang/descr/ReturnValueRestrictionDescr.java
   labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/lang/descr/VariableRestrictionDescr.java
   labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/rule/builder/PatternBuilder.java
   labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/xml/LiteralRestrictionHandler.java
   labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/xml/QualifiedIdentifierRestrictionHandler.java
   labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/xml/ReturnValueRestrictionHandler.java
   labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/xml/VariableRestrictionsHandler.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/integrationtests/CepEspTest.java
   labs/jbossrules/branches/temporal_rete/drools-compiler/src/test/java/org/drools/lang/RuleParserTest.java
   labs/jbossrules/branches/temporal_rete/drools-compiler/src/test/resources/org/drools/integrationtests/test_CEP_SimpleTimeWindow.drl
   labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/RuleBase.java
   labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/StatefulSession.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/base/evaluators/Operator.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/ReteooFactHandleFactory.java
   labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/reteoo/ReteooRuleBase.java
   labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/reteoo/ReteooStatefulSession.java
   labs/jbossrules/branches/temporal_rete/drools-core/src/test/java/org/drools/base/EvaluatorFactoryTest.java
   labs/jbossrules/branches/temporal_rete/drools-jsr94/src/main/java/org/drools/jsr94/rules/Jsr94FactHandleFactory.java
Log:
JBRULES-1353 JBRULES-1356: adding temporal session support. Adding support to pluggable operators at parser level.

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-02 06:37:00 UTC (rev 16966)
+++ labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/lang/DRLLexer.java	2007-12-02 11:01:29 UTC (rev 16967)
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g 2007-10-29 17:23:34
+// $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
 
 	package org.drools.lang;
 
@@ -15,117 +15,99 @@
     public static final int T79=79;
     public static final int AUTO_FOCUS=28;
     public static final int END=15;
-    public static final int HexDigit=66;
+    public static final int HexDigit=67;
     public static final int FORALL=43;
     public static final int TEMPLATE=16;
-    public static final int MISC=72;
-    public static final int FLOAT=56;
+    public static final int MISC=73;
+    public static final int FLOAT=57;
     public static final int T74=74;
     public static final int QUERY=14;
-    public static final int THEN=62;
+    public static final int THEN=63;
     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 IMPORT=5;
+    public static final int PACKAGE=4;
     public static final int DATE_EFFECTIVE=20;
-    public static final int PACKAGE=4;
     public static final int OR=35;
     public static final int DOT=9;
     public static final int DOUBLE_PIPE=36;
     public static final int AND=37;
     public static final int FUNCTION=6;
     public static final int GLOBAL=10;
-    public static final int EscapeSequence=65;
+    public static final int EscapeSequence=66;
     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=60;
+    public static final int LEFT_SQUARE=61;
     public static final int CONTAINS=50;
-    public static final int SH_STYLE_SINGLE_LINE_COMMENT=69;
+    public static final int SH_STYLE_SINGLE_LINE_COMMENT=70;
     public static final int T77=77;
     public static final int ATTRIBUTES=19;
     public static final int EVENT=7;
-    public static final int LEFT_CURLY=58;
+    public static final int LEFT_CURLY=59;
     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=59;
+    public static final int RIGHT_CURLY=60;
     public static final int BOOL=24;
     public static final int EXCLUDES=51;
     public static final int SOUNDSLIKE=53;
-    public static final int T73=73;
     public static final int MEMBEROF=54;
     public static final int WHEN=18;
     public static final int T78=78;
     public static final int RULEFLOW_GROUP=30;
-    public static final int WS=64;
+    public static final int WS=65;
     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=55;
+    public static final int IN=56;
     public static final int T80=80;
     public static final int NO_LOOP=27;
     public static final int ACCUMULATE=44;
-    public static final int UnicodeEscape=67;
+    public static final int UnicodeEscape=68;
     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 EOF=-1;
     public static final int AGENDA_GROUP=31;
-    public static final int NULL=57;
-    public static final int EOL=63;
-    public static final int Tokens=83;
+    public static final int NULL=58;
+    public static final int EOL=64;
+    public static final int Tokens=84;
     public static final int T82=82;
     public static final int SALIENCE=25;
-    public static final int OctalEscape=68;
-    public static final int MULTI_LINE_COMMENT=71;
+    public static final int OctalEscape=69;
+    public static final int MULTI_LINE_COMMENT=72;
     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=61;
-    public static final int C_STYLE_SINGLE_LINE_COMMENT=70;
+    public static final int RIGHT_SQUARE=62;
+    public static final int C_STYLE_SINGLE_LINE_COMMENT=71;
     public DRLLexer() {;} 
     public DRLLexer(CharStream input) {
         super(input);
-        ruleMemo = new HashMap[81+1];
+        ruleMemo = new HashMap[82+1];
      }
-    public String getGrammarFileName() { return "/home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g"; }
+    public String getGrammarFileName() { return "/home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g"; }
 
-    // $ANTLR start T73
-    public final void mT73() throws RecognitionException {
-        try {
-            int _type = T73;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:6:5: ( ';' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:6:7: ';'
-            {
-            match(';'); if (failed) return ;
-
-            }
-
-            this.type = _type;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end T73
-
     // $ANTLR start T74
     public final void mT74() throws RecognitionException {
         try {
             int _type = T74;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:7:5: ( '.*' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:7:7: '.*'
+            // /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: ';'
             {
-            match(".*"); if (failed) return ;
+            match(';'); if (failed) return ;
 
-
             }
 
             this.type = _type;
@@ -139,11 +121,12 @@
     public final void mT75() throws RecognitionException {
         try {
             int _type = T75;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:8:5: ( ':' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:8:7: ':'
+            // /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: '.*'
             {
-            match(':'); if (failed) return ;
+            match(".*"); if (failed) return ;
 
+
             }
 
             this.type = _type;
@@ -157,12 +140,11 @@
     public final void mT76() throws RecognitionException {
         try {
             int _type = T76;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:9:5: ( '->' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:9:7: '->'
+            // /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: ':'
             {
-            match("->"); if (failed) return ;
+            match(':'); if (failed) return ;
 
-
             }
 
             this.type = _type;
@@ -176,10 +158,10 @@
     public final void mT77() throws RecognitionException {
         try {
             int _type = T77;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:10:5: ( '==' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:10:7: '=='
+            // /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: '->'
             {
-            match("=="); if (failed) return ;
+            match("->"); if (failed) return ;
 
 
             }
@@ -195,11 +177,12 @@
     public final void mT78() throws RecognitionException {
         try {
             int _type = T78;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:11:5: ( '>' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:11:7: '>'
+            // /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: '=='
             {
-            match('>'); if (failed) return ;
+            match("=="); if (failed) return ;
 
+
             }
 
             this.type = _type;
@@ -213,12 +196,11 @@
     public final void mT79() throws RecognitionException {
         try {
             int _type = T79;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:12:5: ( '>=' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:12:7: '>='
+            // /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: '>'
             {
-            match(">="); if (failed) return ;
+            match('>'); if (failed) return ;
 
-
             }
 
             this.type = _type;
@@ -232,11 +214,12 @@
     public final void mT80() throws RecognitionException {
         try {
             int _type = T80;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:13:5: ( '<' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:13:7: '<'
+            // /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: '>='
             {
-            match('<'); if (failed) return ;
+            match(">="); if (failed) return ;
 
+
             }
 
             this.type = _type;
@@ -250,12 +233,11 @@
     public final void mT81() throws RecognitionException {
         try {
             int _type = T81;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:14:5: ( '<=' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:14:7: '<='
+            // /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: '<'
             {
-            match("<="); if (failed) return ;
+            match('<'); if (failed) return ;
 
-
             }
 
             this.type = _type;
@@ -269,10 +251,10 @@
     public final void mT82() throws RecognitionException {
         try {
             int _type = T82;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:15:5: ( '!=' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:15:7: '!='
+            // /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: '<='
             {
-            match("!="); if (failed) return ;
+            match("<="); if (failed) return ;
 
 
             }
@@ -284,14 +266,33 @@
     }
     // $ANTLR end T82
 
+    // $ANTLR start T83
+    public final void mT83() throws RecognitionException {
+        try {
+            int _type = T83;
+            // /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: '!='
+            {
+            match("!="); if (failed) return ;
+
+
+            }
+
+            this.type = _type;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end T83
+
     // $ANTLR start WS
     public final void mWS() throws RecognitionException {
         try {
             int _type = WS;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1707:9: ( ( ' ' | '\\t' | '\\f' | EOL )+ )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1707:17: ( ' ' | '\\t' | '\\f' | EOL )+
+            // /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/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1707:17: ( ' ' | '\\t' | '\\f' | EOL )+
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1706:17: ( ' ' | '\\t' | '\\f' | EOL )+
             int cnt1=0;
             loop1:
             do {
@@ -323,28 +324,28 @@
 
                 switch (alt1) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1707:19: ' '
+            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1706:19: ' '
             	    {
             	    match(' '); if (failed) return ;
 
             	    }
             	    break;
             	case 2 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1708:19: '\\t'
+            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1707:19: '\\t'
             	    {
             	    match('\t'); if (failed) return ;
 
             	    }
             	    break;
             	case 3 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1709:19: '\\f'
+            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1708:19: '\\f'
             	    {
             	    match('\f'); if (failed) return ;
 
             	    }
             	    break;
             	case 4 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1710:19: EOL
+            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1709:19: EOL
             	    {
             	    mEOL(); if (failed) return ;
 
@@ -377,10 +378,10 @@
     // $ANTLR start EOL
     public final void mEOL() throws RecognitionException {
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1716:6: ( ( ( '\\r\\n' )=> '\\r\\n' | '\\r' | '\\n' ) )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1717:6: ( ( '\\r\\n' )=> '\\r\\n' | '\\r' | '\\n' )
+            // /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/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1717: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' )
             int alt2=3;
             int LA2_0 = input.LA(1);
 
@@ -399,13 +400,13 @@
             else {
                 if (backtracking>0) {failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1717:6: ( ( '\\r\\n' )=> '\\r\\n' | '\\r' | '\\n' )", 2, 0, input);
+                    new NoViableAltException("1716:6: ( ( '\\r\\n' )=> '\\r\\n' | '\\r' | '\\n' )", 2, 0, input);
 
                 throw nvae;
             }
             switch (alt2) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1717:14: ( '\\r\\n' )=> '\\r\\n'
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1716:14: ( '\\r\\n' )=> '\\r\\n'
                     {
                     match("\r\n"); if (failed) return ;
 
@@ -413,14 +414,14 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1718:25: '\\r'
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1717:25: '\\r'
                     {
                     match('\r'); if (failed) return ;
 
                     }
                     break;
                 case 3 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1719:25: '\\n'
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1718:25: '\\n'
                     {
                     match('\n'); if (failed) return ;
 
@@ -442,10 +443,10 @@
     public final void mINT() throws RecognitionException {
         try {
             int _type = INT;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1724:2: ( ( '-' )? ( '0' .. '9' )+ )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1724:4: ( '-' )? ( '0' .. '9' )+
+            // /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/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1724:4: ( '-' )?
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1723:4: ( '-' )?
             int alt3=2;
             int LA3_0 = input.LA(1);
 
@@ -454,7 +455,7 @@
             }
             switch (alt3) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1724:5: '-'
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1723:5: '-'
                     {
                     match('-'); if (failed) return ;
 
@@ -463,7 +464,7 @@
 
             }
 
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1724:10: ( '0' .. '9' )+
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1723:10: ( '0' .. '9' )+
             int cnt4=0;
             loop4:
             do {
@@ -477,7 +478,7 @@
 
                 switch (alt4) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1724:11: '0' .. '9'
+            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1723:11: '0' .. '9'
             	    {
             	    matchRange('0','9'); if (failed) return ;
 
@@ -508,10 +509,10 @@
     public final void mFLOAT() throws RecognitionException {
         try {
             int _type = FLOAT;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1728:2: ( ( '-' )? ( '0' .. '9' )+ '.' ( '0' .. '9' )+ )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1728:4: ( '-' )? ( '0' .. '9' )+ '.' ( '0' .. '9' )+
+            // /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/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1728:4: ( '-' )?
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1727:4: ( '-' )?
             int alt5=2;
             int LA5_0 = input.LA(1);
 
@@ -520,7 +521,7 @@
             }
             switch (alt5) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1728:5: '-'
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1727:5: '-'
                     {
                     match('-'); if (failed) return ;
 
@@ -529,7 +530,7 @@
 
             }
 
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1728:10: ( '0' .. '9' )+
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1727:10: ( '0' .. '9' )+
             int cnt6=0;
             loop6:
             do {
@@ -543,7 +544,7 @@
 
                 switch (alt6) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1728:11: '0' .. '9'
+            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1727:11: '0' .. '9'
             	    {
             	    matchRange('0','9'); if (failed) return ;
 
@@ -561,7 +562,7 @@
             } while (true);
 
             match('.'); if (failed) return ;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1728:26: ( '0' .. '9' )+
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1727:26: ( '0' .. '9' )+
             int cnt7=0;
             loop7:
             do {
@@ -575,7 +576,7 @@
 
                 switch (alt7) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1728:27: '0' .. '9'
+            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1727:27: '0' .. '9'
             	    {
             	    matchRange('0','9'); if (failed) return ;
 
@@ -606,7 +607,7 @@
     public final void mSTRING() throws RecognitionException {
         try {
             int _type = STRING;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1732:5: ( ( '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"' ) | ( '\\'' ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )* '\\'' ) )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1731:5: ( ( '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"' ) | ( '\\'' ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )* '\\'' ) )
             int alt10=2;
             int LA10_0 = input.LA(1);
 
@@ -619,19 +620,19 @@
             else {
                 if (backtracking>0) {failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1731:1: STRING : ( ( '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"' ) | ( '\\'' ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )* '\\'' ) );", 10, 0, input);
+                    new NoViableAltException("1730:1: STRING : ( ( '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"' ) | ( '\\'' ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )* '\\'' ) );", 10, 0, input);
 
                 throw nvae;
             }
             switch (alt10) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1732:8: ( '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"' )
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1731:8: ( '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"' )
                     {
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1732:8: ( '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"' )
-                    // /home/etirelli/workspace/jboss/jbossrules/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:1731:8: ( '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"' )
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1731:9: '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"'
                     {
                     match('\"'); if (failed) return ;
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1732:13: ( EscapeSequence | ~ ( '\\\\' | '\"' ) )*
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1731:13: ( EscapeSequence | ~ ( '\\\\' | '\"' ) )*
                     loop8:
                     do {
                         int alt8=3;
@@ -647,14 +648,14 @@
 
                         switch (alt8) {
                     	case 1 :
-                    	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1732:15: EscapeSequence
+                    	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1731:15: EscapeSequence
                     	    {
                     	    mEscapeSequence(); if (failed) return ;
 
                     	    }
                     	    break;
                     	case 2 :
-                    	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1732:32: ~ ( '\\\\' | '\"' )
+                    	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1731:32: ~ ( '\\\\' | '\"' )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
                     	        input.consume();
@@ -684,13 +685,13 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1733:8: ( '\\'' ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )* '\\'' )
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1732:8: ( '\\'' ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )* '\\'' )
                     {
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1733:8: ( '\\'' ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )* '\\'' )
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1733:9: '\\'' ( 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 | ~ ( '\\\\' | '\\'' ) )* '\\''
                     {
                     match('\''); if (failed) return ;
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1733:14: ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )*
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1732:14: ( EscapeSequence | ~ ( '\\\\' | '\\'' ) )*
                     loop9:
                     do {
                         int alt9=3;
@@ -706,14 +707,14 @@
 
                         switch (alt9) {
                     	case 1 :
-                    	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1733:16: EscapeSequence
+                    	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1732:16: EscapeSequence
                     	    {
                     	    mEscapeSequence(); if (failed) return ;
 
                     	    }
                     	    break;
                     	case 2 :
-                    	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1733:33: ~ ( '\\\\' | '\\'' )
+                    	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1732:33: ~ ( '\\\\' | '\\'' )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
                     	        input.consume();
@@ -754,8 +755,8 @@
     // $ANTLR start HexDigit
     public final void mHexDigit() throws RecognitionException {
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1737:10: ( ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1737:12: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' )
+            // /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' )
             {
             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();
@@ -780,7 +781,7 @@
     // $ANTLR start EscapeSequence
     public final void mEscapeSequence() throws RecognitionException {
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1741: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: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 )
             int alt11=3;
             int LA11_0 = input.LA(1);
 
@@ -852,7 +853,7 @@
                 default:
                     if (backtracking>0) {failed=true; return ;}
                     NoViableAltException nvae =
-                        new NoViableAltException("1739: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("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);
 
                     throw nvae;
                 }
@@ -861,13 +862,13 @@
             else {
                 if (backtracking>0) {failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1739: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("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);
 
                 throw nvae;
             }
             switch (alt11) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1741: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: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' | '*' | '[' | ']' | '(' | ')' | '$' | '^' | '{' | '}' | '?' | '+' | '-' | '&' | '|' )
                     {
                     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)<='}') ) {
@@ -885,14 +886,14 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1745:9: UnicodeEscape
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1744:9: UnicodeEscape
                     {
                     mUnicodeEscape(); if (failed) return ;
 
                     }
                     break;
                 case 3 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1746:9: OctalEscape
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1745:9: OctalEscape
                     {
                     mOctalEscape(); if (failed) return ;
 
@@ -909,7 +910,7 @@
     // $ANTLR start OctalEscape
     public final void mOctalEscape() throws RecognitionException {
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1751: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:1750:5: ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) )
             int alt12=3;
             int LA12_0 = input.LA(1);
 
@@ -920,9 +921,9 @@
                     int LA12_2 = input.LA(3);
 
                     if ( ((LA12_2>='0' && LA12_2<='7')) ) {
-                        int LA12_5 = input.LA(4);
+                        int LA12_4 = input.LA(4);
 
-                        if ( ((LA12_5>='0' && LA12_5<='7')) ) {
+                        if ( ((LA12_4>='0' && LA12_4<='7')) ) {
                             alt12=1;
                         }
                         else {
@@ -943,7 +944,7 @@
                 else {
                     if (backtracking>0) {failed=true; return ;}
                     NoViableAltException nvae =
-                        new NoViableAltException("1749:1: fragment OctalEscape : ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) );", 12, 1, input);
+                        new NoViableAltException("1748:1: fragment OctalEscape : ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) );", 12, 1, input);
 
                     throw nvae;
                 }
@@ -951,31 +952,31 @@
             else {
                 if (backtracking>0) {failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1749:1: fragment OctalEscape : ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) );", 12, 0, input);
+                    new NoViableAltException("1748:1: fragment OctalEscape : ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) );", 12, 0, input);
 
                 throw nvae;
             }
             switch (alt12) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1751:9: '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' )
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1750:9: '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' )
                     {
                     match('\\'); if (failed) return ;
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1751:14: ( '0' .. '3' )
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1751:15: '0' .. '3'
+                    // /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'
                     {
                     matchRange('0','3'); if (failed) return ;
 
                     }
 
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1751:25: ( '0' .. '7' )
-                    // /home/etirelli/workspace/jboss/jbossrules/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:1750:25: ( '0' .. '7' )
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1750:26: '0' .. '7'
                     {
                     matchRange('0','7'); if (failed) return ;
 
                     }
 
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1751:36: ( '0' .. '7' )
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1751:37: '0' .. '7'
+                    // /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'
                     {
                     matchRange('0','7'); if (failed) return ;
 
@@ -985,18 +986,18 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1752:9: '\\\\' ( '0' .. '7' ) ( '0' .. '7' )
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1751:9: '\\\\' ( '0' .. '7' ) ( '0' .. '7' )
                     {
                     match('\\'); if (failed) return ;
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1752:14: ( '0' .. '7' )
-                    // /home/etirelli/workspace/jboss/jbossrules/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:1751:14: ( '0' .. '7' )
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1751:15: '0' .. '7'
                     {
                     matchRange('0','7'); if (failed) return ;
 
                     }
 
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1752:25: ( '0' .. '7' )
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1752:26: '0' .. '7'
+                    // /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'
                     {
                     matchRange('0','7'); if (failed) return ;
 
@@ -1006,11 +1007,11 @@
                     }
                     break;
                 case 3 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1753:9: '\\\\' ( '0' .. '7' )
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1752:9: '\\\\' ( '0' .. '7' )
                     {
                     match('\\'); if (failed) return ;
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1753:14: ( '0' .. '7' )
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1753:15: '0' .. '7'
+                    // /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'
                     {
                     matchRange('0','7'); if (failed) return ;
 
@@ -1030,8 +1031,8 @@
     // $ANTLR start UnicodeEscape
     public final void mUnicodeEscape() throws RecognitionException {
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1758:5: ( '\\\\' 'u' HexDigit HexDigit HexDigit HexDigit )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1758:9: '\\\\' 'u' HexDigit HexDigit HexDigit HexDigit
+            // /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
             {
             match('\\'); if (failed) return ;
             match('u'); if (failed) return ;
@@ -1052,10 +1053,10 @@
     public final void mBOOL() throws RecognitionException {
         try {
             int _type = BOOL;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1762:2: ( ( 'true' | 'false' ) )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1762:4: ( 'true' | 'false' )
+            // /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/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1762:4: ( 'true' | 'false' )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1761:4: ( 'true' | 'false' )
             int alt13=2;
             int LA13_0 = input.LA(1);
 
@@ -1068,13 +1069,13 @@
             else {
                 if (backtracking>0) {failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1762:4: ( 'true' | 'false' )", 13, 0, input);
+                    new NoViableAltException("1761:4: ( 'true' | 'false' )", 13, 0, input);
 
                 throw nvae;
             }
             switch (alt13) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1762:5: 'true'
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1761:5: 'true'
                     {
                     match("true"); if (failed) return ;
 
@@ -1082,7 +1083,7 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1762:12: 'false'
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1761:12: 'false'
                     {
                     match("false"); if (failed) return ;
 
@@ -1106,8 +1107,8 @@
     public final void mPACKAGE() throws RecognitionException {
         try {
             int _type = PACKAGE;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1765:9: ( 'package' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1765:11: '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'
             {
             match("package"); if (failed) return ;
 
@@ -1125,8 +1126,8 @@
     public final void mIMPORT() throws RecognitionException {
         try {
             int _type = IMPORT;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1767:8: ( 'import' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1767:10: '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'
             {
             match("import"); if (failed) return ;
 
@@ -1144,8 +1145,8 @@
     public final void mFUNCTION() throws RecognitionException {
         try {
             int _type = FUNCTION;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1769:10: ( 'function' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1769:12: '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'
             {
             match("function"); if (failed) return ;
 
@@ -1163,8 +1164,8 @@
     public final void mEVENT() throws RecognitionException {
         try {
             int _type = EVENT;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1771:7: ( 'event' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1771:10: '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'
             {
             match("event"); if (failed) return ;
 
@@ -1182,8 +1183,8 @@
     public final void mGLOBAL() throws RecognitionException {
         try {
             int _type = GLOBAL;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1773:8: ( 'global' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1773:10: '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'
             {
             match("global"); if (failed) return ;
 
@@ -1201,8 +1202,8 @@
     public final void mRULE() throws RecognitionException {
         try {
             int _type = RULE;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1775:9: ( 'rule' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1775:11: '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'
             {
             match("rule"); if (failed) return ;
 
@@ -1220,8 +1221,8 @@
     public final void mQUERY() throws RecognitionException {
         try {
             int _type = QUERY;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1777:7: ( 'query' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1777:9: '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'
             {
             match("query"); if (failed) return ;
 
@@ -1239,8 +1240,8 @@
     public final void mTEMPLATE() throws RecognitionException {
         try {
             int _type = TEMPLATE;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1779:10: ( 'template' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1779:12: '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'
             {
             match("template"); if (failed) return ;
 
@@ -1258,8 +1259,8 @@
     public final void mATTRIBUTES() throws RecognitionException {
         try {
             int _type = ATTRIBUTES;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1781:12: ( 'attributes' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1781:14: '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'
             {
             match("attributes"); if (failed) return ;
 
@@ -1277,8 +1278,8 @@
     public final void mDATE_EFFECTIVE() throws RecognitionException {
         try {
             int _type = DATE_EFFECTIVE;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1784:2: ( 'date-effective' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1784:4: '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'
             {
             match("date-effective"); if (failed) return ;
 
@@ -1296,8 +1297,8 @@
     public final void mDATE_EXPIRES() throws RecognitionException {
         try {
             int _type = DATE_EXPIRES;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1787:2: ( 'date-expires' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1787:4: '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'
             {
             match("date-expires"); if (failed) return ;
 
@@ -1315,8 +1316,8 @@
     public final void mENABLED() throws RecognitionException {
         try {
             int _type = ENABLED;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1789:9: ( 'enabled' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1789:11: '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'
             {
             match("enabled"); if (failed) return ;
 
@@ -1334,8 +1335,8 @@
     public final void mSALIENCE() throws RecognitionException {
         try {
             int _type = SALIENCE;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1792:2: ( 'salience' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1792:4: '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'
             {
             match("salience"); if (failed) return ;
 
@@ -1353,8 +1354,8 @@
     public final void mNO_LOOP() throws RecognitionException {
         try {
             int _type = NO_LOOP;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1794:9: ( 'no-loop' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1794:11: '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'
             {
             match("no-loop"); if (failed) return ;
 
@@ -1372,8 +1373,8 @@
     public final void mAUTO_FOCUS() throws RecognitionException {
         try {
             int _type = AUTO_FOCUS;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1797:2: ( 'auto-focus' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1797:4: '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'
             {
             match("auto-focus"); if (failed) return ;
 
@@ -1391,8 +1392,8 @@
     public final void mACTIVATION_GROUP() throws RecognitionException {
         try {
             int _type = ACTIVATION_GROUP;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1800:2: ( 'activation-group' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1800:4: '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'
             {
             match("activation-group"); if (failed) return ;
 
@@ -1410,8 +1411,8 @@
     public final void mAGENDA_GROUP() throws RecognitionException {
         try {
             int _type = AGENDA_GROUP;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1803:2: ( 'agenda-group' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1803:4: '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'
             {
             match("agenda-group"); if (failed) return ;
 
@@ -1429,8 +1430,8 @@
     public final void mDIALECT() throws RecognitionException {
         try {
             int _type = DIALECT;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1806:2: ( 'dialect' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1806:4: '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'
             {
             match("dialect"); if (failed) return ;
 
@@ -1448,8 +1449,8 @@
     public final void mRULEFLOW_GROUP() throws RecognitionException {
         try {
             int _type = RULEFLOW_GROUP;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1809:2: ( 'ruleflow-group' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1809:4: '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'
             {
             match("ruleflow-group"); if (failed) return ;
 
@@ -1467,8 +1468,8 @@
     public final void mDURATION() throws RecognitionException {
         try {
             int _type = DURATION;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1812:2: ( 'duration' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1812:4: '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'
             {
             match("duration"); if (failed) return ;
 
@@ -1486,8 +1487,8 @@
     public final void mLOCK_ON_ACTIVE() throws RecognitionException {
         try {
             int _type = LOCK_ON_ACTIVE;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1815:2: ( 'lock-on-active' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1815:4: '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'
             {
             match("lock-on-active"); if (failed) return ;
 
@@ -1505,8 +1506,8 @@
     public final void mFROM() throws RecognitionException {
         try {
             int _type = FROM;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1817:6: ( 'from' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1817:8: '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'
             {
             match("from"); if (failed) return ;
 
@@ -1524,8 +1525,8 @@
     public final void mACCUMULATE() throws RecognitionException {
         try {
             int _type = ACCUMULATE;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1820:2: ( 'accumulate' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1820:4: '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'
             {
             match("accumulate"); if (failed) return ;
 
@@ -1543,8 +1544,8 @@
     public final void mINIT() throws RecognitionException {
         try {
             int _type = INIT;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1822:6: ( 'init' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1822:8: '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'
             {
             match("init"); if (failed) return ;
 
@@ -1562,8 +1563,8 @@
     public final void mACTION() throws RecognitionException {
         try {
             int _type = ACTION;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1824:8: ( 'action' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1824:10: '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'
             {
             match("action"); if (failed) return ;
 
@@ -1581,8 +1582,8 @@
     public final void mREVERSE() throws RecognitionException {
         try {
             int _type = REVERSE;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1826:9: ( 'reverse' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1826:11: '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'
             {
             match("reverse"); if (failed) return ;
 
@@ -1600,8 +1601,8 @@
     public final void mRESULT() throws RecognitionException {
         try {
             int _type = RESULT;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1828:8: ( 'result' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1828:10: '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'
             {
             match("result"); if (failed) return ;
 
@@ -1619,8 +1620,8 @@
     public final void mCOLLECT() throws RecognitionException {
         try {
             int _type = COLLECT;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1830:9: ( 'collect' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1830:11: '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'
             {
             match("collect"); if (failed) return ;
 
@@ -1638,8 +1639,8 @@
     public final void mOR() throws RecognitionException {
         try {
             int _type = OR;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1832:4: ( 'or' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1832:6: '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'
             {
             match("or"); if (failed) return ;
 
@@ -1657,8 +1658,8 @@
     public final void mAND() throws RecognitionException {
         try {
             int _type = AND;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1834:5: ( 'and' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1834:7: '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'
             {
             match("and"); if (failed) return ;
 
@@ -1676,8 +1677,8 @@
     public final void mCONTAINS() throws RecognitionException {
         try {
             int _type = CONTAINS;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1837:2: ( 'contains' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1837:4: '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'
             {
             match("contains"); if (failed) return ;
 
@@ -1695,8 +1696,8 @@
     public final void mEXCLUDES() throws RecognitionException {
         try {
             int _type = EXCLUDES;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1840:2: ( 'excludes' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1840:4: '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'
             {
             match("excludes"); if (failed) return ;
 
@@ -1714,8 +1715,8 @@
     public final void mMEMBEROF() throws RecognitionException {
         try {
             int _type = MEMBEROF;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1843:2: ( 'memberOf' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1843:4: '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'
             {
             match("memberOf"); if (failed) return ;
 
@@ -1733,8 +1734,8 @@
     public final void mMATCHES() throws RecognitionException {
         try {
             int _type = MATCHES;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1845:9: ( 'matches' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1845:11: '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'
             {
             match("matches"); if (failed) return ;
 
@@ -1752,8 +1753,8 @@
     public final void mSOUNDSLIKE() throws RecognitionException {
         try {
             int _type = SOUNDSLIKE;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1847:12: ( 'soundslike' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1847:14: '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'
             {
             match("soundslike"); if (failed) return ;
 
@@ -1771,8 +1772,8 @@
     public final void mIN() throws RecognitionException {
         try {
             int _type = IN;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1849:4: ( 'in' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1849:6: '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'
             {
             match("in"); if (failed) return ;
 
@@ -1790,8 +1791,8 @@
     public final void mNULL() throws RecognitionException {
         try {
             int _type = NULL;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1851:6: ( 'null' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1851:8: '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'
             {
             match("null"); if (failed) return ;
 
@@ -1809,8 +1810,8 @@
     public final void mEXISTS() throws RecognitionException {
         try {
             int _type = EXISTS;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1853:8: ( 'exists' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1853:10: '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'
             {
             match("exists"); if (failed) return ;
 
@@ -1828,8 +1829,8 @@
     public final void mNOT() throws RecognitionException {
         try {
             int _type = NOT;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1855:5: ( 'not' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1855:7: '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'
             {
             match("not"); if (failed) return ;
 
@@ -1847,8 +1848,8 @@
     public final void mEVAL() throws RecognitionException {
         try {
             int _type = EVAL;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1857:6: ( 'eval' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1857:8: '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'
             {
             match("eval"); if (failed) return ;
 
@@ -1866,8 +1867,8 @@
     public final void mFORALL() throws RecognitionException {
         try {
             int _type = FORALL;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1859:8: ( 'forall' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1859:10: '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'
             {
             match("forall"); if (failed) return ;
 
@@ -1885,8 +1886,8 @@
     public final void mWHEN() throws RecognitionException {
         try {
             int _type = WHEN;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1861:9: ( 'when' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1861:11: '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'
             {
             match("when"); if (failed) return ;
 
@@ -1904,8 +1905,8 @@
     public final void mTHEN() throws RecognitionException {
         try {
             int _type = THEN;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1863:6: ( 'then' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1863:12: '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'
             {
             match("then"); if (failed) return ;
 
@@ -1923,8 +1924,8 @@
     public final void mEND() throws RecognitionException {
         try {
             int _type = END;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1865:9: ( 'end' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1865:11: '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'
             {
             match("end"); if (failed) return ;
 
@@ -1942,8 +1943,8 @@
     public final void mID() throws RecognitionException {
         try {
             int _type = ID;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1868:2: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '$' | '\\u00c0' .. '\\u00ff' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' | '\\u00c0' .. '\\u00ff' )* )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1868: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: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' )*
             {
             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();
@@ -1956,7 +1957,7 @@
                 recover(mse);    throw mse;
             }
 
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1868:50: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' | '\\u00c0' .. '\\u00ff' )*
+            // /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' )*
             loop14:
             do {
                 int alt14=2;
@@ -1969,7 +1970,7 @@
 
                 switch (alt14) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:
+            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:
             	    {
             	    if ( (input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z')||(input.LA(1)>='\u00C0' && input.LA(1)<='\u00FF') ) {
             	        input.consume();
@@ -2005,8 +2006,8 @@
     public final void mLEFT_PAREN() throws RecognitionException {
         try {
             int _type = LEFT_PAREN;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1872:9: ( '(' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1872:11: '('
+            // /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: '('
             {
             match('('); if (failed) return ;
 
@@ -2023,8 +2024,8 @@
     public final void mRIGHT_PAREN() throws RecognitionException {
         try {
             int _type = RIGHT_PAREN;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1876:9: ( ')' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1876:11: ')'
+            // /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: ')'
             {
             match(')'); if (failed) return ;
 
@@ -2041,8 +2042,8 @@
     public final void mLEFT_SQUARE() throws RecognitionException {
         try {
             int _type = LEFT_SQUARE;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1880:9: ( '[' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1880:11: '['
+            // /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: '['
             {
             match('['); if (failed) return ;
 
@@ -2059,8 +2060,8 @@
     public final void mRIGHT_SQUARE() throws RecognitionException {
         try {
             int _type = RIGHT_SQUARE;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1884:9: ( ']' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1884:11: ']'
+            // /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: ']'
             {
             match(']'); if (failed) return ;
 
@@ -2077,8 +2078,8 @@
     public final void mLEFT_CURLY() throws RecognitionException {
         try {
             int _type = LEFT_CURLY;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1888:9: ( '{' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1888:11: '{'
+            // /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: '{'
             {
             match('{'); if (failed) return ;
 
@@ -2095,8 +2096,8 @@
     public final void mRIGHT_CURLY() throws RecognitionException {
         try {
             int _type = RIGHT_CURLY;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1892:9: ( '}' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1892:11: '}'
+            // /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: '}'
             {
             match('}'); if (failed) return ;
 
@@ -2113,8 +2114,8 @@
     public final void mCOMMA() throws RecognitionException {
         try {
             int _type = COMMA;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1895:7: ( ',' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1895:9: ','
+            // /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: ','
             {
             match(','); if (failed) return ;
 
@@ -2131,8 +2132,8 @@
     public final void mDOT() throws RecognitionException {
         try {
             int _type = DOT;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1898:5: ( '.' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1898:7: '.'
+            // /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: '.'
             {
             match('.'); if (failed) return ;
 
@@ -2149,8 +2150,8 @@
     public final void mDOUBLE_AMPER() throws RecognitionException {
         try {
             int _type = DOUBLE_AMPER;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1902:2: ( '&&' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1902:4: '&&'
+            // /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: '&&'
             {
             match("&&"); if (failed) return ;
 
@@ -2168,8 +2169,8 @@
     public final void mDOUBLE_PIPE() throws RecognitionException {
         try {
             int _type = DOUBLE_PIPE;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1906:2: ( '||' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1906:4: '||'
+            // /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: '||'
             {
             match("||"); if (failed) return ;
 
@@ -2183,15 +2184,33 @@
     }
     // $ANTLR end DOUBLE_PIPE
 
+    // $ANTLR start TILDE
+    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: '~'
+            {
+            match('~'); if (failed) return ;
+
+            }
+
+            this.type = _type;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end TILDE
+
     // $ANTLR start SH_STYLE_SINGLE_LINE_COMMENT
     public final void mSH_STYLE_SINGLE_LINE_COMMENT() throws RecognitionException {
         try {
             int _type = SH_STYLE_SINGLE_LINE_COMMENT;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1910:2: ( '#' ( options {greedy=false; } : . )* EOL )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1910:4: '#' ( options {greedy=false; } : . )* EOL
+            // /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
             {
             match('#'); if (failed) return ;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1910:8: ( options {greedy=false; } : . )*
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1911:8: ( options {greedy=false; } : . )*
             loop15:
             do {
                 int alt15=2;
@@ -2210,7 +2229,7 @@
 
                 switch (alt15) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1910:35: .
+            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1911:35: .
             	    {
             	    matchAny(); if (failed) return ;
 
@@ -2240,12 +2259,12 @@
     public final void mC_STYLE_SINGLE_LINE_COMMENT() throws RecognitionException {
         try {
             int _type = C_STYLE_SINGLE_LINE_COMMENT;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1916:2: ( '//' ( options {greedy=false; } : . )* EOL )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1916:4: '//' ( options {greedy=false; } : . )* EOL
+            // /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
             {
             match("//"); if (failed) return ;
 
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1916:9: ( options {greedy=false; } : . )*
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1917:9: ( options {greedy=false; } : . )*
             loop16:
             do {
                 int alt16=2;
@@ -2264,7 +2283,7 @@
 
                 switch (alt16) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1916:36: .
+            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1917:36: .
             	    {
             	    matchAny(); if (failed) return ;
 
@@ -2294,12 +2313,12 @@
     public final void mMULTI_LINE_COMMENT() throws RecognitionException {
         try {
             int _type = MULTI_LINE_COMMENT;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1921:2: ( '/*' ( options {greedy=false; } : . )* '*/' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1921:4: '/*' ( options {greedy=false; } : . )* '*/'
+            // /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; } : . )* '*/'
             {
             match("/*"); if (failed) return ;
 
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1921:9: ( options {greedy=false; } : . )*
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1922:9: ( options {greedy=false; } : . )*
             loop17:
             do {
                 int alt17=2;
@@ -2324,7 +2343,7 @@
 
                 switch (alt17) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1921:35: .
+            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1922:35: .
             	    {
             	    matchAny(); if (failed) return ;
 
@@ -2355,8 +2374,8 @@
     public final void mMISC() throws RecognitionException {
         try {
             int _type = MISC;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1925:7: ( '!' | '@' | '$' | '%' | '^' | '*' | '_' | '-' | '+' | '?' | '=' | '/' | '\\'' | '\\\\' | '|' | '&' )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:
+            // /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:
             {
             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)=='|' ) {
                 input.consume();
@@ -2380,524 +2399,531 @@
     // $ANTLR end MISC
 
     public void mTokens() throws RecognitionException {
-        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:8: ( T73 | T74 | T75 | T76 | T77 | T78 | T79 | T80 | T81 | T82 | 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 | SH_STYLE_SINGLE_LINE_COMMENT | C_STYLE_SINGLE_LINE_COMMENT | MULTI_LINE_COMMENT | MISC )
-        int alt18=74;
+        // /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;
         alt18 = dfa18.predict(input);
         switch (alt18) {
             case 1 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:10: T73
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:10: T74
                 {
-                mT73(); if (failed) return ;
+                mT74(); if (failed) return ;
 
                 }
                 break;
             case 2 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:14: T74
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:14: T75
                 {
-                mT74(); if (failed) return ;
+                mT75(); if (failed) return ;
 
                 }
                 break;
             case 3 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:18: T75
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:18: T76
                 {
-                mT75(); if (failed) return ;
+                mT76(); if (failed) return ;
 
                 }
                 break;
             case 4 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:22: T76
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:22: T77
                 {
-                mT76(); if (failed) return ;
+                mT77(); if (failed) return ;
 
                 }
                 break;
             case 5 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:26: T77
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:26: T78
                 {
-                mT77(); if (failed) return ;
+                mT78(); if (failed) return ;
 
                 }
                 break;
             case 6 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:30: T78
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:30: T79
                 {
-                mT78(); if (failed) return ;
+                mT79(); if (failed) return ;
 
                 }
                 break;
             case 7 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:34: T79
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:34: T80
                 {
-                mT79(); if (failed) return ;
+                mT80(); if (failed) return ;
 
                 }
                 break;
             case 8 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:38: T80
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:38: T81
                 {
-                mT80(); if (failed) return ;
+                mT81(); if (failed) return ;
 
                 }
                 break;
             case 9 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:42: T81
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:42: T82
                 {
-                mT81(); if (failed) return ;
+                mT82(); if (failed) return ;
 
                 }
                 break;
             case 10 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:46: T82
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:46: T83
                 {
-                mT82(); if (failed) return ;
+                mT83(); if (failed) return ;
 
                 }
                 break;
             case 11 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:50: WS
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:50: WS
                 {
                 mWS(); if (failed) return ;
 
                 }
                 break;
             case 12 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:53: INT
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:53: INT
                 {
                 mINT(); if (failed) return ;
 
                 }
                 break;
             case 13 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:57: FLOAT
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:57: FLOAT
                 {
                 mFLOAT(); if (failed) return ;
 
                 }
                 break;
             case 14 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:63: STRING
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:63: STRING
                 {
                 mSTRING(); if (failed) return ;
 
                 }
                 break;
             case 15 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:70: BOOL
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:70: BOOL
                 {
                 mBOOL(); if (failed) return ;
 
                 }
                 break;
             case 16 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:75: PACKAGE
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:75: PACKAGE
                 {
                 mPACKAGE(); if (failed) return ;
 
                 }
                 break;
             case 17 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:83: IMPORT
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:83: IMPORT
                 {
                 mIMPORT(); if (failed) return ;
 
                 }
                 break;
             case 18 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:90: FUNCTION
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:90: FUNCTION
                 {
                 mFUNCTION(); if (failed) return ;
 
                 }
                 break;
             case 19 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:99: EVENT
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:99: EVENT
                 {
                 mEVENT(); if (failed) return ;
 
                 }
                 break;
             case 20 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:105: GLOBAL
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:105: GLOBAL
                 {
                 mGLOBAL(); if (failed) return ;
 
                 }
                 break;
             case 21 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:112: RULE
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:112: RULE
                 {
                 mRULE(); if (failed) return ;
 
                 }
                 break;
             case 22 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:117: QUERY
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:117: QUERY
                 {
                 mQUERY(); if (failed) return ;
 
                 }
                 break;
             case 23 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:123: TEMPLATE
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:123: TEMPLATE
                 {
                 mTEMPLATE(); if (failed) return ;
 
                 }
                 break;
             case 24 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:132: ATTRIBUTES
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:132: ATTRIBUTES
                 {
                 mATTRIBUTES(); if (failed) return ;
 
                 }
                 break;
             case 25 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:143: DATE_EFFECTIVE
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:143: DATE_EFFECTIVE
                 {
                 mDATE_EFFECTIVE(); if (failed) return ;
 
                 }
                 break;
             case 26 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:158: DATE_EXPIRES
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:158: DATE_EXPIRES
                 {
                 mDATE_EXPIRES(); if (failed) return ;
 
                 }
                 break;
             case 27 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:171: ENABLED
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:171: ENABLED
                 {
                 mENABLED(); if (failed) return ;
 
                 }
                 break;
             case 28 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:179: SALIENCE
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:179: SALIENCE
                 {
                 mSALIENCE(); if (failed) return ;
 
                 }
                 break;
             case 29 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:188: NO_LOOP
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:188: NO_LOOP
                 {
                 mNO_LOOP(); if (failed) return ;
 
                 }
                 break;
             case 30 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:196: AUTO_FOCUS
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:196: AUTO_FOCUS
                 {
                 mAUTO_FOCUS(); if (failed) return ;
 
                 }
                 break;
             case 31 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:207: ACTIVATION_GROUP
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:207: ACTIVATION_GROUP
                 {
                 mACTIVATION_GROUP(); if (failed) return ;
 
                 }
                 break;
             case 32 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:224: AGENDA_GROUP
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:224: AGENDA_GROUP
                 {
                 mAGENDA_GROUP(); if (failed) return ;
 
                 }
                 break;
             case 33 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:237: DIALECT
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:237: DIALECT
                 {
                 mDIALECT(); if (failed) return ;
 
                 }
                 break;
             case 34 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:245: RULEFLOW_GROUP
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:245: RULEFLOW_GROUP
                 {
                 mRULEFLOW_GROUP(); if (failed) return ;
 
                 }
                 break;
             case 35 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:260: DURATION
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:260: DURATION
                 {
                 mDURATION(); if (failed) return ;
 
                 }
                 break;
             case 36 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:269: LOCK_ON_ACTIVE
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:269: LOCK_ON_ACTIVE
                 {
                 mLOCK_ON_ACTIVE(); if (failed) return ;
 
                 }
                 break;
             case 37 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:284: FROM
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:284: FROM
                 {
                 mFROM(); if (failed) return ;
 
                 }
                 break;
             case 38 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:289: ACCUMULATE
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:289: ACCUMULATE
                 {
                 mACCUMULATE(); if (failed) return ;
 
                 }
                 break;
             case 39 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:300: INIT
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:300: INIT
                 {
                 mINIT(); if (failed) return ;
 
                 }
                 break;
             case 40 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:305: ACTION
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:305: ACTION
                 {
                 mACTION(); if (failed) return ;
 
                 }
                 break;
             case 41 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:312: REVERSE
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:312: REVERSE
                 {
                 mREVERSE(); if (failed) return ;
 
                 }
                 break;
             case 42 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:320: RESULT
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:320: RESULT
                 {
                 mRESULT(); if (failed) return ;
 
                 }
                 break;
             case 43 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:327: COLLECT
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:327: COLLECT
                 {
                 mCOLLECT(); if (failed) return ;
 
                 }
                 break;
             case 44 :
-                // /home/etirelli/workspace/jboss/jbossrules/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: OR
                 {
                 mOR(); if (failed) return ;
 
                 }
                 break;
             case 45 :
-                // /home/etirelli/workspace/jboss/jbossrules/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:338: AND
                 {
                 mAND(); if (failed) return ;
 
                 }
                 break;
             case 46 :
-                // /home/etirelli/workspace/jboss/jbossrules/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:342: CONTAINS
                 {
                 mCONTAINS(); if (failed) return ;
 
                 }
                 break;
             case 47 :
-                // /home/etirelli/workspace/jboss/jbossrules/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:351: EXCLUDES
                 {
                 mEXCLUDES(); if (failed) return ;
 
                 }
                 break;
             case 48 :
-                // /home/etirelli/workspace/jboss/jbossrules/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:360: MEMBEROF
                 {
                 mMEMBEROF(); if (failed) return ;
 
                 }
                 break;
             case 49 :
-                // /home/etirelli/workspace/jboss/jbossrules/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:369: MATCHES
                 {
                 mMATCHES(); if (failed) return ;
 
                 }
                 break;
             case 50 :
-                // /home/etirelli/workspace/jboss/jbossrules/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:377: SOUNDSLIKE
                 {
                 mSOUNDSLIKE(); if (failed) return ;
 
                 }
                 break;
             case 51 :
-                // /home/etirelli/workspace/jboss/jbossrules/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:388: IN
                 {
                 mIN(); if (failed) return ;
 
                 }
                 break;
             case 52 :
-                // /home/etirelli/workspace/jboss/jbossrules/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:391: NULL
                 {
                 mNULL(); if (failed) return ;
 
                 }
                 break;
             case 53 :
-                // /home/etirelli/workspace/jboss/jbossrules/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:396: EXISTS
                 {
                 mEXISTS(); if (failed) return ;
 
                 }
                 break;
             case 54 :
-                // /home/etirelli/workspace/jboss/jbossrules/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:403: NOT
                 {
                 mNOT(); if (failed) return ;
 
                 }
                 break;
             case 55 :
-                // /home/etirelli/workspace/jboss/jbossrules/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:407: EVAL
                 {
                 mEVAL(); if (failed) return ;
 
                 }
                 break;
             case 56 :
-                // /home/etirelli/workspace/jboss/jbossrules/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:412: FORALL
                 {
                 mFORALL(); if (failed) return ;
 
                 }
                 break;
             case 57 :
-                // /home/etirelli/workspace/jboss/jbossrules/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:419: WHEN
                 {
                 mWHEN(); if (failed) return ;
 
                 }
                 break;
             case 58 :
-                // /home/etirelli/workspace/jboss/jbossrules/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:424: THEN
                 {
                 mTHEN(); if (failed) return ;
 
                 }
                 break;
             case 59 :
-                // /home/etirelli/workspace/jboss/jbossrules/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:429: END
                 {
                 mEND(); if (failed) return ;
 
                 }
                 break;
             case 60 :
-                // /home/etirelli/workspace/jboss/jbossrules/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:433: ID
                 {
                 mID(); if (failed) return ;
 
                 }
                 break;
             case 61 :
-                // /home/etirelli/workspace/jboss/jbossrules/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:436: LEFT_PAREN
                 {
                 mLEFT_PAREN(); if (failed) return ;
 
                 }
                 break;
             case 62 :
-                // /home/etirelli/workspace/jboss/jbossrules/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:447: RIGHT_PAREN
                 {
                 mRIGHT_PAREN(); if (failed) return ;
 
                 }
                 break;
             case 63 :
-                // /home/etirelli/workspace/jboss/jbossrules/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: LEFT_SQUARE
                 {
                 mLEFT_SQUARE(); if (failed) return ;
 
                 }
                 break;
             case 64 :
-                // /home/etirelli/workspace/jboss/jbossrules/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: RIGHT_SQUARE
                 {
                 mRIGHT_SQUARE(); if (failed) return ;
 
                 }
                 break;
             case 65 :
-                // /home/etirelli/workspace/jboss/jbossrules/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:484: LEFT_CURLY
                 {
                 mLEFT_CURLY(); if (failed) return ;
 
                 }
                 break;
             case 66 :
-                // /home/etirelli/workspace/jboss/jbossrules/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:495: RIGHT_CURLY
                 {
                 mRIGHT_CURLY(); if (failed) return ;
 
                 }
                 break;
             case 67 :
-                // /home/etirelli/workspace/jboss/jbossrules/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: COMMA
                 {
                 mCOMMA(); if (failed) return ;
 
                 }
                 break;
             case 68 :
-                // /home/etirelli/workspace/jboss/jbossrules/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:513: DOT
                 {
                 mDOT(); if (failed) return ;
 
                 }
                 break;
             case 69 :
-                // /home/etirelli/workspace/jboss/jbossrules/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:517: DOUBLE_AMPER
                 {
                 mDOUBLE_AMPER(); if (failed) return ;
 
                 }
                 break;
             case 70 :
-                // /home/etirelli/workspace/jboss/jbossrules/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:530: DOUBLE_PIPE
                 {
                 mDOUBLE_PIPE(); if (failed) return ;
 
                 }
                 break;
             case 71 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:542: SH_STYLE_SINGLE_LINE_COMMENT
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:542: TILDE
                 {
-                mSH_STYLE_SINGLE_LINE_COMMENT(); if (failed) return ;
+                mTILDE(); if (failed) return ;
 
                 }
                 break;
             case 72 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:571: C_STYLE_SINGLE_LINE_COMMENT
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:548: SH_STYLE_SINGLE_LINE_COMMENT
                 {
-                mC_STYLE_SINGLE_LINE_COMMENT(); if (failed) return ;
+                mSH_STYLE_SINGLE_LINE_COMMENT(); if (failed) return ;
 
                 }
                 break;
             case 73 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:599: MULTI_LINE_COMMENT
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:577: C_STYLE_SINGLE_LINE_COMMENT
                 {
-                mMULTI_LINE_COMMENT(); if (failed) return ;
+                mC_STYLE_SINGLE_LINE_COMMENT(); if (failed) return ;
 
                 }
                 break;
             case 74 :
-                // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:618: MISC
+                // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1:605: MULTI_LINE_COMMENT
                 {
+                mMULTI_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
+                {
                 mMISC(); if (failed) return ;
 
                 }
@@ -2909,8 +2935,8 @@
 
     // $ANTLR start synpred1
     public final void synpred1_fragment() throws RecognitionException {   
-        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1717:14: ( '\\r\\n' )
-        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1717:16: '\\r\\n'
+        // /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'
         {
         match("\r\n"); if (failed) return ;
 
@@ -2937,125 +2963,127 @@
 
     protected DFA18 dfa18 = new DFA18(this);
     static final String DFA18_eotS =
-        "\2\uffff\1\55\1\uffff\2\53\1\61\1\63\1\53\1\uffff\1\66\1\uffff\1"+
-        "\53\21\52\10\uffff\2\53\1\uffff\1\53\15\uffff\10\52\1\147\26\52"+
-        "\1\u0085\3\52\4\uffff\11\52\1\uffff\2\52\1\u0094\14\52\1\u00a1\7"+
-        "\52\1\u00a9\1\uffff\4\52\1\uffff\3\52\1\u00b1\1\u00b2\1\52\1\u00b4"+
-        "\4\52\1\u00b9\2\52\1\uffff\1\u00bc\6\52\1\u00c4\4\52\1\uffff\7\52"+
-        "\1\uffff\1\u00d1\5\52\1\u00d7\2\uffff\1\52\1\uffff\2\52\1\u00b1"+
-        "\1\52\1\uffff\2\52\1\uffff\1\u00de\6\52\1\uffff\1\u00e5\5\52\1\uffff"+
-        "\1\52\1\uffff\3\52\2\uffff\4\52\1\uffff\1\52\1\u00f5\2\52\1\u00f8"+
-        "\1\52\1\uffff\1\52\1\u00fb\1\u00fc\1\u00fd\2\52\1\uffff\1\52\1\u0101"+
-        "\4\52\1\uffff\10\52\1\uffff\1\52\1\u0111\1\uffff\1\u0112\1\52\3"+
-        "\uffff\1\u0114\2\52\1\uffff\2\52\1\uffff\1\u0119\2\uffff\4\52\1"+
-        "\u011e\1\52\1\u0120\1\u0121\1\u0122\2\uffff\1\u0123\1\uffff\4\52"+
-        "\1\uffff\1\u0128\1\52\1\u012a\1\u012b\1\uffff\1\u012c\5\uffff\3"+
-        "\52\1\uffff\1\52\3\uffff\1\u0131\1\52\1\u0133\1\u0134\4\uffff";
+        "\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";
     static final String DFA18_eofS =
-        "\u0135\uffff";
+        "\u0136\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\1\uffff\1\52\15\uffff\1\165\1\145"+
-        "\1\155\1\157\1\162\1\156\1\154\1\143\1\60\1\160\2\141\1\143\1\157"+
-        "\1\163\1\154\1\145\1\143\1\164\1\144\1\145\1\164\1\141\1\164\1\162"+
-        "\1\165\1\154\1\55\1\154\1\143\1\154\1\60\1\155\1\164\1\145\4\uffff"+
-        "\1\145\1\156\1\160\1\155\1\141\1\143\1\163\1\153\1\164\1\uffff\1"+
-        "\157\1\142\1\60\1\154\1\156\1\154\1\163\1\142\1\165\2\145\1\162"+
-        "\1\165\1\151\1\162\1\60\1\156\1\157\1\154\1\145\1\141\1\156\1\151"+
-        "\1\60\1\uffff\1\154\1\153\1\164\1\154\1\uffff\1\142\1\143\1\156"+
-        "\2\60\1\154\1\60\1\154\1\164\1\145\1\141\1\60\1\162\1\154\1\uffff"+
-        "\1\60\1\164\1\165\1\164\1\141\1\154\1\162\1\60\1\171\1\155\1\157"+
-        "\1\151\1\uffff\1\144\1\55\1\145\1\55\1\164\1\144\1\145\1\uffff\1"+
-        "\60\1\55\1\141\2\145\1\150\1\60\2\uffff\1\141\1\uffff\1\154\1\151"+
-        "\1\60\1\147\1\uffff\1\164\1\145\1\uffff\1\60\1\144\1\163\1\154\1"+
-        "\164\1\163\1\154\1\uffff\1\60\1\165\1\156\1\141\1\142\1\141\1\uffff"+
-        "\1\143\1\145\1\151\1\163\1\156\2\uffff\1\151\1\143\1\162\1\145\1"+
-        "\uffff\1\164\1\60\1\157\1\145\1\60\1\144\1\uffff\1\145\3\60\1\145"+
-        "\1\157\1\uffff\1\154\1\60\1\164\1\165\1\55\1\164\1\146\1\157\1\154"+
-        "\1\143\1\156\1\164\1\117\1\163\1\145\1\uffff\1\156\1\60\1\uffff"+
-        "\1\60\1\163\3\uffff\1\60\1\167\1\141\1\uffff\1\151\1\164\1\uffff"+
-        "\1\60\2\uffff\1\156\1\151\1\145\1\163\1\60\1\146\3\60\2\uffff\1"+
-        "\60\1\uffff\1\55\1\164\1\157\1\145\1\uffff\1\60\1\153\2\60\1\uffff"+
-        "\1\60\5\uffff\1\145\1\156\1\163\1\uffff\1\145\3\uffff\1\60\1\55"+
-        "\2\60\4\uffff";
+        "\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";
     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\1\uffff\1\57\15\uffff\1\165\1\145"+
-        "\1\155\1\157\1\162\1\156\1\154\1\143\1\u00ff\1\160\1\144\1\145\1"+
-        "\151\1\157\1\166\1\154\1\145\2\164\1\144\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\155\1\164\1"+
-        "\145\4\uffff\1\145\1\156\1\160\1\155\1\141\1\143\1\163\1\153\1\164"+
-        "\1\uffff\1\157\1\142\1\u00ff\1\154\1\156\1\154\1\163\1\142\1\165"+
-        "\2\145\1\162\1\165\1\151\1\162\1\u00ff\1\156\1\157\1\154\1\145\1"+
-        "\141\1\156\1\151\1\u00ff\1\uffff\1\154\1\153\1\164\1\154\1\uffff"+
-        "\1\142\1\143\1\156\2\u00ff\1\154\1\u00ff\1\154\1\164\1\145\1\141"+
-        "\1\u00ff\1\162\1\154\1\uffff\1\u00ff\1\164\1\165\1\164\1\141\1\154"+
-        "\1\162\1\u00ff\1\171\1\155\1\166\1\151\1\uffff\1\144\1\55\1\145"+
-        "\1\55\1\164\1\144\1\145\1\uffff\1\u00ff\1\55\1\141\2\145\1\150\1"+
-        "\u00ff\2\uffff\1\141\1\uffff\1\154\1\151\1\u00ff\1\147\1\uffff\1"+
-        "\164\1\145\1\uffff\1\u00ff\1\144\1\163\1\154\1\164\1\163\1\154\1"+
-        "\uffff\1\u00ff\1\165\1\156\1\141\1\142\1\141\1\uffff\1\143\1\145"+
-        "\1\151\1\163\1\156\2\uffff\1\151\1\143\1\162\1\145\1\uffff\1\164"+
-        "\1\u00ff\1\157\1\145\1\u00ff\1\144\1\uffff\1\145\3\u00ff\1\145\1"+
-        "\157\1\uffff\1\154\1\u00ff\1\164\1\165\1\55\1\164\1\170\1\157\1"+
-        "\154\1\143\1\156\1\164\1\117\1\163\1\145\1\uffff\1\156\1\u00ff\1"+
-        "\uffff\1\u00ff\1\163\3\uffff\1\u00ff\1\167\1\141\1\uffff\1\151\1"+
-        "\164\1\uffff\1\u00ff\2\uffff\1\156\1\151\1\145\1\163\1\u00ff\1\146"+
-        "\3\u00ff\2\uffff\1\u00ff\1\uffff\1\55\1\164\1\157\1\145\1\uffff"+
-        "\1\u00ff\1\153\2\u00ff\1\uffff\1\u00ff\5\uffff\1\145\1\156\1\163"+
-        "\1\uffff\1\145\3\uffff\1\u00ff\1\55\2\u00ff\4\uffff";
+        "\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";
     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\uffff\1"+
-        "\74\1\112\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\110\11\uffff\1\63\30\uffff\1\35\4\uffff"+
-        "\1\54\16\uffff\1\73\14\uffff\1\55\7\uffff\1\66\7\uffff\1\17\1\72"+
-        "\1\uffff\1\45\4\uffff\1\47\2\uffff\1\67\7\uffff\1\25\6\uffff\1\36"+
-        "\5\uffff\1\64\1\44\4\uffff\1\71\6\uffff\1\23\6\uffff\1\26\17\uffff"+
-        "\1\70\2\uffff\1\21\2\uffff\1\65\1\24\1\52\3\uffff\1\50\2\uffff\1"+
-        "\40\1\uffff\1\31\1\32\11\uffff\1\20\1\33\1\uffff\1\51\4\uffff\1"+
-        "\41\4\uffff\1\53\1\uffff\1\61\1\27\1\22\1\57\1\42\3\uffff\1\43\1"+
-        "\uffff\1\34\1\56\1\60\4\uffff\1\46\1\37\1\30\1\62";
+        "\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";
     static final String DFA18_specialS =
-        "\u0135\uffff}>";
+        "\u0136\uffff}>";
     static final String[] DFA18_transitionS = {
-            "\2\11\1\uffff\2\11\22\uffff\1\11\1\10\1\13\1\50\1\36\1\53\1"+
-            "\46\1\14\1\37\1\40\2\53\1\45\1\4\1\2\1\51\12\12\1\3\1\1\1\7"+
-            "\1\5\1\6\2\53\32\52\1\41\1\53\1\42\1\53\1\36\1\uffff\1\25\1"+
-            "\52\1\32\1\26\1\21\1\16\1\22\1\52\1\20\2\52\1\31\1\34\1\30\1"+
-            "\33\1\17\1\24\1\23\1\27\1\15\2\52\1\35\3\52\1\43\1\47\1\44\102"+
-            "\uffff\100\52",
+            "\2\11\1\uffff\2\11\22\uffff\1\11\1\10\1\13\1\51\1\36\1\54\1"+
+            "\46\1\14\1\37\1\40\2\54\1\45\1\4\1\2\1\52\12\12\1\3\1\1\1\7"+
+            "\1\5\1\6\2\54\32\53\1\41\1\54\1\42\1\54\1\36\1\uffff\1\25\1"+
+            "\53\1\32\1\26\1\21\1\16\1\22\1\53\1\20\2\53\1\31\1\34\1\30\1"+
+            "\33\1\17\1\24\1\23\1\27\1\15\2\53\1\35\3\53\1\43\1\47\1\44\1"+
+            "\50\101\uffff\100\53",
             "",
-            "\1\54",
+            "\1\55",
             "",
-            "\12\12\4\uffff\1\56",
-            "\1\57",
+            "\12\12\4\uffff\1\57",
             "\1\60",
-            "\1\62",
-            "\1\64",
+            "\1\61",
+            "\1\63",
+            "\1\65",
             "",
-            "\1\65\1\uffff\12\12",
+            "\1\66\1\uffff\12\12",
             "",
             "\uffff\13",
-            "\1\71\2\uffff\1\70\11\uffff\1\67",
-            "\1\75\15\uffff\1\73\2\uffff\1\72\2\uffff\1\74",
-            "\1\76",
-            "\1\100\1\77",
-            "\1\101\7\uffff\1\102\1\uffff\1\103",
-            "\1\104",
-            "\1\105\17\uffff\1\106",
-            "\1\107",
-            "\1\110\3\uffff\1\113\6\uffff\1\112\5\uffff\1\111\1\114",
-            "\1\116\7\uffff\1\115\13\uffff\1\117",
-            "\1\121\15\uffff\1\120",
-            "\1\122\5\uffff\1\123",
-            "\1\124",
+            "\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\77",
+            "\1\101\1\100",
+            "\1\104\7\uffff\1\103\1\uffff\1\102",
+            "\1\105",
+            "\1\106\17\uffff\1\107",
+            "\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\125",
             "\1\126",
-            "\1\130\3\uffff\1\127",
-            "\1\131",
+            "\1\127",
+            "\1\130\3\uffff\1\131",
+            "\1\132",
             "",
             "",
             "",
@@ -3064,11 +3092,11 @@
             "",
             "",
             "",
-            "\1\132",
             "\1\133",
+            "\1\134",
             "",
-            "\1\134\4\uffff\1\135",
             "",
+            "\1\136\4\uffff\1\135",
             "",
             "",
             "",
@@ -3081,7 +3109,7 @@
             "",
             "",
             "",
-            "\1\136",
+            "",
             "\1\137",
             "\1\140",
             "\1\141",
@@ -3089,18 +3117,18 @@
             "\1\143",
             "\1\144",
             "\1\145",
-            "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\10\52\1\146\21\52"+
-            "\105\uffff\100\52",
-            "\1\150",
-            "\1\151\2\uffff\1\152",
-            "\1\153\3\uffff\1\154",
-            "\1\155\5\uffff\1\156",
-            "\1\157",
-            "\1\160\2\uffff\1\161",
-            "\1\162",
+            "\1\146",
+            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\10\53\1\147\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\20\uffff\1\165",
-            "\1\166",
+            "\1\164",
+            "\1\166\20\uffff\1\165",
             "\1\167",
             "\1\170",
             "\1\171",
@@ -3109,20 +3137,20 @@
             "\1\174",
             "\1\175",
             "\1\176",
-            "\1\u0080\106\uffff\1\177",
-            "\1\u0081",
-            "\1\u0082",
-            "\1\u0084\1\uffff\1\u0083",
-            "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100"+
-            "\52",
-            "\1\u0086",
+            "\1\177",
+            "\1\u0080",
+            "\1\u0081\106\uffff\1\u0082",
+            "\1\u0083",
+            "\1\u0085\1\uffff\1\u0084",
+            "\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\u0089",
             "\1\u008a",
             "\1\u008b",
             "\1\u008c",
@@ -3131,15 +3159,15 @@
             "\1\u008f",
             "\1\u0090",
             "\1\u0091",
+            "\1\u0092",
             "",
-            "\1\u0092",
             "\1\u0093",
-            "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100"+
-            "\52",
+            "\1\u0094",
             "\1\u0095",
             "\1\u0096",
             "\1\u0097",
-            "\1\u0098",
+            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
+            "\53",
             "\1\u0099",
             "\1\u009a",
             "\1\u009b",
@@ -3148,99 +3176,99 @@
             "\1\u009e",
             "\1\u009f",
             "\1\u00a0",
-            "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100"+
-            "\52",
-            "\1\u00a2",
+            "\1\u00a1",
+            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
+            "\53",
             "\1\u00a3",
             "\1\u00a4",
             "\1\u00a5",
             "\1\u00a6",
             "\1\u00a7",
             "\1\u00a8",
-            "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100"+
-            "\52",
+            "\1\u00a9",
+            "\1\u00aa",
             "",
-            "\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\u00ae",
             "\1\u00af",
             "\1\u00b0",
-            "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100"+
-            "\52",
-            "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100"+
-            "\52",
-            "\1\u00b3",
-            "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100"+
-            "\52",
-            "\1\u00b5",
+            "\1\u00b1",
+            "\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",
-            "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100"+
-            "\52",
-            "\1\u00ba",
+            "\1\u00b9",
+            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
+            "\53",
             "\1\u00bb",
-            "",
-            "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100"+
-            "\52",
+            "\1\u00bc",
             "\1\u00bd",
-            "\1\u00be",
+            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
+            "\53",
             "\1\u00bf",
+            "",
             "\1\u00c0",
             "\1\u00c1",
             "\1\u00c2",
-            "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\5\52\1\u00c3\24\52"+
-            "\105\uffff\100\52",
-            "\1\u00c5",
+            "\1\u00c3",
+            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\5\53\1\u00c4\24\53"+
+            "\105\uffff\100\53",
             "\1\u00c6",
             "\1\u00c7\6\uffff\1\u00c8",
             "\1\u00c9",
+            "\1\u00ca",
             "",
-            "\1\u00ca",
             "\1\u00cb",
             "\1\u00cc",
             "\1\u00cd",
             "\1\u00ce",
             "\1\u00cf",
             "\1\u00d0",
+            "\1\u00d1",
+            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
+            "\53",
             "",
-            "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100"+
-            "\52",
-            "\1\u00d2",
             "\1\u00d3",
             "\1\u00d4",
             "\1\u00d5",
             "\1\u00d6",
-            "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100"+
-            "\52",
+            "\1\u00d7",
+            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
+            "\53",
             "",
             "",
-            "\1\u00d8",
+            "\1\u00d9",
             "",
-            "\1\u00d9",
             "\1\u00da",
-            "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100"+
-            "\52",
+            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
+            "\53",
             "\1\u00db",
+            "\1\u00dc",
             "",
-            "\1\u00dc",
             "\1\u00dd",
+            "\1\u00de",
+            "\1\u00df",
             "",
-            "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100"+
-            "\52",
-            "\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\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100"+
-            "\52",
-            "\1\u00e6",
+            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
+            "\53",
             "\1\u00e7",
             "\1\u00e8",
             "\1\u00e9",
@@ -3251,41 +3279,41 @@
             "\1\u00ed",
             "\1\u00ee",
             "\1\u00ef",
+            "\1\u00f0",
             "",
             "",
-            "\1\u00f0",
             "\1\u00f1",
             "\1\u00f2",
             "\1\u00f3",
+            "\1\u00f4",
             "",
-            "\1\u00f4",
-            "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100"+
-            "\52",
-            "\1\u00f6",
+            "\1\u00f5",
+            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
+            "\53",
             "\1\u00f7",
-            "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100"+
-            "\52",
-            "\1\u00f9",
+            "\1\u00f8",
+            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
+            "\53",
+            "\1\u00fa",
+            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
+            "\53",
             "",
-            "\1\u00fa",
-            "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100"+
-            "\52",
-            "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100"+
-            "\52",
-            "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100"+
-            "\52",
+            "\1\u00fc",
+            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
+            "\53",
             "\1\u00fe",
-            "\1\u00ff",
+            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
+            "\53",
+            "\1\u0100",
             "",
-            "\1\u0100",
-            "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100"+
-            "\52",
+            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
+            "\53",
             "\1\u0102",
             "\1\u0103",
             "\1\u0104",
             "\1\u0105",
-            "\1\u0106\21\uffff\1\u0107",
-            "\1\u0108",
+            "\1\u0106",
+            "\1\u0107\21\uffff\1\u0108",
             "\1\u0109",
             "\1\u010a",
             "\1\u010b",
@@ -3293,82 +3321,83 @@
             "\1\u010d",
             "\1\u010e",
             "\1\u010f",
-            "",
             "\1\u0110",
-            "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100"+
-            "\52",
             "",
-            "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100"+
-            "\52",
+            "\1\u0111",
+            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
+            "\53",
+            "",
             "\1\u0113",
             "",
+            "\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\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100"+
-            "\52",
-            "\1\u0115",
             "\1\u0116",
             "",
             "\1\u0117",
             "\1\u0118",
+            "\1\u0119",
             "",
-            "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100"+
-            "\52",
+            "\1\u011a",
             "",
             "",
-            "\1\u011a",
-            "\1\u011b",
+            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
+            "\53",
             "\1\u011c",
             "\1\u011d",
-            "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100"+
-            "\52",
-            "\1\u011f",
-            "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100"+
-            "\52",
-            "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100"+
-            "\52",
-            "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100"+
-            "\52",
+            "\1\u011e",
+            "\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\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",
             "",
-            "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100"+
-            "\52",
             "",
-            "\1\u0124",
             "\1\u0125",
             "\1\u0126",
             "\1\u0127",
+            "\1\u0128",
+            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
+            "\53",
             "",
-            "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100"+
-            "\52",
-            "\1\u0129",
-            "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100"+
-            "\52",
-            "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100"+
-            "\52",
+            "\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\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100"+
-            "\52",
             "",
+            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53\105\uffff\100"+
+            "\53",
             "",
             "",
             "",
             "",
-            "\1\u012d",
             "\1\u012e",
             "\1\u012f",
-            "",
             "\1\u0130",
             "",
             "",
+            "\1\u0131",
             "",
-            "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100"+
-            "\52",
+            "",
             "\1\u0132",
-            "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100"+
-            "\52",
-            "\12\52\7\uffff\32\52\4\uffff\1\52\1\uffff\32\52\105\uffff\100"+
-            "\52",
+            "\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",
             "",
             "",
             "",
@@ -3405,7 +3434,7 @@
             this.transition = DFA18_transition;
         }
         public String getDescription() {
-            return "1:1: Tokens : ( T73 | T74 | T75 | T76 | T77 | T78 | T79 | T80 | T81 | T82 | 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 | SH_STYLE_SINGLE_LINE_COMMENT | C_STYLE_SINGLE_LINE_COMMENT | MULTI_LINE_COMMENT | MISC );";
+            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 );";
         }
     }
  

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-02 06:37:00 UTC (rev 16966)
+++ labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/lang/DRLParser.java	2007-12-02 11:01:29 UTC (rev 16967)
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g 2007-10-29 17:23:33
+// $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
 
 	package org.drools.lang;
 	import java.util.List;
@@ -17,21 +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", "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", "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=66;
+    public static final int HexDigit=67;
     public static final int FORALL=43;
     public static final int TEMPLATE=16;
-    public static final int MISC=72;
-    public static final int FLOAT=56;
+    public static final int MISC=73;
+    public static final int FLOAT=57;
     public static final int QUERY=14;
-    public static final int THEN=62;
+    public static final int THEN=63;
     public static final int RULE=17;
     public static final int INIT=45;
+    public static final int TILDE=55;
     public static final int IMPORT=5;
     public static final int PACKAGE=4;
     public static final int DATE_EFFECTIVE=20;
@@ -41,54 +42,54 @@
     public static final int AND=37;
     public static final int FUNCTION=6;
     public static final int GLOBAL=10;
-    public static final int EscapeSequence=65;
+    public static final int EscapeSequence=66;
     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=60;
+    public static final int LEFT_SQUARE=61;
     public static final int CONTAINS=50;
-    public static final int SH_STYLE_SINGLE_LINE_COMMENT=69;
+    public static final int SH_STYLE_SINGLE_LINE_COMMENT=70;
     public static final int ATTRIBUTES=19;
     public static final int EVENT=7;
-    public static final int LEFT_CURLY=58;
+    public static final int LEFT_CURLY=59;
     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=59;
+    public static final int RIGHT_CURLY=60;
     public static final int SOUNDSLIKE=53;
     public static final int EXCLUDES=51;
     public static final int BOOL=24;
     public static final int MEMBEROF=54;
     public static final int WHEN=18;
     public static final int RULEFLOW_GROUP=30;
-    public static final int WS=64;
+    public static final int WS=65;
     public static final int STRING=21;
     public static final int ACTION=46;
     public static final int COLLECT=49;
-    public static final int IN=55;
+    public static final int IN=56;
     public static final int REVERSE=47;
     public static final int ACCUMULATE=44;
     public static final int NO_LOOP=27;
-    public static final int UnicodeEscape=67;
+    public static final int UnicodeEscape=68;
     public static final int DURATION=32;
     public static final int EVAL=42;
     public static final int MATCHES=52;
     public static final int EOF=-1;
-    public static final int EOL=63;
-    public static final int NULL=57;
+    public static final int EOL=64;
+    public static final int NULL=58;
     public static final int AGENDA_GROUP=31;
-    public static final int OctalEscape=68;
+    public static final int OctalEscape=69;
     public static final int SALIENCE=25;
-    public static final int MULTI_LINE_COMMENT=71;
+    public static final int MULTI_LINE_COMMENT=72;
     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=61;
-    public static final int C_STYLE_SINGLE_LINE_COMMENT=70;
+    public static final int RIGHT_SQUARE=62;
+    public static final int C_STYLE_SINGLE_LINE_COMMENT=71;
 
         public DRLParser(TokenStream input) {
             super(input);
@@ -97,7 +98,7 @@
         
 
     public String[] getTokenNames() { return tokenNames; }
-    public String getGrammarFileName() { return "/home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g"; }
+    public String getGrammarFileName() { return "/home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g"; }
 
 
     	private PackageDescr packageDescr;
@@ -279,24 +280,24 @@
 
 
     // $ANTLR start opt_semicolon
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:195:1: opt_semicolon : ( ';' )? ;
+    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:195:1: opt_semicolon : ( ';' )? ;
     public final void opt_semicolon() throws RecognitionException {
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:196:2: ( ( ';' )? )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:196:4: ( ';' )?
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:196:2: ( ( ';' )? )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:196:4: ( ';' )?
             {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:196:4: ( ';' )?
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:196:4: ( ';' )?
             int alt1=2;
             int LA1_0 = input.LA(1);
 
-            if ( (LA1_0==73) ) {
+            if ( (LA1_0==74) ) {
                 alt1=1;
             }
             switch (alt1) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:196:4: ';'
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:196:4: ';'
                     {
-                    match(input,73,FOLLOW_73_in_opt_semicolon39); if (failed) return ;
+                    match(input,74,FOLLOW_74_in_opt_semicolon39); if (failed) return ;
 
                     }
                     break;
@@ -319,21 +320,21 @@
 
 
     // $ANTLR start compilation_unit
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:199:1: compilation_unit : prolog ( statement )* EOF ;
+    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:199:1: compilation_unit : prolog ( statement )* EOF ;
     public final void compilation_unit() throws RecognitionException {
 
         		// reset Location information
         		this.location = new Location( Location.LOCATION_UNKNOWN );
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:204:2: ( prolog ( statement )* EOF )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:204:4: prolog ( statement )* EOF
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:204:2: ( prolog ( statement )* EOF )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:204:4: prolog ( statement )* EOF
             {
             pushFollow(FOLLOW_prolog_in_compilation_unit57);
             prolog();
             _fsp--;
             if (failed) return ;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:205:3: ( statement )*
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:205:3: ( statement )*
             loop2:
             do {
                 int alt2=2;
@@ -346,7 +347,7 @@
 
                 switch (alt2) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:205:3: statement
+            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:205:3: statement
             	    {
             	    pushFollow(FOLLOW_statement_in_compilation_unit62);
             	    statement();
@@ -379,7 +380,7 @@
 
 
     // $ANTLR start prolog
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:212:1: prolog : (pkgstmt= package_statement )? ;
+    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:212:1: prolog : (pkgstmt= package_statement )? ;
     public final void prolog() throws RecognitionException {
         String pkgstmt = null;
 
@@ -388,10 +389,10 @@
         		String packageName = "";
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:216:2: ( (pkgstmt= package_statement )? )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:216:4: (pkgstmt= package_statement )?
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:216:2: ( (pkgstmt= package_statement )? )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:216:4: (pkgstmt= package_statement )?
             {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:216:4: (pkgstmt= package_statement )?
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:216:4: (pkgstmt= package_statement )?
             int alt3=2;
             int LA3_0 = input.LA(1);
 
@@ -400,7 +401,7 @@
             }
             switch (alt3) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:216:6: pkgstmt= package_statement
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:216:6: pkgstmt= package_statement
                     {
                     pushFollow(FOLLOW_package_statement_in_prolog96);
                     pkgstmt=package_statement();
@@ -436,7 +437,7 @@
 
 
     // $ANTLR start statement
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:223:1: statement : (a= rule_attribute | function_import_statement | event_import_statement | import_statement | global | function | t= template | r= rule | q= query );
+    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:223:1: statement : (a= rule_attribute | function_import_statement | event_import_statement | import_statement | global | function | t= template | r= rule | q= query );
     public final void statement() throws RecognitionException {
         AttributeDescr a = null;
 
@@ -448,7 +449,7 @@
 
 
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:224:2: (a= rule_attribute | function_import_statement | event_import_statement | import_statement | global | function | t= template | r= rule | q= query )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:224:2: (a= rule_attribute | function_import_statement | event_import_statement | import_statement | global | function | t= template | r= rule | q= query )
             int alt4=9;
             switch ( input.LA(1) ) {
             case DATE_EFFECTIVE:
@@ -530,7 +531,7 @@
 
             switch (alt4) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:224:4: a= rule_attribute
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:224:4: a= rule_attribute
                     {
                     pushFollow(FOLLOW_rule_attribute_in_statement121);
                     a=rule_attribute();
@@ -543,7 +544,7 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:225:4: function_import_statement
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:225:4: function_import_statement
                     {
                     pushFollow(FOLLOW_function_import_statement_in_statement128);
                     function_import_statement();
@@ -553,7 +554,7 @@
                     }
                     break;
                 case 3 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:226:4: event_import_statement
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:226:4: event_import_statement
                     {
                     pushFollow(FOLLOW_event_import_statement_in_statement134);
                     event_import_statement();
@@ -563,7 +564,7 @@
                     }
                     break;
                 case 4 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:227:4: import_statement
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:227:4: import_statement
                     {
                     pushFollow(FOLLOW_import_statement_in_statement139);
                     import_statement();
@@ -573,7 +574,7 @@
                     }
                     break;
                 case 5 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:228:4: global
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:228:4: global
                     {
                     pushFollow(FOLLOW_global_in_statement145);
                     global();
@@ -583,7 +584,7 @@
                     }
                     break;
                 case 6 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:229:4: function
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:229:4: function
                     {
                     pushFollow(FOLLOW_function_in_statement151);
                     function();
@@ -593,7 +594,7 @@
                     }
                     break;
                 case 7 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:230:10: t= template
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:230:10: t= template
                     {
                     pushFollow(FOLLOW_template_in_statement165);
                     t=template();
@@ -606,7 +607,7 @@
                     }
                     break;
                 case 8 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:231:4: r= rule
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:231:4: r= rule
                     {
                     pushFollow(FOLLOW_rule_in_statement174);
                     r=rule();
@@ -619,7 +620,7 @@
                     }
                     break;
                 case 9 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:232:4: q= query
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:232:4: q= query
                     {
                     pushFollow(FOLLOW_query_in_statement186);
                     q=query();
@@ -646,7 +647,7 @@
 
 
     // $ANTLR start package_statement
-    // /home/etirelli/workspace/jboss/jbossrules/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:234:1: package_statement returns [String packageName] : PACKAGE n= dotted_name opt_semicolon ;
     public final String package_statement() throws RecognitionException {
         String packageName = null;
 
@@ -657,8 +658,8 @@
         		packageName = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:238:2: ( PACKAGE n= dotted_name opt_semicolon )
-            // /home/etirelli/workspace/jboss/jbossrules/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: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
             {
             match(input,PACKAGE,FOLLOW_PACKAGE_in_package_statement210); if (failed) return packageName;
             pushFollow(FOLLOW_dotted_name_in_package_statement214);
@@ -690,7 +691,7 @@
 
 
     // $ANTLR start import_statement
-    // /home/etirelli/workspace/jboss/jbossrules/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:247:1: import_statement : IMPORT import_name[importDecl] opt_semicolon ;
     public final void import_statement() throws RecognitionException {
         Token IMPORT1=null;
 
@@ -698,8 +699,8 @@
                 	ImportDescr importDecl = null;
                 
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:251:2: ( IMPORT import_name[importDecl] opt_semicolon )
-            // /home/etirelli/workspace/jboss/jbossrules/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: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
             {
             IMPORT1=(Token)input.LT(1);
             match(input,IMPORT,FOLLOW_IMPORT_in_import_statement247); if (failed) return ;
@@ -736,7 +737,7 @@
 
 
     // $ANTLR start function_import_statement
-    // /home/etirelli/workspace/jboss/jbossrules/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:262:1: function_import_statement : IMPORT FUNCTION import_name[importDecl] opt_semicolon ;
     public final void function_import_statement() throws RecognitionException {
         Token IMPORT2=null;
 
@@ -744,8 +745,8 @@
                 	FunctionImportDescr importDecl = null;
                 
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:266:2: ( IMPORT FUNCTION import_name[importDecl] opt_semicolon )
-            // /home/etirelli/workspace/jboss/jbossrules/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: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
             {
             IMPORT2=(Token)input.LT(1);
             match(input,IMPORT,FOLLOW_IMPORT_in_function_import_statement297); if (failed) return ;
@@ -783,7 +784,7 @@
 
 
     // $ANTLR start event_import_statement
-    // /home/etirelli/workspace/jboss/jbossrules/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:277:1: event_import_statement : IMPORT EVENT import_name[importDecl] opt_semicolon ;
     public final void event_import_statement() throws RecognitionException {
         Token IMPORT3=null;
 
@@ -791,8 +792,8 @@
                 	ImportDescr importDecl = null;
                 
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:281:2: ( IMPORT EVENT import_name[importDecl] opt_semicolon )
-            // /home/etirelli/workspace/jboss/jbossrules/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: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
             {
             IMPORT3=(Token)input.LT(1);
             match(input,IMPORT,FOLLOW_IMPORT_in_event_import_statement349); if (failed) return ;
@@ -830,7 +831,7 @@
 
 
     // $ANTLR start import_name
-    // /home/etirelli/workspace/jboss/jbossrules/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:293: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;
 
@@ -844,8 +845,8 @@
         		name = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:297:2: ( ID ( DOT id= identifier )* (star= '.*' )? )
-            // /home/etirelli/workspace/jboss/jbossrules/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: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= '.*' )?
             {
             ID4=(Token)input.LT(1);
             match(input,ID,FOLLOW_ID_in_import_name403); if (failed) return name;
@@ -856,7 +857,7 @@
               		    importDecl.setEndCharacter( ((CommonToken)ID4).getStopIndex() );
               		
             }
-            // /home/etirelli/workspace/jboss/jbossrules/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:304:3: ( DOT id= identifier )*
             loop5:
             do {
                 int alt5=2;
@@ -869,7 +870,7 @@
 
                 switch (alt5) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/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:304:5: DOT id= identifier
             	    {
             	    DOT5=(Token)input.LT(1);
             	    match(input,DOT,FOLLOW_DOT_in_import_name415); if (failed) return name;
@@ -893,19 +894,19 @@
                 }
             } while (true);
 
-            // /home/etirelli/workspace/jboss/jbossrules/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:311:3: (star= '.*' )?
             int alt6=2;
             int LA6_0 = input.LA(1);
 
-            if ( (LA6_0==74) ) {
+            if ( (LA6_0==75) ) {
                 alt6=1;
             }
             switch (alt6) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/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:311:5: star= '.*'
                     {
                     star=(Token)input.LT(1);
-                    match(input,74,FOLLOW_74_in_import_name443); if (failed) return name;
+                    match(input,75,FOLLOW_75_in_import_name443); if (failed) return name;
                     if ( backtracking==0 ) {
                        
                       		        name = name + star.getText(); 
@@ -935,7 +936,7 @@
 
 
     // $ANTLR start global
-    // /home/etirelli/workspace/jboss/jbossrules/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:321:1: global : GLOBAL type= dotted_name id= identifier opt_semicolon ;
     public final void global() throws RecognitionException {
         Token GLOBAL6=null;
         String type = null;
@@ -947,8 +948,8 @@
         	    GlobalDescr global = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:325:2: ( GLOBAL type= dotted_name id= identifier opt_semicolon )
-            // /home/etirelli/workspace/jboss/jbossrules/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: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
             {
             GLOBAL6=(Token)input.LT(1);
             match(input,GLOBAL,FOLLOW_GLOBAL_in_global477); if (failed) return ;
@@ -998,7 +999,7 @@
 
 
     // $ANTLR start function
-    // /home/etirelli/workspace/jboss/jbossrules/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: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 ;
     public final void function() throws RecognitionException {
         Token FUNCTION7=null;
         String retType = null;
@@ -1017,25 +1018,25 @@
         		String type = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/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/jbossrules/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: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
             {
             FUNCTION7=(Token)input.LT(1);
             match(input,FUNCTION,FOLLOW_FUNCTION_in_function526); if (failed) return ;
-            // /home/etirelli/workspace/jboss/jbossrules/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:350:19: (retType= dotted_name )?
             int alt7=2;
             int LA7_0 = input.LA(1);
 
-            if ( ((LA7_0>=PACKAGE && LA7_0<=ID)||LA7_0==GLOBAL||(LA7_0>=QUERY && LA7_0<=ATTRIBUTES)||LA7_0==ENABLED||LA7_0==SALIENCE||(LA7_0>=DURATION && LA7_0<=DIALECT)||LA7_0==FROM||(LA7_0>=INIT && LA7_0<=RESULT)||(LA7_0>=CONTAINS && LA7_0<=IN)||LA7_0==THEN) ) {
+            if ( ((LA7_0>=PACKAGE && LA7_0<=ID)||LA7_0==GLOBAL||(LA7_0>=QUERY && LA7_0<=ATTRIBUTES)||LA7_0==ENABLED||LA7_0==SALIENCE||(LA7_0>=DURATION && LA7_0<=DIALECT)||LA7_0==FROM||(LA7_0>=INIT && LA7_0<=RESULT)||(LA7_0>=CONTAINS && LA7_0<=MEMBEROF)||LA7_0==IN||LA7_0==THEN) ) {
                 int LA7_1 = input.LA(2);
 
-                if ( ((LA7_1>=PACKAGE && LA7_1<=GLOBAL)||(LA7_1>=QUERY && LA7_1<=ATTRIBUTES)||LA7_1==ENABLED||LA7_1==SALIENCE||(LA7_1>=DURATION && LA7_1<=DIALECT)||LA7_1==FROM||(LA7_1>=INIT && LA7_1<=RESULT)||(LA7_1>=CONTAINS && LA7_1<=IN)||LA7_1==LEFT_SQUARE||LA7_1==THEN) ) {
+                if ( ((LA7_1>=PACKAGE && LA7_1<=GLOBAL)||(LA7_1>=QUERY && LA7_1<=ATTRIBUTES)||LA7_1==ENABLED||LA7_1==SALIENCE||(LA7_1>=DURATION && LA7_1<=DIALECT)||LA7_1==FROM||(LA7_1>=INIT && LA7_1<=RESULT)||(LA7_1>=CONTAINS && LA7_1<=MEMBEROF)||LA7_1==IN||LA7_1==LEFT_SQUARE||LA7_1==THEN) ) {
                     alt7=1;
                 }
             }
             switch (alt7) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/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:350:19: retType= dotted_name
                     {
                     pushFollow(FOLLOW_dotted_name_in_function530);
                     retType=dotted_name();
@@ -1062,23 +1063,23 @@
               		
             }
             match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_function544); if (failed) return ;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:360:4: ( (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:4: ( (paramType= dotted_name )? paramName= argument ( COMMA (paramType= dotted_name )? paramName= argument )* )?
             int alt11=2;
             int LA11_0 = input.LA(1);
 
-            if ( ((LA11_0>=PACKAGE && LA11_0<=ID)||LA11_0==GLOBAL||(LA11_0>=QUERY && LA11_0<=ATTRIBUTES)||LA11_0==ENABLED||LA11_0==SALIENCE||(LA11_0>=DURATION && LA11_0<=DIALECT)||LA11_0==FROM||(LA11_0>=INIT && LA11_0<=RESULT)||(LA11_0>=CONTAINS && LA11_0<=IN)||LA11_0==THEN) ) {
+            if ( ((LA11_0>=PACKAGE && LA11_0<=ID)||LA11_0==GLOBAL||(LA11_0>=QUERY && LA11_0<=ATTRIBUTES)||LA11_0==ENABLED||LA11_0==SALIENCE||(LA11_0>=DURATION && LA11_0<=DIALECT)||LA11_0==FROM||(LA11_0>=INIT && LA11_0<=RESULT)||(LA11_0>=CONTAINS && LA11_0<=MEMBEROF)||LA11_0==IN||LA11_0==THEN) ) {
                 alt11=1;
             }
             switch (alt11) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/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:360:6: (paramType= dotted_name )? paramName= argument ( COMMA (paramType= dotted_name )? paramName= argument )*
                     {
-                    // /home/etirelli/workspace/jboss/jbossrules/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:360:15: (paramType= dotted_name )?
                     int alt8=2;
                     alt8 = dfa8.predict(input);
                     switch (alt8) {
                         case 1 :
-                            // /home/etirelli/workspace/jboss/jbossrules/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:360:15: paramType= dotted_name
                             {
                             pushFollow(FOLLOW_dotted_name_in_function553);
                             paramType=dotted_name();
@@ -1100,7 +1101,7 @@
                       					f.addParameter( type, paramName );
                       				
                     }
-                    // /home/etirelli/workspace/jboss/jbossrules/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:365:5: ( COMMA (paramType= dotted_name )? paramName= argument )*
                     loop10:
                     do {
                         int alt10=2;
@@ -1113,15 +1114,15 @@
 
                         switch (alt10) {
                     	case 1 :
-                    	    // /home/etirelli/workspace/jboss/jbossrules/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:365:7: COMMA (paramType= dotted_name )? paramName= argument
                     	    {
                     	    match(input,COMMA,FOLLOW_COMMA_in_function572); if (failed) return ;
-                    	    // /home/etirelli/workspace/jboss/jbossrules/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:365:22: (paramType= dotted_name )?
                     	    int alt9=2;
                     	    alt9 = dfa9.predict(input);
                     	    switch (alt9) {
                     	        case 1 :
-                    	            // /home/etirelli/workspace/jboss/jbossrules/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:365:22: paramType= dotted_name
                     	            {
                     	            pushFollow(FOLLOW_dotted_name_in_function576);
                     	            paramType=dotted_name();
@@ -1187,7 +1188,7 @@
 
 
     // $ANTLR start argument
-    // /home/etirelli/workspace/jboss/jbossrules/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:382:1: argument returns [String name] : id= identifier ( '[' ']' )* ;
     public final String argument() throws RecognitionException {
         String name = null;
 
@@ -1198,8 +1199,8 @@
         		name = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:386:2: (id= identifier ( '[' ']' )* )
-            // /home/etirelli/workspace/jboss/jbossrules/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:386:2: (id= identifier ( '[' ']' )* )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:386:4: id= identifier ( '[' ']' )*
             {
             pushFollow(FOLLOW_identifier_in_argument638);
             id=identifier();
@@ -1208,7 +1209,7 @@
             if ( backtracking==0 ) {
                name =input.toString(id.start,id.stop); 
             }
-            // /home/etirelli/workspace/jboss/jbossrules/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:386:38: ( '[' ']' )*
             loop12:
             do {
                 int alt12=2;
@@ -1221,7 +1222,7 @@
 
                 switch (alt12) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/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:386: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;
@@ -1253,7 +1254,7 @@
 
 
     // $ANTLR start query
-    // /home/etirelli/workspace/jboss/jbossrules/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: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 ;
     public final QueryDescr query() throws RecognitionException {
         QueryDescr query = null;
 
@@ -1273,8 +1274,8 @@
          
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/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/jbossrules/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: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
             {
             QUERY8=(Token)input.LT(1);
             match(input,QUERY,FOLLOW_QUERY_in_query676); if (failed) return query;
@@ -1292,15 +1293,15 @@
                                       location.setType( Location.LOCATION_RULE_HEADER );
               		
             }
-            // /home/etirelli/workspace/jboss/jbossrules/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:409: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/jbossrules/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:409: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/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:410:11: ( ( (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:410:11: ( ( (paramType= qualified_id )? paramName= ID ) ( COMMA (paramType= qualified_id )? paramName= ID )* )?
                     int alt16=2;
                     int LA16_0 = input.LA(1);
 
@@ -1309,15 +1310,15 @@
                     }
                     switch (alt16) {
                         case 1 :
-                            // /home/etirelli/workspace/jboss/jbossrules/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:410:13: ( (paramType= qualified_id )? paramName= ID ) ( COMMA (paramType= qualified_id )? paramName= ID )*
                             {
                             if ( backtracking==0 ) {
                                params = new ArrayList(); types = new ArrayList();
                             }
-                            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:412:15: ( (paramType= qualified_id )? paramName= ID )
-                            // /home/etirelli/workspace/jboss/jbossrules/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: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/jbossrules/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:412:25: (paramType= qualified_id )?
                             int alt13=2;
                             int LA13_0 = input.LA(1);
 
@@ -1330,7 +1331,7 @@
                             }
                             switch (alt13) {
                                 case 1 :
-                                    // /home/etirelli/workspace/jboss/jbossrules/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:412:25: paramType= qualified_id
                                     {
                                     pushFollow(FOLLOW_qualified_id_in_query725);
                                     paramType=qualified_id();
@@ -1350,7 +1351,7 @@
 
                             }
 
-                            // /home/etirelli/workspace/jboss/jbossrules/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:413:15: ( COMMA (paramType= qualified_id )? paramName= ID )*
                             loop15:
                             do {
                                 int alt15=2;
@@ -1363,10 +1364,10 @@
 
                                 switch (alt15) {
                             	case 1 :
-                            	    // /home/etirelli/workspace/jboss/jbossrules/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:413:16: COMMA (paramType= qualified_id )? paramName= ID
                             	    {
                             	    match(input,COMMA,FOLLOW_COMMA_in_query751); if (failed) return query;
-                            	    // /home/etirelli/workspace/jboss/jbossrules/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:413:31: (paramType= qualified_id )?
                             	    int alt14=2;
                             	    int LA14_0 = input.LA(1);
 
@@ -1379,7 +1380,7 @@
                             	    }
                             	    switch (alt14) {
                             	        case 1 :
-                            	            // /home/etirelli/workspace/jboss/jbossrules/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:413:31: paramType= qualified_id
                             	            {
                             	            pushFollow(FOLLOW_qualified_id_in_query755);
                             	            paramType=qualified_id();
@@ -1459,7 +1460,7 @@
 
 
     // $ANTLR start template
-    // /home/etirelli/workspace/jboss/jbossrules/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:431: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;
 
@@ -1474,8 +1475,8 @@
         		template = null;		
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/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/jbossrules/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: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
             {
             TEMPLATE10=(Token)input.LT(1);
             match(input,TEMPLATE,FOLLOW_TEMPLATE_in_template874); if (failed) return template;
@@ -1494,7 +1495,7 @@
               			template.setStartCharacter( ((CommonToken)TEMPLATE10).getStartIndex() );
               		
             }
-            // /home/etirelli/workspace/jboss/jbossrules/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:442:3: (slot= template_slot )+
             int cnt18=0;
             loop18:
             do {
@@ -1508,7 +1509,7 @@
 
                 switch (alt18) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/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:443:4: slot= template_slot
             	    {
             	    pushFollow(FOLLOW_template_slot_in_template895);
             	    slot=template_slot();
@@ -1560,7 +1561,7 @@
 
 
     // $ANTLR start template_slot
-    // /home/etirelli/workspace/jboss/jbossrules/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:454:1: template_slot returns [FieldTemplateDescr field] : fieldType= qualified_id id= identifier opt_semicolon ;
     public final FieldTemplateDescr template_slot() throws RecognitionException {
         FieldTemplateDescr field = null;
 
@@ -1573,8 +1574,8 @@
         		field = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:458:2: (fieldType= qualified_id id= identifier opt_semicolon )
-            // /home/etirelli/workspace/jboss/jbossrules/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: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
             {
             if ( backtracking==0 ) {
 
@@ -1623,7 +1624,7 @@
 
 
     // $ANTLR start rule
-    // /home/etirelli/workspace/jboss/jbossrules/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:477: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;
 
@@ -1637,8 +1638,8 @@
         		AndDescr lhs = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/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/jbossrules/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: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]
             {
             RULE12=(Token)input.LT(1);
             match(input,RULE,FOLLOW_RULE_in_rule1007); if (failed) return rule;
@@ -1655,7 +1656,7 @@
               			rule.setStartCharacter( ((CommonToken)RULE12).getStartIndex() );
               		
             }
-            // /home/etirelli/workspace/jboss/jbossrules/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:491:3: ( rule_attributes[$rule] )?
             int alt19=2;
             int LA19_0 = input.LA(1);
 
@@ -1664,7 +1665,7 @@
             }
             switch (alt19) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/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:491:3: rule_attributes[$rule]
                     {
                     pushFollow(FOLLOW_rule_attributes_in_rule1020);
                     rule_attributes(rule);
@@ -1676,7 +1677,7 @@
 
             }
 
-            // /home/etirelli/workspace/jboss/jbossrules/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:492:3: ( WHEN ( ':' )? normal_lhs_block[lhs] )?
             int alt21=2;
             int LA21_0 = input.LA(1);
 
@@ -1685,22 +1686,22 @@
             }
             switch (alt21) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/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:493: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/jbossrules/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:493:9: ( ':' )?
                     int alt20=2;
                     int LA20_0 = input.LA(1);
 
-                    if ( (LA20_0==75) ) {
+                    if ( (LA20_0==76) ) {
                         alt20=1;
                     }
                     switch (alt20) {
                         case 1 :
-                            // /home/etirelli/workspace/jboss/jbossrules/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:493:9: ':'
                             {
-                            match(input,75,FOLLOW_75_in_rule1034); if (failed) return rule;
+                            match(input,76,FOLLOW_76_in_rule1034); if (failed) return rule;
 
                             }
                             break;
@@ -1745,16 +1746,16 @@
 
 
     // $ANTLR start rule_attributes
-    // /home/etirelli/workspace/jboss/jbossrules/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:507: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/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:508:2: ( ( ATTRIBUTES ':' )? attr= rule_attribute ( ( ',' )? attr= rule_attribute )* )
-            // /home/etirelli/workspace/jboss/jbossrules/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: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/jbossrules/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:509:2: ( ATTRIBUTES ':' )?
             int alt22=2;
             int LA22_0 = input.LA(1);
 
@@ -1763,10 +1764,10 @@
             }
             switch (alt22) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/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:509:4: ATTRIBUTES ':'
                     {
                     match(input,ATTRIBUTES,FOLLOW_ATTRIBUTES_in_rule_attributes1075); if (failed) return ;
-                    match(input,75,FOLLOW_75_in_rule_attributes1077); if (failed) return ;
+                    match(input,76,FOLLOW_76_in_rule_attributes1077); if (failed) return ;
 
                     }
                     break;
@@ -1780,7 +1781,7 @@
             if ( backtracking==0 ) {
                rule.addAttribute( attr ); 
             }
-            // /home/etirelli/workspace/jboss/jbossrules/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:511:2: ( ( ',' )? attr= rule_attribute )*
             loop24:
             do {
                 int alt24=2;
@@ -1793,9 +1794,9 @@
 
                 switch (alt24) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/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:511:4: ( ',' )? attr= rule_attribute
             	    {
-            	    // /home/etirelli/workspace/jboss/jbossrules/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:511:4: ( ',' )?
             	    int alt23=2;
             	    int LA23_0 = input.LA(1);
 
@@ -1804,7 +1805,7 @@
             	    }
             	    switch (alt23) {
             	        case 1 :
-            	            // /home/etirelli/workspace/jboss/jbossrules/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:511:4: ','
             	            {
             	            match(input,COMMA,FOLLOW_COMMA_in_rule_attributes1092); if (failed) return ;
 
@@ -1845,7 +1846,7 @@
 
 
     // $ANTLR start rule_attribute
-    // /home/etirelli/workspace/jboss/jbossrules/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: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 );
     public final AttributeDescr rule_attribute() throws RecognitionException {
         AttributeDescr attr = null;
 
@@ -1856,7 +1857,7 @@
         		attr = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/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: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 )
             int alt25=12;
             switch ( input.LA(1) ) {
             case SALIENCE:
@@ -1929,7 +1930,7 @@
 
             switch (alt25) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/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:523:4: a= salience
                     {
                     pushFollow(FOLLOW_salience_in_rule_attribute1134);
                     a=salience();
@@ -1939,7 +1940,7 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/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:524:4: a= no_loop
                     {
                     pushFollow(FOLLOW_no_loop_in_rule_attribute1142);
                     a=no_loop();
@@ -1949,7 +1950,7 @@
                     }
                     break;
                 case 3 :
-                    // /home/etirelli/workspace/jboss/jbossrules/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:525:4: a= agenda_group
                     {
                     pushFollow(FOLLOW_agenda_group_in_rule_attribute1151);
                     a=agenda_group();
@@ -1959,7 +1960,7 @@
                     }
                     break;
                 case 4 :
-                    // /home/etirelli/workspace/jboss/jbossrules/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:526:4: a= duration
                     {
                     pushFollow(FOLLOW_duration_in_rule_attribute1160);
                     a=duration();
@@ -1969,7 +1970,7 @@
                     }
                     break;
                 case 5 :
-                    // /home/etirelli/workspace/jboss/jbossrules/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:527:4: a= activation_group
                     {
                     pushFollow(FOLLOW_activation_group_in_rule_attribute1169);
                     a=activation_group();
@@ -1979,7 +1980,7 @@
                     }
                     break;
                 case 6 :
-                    // /home/etirelli/workspace/jboss/jbossrules/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:528:4: a= auto_focus
                     {
                     pushFollow(FOLLOW_auto_focus_in_rule_attribute1177);
                     a=auto_focus();
@@ -1989,7 +1990,7 @@
                     }
                     break;
                 case 7 :
-                    // /home/etirelli/workspace/jboss/jbossrules/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:529:4: a= date_effective
                     {
                     pushFollow(FOLLOW_date_effective_in_rule_attribute1185);
                     a=date_effective();
@@ -1999,7 +2000,7 @@
                     }
                     break;
                 case 8 :
-                    // /home/etirelli/workspace/jboss/jbossrules/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:530:4: a= date_expires
                     {
                     pushFollow(FOLLOW_date_expires_in_rule_attribute1193);
                     a=date_expires();
@@ -2009,7 +2010,7 @@
                     }
                     break;
                 case 9 :
-                    // /home/etirelli/workspace/jboss/jbossrules/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:531:4: a= enabled
                     {
                     pushFollow(FOLLOW_enabled_in_rule_attribute1201);
                     a=enabled();
@@ -2019,7 +2020,7 @@
                     }
                     break;
                 case 10 :
-                    // /home/etirelli/workspace/jboss/jbossrules/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:532:4: a= ruleflow_group
                     {
                     pushFollow(FOLLOW_ruleflow_group_in_rule_attribute1209);
                     a=ruleflow_group();
@@ -2029,7 +2030,7 @@
                     }
                     break;
                 case 11 :
-                    // /home/etirelli/workspace/jboss/jbossrules/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:533:4: a= lock_on_active
                     {
                     pushFollow(FOLLOW_lock_on_active_in_rule_attribute1217);
                     a=lock_on_active();
@@ -2039,7 +2040,7 @@
                     }
                     break;
                 case 12 :
-                    // /home/etirelli/workspace/jboss/jbossrules/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:534:4: a= dialect
                     {
                     pushFollow(FOLLOW_dialect_in_rule_attribute1224);
                     a=dialect();
@@ -2068,7 +2069,7 @@
 
 
     // $ANTLR start date_effective
-    // /home/etirelli/workspace/jboss/jbossrules/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:537:1: date_effective returns [AttributeDescr descr] : DATE_EFFECTIVE STRING ;
     public final AttributeDescr date_effective() throws RecognitionException {
         AttributeDescr descr = null;
 
@@ -2079,8 +2080,8 @@
         		descr = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:541:2: ( DATE_EFFECTIVE STRING )
-            // /home/etirelli/workspace/jboss/jbossrules/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: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
             {
             DATE_EFFECTIVE15=(Token)input.LT(1);
             match(input,DATE_EFFECTIVE,FOLLOW_DATE_EFFECTIVE_in_date_effective1250); if (failed) return descr;
@@ -2110,7 +2111,7 @@
 
 
     // $ANTLR start date_expires
-    // /home/etirelli/workspace/jboss/jbossrules/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:552:1: date_expires returns [AttributeDescr descr] : DATE_EXPIRES STRING ;
     public final AttributeDescr date_expires() throws RecognitionException {
         AttributeDescr descr = null;
 
@@ -2121,8 +2122,8 @@
         		descr = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:556:2: ( DATE_EXPIRES STRING )
-            // /home/etirelli/workspace/jboss/jbossrules/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: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
             {
             DATE_EXPIRES17=(Token)input.LT(1);
             match(input,DATE_EXPIRES,FOLLOW_DATE_EXPIRES_in_date_expires1281); if (failed) return descr;
@@ -2152,7 +2153,7 @@
 
 
     // $ANTLR start enabled
-    // /home/etirelli/workspace/jboss/jbossrules/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:565:1: enabled returns [AttributeDescr descr] : ENABLED BOOL ;
     public final AttributeDescr enabled() throws RecognitionException {
         AttributeDescr descr = null;
 
@@ -2163,8 +2164,8 @@
         		descr = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:569:2: ( ENABLED BOOL )
-            // /home/etirelli/workspace/jboss/jbossrules/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:569:2: ( ENABLED BOOL )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:569:5: ENABLED BOOL
             {
             ENABLED19=(Token)input.LT(1);
             match(input,ENABLED,FOLLOW_ENABLED_in_enabled1312); if (failed) return descr;
@@ -2194,7 +2195,7 @@
 
 
     // $ANTLR start salience
-    // /home/etirelli/workspace/jboss/jbossrules/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:578:1: salience returns [AttributeDescr descr] : SALIENCE ( INT | txt= paren_chunk ) ;
     public final AttributeDescr salience() throws RecognitionException {
         AttributeDescr descr = null;
 
@@ -2207,8 +2208,8 @@
         		descr = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:582:2: ( SALIENCE ( INT | txt= paren_chunk ) )
-            // /home/etirelli/workspace/jboss/jbossrules/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: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 )
             {
             SALIENCE20=(Token)input.LT(1);
             match(input,SALIENCE,FOLLOW_SALIENCE_in_salience1347); if (failed) return descr;
@@ -2219,7 +2220,7 @@
               			descr.setStartCharacter( ((CommonToken)SALIENCE20).getStartIndex() );
               		
             }
-            // /home/etirelli/workspace/jboss/jbossrules/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:589:3: ( INT | txt= paren_chunk )
             int alt26=2;
             int LA26_0 = input.LA(1);
 
@@ -2238,7 +2239,7 @@
             }
             switch (alt26) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/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:589:5: INT
                     {
                     INT21=(Token)input.LT(1);
                     match(input,INT,FOLLOW_INT_in_salience1358); if (failed) return descr;
@@ -2252,7 +2253,7 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/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:594:5: txt= paren_chunk
                     {
                     pushFollow(FOLLOW_paren_chunk_in_salience1373);
                     txt=paren_chunk();
@@ -2286,7 +2287,7 @@
 
 
     // $ANTLR start no_loop
-    // /home/etirelli/workspace/jboss/jbossrules/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:602:1: no_loop returns [AttributeDescr descr] : NO_LOOP ( BOOL )? ;
     public final AttributeDescr no_loop() throws RecognitionException {
         AttributeDescr descr = null;
 
@@ -2297,8 +2298,8 @@
         		descr = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:606:2: ( NO_LOOP ( BOOL )? )
-            // /home/etirelli/workspace/jboss/jbossrules/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: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 )?
             {
             NO_LOOP22=(Token)input.LT(1);
             match(input,NO_LOOP,FOLLOW_NO_LOOP_in_no_loop1403); if (failed) return descr;
@@ -2310,7 +2311,7 @@
               			descr.setEndCharacter( ((CommonToken)NO_LOOP22).getStopIndex() );
               		
             }
-            // /home/etirelli/workspace/jboss/jbossrules/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:613:3: ( BOOL )?
             int alt27=2;
             int LA27_0 = input.LA(1);
 
@@ -2319,7 +2320,7 @@
             }
             switch (alt27) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/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:613:5: BOOL
                     {
                     BOOL23=(Token)input.LT(1);
                     match(input,BOOL,FOLLOW_BOOL_in_no_loop1416); if (failed) return descr;
@@ -2351,7 +2352,7 @@
 
 
     // $ANTLR start auto_focus
-    // /home/etirelli/workspace/jboss/jbossrules/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:621:1: auto_focus returns [AttributeDescr descr] : AUTO_FOCUS ( BOOL )? ;
     public final AttributeDescr auto_focus() throws RecognitionException {
         AttributeDescr descr = null;
 
@@ -2362,8 +2363,8 @@
         		descr = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:625:2: ( AUTO_FOCUS ( BOOL )? )
-            // /home/etirelli/workspace/jboss/jbossrules/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: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 )?
             {
             AUTO_FOCUS24=(Token)input.LT(1);
             match(input,AUTO_FOCUS,FOLLOW_AUTO_FOCUS_in_auto_focus1451); if (failed) return descr;
@@ -2375,7 +2376,7 @@
               			descr.setEndCharacter( ((CommonToken)AUTO_FOCUS24).getStopIndex() );
               		
             }
-            // /home/etirelli/workspace/jboss/jbossrules/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:632:3: ( BOOL )?
             int alt28=2;
             int LA28_0 = input.LA(1);
 
@@ -2384,7 +2385,7 @@
             }
             switch (alt28) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/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:632:5: BOOL
                     {
                     BOOL25=(Token)input.LT(1);
                     match(input,BOOL,FOLLOW_BOOL_in_auto_focus1464); if (failed) return descr;
@@ -2416,7 +2417,7 @@
 
 
     // $ANTLR start activation_group
-    // /home/etirelli/workspace/jboss/jbossrules/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:640:1: activation_group returns [AttributeDescr descr] : ACTIVATION_GROUP STRING ;
     public final AttributeDescr activation_group() throws RecognitionException {
         AttributeDescr descr = null;
 
@@ -2427,8 +2428,8 @@
         		descr = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:644:2: ( ACTIVATION_GROUP STRING )
-            // /home/etirelli/workspace/jboss/jbossrules/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: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
             {
             ACTIVATION_GROUP27=(Token)input.LT(1);
             match(input,ACTIVATION_GROUP,FOLLOW_ACTIVATION_GROUP_in_activation_group1500); if (failed) return descr;
@@ -2458,7 +2459,7 @@
 
 
     // $ANTLR start ruleflow_group
-    // /home/etirelli/workspace/jboss/jbossrules/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:653:1: ruleflow_group returns [AttributeDescr descr] : RULEFLOW_GROUP STRING ;
     public final AttributeDescr ruleflow_group() throws RecognitionException {
         AttributeDescr descr = null;
 
@@ -2469,8 +2470,8 @@
         		descr = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:657:2: ( RULEFLOW_GROUP STRING )
-            // /home/etirelli/workspace/jboss/jbossrules/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: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
             {
             RULEFLOW_GROUP29=(Token)input.LT(1);
             match(input,RULEFLOW_GROUP,FOLLOW_RULEFLOW_GROUP_in_ruleflow_group1530); if (failed) return descr;
@@ -2500,7 +2501,7 @@
 
 
     // $ANTLR start agenda_group
-    // /home/etirelli/workspace/jboss/jbossrules/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:666:1: agenda_group returns [AttributeDescr descr] : AGENDA_GROUP STRING ;
     public final AttributeDescr agenda_group() throws RecognitionException {
         AttributeDescr descr = null;
 
@@ -2511,8 +2512,8 @@
         		descr = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:670:2: ( AGENDA_GROUP STRING )
-            // /home/etirelli/workspace/jboss/jbossrules/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: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
             {
             AGENDA_GROUP31=(Token)input.LT(1);
             match(input,AGENDA_GROUP,FOLLOW_AGENDA_GROUP_in_agenda_group1560); if (failed) return descr;
@@ -2542,7 +2543,7 @@
 
 
     // $ANTLR start duration
-    // /home/etirelli/workspace/jboss/jbossrules/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:679:1: duration returns [AttributeDescr descr] : DURATION INT ;
     public final AttributeDescr duration() throws RecognitionException {
         AttributeDescr descr = null;
 
@@ -2553,8 +2554,8 @@
         		descr = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:683:2: ( DURATION INT )
-            // /home/etirelli/workspace/jboss/jbossrules/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:683:2: ( DURATION INT )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:683:4: DURATION INT
             {
             DURATION33=(Token)input.LT(1);
             match(input,DURATION,FOLLOW_DURATION_in_duration1590); if (failed) return descr;
@@ -2584,7 +2585,7 @@
 
 
     // $ANTLR start dialect
-    // /home/etirelli/workspace/jboss/jbossrules/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:692:1: dialect returns [AttributeDescr descr] : DIALECT STRING ;
     public final AttributeDescr dialect() throws RecognitionException {
         AttributeDescr descr = null;
 
@@ -2595,8 +2596,8 @@
         		descr = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:696:2: ( DIALECT STRING )
-            // /home/etirelli/workspace/jboss/jbossrules/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:696:2: ( DIALECT STRING )
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:696:4: DIALECT STRING
             {
             DIALECT35=(Token)input.LT(1);
             match(input,DIALECT,FOLLOW_DIALECT_in_dialect1620); if (failed) return descr;
@@ -2626,7 +2627,7 @@
 
 
     // $ANTLR start lock_on_active
-    // /home/etirelli/workspace/jboss/jbossrules/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:705:1: lock_on_active returns [AttributeDescr descr] : LOCK_ON_ACTIVE ( BOOL )? ;
     public final AttributeDescr lock_on_active() throws RecognitionException {
         AttributeDescr descr = null;
 
@@ -2637,8 +2638,8 @@
         		descr = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:709:2: ( LOCK_ON_ACTIVE ( BOOL )? )
-            // /home/etirelli/workspace/jboss/jbossrules/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: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 )?
             {
             LOCK_ON_ACTIVE36=(Token)input.LT(1);
             match(input,LOCK_ON_ACTIVE,FOLLOW_LOCK_ON_ACTIVE_in_lock_on_active1654); if (failed) return descr;
@@ -2650,7 +2651,7 @@
               			descr.setEndCharacter( ((CommonToken)LOCK_ON_ACTIVE36).getStopIndex() );
               		
             }
-            // /home/etirelli/workspace/jboss/jbossrules/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:716:3: ( BOOL )?
             int alt29=2;
             int LA29_0 = input.LA(1);
 
@@ -2659,7 +2660,7 @@
             }
             switch (alt29) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/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:716:5: BOOL
                     {
                     BOOL37=(Token)input.LT(1);
                     match(input,BOOL,FOLLOW_BOOL_in_lock_on_active1667); if (failed) return descr;
@@ -2691,7 +2692,7 @@
 
 
     // $ANTLR start normal_lhs_block
-    // /home/etirelli/workspace/jboss/jbossrules/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:724:1: normal_lhs_block[AndDescr descr] : (d= lhs[$descr] )* ;
     public final void normal_lhs_block(AndDescr descr) throws RecognitionException {
         BaseDescr d = null;
 
@@ -2700,10 +2701,10 @@
         		location.setType( Location.LOCATION_LHS_BEGIN_OF_CONDITION );
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:728:2: ( (d= lhs[$descr] )* )
-            // /home/etirelli/workspace/jboss/jbossrules/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: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/jbossrules/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:729:3: (d= lhs[$descr] )*
             loop30:
             do {
                 int alt30=2;
@@ -2716,7 +2717,7 @@
 
                 switch (alt30) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/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:729:5: d= lhs[$descr]
             	    {
             	    pushFollow(FOLLOW_lhs_in_normal_lhs_block1706);
             	    d=lhs(descr);
@@ -2750,7 +2751,7 @@
 
 
     // $ANTLR start lhs
-    // /home/etirelli/workspace/jboss/jbossrules/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:735:1: lhs[ConditionalElementDescr ce] returns [BaseDescr d] : l= lhs_or ;
     public final BaseDescr lhs(ConditionalElementDescr ce) throws RecognitionException {
         BaseDescr d = null;
 
@@ -2761,8 +2762,8 @@
         		d =null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:739:2: (l= lhs_or )
-            // /home/etirelli/workspace/jboss/jbossrules/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: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
             {
             pushFollow(FOLLOW_lhs_or_in_lhs1743);
             l=lhs_or();
@@ -2787,7 +2788,7 @@
 
 
     // $ANTLR start lhs_or
-    // /home/etirelli/workspace/jboss/jbossrules/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:743: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;
 
@@ -2803,7 +2804,7 @@
         		OrDescr or = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/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:748: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);
 
@@ -2836,7 +2837,7 @@
             }
             switch (alt33) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/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:748: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;
@@ -2847,7 +2848,7 @@
                       			location.setType( Location.LOCATION_LHS_BEGIN_OF_CONDITION_AND_OR );
                       		
                     }
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:754:3: (lhsand= lhs_and )+
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:754:3: (lhsand= lhs_and )+
                     int cnt31=0;
                     loop31:
                     do {
@@ -2861,7 +2862,7 @@
 
                         switch (alt31) {
                     	case 1 :
-                    	    // /home/etirelli/workspace/jboss/jbossrules/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:754:5: lhsand= lhs_and
                     	    {
                     	    pushFollow(FOLLOW_lhs_and_in_lhs_or1783);
                     	    lhsand=lhs_and();
@@ -2891,7 +2892,7 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/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:760:10: left= lhs_and ( ( OR | DOUBLE_PIPE ) right= lhs_and )*
                     {
                     pushFollow(FOLLOW_lhs_and_in_lhs_or1812);
                     left=lhs_and();
@@ -2900,7 +2901,7 @@
                     if ( backtracking==0 ) {
                        d = left; 
                     }
-                    // /home/etirelli/workspace/jboss/jbossrules/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:761:3: ( ( OR | DOUBLE_PIPE ) right= lhs_and )*
                     loop32:
                     do {
                         int alt32=2;
@@ -2913,7 +2914,7 @@
 
                         switch (alt32) {
                     	case 1 :
-                    	    // /home/etirelli/workspace/jboss/jbossrules/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:761:5: ( OR | DOUBLE_PIPE ) right= lhs_and
                     	    {
                     	    if ( (input.LA(1)>=OR && input.LA(1)<=DOUBLE_PIPE) ) {
                     	        input.consume();
@@ -2973,7 +2974,7 @@
 
 
     // $ANTLR start lhs_and
-    // /home/etirelli/workspace/jboss/jbossrules/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:778: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;
 
@@ -2989,7 +2990,7 @@
         		AndDescr and = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/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:783: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);
 
@@ -3022,7 +3023,7 @@
             }
             switch (alt36) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/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:783: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;
@@ -3033,7 +3034,7 @@
                       			location.setType( Location.LOCATION_LHS_BEGIN_OF_CONDITION_AND_OR );
                       		
                     }
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:789:3: (lhsunary= lhs_unary )+
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:789:3: (lhsunary= lhs_unary )+
                     int cnt34=0;
                     loop34:
                     do {
@@ -3047,7 +3048,7 @@
 
                         switch (alt34) {
                     	case 1 :
-                    	    // /home/etirelli/workspace/jboss/jbossrules/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:789:4: lhsunary= lhs_unary
                     	    {
                     	    pushFollow(FOLLOW_lhs_unary_in_lhs_and1881);
                     	    lhsunary=lhs_unary();
@@ -3077,7 +3078,7 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/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:795:10: left= lhs_unary ( ( AND | DOUBLE_AMPER ) right= lhs_unary )*
                     {
                     pushFollow(FOLLOW_lhs_unary_in_lhs_and1909);
                     left=lhs_unary();
@@ -3086,7 +3087,7 @@
                     if ( backtracking==0 ) {
                        d = left; 
                     }
-                    // /home/etirelli/workspace/jboss/jbossrules/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:796:3: ( ( AND | DOUBLE_AMPER ) right= lhs_unary )*
                     loop35:
                     do {
                         int alt35=2;
@@ -3099,7 +3100,7 @@
 
                         switch (alt35) {
                     	case 1 :
-                    	    // /home/etirelli/workspace/jboss/jbossrules/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:796:5: ( AND | DOUBLE_AMPER ) right= lhs_unary
                     	    {
                     	    if ( (input.LA(1)>=AND && input.LA(1)<=DOUBLE_AMPER) ) {
                     	        input.consume();
@@ -3159,7 +3160,7 @@
 
 
     // $ANTLR start lhs_unary
-    // /home/etirelli/workspace/jboss/jbossrules/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: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 ;
     public final BaseDescr lhs_unary() throws RecognitionException {
         BaseDescr d = null;
 
@@ -3172,10 +3173,10 @@
         		d = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/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/jbossrules/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: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/jbossrules/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: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 )
             int alt37=6;
             int LA37_0 = input.LA(1);
 
@@ -3206,7 +3207,7 @@
             }
             switch (alt37) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/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:817:6: ( EXISTS )=>u= lhs_exist
                     {
                     pushFollow(FOLLOW_lhs_exist_in_lhs_unary1978);
                     u=lhs_exist();
@@ -3219,7 +3220,7 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/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:818:5: ( NOT )=>u= lhs_not
                     {
                     pushFollow(FOLLOW_lhs_not_in_lhs_unary1996);
                     u=lhs_not();
@@ -3232,7 +3233,7 @@
                     }
                     break;
                 case 3 :
-                    // /home/etirelli/workspace/jboss/jbossrules/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:819:5: ( EVAL )=>u= lhs_eval
                     {
                     pushFollow(FOLLOW_lhs_eval_in_lhs_unary2015);
                     u=lhs_eval();
@@ -3245,7 +3246,7 @@
                     }
                     break;
                 case 4 :
-                    // /home/etirelli/workspace/jboss/jbossrules/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:820:5: ( FORALL )=>u= lhs_forall
                     {
                     pushFollow(FOLLOW_lhs_forall_in_lhs_unary2034);
                     u=lhs_forall();
@@ -3258,7 +3259,7 @@
                     }
                     break;
                 case 5 :
-                    // /home/etirelli/workspace/jboss/jbossrules/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:821: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);
@@ -3273,7 +3274,7 @@
                     }
                     break;
                 case 6 :
-                    // /home/etirelli/workspace/jboss/jbossrules/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:822:5: ps= pattern_source
                     {
                     pushFollow(FOLLOW_pattern_source_in_lhs_unary2068);
                     ps=pattern_source();
@@ -3308,7 +3309,7 @@
 
 
     // $ANTLR start pattern_source
-    // /home/etirelli/workspace/jboss/jbossrules/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:827:1: pattern_source returns [BaseDescr d] : u= lhs_pattern ( FROM ( options {k=1; } : (ac= accumulate_statement ) | (cs= collect_statement ) | (fm= from_statement ) ) )? ;
     public final BaseDescr pattern_source() throws RecognitionException {
         BaseDescr d = null;
 
@@ -3325,8 +3326,8 @@
         		d = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/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/jbossrules/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: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 ) ) )?
             {
             pushFollow(FOLLOW_lhs_pattern_in_pattern_source2107);
             u=lhs_pattern();
@@ -3335,7 +3336,7 @@
             if ( backtracking==0 ) {
                d = u; 
             }
-            // /home/etirelli/workspace/jboss/jbossrules/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 ) ) )?
+            // /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;
             int LA39_0 = input.LA(1);
 
@@ -3344,7 +3345,7 @@
             }
             switch (alt39) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/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:834:4: FROM ( options {k=1; } : (ac= accumulate_statement ) | (cs= collect_statement ) | (fm= from_statement ) )
                     {
                     match(input,FROM,FOLLOW_FROM_in_pattern_source2119); if (failed) return d;
                     if ( backtracking==0 ) {
@@ -3353,7 +3354,7 @@
                       				location.setProperty(Location.LOCATION_FROM_CONTENT, "");
                       		        
                     }
-                    // /home/etirelli/workspace/jboss/jbossrules/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:839:11: ( options {k=1; } : (ac= accumulate_statement ) | (cs= collect_statement ) | (fm= from_statement ) )
                     int alt38=3;
                     switch ( input.LA(1) ) {
                     case ACCUMULATE:
@@ -3408,10 +3409,10 @@
 
                     switch (alt38) {
                         case 1 :
-                            // /home/etirelli/workspace/jboss/jbossrules/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:15: (ac= accumulate_statement )
                             {
-                            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:840:15: (ac= accumulate_statement )
-                            // /home/etirelli/workspace/jboss/jbossrules/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: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
                             {
                             pushFollow(FOLLOW_accumulate_statement_in_pattern_source2175);
                             ac=accumulate_statement();
@@ -3427,10 +3428,10 @@
                             }
                             break;
                         case 2 :
-                            // /home/etirelli/workspace/jboss/jbossrules/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:15: (cs= collect_statement )
                             {
-                            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:841:15: (cs= collect_statement )
-                            // /home/etirelli/workspace/jboss/jbossrules/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: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
                             {
                             pushFollow(FOLLOW_collect_statement_in_pattern_source2198);
                             cs=collect_statement();
@@ -3446,10 +3447,10 @@
                             }
                             break;
                         case 3 :
-                            // /home/etirelli/workspace/jboss/jbossrules/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:15: (fm= from_statement )
                             {
-                            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:842:15: (fm= from_statement )
-                            // /home/etirelli/workspace/jboss/jbossrules/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: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
                             {
                             pushFollow(FOLLOW_from_statement_in_pattern_source2222);
                             fm=from_statement();
@@ -3489,7 +3490,7 @@
 
 
     // $ANTLR start lhs_exist
-    // /home/etirelli/workspace/jboss/jbossrules/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:847: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;
 
@@ -3504,8 +3505,8 @@
         		d = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/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/jbossrules/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: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 )
             {
             EXISTS38=(Token)input.LT(1);
             match(input,EXISTS,FOLLOW_EXISTS_in_lhs_exist2265); if (failed) return d;
@@ -3517,7 +3518,7 @@
               			location.setType( Location.LOCATION_LHS_BEGIN_OF_CONDITION_EXISTS );
               		
             }
-            // /home/etirelli/workspace/jboss/jbossrules/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:858:10: ( ( LEFT_PAREN or= lhs_or RIGHT_PAREN ) | pattern= lhs_pattern )
             int alt40=2;
             int LA40_0 = input.LA(1);
 
@@ -3536,10 +3537,10 @@
             }
             switch (alt40) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/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:12: ( LEFT_PAREN or= lhs_or RIGHT_PAREN )
                     {
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:858:12: ( LEFT_PAREN or= lhs_or RIGHT_PAREN )
-                    // /home/etirelli/workspace/jboss/jbossrules/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: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
                     {
                     match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_exist2285); if (failed) return d;
                     pushFollow(FOLLOW_lhs_or_in_lhs_exist2289);
@@ -3561,7 +3562,7 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/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:863:12: pattern= lhs_pattern
                     {
                     pushFollow(FOLLOW_lhs_pattern_in_lhs_exist2369);
                     pattern=lhs_pattern();
@@ -3597,7 +3598,7 @@
 
 
     // $ANTLR start lhs_not
-    // /home/etirelli/workspace/jboss/jbossrules/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:873: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;
 
@@ -3612,8 +3613,8 @@
         		d = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/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/jbossrules/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: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 )
             {
             NOT40=(Token)input.LT(1);
             match(input,NOT,FOLLOW_NOT_in_lhs_not2421); if (failed) return d;
@@ -3625,7 +3626,7 @@
               			location.setType( Location.LOCATION_LHS_BEGIN_OF_CONDITION_NOT );
               		
             }
-            // /home/etirelli/workspace/jboss/jbossrules/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:884:3: ( ( LEFT_PAREN or= lhs_or RIGHT_PAREN ) | pattern= lhs_pattern )
             int alt41=2;
             int LA41_0 = input.LA(1);
 
@@ -3644,10 +3645,10 @@
             }
             switch (alt41) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/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:5: ( LEFT_PAREN or= lhs_or RIGHT_PAREN )
                     {
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:884:5: ( LEFT_PAREN or= lhs_or RIGHT_PAREN )
-                    // /home/etirelli/workspace/jboss/jbossrules/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: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
                     {
                     match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_lhs_not2434); if (failed) return d;
                     pushFollow(FOLLOW_lhs_or_in_lhs_not2438);
@@ -3669,7 +3670,7 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/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:890:3: pattern= lhs_pattern
                     {
                     pushFollow(FOLLOW_lhs_pattern_in_lhs_not2506);
                     pattern=lhs_pattern();
@@ -3705,7 +3706,7 @@
 
 
     // $ANTLR start lhs_eval
-    // /home/etirelli/workspace/jboss/jbossrules/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:900:1: lhs_eval returns [BaseDescr d] : EVAL c= paren_chunk ;
     public final BaseDescr lhs_eval() throws RecognitionException {
         BaseDescr d = null;
 
@@ -3717,8 +3718,8 @@
         		d = new EvalDescr( );
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:904:2: ( EVAL c= paren_chunk )
-            // /home/etirelli/workspace/jboss/jbossrules/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: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
             {
             EVAL42=(Token)input.LT(1);
             match(input,EVAL,FOLLOW_EVAL_in_lhs_eval2552); if (failed) return d;
@@ -3762,7 +3763,7 @@
 
 
     // $ANTLR start lhs_forall
-    // /home/etirelli/workspace/jboss/jbossrules/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:925: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;
 
@@ -3777,8 +3778,8 @@
         		d = factory.createForall();
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/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/jbossrules/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: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
             {
             FORALL43=(Token)input.LT(1);
             match(input,FORALL,FOLLOW_FORALL_in_lhs_forall2589); if (failed) return d;
@@ -3795,7 +3796,7 @@
               			d.setLocation( offset(FORALL43.getLine()), FORALL43.getCharPositionInLine() );
               		
             }
-            // /home/etirelli/workspace/jboss/jbossrules/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:936:3: (pattern= lhs_pattern )*
             loop42:
             do {
                 int alt42=2;
@@ -3808,7 +3809,7 @@
 
                 switch (alt42) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/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:936:5: pattern= lhs_pattern
             	    {
             	    pushFollow(FOLLOW_lhs_pattern_in_lhs_forall2610);
             	    pattern=lhs_pattern();
@@ -3852,7 +3853,7 @@
 
 
     // $ANTLR start lhs_pattern
-    // /home/etirelli/workspace/jboss/jbossrules/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:948:1: lhs_pattern returns [BaseDescr d] : (f= fact_binding | f= fact[null] );
     public final BaseDescr lhs_pattern() throws RecognitionException {
         BaseDescr d = null;
 
@@ -3863,14 +3864,14 @@
         		d =null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/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:955: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==75) ) {
+                if ( (LA43_1==76) ) {
                     alt43=1;
                 }
                 else if ( (LA43_1==DOT||LA43_1==LEFT_PAREN||LA43_1==LEFT_SQUARE) ) {
@@ -3893,7 +3894,7 @@
             }
             switch (alt43) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/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:955:4: f= fact_binding
                     {
                     pushFollow(FOLLOW_fact_binding_in_lhs_pattern2659);
                     f=fact_binding();
@@ -3903,7 +3904,7 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/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:956:4: f= fact[null]
                     {
                     pushFollow(FOLLOW_fact_in_lhs_pattern2667);
                     f=fact(null);
@@ -3932,7 +3933,7 @@
 
 
     // $ANTLR start from_statement
-    // /home/etirelli/workspace/jboss/jbossrules/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:959:1: from_statement returns [FromDescr d] : ds= from_source[$d] ;
     public final FromDescr from_statement() throws RecognitionException {
         FromDescr d = null;
 
@@ -3943,8 +3944,8 @@
         		d =factory.createFrom();
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:963:2: (ds= from_source[$d] )
-            // /home/etirelli/workspace/jboss/jbossrules/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: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]
             {
             pushFollow(FOLLOW_from_source_in_from_statement2694);
             ds=from_source(d);
@@ -3971,7 +3972,7 @@
 
 
     // $ANTLR start accumulate_statement
-    // /home/etirelli/workspace/jboss/jbossrules/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: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 ;
     public final AccumulateDescr accumulate_statement() throws RecognitionException {
         AccumulateDescr d = null;
 
@@ -3987,8 +3988,8 @@
         		d = factory.createAccumulate();
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/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/jbossrules/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: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
             {
             ACCUMULATE45=(Token)input.LT(1);
             match(input,ACCUMULATE,FOLLOW_ACCUMULATE_in_accumulate_statement2731); if (failed) return d;
@@ -4004,7 +4005,7 @@
             inputCE=lhs_or();
             _fsp--;
             if (failed) return d;
-            // /home/etirelli/workspace/jboss/jbossrules/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:982:29: ( COMMA )?
             int alt44=2;
             int LA44_0 = input.LA(1);
 
@@ -4013,7 +4014,7 @@
             }
             switch (alt44) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/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:982:29: COMMA
                     {
                     match(input,COMMA,FOLLOW_COMMA_in_accumulate_statement2747); if (failed) return d;
 
@@ -4027,7 +4028,7 @@
               		        d.setInput( inputCE );
               		
             }
-            // /home/etirelli/workspace/jboss/jbossrules/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: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 ) )
             int alt49=2;
             int LA49_0 = input.LA(1);
 
@@ -4046,10 +4047,10 @@
             }
             switch (alt49) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/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: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/jbossrules/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/jbossrules/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: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
                     {
                     match(input,INIT,FOLLOW_INIT_in_accumulate_statement2765); if (failed) return d;
                     if ( backtracking==0 ) {
@@ -4061,7 +4062,7 @@
                     text=paren_chunk();
                     _fsp--;
                     if (failed) return d;
-                    // /home/etirelli/workspace/jboss/jbossrules/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:991:21: ( COMMA )?
                     int alt45=2;
                     int LA45_0 = input.LA(1);
 
@@ -4070,7 +4071,7 @@
                     }
                     switch (alt45) {
                         case 1 :
-                            // /home/etirelli/workspace/jboss/jbossrules/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:991:21: COMMA
                             {
                             match(input,COMMA,FOLLOW_COMMA_in_accumulate_statement2780); if (failed) return d;
 
@@ -4093,7 +4094,7 @@
                     text=paren_chunk();
                     _fsp--;
                     if (failed) return d;
-                    // /home/etirelli/workspace/jboss/jbossrules/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:999:28: ( COMMA )?
                     int alt46=2;
                     int LA46_0 = input.LA(1);
 
@@ -4102,7 +4103,7 @@
                     }
                     switch (alt46) {
                         case 1 :
-                            // /home/etirelli/workspace/jboss/jbossrules/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:999:28: COMMA
                             {
                             match(input,COMMA,FOLLOW_COMMA_in_accumulate_statement2797); if (failed) return d;
 
@@ -4120,7 +4121,7 @@
                       				}
                       			
                     }
-                    // /home/etirelli/workspace/jboss/jbossrules/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:1007:4: ( REVERSE text= paren_chunk ( COMMA )? )?
                     int alt48=2;
                     int LA48_0 = input.LA(1);
 
@@ -4129,14 +4130,14 @@
                     }
                     switch (alt48) {
                         case 1 :
-                            // /home/etirelli/workspace/jboss/jbossrules/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:1007: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);
                             text=paren_chunk();
                             _fsp--;
                             if (failed) return d;
-                            // /home/etirelli/workspace/jboss/jbossrules/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:1007:31: ( COMMA )?
                             int alt47=2;
                             int LA47_0 = input.LA(1);
 
@@ -4145,7 +4146,7 @@
                             }
                             switch (alt47) {
                                 case 1 :
-                                    // /home/etirelli/workspace/jboss/jbossrules/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:1007:31: COMMA
                                     {
                                     match(input,COMMA,FOLLOW_COMMA_in_accumulate_statement2816); if (failed) return d;
 
@@ -4189,10 +4190,10 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/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:1025:3: (id= ID text= paren_chunk )
                     {
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1025:3: (id= ID text= paren_chunk )
-                    // /home/etirelli/workspace/jboss/jbossrules/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: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
                     {
                     id=(Token)input.LT(1);
                     match(input,ID,FOLLOW_ID_in_accumulate_statement2863); if (failed) return d;
@@ -4245,7 +4246,7 @@
 
 
     // $ANTLR start from_source
-    // /home/etirelli/workspace/jboss/jbossrules/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:1044:4: 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;
 
@@ -4260,8 +4261,8 @@
         		FunctionCallDescr fc = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/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/jbossrules/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: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] )?
             {
             pushFollow(FOLLOW_identifier_in_from_source2912);
             ident=identifier();
@@ -4277,7 +4278,7 @@
               			location.setProperty(Location.LOCATION_FROM_CONTENT, ident.start.getText());
               		
             }
-            // /home/etirelli/workspace/jboss/jbossrules/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:1059:3: ( options {k=1; } : args= paren_chunk )?
             int alt50=2;
             int LA50_0 = input.LA(1);
 
@@ -4286,7 +4287,7 @@
             }
             switch (alt50) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/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:1066:5: args= paren_chunk
                     {
                     pushFollow(FOLLOW_paren_chunk_in_from_source2940);
                     args=paren_chunk();
@@ -4312,7 +4313,7 @@
 
             }
 
-            // /home/etirelli/workspace/jboss/jbossrules/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:1080:3: ( expression_chain[$from, ad] )?
             int alt51=2;
             int LA51_0 = input.LA(1);
 
@@ -4321,7 +4322,7 @@
             }
             switch (alt51) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/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:1080:3: expression_chain[$from, ad]
                     {
                     pushFollow(FOLLOW_expression_chain_in_from_source2953);
                     expression_chain(from,  ad);
@@ -4357,7 +4358,7 @@
 
 
     // $ANTLR start expression_chain
-    // /home/etirelli/workspace/jboss/jbossrules/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: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] )? ) ;
     public final void expression_chain(FromDescr from, AccessorDescr as) throws RecognitionException {
         identifier_return field = null;
 
@@ -4371,11 +4372,11 @@
         	    	MethodAccessDescr ma = null;	
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/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/jbossrules/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: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/jbossrules/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/jbossrules/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: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] )?
             {
             match(input,DOT,FOLLOW_DOT_in_expression_chain2988); if (failed) return ;
             pushFollow(FOLLOW_identifier_in_expression_chain2992);
@@ -4390,12 +4391,12 @@
               		fa.setEndCharacter( ((CommonToken)((Token)field.start)).getStopIndex() );
               	    
             }
-            // /home/etirelli/workspace/jboss/jbossrules/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:1107: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/jbossrules/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:1108:6: ( LEFT_SQUARE )=>sqarg= square_chunk
                     {
                     pushFollow(FOLLOW_square_chunk_in_expression_chain3023);
                     sqarg=square_chunk();
@@ -4411,7 +4412,7 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/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:1114:6: ( LEFT_PAREN )=>paarg= paren_chunk
                     {
                     pushFollow(FOLLOW_paren_chunk_in_expression_chain3056);
                     paarg=paren_chunk();
@@ -4431,7 +4432,7 @@
 
             }
 
-            // /home/etirelli/workspace/jboss/jbossrules/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:1122:4: ( expression_chain[from, as] )?
             int alt53=2;
             int LA53_0 = input.LA(1);
 
@@ -4440,7 +4441,7 @@
             }
             switch (alt53) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/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:1122:4: expression_chain[from, as]
                     {
                     pushFollow(FOLLOW_expression_chain_in_expression_chain3071);
                     expression_chain(from,  as);
@@ -4479,7 +4480,7 @@
 
 
     // $ANTLR start collect_statement
-    // /home/etirelli/workspace/jboss/jbossrules/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:1136:1: collect_statement returns [CollectDescr d] : COLLECT LEFT_PAREN pattern= pattern_source RIGHT_PAREN ;
     public final CollectDescr collect_statement() throws RecognitionException {
         CollectDescr d = null;
 
@@ -4492,8 +4493,8 @@
         		d = factory.createCollect();
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1140:2: ( COLLECT LEFT_PAREN pattern= pattern_source RIGHT_PAREN )
-            // /home/etirelli/workspace/jboss/jbossrules/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: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
             {
             COLLECT47=(Token)input.LT(1);
             match(input,COLLECT,FOLLOW_COLLECT_in_collect_statement3122); if (failed) return d;
@@ -4534,7 +4535,7 @@
 
 
     // $ANTLR start fact_binding
-    // /home/etirelli/workspace/jboss/jbossrules/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: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 ) ;
     public final BaseDescr fact_binding() throws RecognitionException {
         BaseDescr d = null;
 
@@ -4551,12 +4552,12 @@
         		OrDescr or = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/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/jbossrules/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: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 )
             {
             ID49=(Token)input.LT(1);
             match(input,ID,FOLLOW_ID_in_fact_binding3170); if (failed) return d;
-            match(input,75,FOLLOW_75_in_fact_binding3172); if (failed) return d;
+            match(input,76,FOLLOW_76_in_fact_binding3172); if (failed) return d;
             if ( backtracking==0 ) {
 
                		        // handling incomplete parsing
@@ -4564,7 +4565,7 @@
                		        ((PatternDescr) d).setIdentifier( ID49.getText() );
                		
             }
-            // /home/etirelli/workspace/jboss/jbossrules/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:1167: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);
 
@@ -4583,7 +4584,7 @@
             }
             switch (alt55) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/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:1167:5: fe= fact[$ID.text]
                     {
                     pushFollow(FOLLOW_fact_in_fact_binding3186);
                     fe=fact(ID49.getText());
@@ -4602,7 +4603,7 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/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:1176: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);
@@ -4618,7 +4619,7 @@
                          			}
                        		
                     }
-                    // /home/etirelli/workspace/jboss/jbossrules/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:1184:4: ( ( OR | DOUBLE_PIPE ) right= fact[$ID.text] )*
                     loop54:
                     do {
                         int alt54=2;
@@ -4631,7 +4632,7 @@
 
                         switch (alt54) {
                     	case 1 :
-                    	    // /home/etirelli/workspace/jboss/jbossrules/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:1184:6: ( OR | DOUBLE_PIPE ) right= fact[$ID.text]
                     	    {
                     	    if ( (input.LA(1)>=OR && input.LA(1)<=DOUBLE_PIPE) ) {
                     	        input.consume();
@@ -4690,7 +4691,7 @@
 
 
     // $ANTLR start fact
-    // /home/etirelli/workspace/jboss/jbossrules/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:1199: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;
 
@@ -4704,8 +4705,8 @@
         		PatternDescr pattern = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/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/jbossrules/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: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 )?
             {
             if ( backtracking==0 ) {
 
@@ -4740,16 +4741,16 @@
                			pattern.setLeftParentCharacter( ((CommonToken)LEFT_PAREN50).getStartIndex() );
                		
             }
-            // /home/etirelli/workspace/jboss/jbossrules/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:1228:4: ( constraints[pattern] )?
             int alt56=2;
             int LA56_0 = input.LA(1);
 
-            if ( ((LA56_0>=PACKAGE && LA56_0<=ID)||(LA56_0>=GLOBAL && LA56_0<=LEFT_PAREN)||(LA56_0>=QUERY && LA56_0<=ATTRIBUTES)||LA56_0==ENABLED||LA56_0==SALIENCE||(LA56_0>=DURATION && LA56_0<=DIALECT)||LA56_0==FROM||LA56_0==EVAL||(LA56_0>=INIT && LA56_0<=RESULT)||(LA56_0>=CONTAINS && LA56_0<=IN)||LA56_0==THEN) ) {
+            if ( ((LA56_0>=PACKAGE && LA56_0<=ID)||(LA56_0>=GLOBAL && LA56_0<=LEFT_PAREN)||(LA56_0>=QUERY && LA56_0<=ATTRIBUTES)||LA56_0==ENABLED||LA56_0==SALIENCE||(LA56_0>=DURATION && LA56_0<=DIALECT)||LA56_0==FROM||LA56_0==EVAL||(LA56_0>=INIT && LA56_0<=RESULT)||(LA56_0>=CONTAINS && LA56_0<=MEMBEROF)||LA56_0==IN||LA56_0==THEN) ) {
                 alt56=1;
             }
             switch (alt56) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/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:1228:4: constraints[pattern]
                     {
                     pushFollow(FOLLOW_constraints_in_fact3326);
                     constraints(pattern);
@@ -4773,7 +4774,7 @@
               		        }
                		
             }
-            // /home/etirelli/workspace/jboss/jbossrules/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:1238:4: ( EOF )?
             int alt57=2;
             int LA57_0 = input.LA(1);
 
@@ -4782,7 +4783,7 @@
             }
             switch (alt57) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/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:1238:4: EOF
                     {
                     match(input,EOF,FOLLOW_EOF_in_fact3342); if (failed) return d;
 
@@ -4807,17 +4808,17 @@
 
 
     // $ANTLR start constraints
-    // /home/etirelli/workspace/jboss/jbossrules/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:1242:1: constraints[PatternDescr pattern] : constraint[$pattern] ( COMMA constraint[$pattern] )* ;
     public final void constraints(PatternDescr pattern) throws RecognitionException {
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1243:2: ( constraint[$pattern] ( COMMA constraint[$pattern] )* )
-            // /home/etirelli/workspace/jboss/jbossrules/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: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] )*
             {
             pushFollow(FOLLOW_constraint_in_constraints3360);
             constraint(pattern);
             _fsp--;
             if (failed) return ;
-            // /home/etirelli/workspace/jboss/jbossrules/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:1244:3: ( COMMA constraint[$pattern] )*
             loop58:
             do {
                 int alt58=2;
@@ -4830,7 +4831,7 @@
 
                 switch (alt58) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/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:1244:5: COMMA constraint[$pattern]
             	    {
             	    match(input,COMMA,FOLLOW_COMMA_in_constraints3367); if (failed) return ;
             	    if ( backtracking==0 ) {
@@ -4865,7 +4866,7 @@
 
 
     // $ANTLR start constraint
-    // /home/etirelli/workspace/jboss/jbossrules/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:1249:1: constraint[PatternDescr pattern] : or_constr[top] ;
     public final void constraint(PatternDescr pattern) throws RecognitionException {
 
         		ConditionalElementDescr top = null;
@@ -4873,8 +4874,8 @@
         		location.setProperty(Location.LOCATION_PROPERTY_PROPERTY_NAME, input.LT(1).getText() );
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1255:2: ( or_constr[top] )
-            // /home/etirelli/workspace/jboss/jbossrules/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: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]
             {
             if ( backtracking==0 ) {
 
@@ -4901,20 +4902,20 @@
 
 
     // $ANTLR start or_constr
-    // /home/etirelli/workspace/jboss/jbossrules/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:1262:1: or_constr[ConditionalElementDescr base] : and_constr[or] ( DOUBLE_PIPE and_constr[or] )* ;
     public final void or_constr(ConditionalElementDescr base) throws RecognitionException {
 
         		OrDescr or = new OrDescr();
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1266:2: ( and_constr[or] ( DOUBLE_PIPE and_constr[or] )* )
-            // /home/etirelli/workspace/jboss/jbossrules/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: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] )*
             {
             pushFollow(FOLLOW_and_constr_in_or_constr3432);
             and_constr(or);
             _fsp--;
             if (failed) return ;
-            // /home/etirelli/workspace/jboss/jbossrules/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:1268:3: ( DOUBLE_PIPE and_constr[or] )*
             loop59:
             do {
                 int alt59=2;
@@ -4927,7 +4928,7 @@
 
                 switch (alt59) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/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:1268:5: DOUBLE_PIPE and_constr[or]
             	    {
             	    match(input,DOUBLE_PIPE,FOLLOW_DOUBLE_PIPE_in_or_constr3440); if (failed) return ;
             	    if ( backtracking==0 ) {
@@ -4973,20 +4974,20 @@
 
 
     // $ANTLR start and_constr
-    // /home/etirelli/workspace/jboss/jbossrules/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:1283:1: and_constr[ConditionalElementDescr base] : unary_constr[and] ( DOUBLE_AMPER unary_constr[and] )* ;
     public final void and_constr(ConditionalElementDescr base) throws RecognitionException {
 
         		AndDescr and = new AndDescr();
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1287:2: ( unary_constr[and] ( DOUBLE_AMPER unary_constr[and] )* )
-            // /home/etirelli/workspace/jboss/jbossrules/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: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] )*
             {
             pushFollow(FOLLOW_unary_constr_in_and_constr3481);
             unary_constr(and);
             _fsp--;
             if (failed) return ;
-            // /home/etirelli/workspace/jboss/jbossrules/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:1289:3: ( DOUBLE_AMPER unary_constr[and] )*
             loop60:
             do {
                 int alt60=2;
@@ -4999,7 +5000,7 @@
 
                 switch (alt60) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/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:1289:5: DOUBLE_AMPER unary_constr[and]
             	    {
             	    match(input,DOUBLE_AMPER,FOLLOW_DOUBLE_AMPER_in_and_constr3489); if (failed) return ;
             	    if ( backtracking==0 ) {
@@ -5045,13 +5046,13 @@
 
 
     // $ANTLR start unary_constr
-    // /home/etirelli/workspace/jboss/jbossrules/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:1304:1: unary_constr[ConditionalElementDescr base] : ( field_constraint[$base] | LEFT_PAREN or_constr[$base] RIGHT_PAREN | EVAL predicate[$base] ) ;
     public final void unary_constr(ConditionalElementDescr base) throws RecognitionException {
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1305:2: ( ( field_constraint[$base] | LEFT_PAREN or_constr[$base] RIGHT_PAREN | EVAL predicate[$base] ) )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g: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: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/jbossrules/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:1306:3: ( field_constraint[$base] | LEFT_PAREN or_constr[$base] RIGHT_PAREN | EVAL predicate[$base] )
             int alt61=3;
             switch ( input.LA(1) ) {
             case PACKAGE:
@@ -5106,7 +5107,7 @@
 
             switch (alt61) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/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:1306:5: field_constraint[$base]
                     {
                     pushFollow(FOLLOW_field_constraint_in_unary_constr3526);
                     field_constraint(base);
@@ -5116,7 +5117,7 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/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:1307: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);
@@ -5128,7 +5129,7 @@
                     }
                     break;
                 case 3 :
-                    // /home/etirelli/workspace/jboss/jbossrules/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:1308:5: EVAL predicate[$base]
                     {
                     match(input,EVAL,FOLLOW_EVAL_in_unary_constr3545); if (failed) return ;
                     pushFollow(FOLLOW_predicate_in_unary_constr3547);
@@ -5157,7 +5158,7 @@
 
 
     // $ANTLR start field_constraint
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1312:1: field_constraint[ConditionalElementDescr base] : ( ( ID ':' f= accessor_path ( ( options {backtrack=true; } : or_restr_connective[top] ) | '->' predicate[$base] )? ) | (f= accessor_path ( options {backtrack=true; } : or_restr_connective[top] ) ) );
+    // /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] ) );
     public final void field_constraint(ConditionalElementDescr base) throws RecognitionException {
         Token ID52=null;
         accessor_path_return f = null;
@@ -5169,47 +5170,47 @@
         		RestrictionConnectiveDescr top = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1318:2: ( ( ID ':' f= accessor_path ( ( options {backtrack=true; } : or_restr_connective[top] ) | '->' predicate[$base] )? ) | (f= accessor_path ( options {backtrack=true; } : or_restr_connective[top] ) ) )
+            // /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] ) )
             int alt63=2;
             int LA63_0 = input.LA(1);
 
             if ( (LA63_0==ID) ) {
                 int LA63_1 = input.LA(2);
 
-                if ( (LA63_1==75) ) {
+                if ( (LA63_1==76) ) {
                     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>=77 && LA63_1<=82)) ) {
+                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)) ) {
                     alt63=2;
                 }
                 else {
                     if (backtracking>0) {failed=true; return ;}
                     NoViableAltException nvae =
-                        new NoViableAltException("1312:1: field_constraint[ConditionalElementDescr base] : ( ( ID ':' f= accessor_path ( ( options {backtrack=true; } : or_restr_connective[top] ) | '->' predicate[$base] )? ) | (f= accessor_path ( options {backtrack=true; } : or_restr_connective[top] ) ) );", 63, 1, input);
+                        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);
 
                     throw nvae;
                 }
             }
-            else if ( ((LA63_0>=PACKAGE && LA63_0<=EVENT)||LA63_0==GLOBAL||(LA63_0>=QUERY && LA63_0<=ATTRIBUTES)||LA63_0==ENABLED||LA63_0==SALIENCE||(LA63_0>=DURATION && LA63_0<=DIALECT)||LA63_0==FROM||(LA63_0>=INIT && LA63_0<=RESULT)||(LA63_0>=CONTAINS && LA63_0<=IN)||LA63_0==THEN) ) {
+            else if ( ((LA63_0>=PACKAGE && LA63_0<=EVENT)||LA63_0==GLOBAL||(LA63_0>=QUERY && LA63_0<=ATTRIBUTES)||LA63_0==ENABLED||LA63_0==SALIENCE||(LA63_0>=DURATION && LA63_0<=DIALECT)||LA63_0==FROM||(LA63_0>=INIT && LA63_0<=RESULT)||(LA63_0>=CONTAINS && LA63_0<=MEMBEROF)||LA63_0==IN||LA63_0==THEN) ) {
                 alt63=2;
             }
             else {
                 if (backtracking>0) {failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1312:1: field_constraint[ConditionalElementDescr base] : ( ( ID ':' f= accessor_path ( ( options {backtrack=true; } : or_restr_connective[top] ) | '->' predicate[$base] )? ) | (f= accessor_path ( options {backtrack=true; } : or_restr_connective[top] ) ) );", 63, 0, input);
+                    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);
 
                 throw nvae;
             }
             switch (alt63) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1319:10: ( ID ':' f= accessor_path ( ( options {backtrack=true; } : 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/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1319:10: ( ID ':' f= accessor_path ( ( options {backtrack=true; } : or_restr_connective[top] ) | '->' predicate[$base] )? )
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1320:3: ID ':' f= accessor_path ( ( options {backtrack=true; } : 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] )?
                     {
                     ID52=(Token)input.LT(1);
                     match(input,ID,FOLLOW_ID_in_field_constraint3586); if (failed) return ;
-                    match(input,75,FOLLOW_75_in_field_constraint3588); if (failed) return ;
+                    match(input,76,FOLLOW_76_in_field_constraint3588); if (failed) return ;
                     if ( backtracking==0 ) {
                        
                       			fbd = new FieldBindingDescr();
@@ -5249,24 +5250,21 @@
                       		    }
                       		
                     }
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1354:3: ( ( options {backtrack=true; } : or_restr_connective[top] ) | '->' predicate[$base] )?
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1354: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>=77 && LA62_0<=82)) ) {
+                    if ( (LA62_0==LEFT_PAREN||LA62_0==NOT||(LA62_0>=CONTAINS && LA62_0<=IN)||(LA62_0>=78 && LA62_0<=83)) ) {
                         alt62=1;
                     }
-                    else if ( (LA62_0==76) ) {
+                    else if ( (LA62_0==77) ) {
                         alt62=2;
                     }
                     switch (alt62) {
                         case 1 :
-                            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1355:4: ( options {backtrack=true; } : or_restr_connective[top] )
+                            // /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/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1355:4: ( options {backtrack=true; } : or_restr_connective[top] )
-                            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1356:6: or_restr_connective[top]
-                            {
-                            pushFollow(FOLLOW_or_restr_connective_in_field_constraint3635);
+                            pushFollow(FOLLOW_or_restr_connective_in_field_constraint3621);
                             or_restr_connective(top);
                             _fsp--;
                             if (failed) return ;
@@ -5280,15 +5278,12 @@
                             }
 
                             }
-
-
-                            }
                             break;
                         case 2 :
-                            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1365:4: '->' predicate[$base]
+                            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1363:4: '->' predicate[$base]
                             {
-                            match(input,76,FOLLOW_76_in_field_constraint3655); if (failed) return ;
-                            pushFollow(FOLLOW_predicate_in_field_constraint3657);
+                            match(input,77,FOLLOW_77_in_field_constraint3636); if (failed) return ;
+                            pushFollow(FOLLOW_predicate_in_field_constraint3638);
                             predicate(base);
                             _fsp--;
                             if (failed) return ;
@@ -5305,12 +5300,12 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1369:3: (f= accessor_path ( options {backtrack=true; } : 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/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1369:3: (f= accessor_path ( options {backtrack=true; } : or_restr_connective[top] ) )
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1370:3: f= accessor_path ( options {backtrack=true; } : 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]
                     {
-                    pushFollow(FOLLOW_accessor_path_in_field_constraint3683);
+                    pushFollow(FOLLOW_accessor_path_in_field_constraint3664);
                     f=accessor_path();
                     _fsp--;
                     if (failed) return ;
@@ -5331,10 +5326,7 @@
                       		    }
                       		
                     }
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1386:3: ( options {backtrack=true; } : or_restr_connective[top] )
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1387:5: or_restr_connective[top]
-                    {
-                    pushFollow(FOLLOW_or_restr_connective_in_field_constraint3705);
+                    pushFollow(FOLLOW_or_restr_connective_in_field_constraint3673);
                     or_restr_connective(top);
                     _fsp--;
                     if (failed) return ;
@@ -5343,9 +5335,6 @@
 
 
                     }
-
-
-                    }
                     break;
 
             }
@@ -5371,35 +5360,35 @@
 
 
     // $ANTLR start or_restr_connective
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1404: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:1400:1: or_restr_connective[ RestrictionConnectiveDescr base ] options {backtrack=true; } : and_restr_connective[or] ( options {backtrack=true; } : DOUBLE_PIPE and_restr_connective[or] )* ;
     public final void or_restr_connective(RestrictionConnectiveDescr base) throws RecognitionException {
 
         		RestrictionConnectiveDescr or = new RestrictionConnectiveDescr(RestrictionConnectiveDescr.OR);
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1411:2: ( and_restr_connective[or] ( options {backtrack=true; } : DOUBLE_PIPE and_restr_connective[or] )* )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1412: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: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] )*
             {
-            pushFollow(FOLLOW_and_restr_connective_in_or_restr_connective3756);
+            pushFollow(FOLLOW_and_restr_connective_in_or_restr_connective3720);
             and_restr_connective(or);
             _fsp--;
             if (failed) return ;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1413: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:1409: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/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1415: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]
             	    {
-            	    match(input,DOUBLE_PIPE,FOLLOW_DOUBLE_PIPE_in_or_restr_connective3780); if (failed) return ;
+            	    match(input,DOUBLE_PIPE,FOLLOW_DOUBLE_PIPE_in_or_restr_connective3743); if (failed) return ;
             	    if ( backtracking==0 ) {
 
             	      				location.setType(Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR);
             	      			
             	    }
-            	    pushFollow(FOLLOW_and_restr_connective_in_or_restr_connective3791);
+            	    pushFollow(FOLLOW_and_restr_connective_in_or_restr_connective3754);
             	    and_restr_connective(or);
             	    _fsp--;
             	    if (failed) return ;
@@ -5435,7 +5424,7 @@
 
 
     // $ANTLR start and_restr_connective
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1430: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:1426: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;
 
@@ -5443,30 +5432,30 @@
         		RestrictionConnectiveDescr and = new RestrictionConnectiveDescr(RestrictionConnectiveDescr.AND);
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1434:2: ( constraint_expression[and] ( options {backtrack=true; } : t= DOUBLE_AMPER constraint_expression[and] )* )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1435: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: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] )*
             {
-            pushFollow(FOLLOW_constraint_expression_in_and_restr_connective3823);
+            pushFollow(FOLLOW_constraint_expression_in_and_restr_connective3786);
             constraint_expression(and);
             _fsp--;
             if (failed) return ;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1436: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:1432: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/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1437:5: t= DOUBLE_AMPER constraint_expression[and]
+            	    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1433:5: t= DOUBLE_AMPER constraint_expression[and]
             	    {
             	    t=(Token)input.LT(1);
-            	    match(input,DOUBLE_AMPER,FOLLOW_DOUBLE_AMPER_in_and_restr_connective3844); if (failed) return ;
+            	    match(input,DOUBLE_AMPER,FOLLOW_DOUBLE_AMPER_in_and_restr_connective3806); if (failed) return ;
             	    if ( backtracking==0 ) {
 
             	      				location.setType(Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR);
             	      			
             	    }
-            	    pushFollow(FOLLOW_constraint_expression_in_and_restr_connective3855);
+            	    pushFollow(FOLLOW_constraint_expression_in_and_restr_connective3817);
             	    constraint_expression(and);
             	    _fsp--;
             	    if (failed) return ;
@@ -5502,13 +5491,13 @@
 
 
     // $ANTLR start constraint_expression
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1452: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:1448:1: constraint_expression[RestrictionConnectiveDescr base] : ( compound_operator[$base] | simple_operator[$base] | LEFT_PAREN or_restr_connective[$base] RIGHT_PAREN ) ;
     public final void constraint_expression(RestrictionConnectiveDescr base) throws RecognitionException {
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1453:9: ( ( compound_operator[$base] | simple_operator[$base] | LEFT_PAREN or_restr_connective[$base] RIGHT_PAREN ) )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1454: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: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/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1454: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 )
             int alt66=3;
             switch ( input.LA(1) ) {
             case IN:
@@ -5520,7 +5509,7 @@
                 {
                 int LA66_2 = input.LA(2);
 
-                if ( (LA66_2==CONTAINS||LA66_2==MATCHES||LA66_2==MEMBEROF) ) {
+                if ( (LA66_2==CONTAINS||LA66_2==MATCHES||(LA66_2>=MEMBEROF && LA66_2<=TILDE)) ) {
                     alt66=2;
                 }
                 else if ( (LA66_2==IN) ) {
@@ -5529,7 +5518,7 @@
                 else {
                     if (backtracking>0) {failed=true; return ;}
                     NoViableAltException nvae =
-                        new NoViableAltException("1454:3: ( compound_operator[$base] | simple_operator[$base] | LEFT_PAREN or_restr_connective[$base] RIGHT_PAREN )", 66, 2, input);
+                        new NoViableAltException("1450:3: ( compound_operator[$base] | simple_operator[$base] | LEFT_PAREN or_restr_connective[$base] RIGHT_PAREN )", 66, 2, input);
 
                     throw nvae;
                 }
@@ -5540,12 +5529,13 @@
             case MATCHES:
             case SOUNDSLIKE:
             case MEMBEROF:
-            case 77:
+            case TILDE:
             case 78:
             case 79:
             case 80:
             case 81:
             case 82:
+            case 83:
                 {
                 alt66=2;
                 }
@@ -5558,16 +5548,16 @@
             default:
                 if (backtracking>0) {failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1454:3: ( compound_operator[$base] | simple_operator[$base] | LEFT_PAREN or_restr_connective[$base] RIGHT_PAREN )", 66, 0, input);
+                    new NoViableAltException("1450: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/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1454:5: compound_operator[$base]
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1450:5: compound_operator[$base]
                     {
-                    pushFollow(FOLLOW_compound_operator_in_constraint_expression3892);
+                    pushFollow(FOLLOW_compound_operator_in_constraint_expression3854);
                     compound_operator(base);
                     _fsp--;
                     if (failed) return ;
@@ -5575,9 +5565,9 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1455:5: simple_operator[$base]
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1451:5: simple_operator[$base]
                     {
-                    pushFollow(FOLLOW_simple_operator_in_constraint_expression3899);
+                    pushFollow(FOLLOW_simple_operator_in_constraint_expression3861);
                     simple_operator(base);
                     _fsp--;
                     if (failed) return ;
@@ -5585,19 +5575,19 @@
                     }
                     break;
                 case 3 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1456:5: LEFT_PAREN or_restr_connective[$base] RIGHT_PAREN
+                    // /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
                     {
-                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_constraint_expression3906); if (failed) return ;
+                    match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_constraint_expression3869); if (failed) return ;
                     if ( backtracking==0 ) {
 
                       			location.setType(Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR);
                       		
                     }
-                    pushFollow(FOLLOW_or_restr_connective_in_constraint_expression3915);
+                    pushFollow(FOLLOW_or_restr_connective_in_constraint_expression3878);
                     or_restr_connective(base);
                     _fsp--;
                     if (failed) return ;
-                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_constraint_expression3921); if (failed) return ;
+                    match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_constraint_expression3883); if (failed) return ;
 
                     }
                     break;
@@ -5620,80 +5610,89 @@
 
 
     // $ANTLR start simple_operator
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1465: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 ) rd= expression_value[$base, op] ;
+    // /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] ;
     public final void simple_operator(RestrictionConnectiveDescr base) throws RecognitionException {
         Token t=null;
         Token n=null;
+        square_chunk_return param = null;
+
         RestrictionDescr rd = null;
 
 
 
         		String op = null;
+        		String paramText = null;
+        		boolean isNegated = false;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1469: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 ) rd= expression_value[$base, op] )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1470: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 ) rd= expression_value[$base, op]
+            // /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/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1470: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 )
-            int alt67=14;
+            // /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 )? )
+            int alt69=16;
             switch ( input.LA(1) ) {
-            case 77:
-                {
-                alt67=1;
-                }
-                break;
             case 78:
                 {
-                alt67=2;
+                alt69=1;
                 }
                 break;
             case 79:
                 {
-                alt67=3;
+                alt69=2;
                 }
                 break;
             case 80:
                 {
-                alt67=4;
+                alt69=3;
                 }
                 break;
             case 81:
                 {
-                alt67=5;
+                alt69=4;
                 }
                 break;
             case 82:
                 {
-                alt67=6;
+                alt69=5;
                 }
                 break;
+            case 83:
+                {
+                alt69=6;
+                }
+                break;
             case CONTAINS:
                 {
-                alt67=7;
+                alt69=7;
                 }
                 break;
             case NOT:
                 {
                 switch ( input.LA(2) ) {
-                case MATCHES:
+                case CONTAINS:
                     {
-                    alt67=12;
+                    alt69=8;
                     }
                     break;
-                case MEMBEROF:
+                case TILDE:
                     {
-                    alt67=14;
+                    alt69=16;
                     }
                     break;
-                case CONTAINS:
+                case MATCHES:
                     {
-                    alt67=8;
+                    alt69=12;
                     }
                     break;
+                case MEMBEROF:
+                    {
+                    alt69=14;
+                    }
+                    break;
                 default:
                     if (backtracking>0) {failed=true; return ;}
                     NoViableAltException nvae =
-                        new NoViableAltException("1470: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 )", 67, 8, input);
+                        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);
 
                     throw nvae;
                 }
@@ -5702,167 +5701,234 @@
                 break;
             case EXCLUDES:
                 {
-                alt67=9;
+                alt69=9;
                 }
                 break;
             case MATCHES:
                 {
-                alt67=10;
+                alt69=10;
                 }
                 break;
             case SOUNDSLIKE:
                 {
-                alt67=11;
+                alt69=11;
                 }
                 break;
             case MEMBEROF:
                 {
-                alt67=13;
+                alt69=13;
                 }
                 break;
+            case TILDE:
+                {
+                alt69=15;
+                }
+                break;
             default:
                 if (backtracking>0) {failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1470: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 )", 67, 0, input);
+                    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);
 
                 throw nvae;
             }
 
-            switch (alt67) {
+            switch (alt69) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/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:1468:5: t= '=='
                     {
                     t=(Token)input.LT(1);
-                    match(input,77,FOLLOW_77_in_simple_operator3952); if (failed) return ;
+                    match(input,78,FOLLOW_78_in_simple_operator3914); if (failed) return ;
 
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/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:1469:5: t= '>'
                     {
                     t=(Token)input.LT(1);
-                    match(input,78,FOLLOW_78_in_simple_operator3960); if (failed) return ;
+                    match(input,79,FOLLOW_79_in_simple_operator3922); if (failed) return ;
 
                     }
                     break;
                 case 3 :
-                    // /home/etirelli/workspace/jboss/jbossrules/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:1470:5: t= '>='
                     {
                     t=(Token)input.LT(1);
-                    match(input,79,FOLLOW_79_in_simple_operator3968); if (failed) return ;
+                    match(input,80,FOLLOW_80_in_simple_operator3930); if (failed) return ;
 
                     }
                     break;
                 case 4 :
-                    // /home/etirelli/workspace/jboss/jbossrules/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:1471:5: t= '<'
                     {
                     t=(Token)input.LT(1);
-                    match(input,80,FOLLOW_80_in_simple_operator3976); if (failed) return ;
+                    match(input,81,FOLLOW_81_in_simple_operator3938); if (failed) return ;
 
                     }
                     break;
                 case 5 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1474:5: t= '<='
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1472:5: t= '<='
                     {
                     t=(Token)input.LT(1);
-                    match(input,81,FOLLOW_81_in_simple_operator3984); if (failed) return ;
+                    match(input,82,FOLLOW_82_in_simple_operator3946); if (failed) return ;
 
                     }
                     break;
                 case 6 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1475:5: t= '!='
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1473:5: t= '!='
                     {
                     t=(Token)input.LT(1);
-                    match(input,82,FOLLOW_82_in_simple_operator3992); if (failed) return ;
+                    match(input,83,FOLLOW_83_in_simple_operator3954); if (failed) return ;
 
                     }
                     break;
                 case 7 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1476:5: t= CONTAINS
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1474:25: t= CONTAINS
                     {
                     t=(Token)input.LT(1);
-                    match(input,CONTAINS,FOLLOW_CONTAINS_in_simple_operator4000); if (failed) return ;
+                    match(input,CONTAINS,FOLLOW_CONTAINS_in_simple_operator3982); if (failed) return ;
 
                     }
                     break;
                 case 8 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1477:5: n= NOT t= CONTAINS
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1475:25: n= NOT t= CONTAINS
                     {
                     n=(Token)input.LT(1);
-                    match(input,NOT,FOLLOW_NOT_in_simple_operator4008); if (failed) return ;
+                    match(input,NOT,FOLLOW_NOT_in_simple_operator4010); if (failed) return ;
                     t=(Token)input.LT(1);
-                    match(input,CONTAINS,FOLLOW_CONTAINS_in_simple_operator4012); if (failed) return ;
+                    match(input,CONTAINS,FOLLOW_CONTAINS_in_simple_operator4014); if (failed) return ;
 
                     }
                     break;
                 case 9 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1478:5: t= EXCLUDES
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1476:25: t= EXCLUDES
                     {
                     t=(Token)input.LT(1);
-                    match(input,EXCLUDES,FOLLOW_EXCLUDES_in_simple_operator4020); if (failed) return ;
+                    match(input,EXCLUDES,FOLLOW_EXCLUDES_in_simple_operator4042); if (failed) return ;
 
                     }
                     break;
                 case 10 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1479:5: t= MATCHES
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1477:25: t= MATCHES
                     {
                     t=(Token)input.LT(1);
-                    match(input,MATCHES,FOLLOW_MATCHES_in_simple_operator4028); if (failed) return ;
+                    match(input,MATCHES,FOLLOW_MATCHES_in_simple_operator4070); if (failed) return ;
 
                     }
                     break;
                 case 11 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1480:5: t= SOUNDSLIKE
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1478:25: t= SOUNDSLIKE
                     {
                     t=(Token)input.LT(1);
-                    match(input,SOUNDSLIKE,FOLLOW_SOUNDSLIKE_in_simple_operator4036); if (failed) return ;
+                    match(input,SOUNDSLIKE,FOLLOW_SOUNDSLIKE_in_simple_operator4098); if (failed) return ;
 
                     }
                     break;
                 case 12 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1481:5: n= NOT t= MATCHES
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1479:25: n= NOT t= MATCHES
                     {
                     n=(Token)input.LT(1);
-                    match(input,NOT,FOLLOW_NOT_in_simple_operator4044); if (failed) return ;
+                    match(input,NOT,FOLLOW_NOT_in_simple_operator4126); if (failed) return ;
                     t=(Token)input.LT(1);
-                    match(input,MATCHES,FOLLOW_MATCHES_in_simple_operator4048); if (failed) return ;
+                    match(input,MATCHES,FOLLOW_MATCHES_in_simple_operator4130); if (failed) return ;
 
                     }
                     break;
                 case 13 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1482:5: t= MEMBEROF
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1480:25: t= MEMBEROF
                     {
                     t=(Token)input.LT(1);
-                    match(input,MEMBEROF,FOLLOW_MEMBEROF_in_simple_operator4056); if (failed) return ;
+                    match(input,MEMBEROF,FOLLOW_MEMBEROF_in_simple_operator4158); if (failed) return ;
 
                     }
                     break;
                 case 14 :
-                    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1483:5: n= NOT t= MEMBEROF
+                    // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1481:25: n= NOT t= MEMBEROF
                     {
                     n=(Token)input.LT(1);
-                    match(input,NOT,FOLLOW_NOT_in_simple_operator4064); if (failed) return ;
+                    match(input,NOT,FOLLOW_NOT_in_simple_operator4186); if (failed) return ;
                     t=(Token)input.LT(1);
-                    match(input,MEMBEROF,FOLLOW_MEMBEROF_in_simple_operator4068); if (failed) return ;
+                    match(input,MEMBEROF,FOLLOW_MEMBEROF_in_simple_operator4190); 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 )?
+                    {
+                    match(input,TILDE,FOLLOW_TILDE_in_simple_operator4196); 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 )?
+                    int alt67=2;
+                    int LA67_0 = input.LA(1);
 
+                    if ( (LA67_0==LEFT_SQUARE) ) {
+                        alt67=1;
+                    }
+                    switch (alt67) {
+                        case 1 :
+                            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1482:21: param= square_chunk
+                            {
+                            pushFollow(FOLLOW_square_chunk_in_simple_operator4204);
+                            param=square_chunk();
+                            _fsp--;
+                            if (failed) return ;
+
+                            }
+                            break;
+
+                    }
+
+
+                    }
+                    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 )?
+                    {
+                    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 ;
+                    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 )?
+                    int alt68=2;
+                    int LA68_0 = input.LA(1);
+
+                    if ( (LA68_0==LEFT_SQUARE) ) {
+                        alt68=1;
+                    }
+                    switch (alt68) {
+                        case 1 :
+                            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1483:27: param= square_chunk
+                            {
+                            pushFollow(FOLLOW_square_chunk_in_simple_operator4223);
+                            param=square_chunk();
+                            _fsp--;
+                            if (failed) return ;
+
+                            }
+                            break;
+
+                    }
+
+
+                    }
+                    break;
+
             }
 
             if ( backtracking==0 ) {
 
                 		    location.setType(Location.LOCATION_LHS_INSIDE_CONDITION_ARGUMENT);
                                   location.setProperty(Location.LOCATION_PROPERTY_OPERATOR, t.getText());
-              		    if( n != null ) {
-              		        op = "not "+t.getText();
-              		    } else {
-              		        op = t.getText();
-              		    }
+               	            op = t.getText();
+               	            isNegated = n != null;
+               	            if( param != null ) {
+                                      paramText = safeSubstring( input.toString(param.start,param.stop), 1, input.toString(param.start,param.stop).length()-1 );
+               	            } 
               		
             }
-            pushFollow(FOLLOW_expression_value_in_simple_operator4082);
-            rd=expression_value(base,  op);
+            pushFollow(FOLLOW_expression_value_in_simple_operator4238);
+            rd=expression_value(base,  op,  isNegated,  paramText);
             _fsp--;
             if (failed) return ;
 
@@ -5876,7 +5942,7 @@
         finally {
 
             		if ( rd == null && op != null ) {
-            		        base.addRestriction( new LiteralRestrictionDescr(op, null) );
+            		        base.addRestriction( new LiteralRestrictionDescr(op, false, null) );
             		}
             	
         }
@@ -5886,7 +5952,7 @@
 
 
     // $ANTLR start compound_operator
-    // /home/etirelli/workspace/jboss/jbossrules/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] ( COMMA rd= expression_value[group, op] )* RIGHT_PAREN ;
+    // /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 ;
     public final void compound_operator(RestrictionConnectiveDescr base) throws RecognitionException {
         RestrictionDescr rd = null;
 
@@ -5896,31 +5962,31 @@
         		RestrictionConnectiveDescr group = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1507:2: ( ( IN | NOT IN ) LEFT_PAREN rd= expression_value[group, op] ( COMMA rd= expression_value[group, op] )* RIGHT_PAREN )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1508:3: ( IN | NOT IN ) LEFT_PAREN rd= expression_value[group, op] ( COMMA rd= expression_value[group, op] )* RIGHT_PAREN
+            // /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/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1508:3: ( IN | NOT IN )
-            int alt68=2;
-            int LA68_0 = input.LA(1);
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1508:3: ( IN | NOT IN )
+            int alt70=2;
+            int LA70_0 = input.LA(1);
 
-            if ( (LA68_0==IN) ) {
-                alt68=1;
+            if ( (LA70_0==IN) ) {
+                alt70=1;
             }
-            else if ( (LA68_0==NOT) ) {
-                alt68=2;
+            else if ( (LA70_0==NOT) ) {
+                alt70=2;
             }
             else {
                 if (backtracking>0) {failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1508:3: ( IN | NOT IN )", 68, 0, input);
+                    new NoViableAltException("1508:3: ( IN | NOT IN )", 70, 0, input);
 
                 throw nvae;
             }
-            switch (alt68) {
+            switch (alt70) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/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:1508:5: IN
                     {
-                    match(input,IN,FOLLOW_IN_in_compound_operator4112); if (failed) return ;
+                    match(input,IN,FOLLOW_IN_in_compound_operator4268); if (failed) return ;
                     if ( backtracking==0 ) {
 
                       			  op = "==";
@@ -5934,10 +6000,10 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/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:1516:5: NOT IN
                     {
-                    match(input,NOT,FOLLOW_NOT_in_compound_operator4124); if (failed) return ;
-                    match(input,IN,FOLLOW_IN_in_compound_operator4126); if (failed) return ;
+                    match(input,NOT,FOLLOW_NOT_in_compound_operator4280); if (failed) return ;
+                    match(input,IN,FOLLOW_IN_in_compound_operator4282); if (failed) return ;
                     if ( backtracking==0 ) {
 
                       			  op = "!=";
@@ -5953,29 +6019,29 @@
 
             }
 
-            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_compound_operator4141); if (failed) return ;
-            pushFollow(FOLLOW_expression_value_in_compound_operator4145);
-            rd=expression_value(group,  op);
+            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_compound_operator4297); if (failed) return ;
+            pushFollow(FOLLOW_expression_value_in_compound_operator4301);
+            rd=expression_value(group,  op,  false,  null);
             _fsp--;
             if (failed) return ;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1526:3: ( COMMA rd= expression_value[group, op] )*
-            loop69:
+            // /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] )*
+            loop71:
             do {
-                int alt69=2;
-                int LA69_0 = input.LA(1);
+                int alt71=2;
+                int LA71_0 = input.LA(1);
 
-                if ( (LA69_0==COMMA) ) {
-                    alt69=1;
+                if ( (LA71_0==COMMA) ) {
+                    alt71=1;
                 }
 
 
-                switch (alt69) {
+                switch (alt71) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1526:5: COMMA rd= expression_value[group, op]
+            	    // /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]
             	    {
-            	    match(input,COMMA,FOLLOW_COMMA_in_compound_operator4152); if (failed) return ;
-            	    pushFollow(FOLLOW_expression_value_in_compound_operator4156);
-            	    rd=expression_value(group,  op);
+            	    match(input,COMMA,FOLLOW_COMMA_in_compound_operator4308); if (failed) return ;
+            	    pushFollow(FOLLOW_expression_value_in_compound_operator4312);
+            	    rd=expression_value(group,  op,  false,  null);
             	    _fsp--;
             	    if (failed) return ;
 
@@ -5983,11 +6049,11 @@
             	    break;
 
             	default :
-            	    break loop69;
+            	    break loop71;
                 }
             } while (true);
 
-            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_compound_operator4165); if (failed) return ;
+            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_compound_operator4321); if (failed) return ;
             if ( backtracking==0 ) {
 
               			location.setType(Location.LOCATION_LHS_INSIDE_CONDITION_END);
@@ -6009,8 +6075,8 @@
 
 
     // $ANTLR start expression_value
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1533:1: expression_value[RestrictionConnectiveDescr base, String op] returns [RestrictionDescr rd] : (ap= accessor_path | lc= literal_constraint | rvc= paren_chunk ) ;
-    public final RestrictionDescr expression_value(RestrictionConnectiveDescr base, String op) throws RecognitionException {
+    // /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 ) ;
+    public final RestrictionDescr expression_value(RestrictionConnectiveDescr base, String op, boolean isNegated, String paramText) throws RecognitionException {
         RestrictionDescr rd = null;
 
         accessor_path_return ap = null;
@@ -6024,11 +6090,11 @@
         		rd = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/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/jbossrules/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: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/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1538:3: (ap= accessor_path | lc= literal_constraint | rvc= paren_chunk )
-            int alt70=3;
+            // /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 )
+            int alt72=3;
             switch ( input.LA(1) ) {
             case PACKAGE:
             case IMPORT:
@@ -6059,7 +6125,7 @@
             case IN:
             case THEN:
                 {
-                alt70=1;
+                alt72=1;
                 }
                 break;
             case STRING:
@@ -6068,36 +6134,36 @@
             case FLOAT:
             case NULL:
                 {
-                alt70=2;
+                alt72=2;
                 }
                 break;
             case LEFT_PAREN:
                 {
-                alt70=3;
+                alt72=3;
                 }
                 break;
             default:
                 if (backtracking>0) {failed=true; return rd;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1538:3: (ap= accessor_path | lc= literal_constraint | rvc= paren_chunk )", 70, 0, input);
+                    new NoViableAltException("1538:3: (ap= accessor_path | lc= literal_constraint | rvc= paren_chunk )", 72, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt70) {
+            switch (alt72) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/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:1538:5: ap= accessor_path
                     {
-                    pushFollow(FOLLOW_accessor_path_in_expression_value4199);
+                    pushFollow(FOLLOW_accessor_path_in_expression_value4355);
                     ap=accessor_path();
                     _fsp--;
                     if (failed) return rd;
                     if ( backtracking==0 ) {
                        
                       			        if( ap.text.indexOf( '.' ) > -1 || ap.text.indexOf( '[' ) > -1) {
-                      					rd = new QualifiedIdentifierRestrictionDescr(op, ap.text);
+                      					rd = new QualifiedIdentifierRestrictionDescr(op, isNegated, paramText, ap.text);
                       				} else {
-                      					rd = new VariableRestrictionDescr(op, ap.text);
+                      					rd = new VariableRestrictionDescr(op, isNegated, paramText, ap.text);
                       				}
                       			
                     }
@@ -6105,30 +6171,30 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/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:1546:5: lc= literal_constraint
                     {
-                    pushFollow(FOLLOW_literal_constraint_in_expression_value4219);
+                    pushFollow(FOLLOW_literal_constraint_in_expression_value4375);
                     lc=literal_constraint();
                     _fsp--;
                     if (failed) return rd;
                     if ( backtracking==0 ) {
                        
-                      				rd = new LiteralRestrictionDescr(op, lc.text, lc.type );
+                      				rd = new LiteralRestrictionDescr(op, isNegated, paramText, lc.text, lc.type );
                       			
                     }
 
                     }
                     break;
                 case 3 :
-                    // /home/etirelli/workspace/jboss/jbossrules/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:1550:5: rvc= paren_chunk
                     {
-                    pushFollow(FOLLOW_paren_chunk_in_expression_value4233);
+                    pushFollow(FOLLOW_paren_chunk_in_expression_value4389);
                     rvc=paren_chunk();
                     _fsp--;
                     if (failed) return rd;
                     if ( backtracking==0 ) {
                        
-                      				rd = new ReturnValueRestrictionDescr(op, safeSubstring( input.toString(rvc.start,rvc.stop), 1, input.toString(rvc.start,rvc.stop).length()-1) );							
+                      				rd = new ReturnValueRestrictionDescr(op, isNegated, paramText, safeSubstring( input.toString(rvc.start,rvc.stop), 1, input.toString(rvc.start,rvc.stop).length()-1) );							
                       			
                     }
 
@@ -6165,7 +6231,7 @@
     };
 
     // $ANTLR start literal_constraint
-    // /home/etirelli/workspace/jboss/jbossrules/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:1563: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);
@@ -6176,51 +6242,51 @@
         		retval.text = null;
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/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/jbossrules/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: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/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1567:4: (t= STRING | t= INT | t= FLOAT | t= BOOL | t= NULL )
-            int alt71=5;
+            // /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 )
+            int alt73=5;
             switch ( input.LA(1) ) {
             case STRING:
                 {
-                alt71=1;
+                alt73=1;
                 }
                 break;
             case INT:
                 {
-                alt71=2;
+                alt73=2;
                 }
                 break;
             case FLOAT:
                 {
-                alt71=3;
+                alt73=3;
                 }
                 break;
             case BOOL:
                 {
-                alt71=4;
+                alt73=4;
                 }
                 break;
             case NULL:
                 {
-                alt71=5;
+                alt73=5;
                 }
                 break;
             default:
                 if (backtracking>0) {failed=true; return retval;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1567:4: (t= STRING | t= INT | t= FLOAT | t= BOOL | t= NULL )", 71, 0, input);
+                    new NoViableAltException("1567:4: (t= STRING | t= INT | t= FLOAT | t= BOOL | t= NULL )", 73, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt71) {
+            switch (alt73) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/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:1567:6: t= STRING
                     {
                     t=(Token)input.LT(1);
-                    match(input,STRING,FOLLOW_STRING_in_literal_constraint4276); if (failed) return retval;
+                    match(input,STRING,FOLLOW_STRING_in_literal_constraint4432); if (failed) return retval;
                     if ( backtracking==0 ) {
                        retval.text = getString( t.getText() ); retval.type = LiteralRestrictionDescr.TYPE_STRING; 
                     }
@@ -6228,10 +6294,10 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/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:1568:5: t= INT
                     {
                     t=(Token)input.LT(1);
-                    match(input,INT,FOLLOW_INT_in_literal_constraint4287); if (failed) return retval;
+                    match(input,INT,FOLLOW_INT_in_literal_constraint4443); if (failed) return retval;
                     if ( backtracking==0 ) {
                        retval.text = t.getText(); retval.type = LiteralRestrictionDescr.TYPE_NUMBER; 
                     }
@@ -6239,10 +6305,10 @@
                     }
                     break;
                 case 3 :
-                    // /home/etirelli/workspace/jboss/jbossrules/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:1569:5: t= FLOAT
                     {
                     t=(Token)input.LT(1);
-                    match(input,FLOAT,FOLLOW_FLOAT_in_literal_constraint4300); if (failed) return retval;
+                    match(input,FLOAT,FOLLOW_FLOAT_in_literal_constraint4456); if (failed) return retval;
                     if ( backtracking==0 ) {
                        retval.text = t.getText(); retval.type = LiteralRestrictionDescr.TYPE_NUMBER; 
                     }
@@ -6250,10 +6316,10 @@
                     }
                     break;
                 case 4 :
-                    // /home/etirelli/workspace/jboss/jbossrules/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:1570:5: t= BOOL
                     {
                     t=(Token)input.LT(1);
-                    match(input,BOOL,FOLLOW_BOOL_in_literal_constraint4311); if (failed) return retval;
+                    match(input,BOOL,FOLLOW_BOOL_in_literal_constraint4467); if (failed) return retval;
                     if ( backtracking==0 ) {
                        retval.text = t.getText(); retval.type = LiteralRestrictionDescr.TYPE_BOOLEAN; 
                     }
@@ -6261,10 +6327,10 @@
                     }
                     break;
                 case 5 :
-                    // /home/etirelli/workspace/jboss/jbossrules/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:1571:5: t= NULL
                     {
                     t=(Token)input.LT(1);
-                    match(input,NULL,FOLLOW_NULL_in_literal_constraint4323); if (failed) return retval;
+                    match(input,NULL,FOLLOW_NULL_in_literal_constraint4479); if (failed) return retval;
                     if ( backtracking==0 ) {
                        retval.text = null; retval.type = LiteralRestrictionDescr.TYPE_NULL; 
                     }
@@ -6292,7 +6358,7 @@
 
 
     // $ANTLR start predicate
-    // /home/etirelli/workspace/jboss/jbossrules/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:1575:1: predicate[ConditionalElementDescr base] : text= paren_chunk ;
     public final void predicate(ConditionalElementDescr base) throws RecognitionException {
         paren_chunk_return text = null;
 
@@ -6301,10 +6367,10 @@
         		PredicateDescr d = null;
                 
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1579:2: (text= paren_chunk )
-            // /home/etirelli/workspace/jboss/jbossrules/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: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
             {
-            pushFollow(FOLLOW_paren_chunk_in_predicate4361);
+            pushFollow(FOLLOW_paren_chunk_in_predicate4517);
             text=paren_chunk();
             _fsp--;
             if (failed) return ;
@@ -6336,35 +6402,35 @@
     };
 
     // $ANTLR start curly_chunk
-    // /home/etirelli/workspace/jboss/jbossrules/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:1592:1: curly_chunk : LEFT_CURLY (~ ( LEFT_CURLY | RIGHT_CURLY ) | curly_chunk )* RIGHT_CURLY ;
     public final curly_chunk_return curly_chunk() throws RecognitionException {
         curly_chunk_return retval = new curly_chunk_return();
         retval.start = input.LT(1);
 
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1593:2: ( LEFT_CURLY (~ ( LEFT_CURLY | RIGHT_CURLY ) | curly_chunk )* RIGHT_CURLY )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g: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: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
             {
-            match(input,LEFT_CURLY,FOLLOW_LEFT_CURLY_in_curly_chunk4379); if (failed) return retval;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1594:14: (~ ( LEFT_CURLY | RIGHT_CURLY ) | curly_chunk )*
-            loop72:
+            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 )*
+            loop74:
             do {
-                int alt72=3;
-                int LA72_0 = input.LA(1);
+                int alt74=3;
+                int LA74_0 = input.LA(1);
 
-                if ( ((LA72_0>=PACKAGE && LA72_0<=NULL)||(LA72_0>=LEFT_SQUARE && LA72_0<=82)) ) {
-                    alt72=1;
+                if ( ((LA74_0>=PACKAGE && LA74_0<=NULL)||(LA74_0>=LEFT_SQUARE && LA74_0<=83)) ) {
+                    alt74=1;
                 }
-                else if ( (LA72_0==LEFT_CURLY) ) {
-                    alt72=2;
+                else if ( (LA74_0==LEFT_CURLY) ) {
+                    alt74=2;
                 }
 
 
-                switch (alt72) {
+                switch (alt74) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/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:1594:16: ~ ( LEFT_CURLY | RIGHT_CURLY )
             	    {
-            	    if ( (input.LA(1)>=PACKAGE && input.LA(1)<=NULL)||(input.LA(1)>=LEFT_SQUARE && input.LA(1)<=82) ) {
+            	    if ( (input.LA(1)>=PACKAGE && input.LA(1)<=NULL)||(input.LA(1)>=LEFT_SQUARE && input.LA(1)<=83) ) {
             	        input.consume();
             	        errorRecovery=false;failed=false;
             	    }
@@ -6372,16 +6438,16 @@
             	        if (backtracking>0) {failed=true; return retval;}
             	        MismatchedSetException mse =
             	            new MismatchedSetException(null,input);
-            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_curly_chunk4383);    throw mse;
+            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_curly_chunk4539);    throw mse;
             	    }
 
 
             	    }
             	    break;
             	case 2 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/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:1594:44: curly_chunk
             	    {
-            	    pushFollow(FOLLOW_curly_chunk_in_curly_chunk4392);
+            	    pushFollow(FOLLOW_curly_chunk_in_curly_chunk4548);
             	    curly_chunk();
             	    _fsp--;
             	    if (failed) return retval;
@@ -6390,11 +6456,11 @@
             	    break;
 
             	default :
-            	    break loop72;
+            	    break loop74;
                 }
             } while (true);
 
-            match(input,RIGHT_CURLY,FOLLOW_RIGHT_CURLY_in_curly_chunk4397); if (failed) return retval;
+            match(input,RIGHT_CURLY,FOLLOW_RIGHT_CURLY_in_curly_chunk4553); if (failed) return retval;
 
             }
 
@@ -6415,35 +6481,35 @@
     };
 
     // $ANTLR start paren_chunk
-    // /home/etirelli/workspace/jboss/jbossrules/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:1597:1: paren_chunk : LEFT_PAREN (~ ( LEFT_PAREN | RIGHT_PAREN ) | paren_chunk )* RIGHT_PAREN ;
     public final paren_chunk_return paren_chunk() throws RecognitionException {
         paren_chunk_return retval = new paren_chunk_return();
         retval.start = input.LT(1);
 
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1598:2: ( LEFT_PAREN (~ ( LEFT_PAREN | RIGHT_PAREN ) | paren_chunk )* RIGHT_PAREN )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g: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: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
             {
-            match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_paren_chunk4411); if (failed) return retval;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1599:14: (~ ( LEFT_PAREN | RIGHT_PAREN ) | paren_chunk )*
-            loop73:
+            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 )*
+            loop75:
             do {
-                int alt73=3;
-                int LA73_0 = input.LA(1);
+                int alt75=3;
+                int LA75_0 = input.LA(1);
 
-                if ( ((LA73_0>=PACKAGE && LA73_0<=GLOBAL)||LA73_0==COMMA||(LA73_0>=QUERY && LA73_0<=82)) ) {
-                    alt73=1;
+                if ( ((LA75_0>=PACKAGE && LA75_0<=GLOBAL)||LA75_0==COMMA||(LA75_0>=QUERY && LA75_0<=83)) ) {
+                    alt75=1;
                 }
-                else if ( (LA73_0==LEFT_PAREN) ) {
-                    alt73=2;
+                else if ( (LA75_0==LEFT_PAREN) ) {
+                    alt75=2;
                 }
 
 
-                switch (alt73) {
+                switch (alt75) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/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:1599: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)<=82) ) {
+            	    if ( (input.LA(1)>=PACKAGE && input.LA(1)<=GLOBAL)||input.LA(1)==COMMA||(input.LA(1)>=QUERY && input.LA(1)<=83) ) {
             	        input.consume();
             	        errorRecovery=false;failed=false;
             	    }
@@ -6451,16 +6517,16 @@
             	        if (backtracking>0) {failed=true; return retval;}
             	        MismatchedSetException mse =
             	            new MismatchedSetException(null,input);
-            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_paren_chunk4415);    throw mse;
+            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_paren_chunk4571);    throw mse;
             	    }
 
 
             	    }
             	    break;
             	case 2 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/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:1599:44: paren_chunk
             	    {
-            	    pushFollow(FOLLOW_paren_chunk_in_paren_chunk4424);
+            	    pushFollow(FOLLOW_paren_chunk_in_paren_chunk4580);
             	    paren_chunk();
             	    _fsp--;
             	    if (failed) return retval;
@@ -6469,11 +6535,11 @@
             	    break;
 
             	default :
-            	    break loop73;
+            	    break loop75;
                 }
             } while (true);
 
-            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_paren_chunk4429); if (failed) return retval;
+            match(input,RIGHT_PAREN,FOLLOW_RIGHT_PAREN_in_paren_chunk4585); if (failed) return retval;
 
             }
 
@@ -6494,35 +6560,35 @@
     };
 
     // $ANTLR start square_chunk
-    // /home/etirelli/workspace/jboss/jbossrules/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:1602:1: square_chunk : LEFT_SQUARE (~ ( LEFT_SQUARE | RIGHT_SQUARE ) | square_chunk )* RIGHT_SQUARE ;
     public final square_chunk_return square_chunk() throws RecognitionException {
         square_chunk_return retval = new square_chunk_return();
         retval.start = input.LT(1);
 
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1603:2: ( LEFT_SQUARE (~ ( LEFT_SQUARE | RIGHT_SQUARE ) | square_chunk )* RIGHT_SQUARE )
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g: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: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
             {
-            match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_square_chunk4442); if (failed) return retval;
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1604:15: (~ ( LEFT_SQUARE | RIGHT_SQUARE ) | square_chunk )*
-            loop74:
+            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 )*
+            loop76:
             do {
-                int alt74=3;
-                int LA74_0 = input.LA(1);
+                int alt76=3;
+                int LA76_0 = input.LA(1);
 
-                if ( ((LA74_0>=PACKAGE && LA74_0<=RIGHT_CURLY)||(LA74_0>=THEN && LA74_0<=82)) ) {
-                    alt74=1;
+                if ( ((LA76_0>=PACKAGE && LA76_0<=RIGHT_CURLY)||(LA76_0>=THEN && LA76_0<=83)) ) {
+                    alt76=1;
                 }
-                else if ( (LA74_0==LEFT_SQUARE) ) {
-                    alt74=2;
+                else if ( (LA76_0==LEFT_SQUARE) ) {
+                    alt76=2;
                 }
 
 
-                switch (alt74) {
+                switch (alt76) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/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:1604:17: ~ ( LEFT_SQUARE | RIGHT_SQUARE )
             	    {
-            	    if ( (input.LA(1)>=PACKAGE && input.LA(1)<=RIGHT_CURLY)||(input.LA(1)>=THEN && input.LA(1)<=82) ) {
+            	    if ( (input.LA(1)>=PACKAGE && input.LA(1)<=RIGHT_CURLY)||(input.LA(1)>=THEN && input.LA(1)<=83) ) {
             	        input.consume();
             	        errorRecovery=false;failed=false;
             	    }
@@ -6530,16 +6596,16 @@
             	        if (backtracking>0) {failed=true; return retval;}
             	        MismatchedSetException mse =
             	            new MismatchedSetException(null,input);
-            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_square_chunk4446);    throw mse;
+            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_square_chunk4602);    throw mse;
             	    }
 
 
             	    }
             	    break;
             	case 2 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/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:1604:47: square_chunk
             	    {
-            	    pushFollow(FOLLOW_square_chunk_in_square_chunk4455);
+            	    pushFollow(FOLLOW_square_chunk_in_square_chunk4611);
             	    square_chunk();
             	    _fsp--;
             	    if (failed) return retval;
@@ -6548,11 +6614,11 @@
             	    break;
 
             	default :
-            	    break loop74;
+            	    break loop76;
                 }
             } while (true);
 
-            match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_square_chunk4460); if (failed) return retval;
+            match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_square_chunk4616); if (failed) return retval;
 
             }
 
@@ -6574,7 +6640,7 @@
     };
 
     // $ANTLR start qualified_id
-    // /home/etirelli/workspace/jboss/jbossrules/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:1607: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);
@@ -6587,31 +6653,31 @@
         	        StringBuffer buf = new StringBuffer();
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1614:2: ( ID ( DOT identifier )* ( LEFT_SQUARE RIGHT_SQUARE )* )
-            // /home/etirelli/workspace/jboss/jbossrules/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: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 )*
             {
             ID53=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_qualified_id4489); if (failed) return retval;
+            match(input,ID,FOLLOW_ID_in_qualified_id4645); if (failed) return retval;
             if ( backtracking==0 ) {
               buf.append(ID53.getText());
             }
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1614:32: ( DOT identifier )*
-            loop75:
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1614:32: ( DOT identifier )*
+            loop77:
             do {
-                int alt75=2;
-                int LA75_0 = input.LA(1);
+                int alt77=2;
+                int LA77_0 = input.LA(1);
 
-                if ( (LA75_0==DOT) ) {
-                    alt75=1;
+                if ( (LA77_0==DOT) ) {
+                    alt77=1;
                 }
 
 
-                switch (alt75) {
+                switch (alt77) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/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:1614:34: DOT identifier
             	    {
-            	    match(input,DOT,FOLLOW_DOT_in_qualified_id4495); if (failed) return retval;
-            	    pushFollow(FOLLOW_identifier_in_qualified_id4497);
+            	    match(input,DOT,FOLLOW_DOT_in_qualified_id4651); if (failed) return retval;
+            	    pushFollow(FOLLOW_identifier_in_qualified_id4653);
             	    identifier54=identifier();
             	    _fsp--;
             	    if (failed) return retval;
@@ -6623,27 +6689,27 @@
             	    break;
 
             	default :
-            	    break loop75;
+            	    break loop77;
                 }
             } while (true);
 
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1614:88: ( LEFT_SQUARE RIGHT_SQUARE )*
-            loop76:
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1614:88: ( LEFT_SQUARE RIGHT_SQUARE )*
+            loop78:
             do {
-                int alt76=2;
-                int LA76_0 = input.LA(1);
+                int alt78=2;
+                int LA78_0 = input.LA(1);
 
-                if ( (LA76_0==LEFT_SQUARE) ) {
-                    alt76=1;
+                if ( (LA78_0==LEFT_SQUARE) ) {
+                    alt78=1;
                 }
 
 
-                switch (alt76) {
+                switch (alt78) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/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:1614:90: LEFT_SQUARE RIGHT_SQUARE
             	    {
-            	    match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_qualified_id4506); if (failed) return retval;
-            	    match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_qualified_id4508); if (failed) return retval;
+            	    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;
             	    if ( backtracking==0 ) {
             	      buf.append("[]");
             	    }
@@ -6652,7 +6718,7 @@
             	    break;
 
             	default :
-            	    break loop76;
+            	    break loop78;
                 }
             } while (true);
 
@@ -6679,7 +6745,7 @@
 
 
     // $ANTLR start dotted_name
-    // /home/etirelli/workspace/jboss/jbossrules/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:1617: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;
 
@@ -6690,33 +6756,33 @@
         	        StringBuffer buf = new StringBuffer();
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/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/jbossrules/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: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 )*
             {
-            pushFollow(FOLLOW_identifier_in_dotted_name4542);
+            pushFollow(FOLLOW_identifier_in_dotted_name4698);
             i=identifier();
             _fsp--;
             if (failed) return text;
             if ( backtracking==0 ) {
               buf.append(input.toString(i.start,i.stop));
             }
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1624:40: ( DOT i= identifier )*
-            loop77:
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1624:40: ( DOT i= identifier )*
+            loop79:
             do {
-                int alt77=2;
-                int LA77_0 = input.LA(1);
+                int alt79=2;
+                int LA79_0 = input.LA(1);
 
-                if ( (LA77_0==DOT) ) {
-                    alt77=1;
+                if ( (LA79_0==DOT) ) {
+                    alt79=1;
                 }
 
 
-                switch (alt77) {
+                switch (alt79) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/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:1624:42: DOT i= identifier
             	    {
-            	    match(input,DOT,FOLLOW_DOT_in_dotted_name4548); if (failed) return text;
-            	    pushFollow(FOLLOW_identifier_in_dotted_name4552);
+            	    match(input,DOT,FOLLOW_DOT_in_dotted_name4704); if (failed) return text;
+            	    pushFollow(FOLLOW_identifier_in_dotted_name4708);
             	    i=identifier();
             	    _fsp--;
             	    if (failed) return text;
@@ -6728,27 +6794,27 @@
             	    break;
 
             	default :
-            	    break loop77;
+            	    break loop79;
                 }
             } while (true);
 
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1624:89: ( LEFT_SQUARE RIGHT_SQUARE )*
-            loop78:
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1624:89: ( LEFT_SQUARE RIGHT_SQUARE )*
+            loop80:
             do {
-                int alt78=2;
-                int LA78_0 = input.LA(1);
+                int alt80=2;
+                int LA80_0 = input.LA(1);
 
-                if ( (LA78_0==LEFT_SQUARE) ) {
-                    alt78=1;
+                if ( (LA80_0==LEFT_SQUARE) ) {
+                    alt80=1;
                 }
 
 
-                switch (alt78) {
+                switch (alt80) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/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:1624:91: LEFT_SQUARE RIGHT_SQUARE
             	    {
-            	    match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_dotted_name4561); if (failed) return text;
-            	    match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_dotted_name4563); if (failed) return text;
+            	    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;
             	    if ( backtracking==0 ) {
             	      buf.append("[]");
             	    }
@@ -6757,7 +6823,7 @@
             	    break;
 
             	default :
-            	    break loop78;
+            	    break loop80;
                 }
             } while (true);
 
@@ -6785,7 +6851,7 @@
     };
 
     // $ANTLR start accessor_path
-    // /home/etirelli/workspace/jboss/jbossrules/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:1627: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);
@@ -6797,33 +6863,33 @@
         	        StringBuffer buf = new StringBuffer();
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1634:2: (a= accessor_element ( DOT a= accessor_element )* )
-            // /home/etirelli/workspace/jboss/jbossrules/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: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 )*
             {
-            pushFollow(FOLLOW_accessor_element_in_accessor_path4597);
+            pushFollow(FOLLOW_accessor_element_in_accessor_path4753);
             a=accessor_element();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) {
               buf.append(a);
             }
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1634:46: ( DOT a= accessor_element )*
-            loop79:
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1634:46: ( DOT a= accessor_element )*
+            loop81:
             do {
-                int alt79=2;
-                int LA79_0 = input.LA(1);
+                int alt81=2;
+                int LA81_0 = input.LA(1);
 
-                if ( (LA79_0==DOT) ) {
-                    alt79=1;
+                if ( (LA81_0==DOT) ) {
+                    alt81=1;
                 }
 
 
-                switch (alt79) {
+                switch (alt81) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/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:1634:48: DOT a= accessor_element
             	    {
-            	    match(input,DOT,FOLLOW_DOT_in_accessor_path4603); if (failed) return retval;
-            	    pushFollow(FOLLOW_accessor_element_in_accessor_path4607);
+            	    match(input,DOT,FOLLOW_DOT_in_accessor_path4759); if (failed) return retval;
+            	    pushFollow(FOLLOW_accessor_element_in_accessor_path4763);
             	    a=accessor_element();
             	    _fsp--;
             	    if (failed) return retval;
@@ -6835,7 +6901,7 @@
             	    break;
 
             	default :
-            	    break loop79;
+            	    break loop81;
                 }
             } while (true);
 
@@ -6862,7 +6928,7 @@
 
 
     // $ANTLR start accessor_element
-    // /home/etirelli/workspace/jboss/jbossrules/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:1637:1: accessor_element returns [ String text ] : i= identifier (s= square_chunk )* ;
     public final String accessor_element() throws RecognitionException {
         String text = null;
 
@@ -6875,32 +6941,32 @@
         	        StringBuffer buf = new StringBuffer();
         	
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1644:2: (i= identifier (s= square_chunk )* )
-            // /home/etirelli/workspace/jboss/jbossrules/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: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 )*
             {
-            pushFollow(FOLLOW_identifier_in_accessor_element4645);
+            pushFollow(FOLLOW_identifier_in_accessor_element4801);
             i=identifier();
             _fsp--;
             if (failed) return text;
             if ( backtracking==0 ) {
               buf.append(input.toString(i.start,i.stop));
             }
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1645:39: (s= square_chunk )*
-            loop80:
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1645:39: (s= square_chunk )*
+            loop82:
             do {
-                int alt80=2;
-                int LA80_0 = input.LA(1);
+                int alt82=2;
+                int LA82_0 = input.LA(1);
 
-                if ( (LA80_0==LEFT_SQUARE) ) {
-                    alt80=1;
+                if ( (LA82_0==LEFT_SQUARE) ) {
+                    alt82=1;
                 }
 
 
-                switch (alt80) {
+                switch (alt82) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/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:1645:40: s= square_chunk
             	    {
-            	    pushFollow(FOLLOW_square_chunk_in_accessor_element4652);
+            	    pushFollow(FOLLOW_square_chunk_in_accessor_element4808);
             	    s=square_chunk();
             	    _fsp--;
             	    if (failed) return text;
@@ -6912,7 +6978,7 @@
             	    break;
 
             	default :
-            	    break loop80;
+            	    break loop82;
                 }
             } while (true);
 
@@ -6937,36 +7003,36 @@
 
 
     // $ANTLR start rhs_chunk
-    // /home/etirelli/workspace/jboss/jbossrules/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:1648:1: rhs_chunk[RuleDescr rule] : THEN (~ END )* loc= END opt_semicolon ;
     public final void rhs_chunk(RuleDescr rule) throws RecognitionException {
         Token loc=null;
         Token THEN55=null;
 
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1649:2: ( THEN (~ END )* loc= END opt_semicolon )
-            // /home/etirelli/workspace/jboss/jbossrules/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: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
             {
             THEN55=(Token)input.LT(1);
-            match(input,THEN,FOLLOW_THEN_in_rhs_chunk4673); if (failed) return ;
+            match(input,THEN,FOLLOW_THEN_in_rhs_chunk4829); if (failed) return ;
             if ( backtracking==0 ) {
                location.setType( Location.LOCATION_RHS ); 
             }
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1651:3: (~ END )*
-            loop81:
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1651:3: (~ END )*
+            loop83:
             do {
-                int alt81=2;
-                int LA81_0 = input.LA(1);
+                int alt83=2;
+                int LA83_0 = input.LA(1);
 
-                if ( ((LA81_0>=PACKAGE && LA81_0<=QUERY)||(LA81_0>=TEMPLATE && LA81_0<=82)) ) {
-                    alt81=1;
+                if ( ((LA83_0>=PACKAGE && LA83_0<=QUERY)||(LA83_0>=TEMPLATE && LA83_0<=83)) ) {
+                    alt83=1;
                 }
 
 
-                switch (alt81) {
+                switch (alt83) {
             	case 1 :
-            	    // /home/etirelli/workspace/jboss/jbossrules/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:1651:5: ~ END
             	    {
-            	    if ( (input.LA(1)>=PACKAGE && input.LA(1)<=QUERY)||(input.LA(1)>=TEMPLATE && input.LA(1)<=82) ) {
+            	    if ( (input.LA(1)>=PACKAGE && input.LA(1)<=QUERY)||(input.LA(1)>=TEMPLATE && input.LA(1)<=83) ) {
             	        input.consume();
             	        errorRecovery=false;failed=false;
             	    }
@@ -6974,7 +7040,7 @@
             	        if (backtracking>0) {failed=true; return ;}
             	        MismatchedSetException mse =
             	            new MismatchedSetException(null,input);
-            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_rhs_chunk4681);    throw mse;
+            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_rhs_chunk4837);    throw mse;
             	    }
 
 
@@ -6982,13 +7048,13 @@
             	    break;
 
             	default :
-            	    break loop81;
+            	    break loop83;
                 }
             } while (true);
 
             loc=(Token)input.LT(1);
-            match(input,END,FOLLOW_END_in_rhs_chunk4705); if (failed) return ;
-            pushFollow(FOLLOW_opt_semicolon_in_rhs_chunk4707);
+            match(input,END,FOLLOW_END_in_rhs_chunk4861); if (failed) return ;
+            pushFollow(FOLLOW_opt_semicolon_in_rhs_chunk4863);
             opt_semicolon();
             _fsp--;
             if (failed) return ;
@@ -7025,7 +7091,7 @@
 
 
     // $ANTLR start name
-    // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1670:1: name returns [String name] : ( ID | STRING );
+    // /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;
 
@@ -7033,29 +7099,29 @@
         Token STRING57=null;
 
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1671:2: ( ID | STRING )
-            int alt82=2;
-            int LA82_0 = input.LA(1);
+            // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1671:2: ( ID | STRING )
+            int alt84=2;
+            int LA84_0 = input.LA(1);
 
-            if ( (LA82_0==ID) ) {
-                alt82=1;
+            if ( (LA84_0==ID) ) {
+                alt84=1;
             }
-            else if ( (LA82_0==STRING) ) {
-                alt82=2;
+            else if ( (LA84_0==STRING) ) {
+                alt84=2;
             }
             else {
                 if (backtracking>0) {failed=true; return name;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1670:1: name returns [String name] : ( ID | STRING );", 82, 0, input);
+                    new NoViableAltException("1670:1: name returns [String name] : ( ID | STRING );", 84, 0, input);
 
                 throw nvae;
             }
-            switch (alt82) {
+            switch (alt84) {
                 case 1 :
-                    // /home/etirelli/workspace/jboss/jbossrules/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:1671:5: ID
                     {
                     ID56=(Token)input.LT(1);
-                    match(input,ID,FOLLOW_ID_in_name4741); if (failed) return name;
+                    match(input,ID,FOLLOW_ID_in_name4897); if (failed) return name;
                     if ( backtracking==0 ) {
                        name = ID56.getText(); 
                     }
@@ -7063,10 +7129,10 @@
                     }
                     break;
                 case 2 :
-                    // /home/etirelli/workspace/jboss/jbossrules/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:1672:5: STRING
                     {
                     STRING57=(Token)input.LT(1);
-                    match(input,STRING,FOLLOW_STRING_in_name4749); if (failed) return name;
+                    match(input,STRING,FOLLOW_STRING_in_name4905); if (failed) return name;
                     if ( backtracking==0 ) {
                        name = getString( STRING57.getText() ); 
                     }
@@ -7090,16 +7156,16 @@
     };
 
     // $ANTLR start identifier
-    // /home/etirelli/workspace/jboss/jbossrules/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: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 );
     public final identifier_return identifier() throws RecognitionException {
         identifier_return retval = new identifier_return();
         retval.start = input.LT(1);
 
         try {
-            // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g: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/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:
+            // /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:
             {
-            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)<=IN)||input.LA(1)==THEN ) {
+            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 ) {
                 input.consume();
                 errorRecovery=false;failed=false;
             }
@@ -7128,8 +7194,8 @@
 
     // $ANTLR start synpred1
     public final void synpred1_fragment() throws RecognitionException {   
-        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:817:6: ( EXISTS )
-        // /home/etirelli/workspace/jboss/jbossrules/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:817:6: ( EXISTS )
+        // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:817:8: EXISTS
         {
         match(input,EXISTS,FOLLOW_EXISTS_in_synpred11970); if (failed) return ;
 
@@ -7139,8 +7205,8 @@
 
     // $ANTLR start synpred2
     public final void synpred2_fragment() throws RecognitionException {   
-        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:818:5: ( NOT )
-        // /home/etirelli/workspace/jboss/jbossrules/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:818:5: ( NOT )
+        // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:818:7: NOT
         {
         match(input,NOT,FOLLOW_NOT_in_synpred21988); if (failed) return ;
 
@@ -7150,8 +7216,8 @@
 
     // $ANTLR start synpred3
     public final void synpred3_fragment() throws RecognitionException {   
-        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:819:5: ( EVAL )
-        // /home/etirelli/workspace/jboss/jbossrules/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:819:5: ( EVAL )
+        // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:819:7: EVAL
         {
         match(input,EVAL,FOLLOW_EVAL_in_synpred32007); if (failed) return ;
 
@@ -7161,8 +7227,8 @@
 
     // $ANTLR start synpred4
     public final void synpred4_fragment() throws RecognitionException {   
-        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:820:5: ( FORALL )
-        // /home/etirelli/workspace/jboss/jbossrules/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:820:5: ( FORALL )
+        // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:820:7: FORALL
         {
         match(input,FORALL,FOLLOW_FORALL_in_synpred42026); if (failed) return ;
 
@@ -7172,8 +7238,8 @@
 
     // $ANTLR start synpred5
     public final void synpred5_fragment() throws RecognitionException {   
-        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:821:5: ( LEFT_PAREN )
-        // /home/etirelli/workspace/jboss/jbossrules/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:821:5: ( LEFT_PAREN )
+        // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:821:7: LEFT_PAREN
         {
         match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_synpred52045); if (failed) return ;
 
@@ -7183,8 +7249,8 @@
 
     // $ANTLR start synpred6
     public final void synpred6_fragment() throws RecognitionException {   
-        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1108:6: ( LEFT_SQUARE )
-        // /home/etirelli/workspace/jboss/jbossrules/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:1108:6: ( LEFT_SQUARE )
+        // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1108:8: LEFT_SQUARE
         {
         match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_synpred63015); if (failed) return ;
 
@@ -7194,8 +7260,8 @@
 
     // $ANTLR start synpred7
     public final void synpred7_fragment() throws RecognitionException {   
-        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1114:6: ( LEFT_PAREN )
-        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1114:8: LEFT_PAREN
+        // /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
         {
         match(input,LEFT_PAREN,FOLLOW_LEFT_PAREN_in_synpred73048); if (failed) return ;
 
@@ -7205,11 +7271,11 @@
 
     // $ANTLR start synpred8
     public final void synpred8_fragment() throws RecognitionException {   
-        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1415:6: ( DOUBLE_PIPE and_restr_connective[or] )
-        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1415: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] )
+        // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1411:6: DOUBLE_PIPE and_restr_connective[or]
         {
-        match(input,DOUBLE_PIPE,FOLLOW_DOUBLE_PIPE_in_synpred83780); if (failed) return ;
-        pushFollow(FOLLOW_and_restr_connective_in_synpred83791);
+        match(input,DOUBLE_PIPE,FOLLOW_DOUBLE_PIPE_in_synpred83743); if (failed) return ;
+        pushFollow(FOLLOW_and_restr_connective_in_synpred83754);
         and_restr_connective(or);
         _fsp--;
         if (failed) return ;
@@ -7220,11 +7286,11 @@
 
     // $ANTLR start synpred9
     public final void synpred9_fragment() throws RecognitionException {   
-        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1437:5: ( DOUBLE_AMPER constraint_expression[and] )
-        // /home/etirelli/workspace/jboss/jbossrules/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1437: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] )
+        // /home/etirelli/workspace/jboss/temporal/drools-compiler/src/main/resources/org/drools/lang/DRL.g:1433:5: DOUBLE_AMPER constraint_expression[and]
         {
-        match(input,DOUBLE_AMPER,FOLLOW_DOUBLE_AMPER_in_synpred93844); if (failed) return ;
-        pushFollow(FOLLOW_constraint_expression_in_synpred93855);
+        match(input,DOUBLE_AMPER,FOLLOW_DOUBLE_AMPER_in_synpred93806); if (failed) return ;
+        pushFollow(FOLLOW_constraint_expression_in_synpred93817);
         constraint_expression(and);
         _fsp--;
         if (failed) return ;
@@ -7372,24 +7438,26 @@
     static final String DFA8_eofS =
         "\6\uffff";
     static final String DFA8_minS =
-        "\2\4\1\75\2\uffff\1\4";
+        "\2\4\1\uffff\1\76\1\uffff\1\4";
     static final String DFA8_maxS =
-        "\2\76\1\75\2\uffff\1\76";
+        "\2\77\1\uffff\1\76\1\uffff\1\77";
     static final String DFA8_acceptS =
-        "\3\uffff\1\2\1\1\1\uffff";
+        "\2\uffff\1\1\1\uffff\1\2\1\uffff";
     static final String DFA8_specialS =
         "\6\uffff}>";
     static final String[] DFA8_transitionS = {
             "\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\6\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\6\4\4\uffff\1\2\1\uffff\1\4",
+            "\2\1\5\uffff\1\1\5\uffff\4\1\1\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",
+            "",
             "\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\6\4\4\uffff\1\2\1\uffff"+
-            "\1\4"
+            "\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"+
+            "\1\3\1\uffff\1\2"
     };
 
     static final short[] DFA8_eot = DFA.unpackEncodedString(DFA8_eotS);
@@ -7430,24 +7498,26 @@
     static final String DFA9_eofS =
         "\6\uffff";
     static final String DFA9_minS =
-        "\2\4\1\75\2\uffff\1\4";
+        "\2\4\1\76\2\uffff\1\4";
     static final String DFA9_maxS =
-        "\2\76\1\75\2\uffff\1\76";
+        "\2\77\1\76\2\uffff\1\77";
     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\6\1\6\uffff\1\1",
+            "\2\1\5\uffff\1\1\5\uffff\4\1\1\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\6\4\4\uffff\1\2\1\uffff\1\4",
+            "\1\4\5\uffff\4\4\1\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\6\4\4\uffff\1\2\1\uffff"+
-            "\1\4"
+            "\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"
     };
 
     static final short[] DFA9_eot = DFA.unpackEncodedString(DFA9_eotS);
@@ -7488,9 +7558,9 @@
     static final String DFA17_eofS =
         "\11\uffff";
     static final String DFA17_minS =
-        "\2\10\1\uffff\1\10\1\uffff\1\4\1\75\2\10";
+        "\2\10\1\uffff\1\10\1\uffff\1\4\1\76\2\10";
     static final String DFA17_maxS =
-        "\2\53\1\uffff\1\113\1\uffff\1\76\1\75\2\74";
+        "\2\53\1\uffff\1\114\1\uffff\1\77\1\76\2\75";
     static final String DFA17_acceptS =
         "\2\uffff\1\2\1\uffff\1\1\4\uffff";
     static final String DFA17_specialS =
@@ -7500,13 +7570,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\56\uffff\1\6\16\uffff\1\2",
+            "\1\4\1\5\1\uffff\1\2\2\4\57\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\6\7\6\uffff\1\7",
+            "\2\7\5\uffff\1\7\5\uffff\4\7\1\uffff\5\7\1\uffff\1\7\6\uffff"+
+            "\1\7",
             "\1\10",
-            "\1\4\1\5\1\uffff\1\2\60\uffff\1\6",
-            "\1\4\2\uffff\1\2\60\uffff\1\6"
+            "\1\4\1\5\1\uffff\1\2\61\uffff\1\6",
+            "\1\4\2\uffff\1\2\61\uffff\1\6"
     };
 
     static final short[] DFA17_eot = DFA.unpackEncodedString(DFA17_eotS);
@@ -7547,100 +7618,106 @@
     static final String DFA52_eofS =
         "\150\uffff";
     static final String DFA52_minS =
-        "\1\10\1\uffff\1\4\1\uffff\2\4\1\0\5\4\2\uffff\4\4\1\0\1\4\1\0\5"+
-        "\4\1\0\1\4\1\0\1\4\2\0\3\4\2\0\1\4\1\0\1\4\2\0\3\4\2\0\1\4\1\0\1"+
-        "\4\2\0\2\4\1\0\4\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\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";
     static final String DFA52_maxS =
-        "\1\111\1\uffff\1\122\1\uffff\2\122\1\0\5\122\2\uffff\4\122\1\0\1"+
-        "\122\1\0\5\122\1\0\1\122\1\0\1\122\2\0\3\122\2\0\1\122\1\0\1\122"+
-        "\2\0\3\122\2\0\1\122\1\0\1\122\2\0\2\122\1\0\4\122\1\0\3\122\1\0"+
-        "\1\122\1\0\1\122\1\uffff\44\0";
+        "\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";
     static final String DFA52_acceptS =
-        "\1\uffff\1\1\1\uffff\1\3\10\uffff\2\2\65\uffff\1\2\44\uffff";
+        "\1\uffff\1\1\1\uffff\1\3\4\uffff\1\2\4\uffff\1\2\65\uffff\1\2\44"+
+        "\uffff";
     static final String DFA52_specialS =
-        "\1\43\1\uffff\1\47\1\uffff\1\32\1\2\1\73\1\25\1\35\1\67\1\12\1\31"+
-        "\2\uffff\1\75\1\74\1\71\1\4\1\7\1\42\1\45\1\26\1\64\1\61\1\24\1"+
-        "\55\1\46\1\30\1\33\1\27\1\3\1\44\1\51\1\20\1\14\1\60\1\65\1\41\1"+
-        "\5\1\40\1\34\1\66\1\13\1\50\1\6\1\36\1\57\1\54\1\10\1\56\1\63\1"+
-        "\72\1\1\1\0\1\37\1\76\1\52\1\21\1\15\1\17\1\53\1\22\1\16\1\62\1"+
-        "\23\1\70\1\11\45\uffff}>";
+        "\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}>";
     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\16\uffff\1\1\1\uffff\1\3\12\uffff\1\3",
+            "\uffff\1\3\17\uffff\1\1\1\uffff\1\3\12\uffff\1\3",
             "",
-            "\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\47\14",
+            "\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\23\2\14\1\22\1\14\1\15\32\14\1\16\1\17\1\20\1\21\47"+
-            "\14",
-            "\4\14\1\31\2\14\1\24\1\14\1\15\32\14\1\25\1\26\1\27\1\30\47"+
-            "\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",
             "\1\uffff",
-            "\4\14\1\33\2\14\1\32\1\14\1\15\105\14",
-            "\4\14\1\35\2\14\1\34\1\14\1\15\105\14",
-            "\7\14\1\36\1\14\1\15\105\14",
-            "\7\14\1\37\1\14\1\15\105\14",
-            "\5\14\1\41\1\14\1\43\1\14\1\15\56\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\14\1\45\2\14\1\44\1\14\1\15\105\14",
-            "\4\14\1\47\2\14\1\46\1\14\1\15\105\14",
-            "\7\14\1\50\1\14\1\15\105\14",
-            "\7\14\1\51\1\14\1\15\105\14",
+            "\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",
             "\1\uffff",
-            "\5\14\1\53\1\14\1\55\1\14\1\15\56\14\1\54\16\14\1\52\7\14",
+            "\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",
             "\1\uffff",
-            "\4\14\1\57\2\14\1\56\1\14\1\15\105\14",
-            "\4\14\1\61\2\14\1\60\1\14\1\15\105\14",
-            "\7\14\1\62\1\14\1\15\105\14",
-            "\7\14\1\63\1\14\1\15\105\14",
-            "\5\14\1\65\1\14\1\66\1\14\1\15\56\14\1\67\16\14\1\64\7\14",
+            "\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",
             "\1\uffff",
-            "\5\14\1\71\1\14\1\73\1\14\1\15\56\14\1\72\16\14\1\70\7\14",
+            "\5\15\1\71\1\15\1\73\1\15\1\10\57\15\1\72\16\15\1\70\7\15",
             "\1\uffff",
-            "\5\14\1\75\1\14\1\77\1\14\1\15\56\14\1\76\16\14\1\74\7\14",
+            "\5\15\1\75\1\15\1\77\1\15\1\10\57\15\1\76\16\15\1\74\7\15",
             "\1\uffff",
             "\1\uffff",
-            "\4\14\1\100\2\14\1\101\1\14\1\15\105\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\1\14\6\102\6\14\1\102\24\14",
-            "\7\14\1\103\1\14\1\15\57\14\1\104\25\14",
+            "\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",
             "\1\uffff",
             "\1\uffff",
-            "\5\14\1\106\1\14\1\110\1\14\1\15\56\14\1\107\16\14\1\105\7\14",
+            "\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",
             "\1\uffff",
-            "\5\14\1\112\1\14\1\114\1\14\1\15\56\14\1\113\16\14\1\111\7\14",
             "\1\uffff",
             "\1\uffff",
-            "\4\14\1\115\2\14\1\116\1\14\1\15\105\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\1\14\6\117\6\14\1\117\24\14",
-            "\7\14\1\103\1\14\1\15\57\14\1\120\25\14",
+            "\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",
             "\1\uffff",
             "\1\uffff",
-            "\5\14\1\122\1\14\1\123\1\14\1\15\56\14\1\124\16\14\1\121\7\14",
+            "\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",
             "\1\uffff",
-            "\5\14\1\126\1\14\1\130\1\14\1\15\56\14\1\127\16\14\1\125\7\14",
             "\1\uffff",
             "\1\uffff",
-            "\4\14\1\131\2\14\1\132\1\14\1\15\105\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\1\14\6\133\6\14\1\133\24\14",
+            "\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",
             "\1\uffff",
-            "\7\14\1\103\1\14\1\15\57\14\1\134\25\14",
-            "\4\14\1\135\2\14\1\136\1\14\1\15\105\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\1\14\6\137\6\14\1\137\24\14",
-            "\7\14\1\103\1\14\1\15\57\14\1\140\25\14",
+            "\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",
             "\1\uffff",
-            "\4\14\1\141\2\14\1\142\1\14\1\15\105\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\1\14\6\143\6\14\1\143\24\14",
-            "\7\14\1\103\1\14\1\15\57\14\1\144\25\14",
+            "\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",
             "\1\uffff",
-            "\5\14\1\145\1\14\1\147\1\14\1\15\56\14\1\146\26\14",
+            "\5\15\1\145\1\15\1\147\1\15\1\10\57\15\1\146\26\15",
             "\1\uffff",
-            "\5\14\1\41\1\14\1\43\1\14\1\15\56\14\1\42\26\14",
+            "\5\15\1\41\1\15\1\43\1\15\1\10\57\15\1\42\26\15",
             "",
             "\1\uffff",
             "\1\uffff",
@@ -7716,593 +7793,591 @@
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA52_53 = input.LA(1);
+                        int LA52_54 = input.LA(1);
 
                          
-                        int index52_53 = input.index();
+                        int index52_54 = 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<=IN)||LA52_53==THEN) ) {s = 91;}
+                        if ( (LA52_54==RIGHT_SQUARE) ) {s = 92;}
 
-                        else if ( (LA52_53==RIGHT_PAREN) && (synpred7())) {s = 13;}
+                        else if ( (LA52_54==RIGHT_PAREN) && (synpred7())) {s = 8;}
 
-                        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>=FLOAT && LA52_53<=RIGHT_SQUARE)||(LA52_53>=EOL && LA52_53<=82)) && (synpred7())) {s = 12;}
+                        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_53==LEFT_PAREN) && (synpred7())) {s = 67;}
+                        else if ( (LA52_54==LEFT_PAREN) && (synpred7())) {s = 67;}
 
                          
-                        input.seek(index52_53);
+                        input.seek(index52_54);
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA52_52 = input.LA(1);
+                        int LA52_45 = input.LA(1);
 
                          
-                        int index52_52 = input.index();
+                        int index52_45 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_52==ID) ) {s = 89;}
+                        if ( (synpred7()) ) {s = 67;}
 
-                        else if ( (LA52_52==LEFT_PAREN) ) {s = 90;}
+                        else if ( (true) ) {s = 3;}
 
-                        else if ( (LA52_52==RIGHT_PAREN) && (synpred7())) {s = 13;}
-
-                        else if ( ((LA52_52>=PACKAGE && LA52_52<=EVENT)||(LA52_52>=DOT && LA52_52<=GLOBAL)||LA52_52==COMMA||(LA52_52>=QUERY && LA52_52<=82)) && (synpred7())) {s = 12;}
-
                          
-                        input.seek(index52_52);
+                        input.seek(index52_45);
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA52_5 = input.LA(1);
+                        int LA52_64 = input.LA(1);
 
                          
-                        int index52_5 = input.index();
+                        int index52_64 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_5==LEFT_PAREN) ) {s = 20;}
+                        if ( (LA52_64==DOT) ) {s = 101;}
 
-                        else if ( (LA52_5==EXISTS) ) {s = 21;}
+                        else if ( (LA52_64==LEFT_SQUARE) ) {s = 102;}
 
-                        else if ( (LA52_5==NOT) ) {s = 22;}
+                        else if ( (LA52_64==LEFT_PAREN) ) {s = 103;}
 
-                        else if ( (LA52_5==EVAL) ) {s = 23;}
+                        else if ( (LA52_64==RIGHT_PAREN) && (synpred7())) {s = 8;}
 
-                        else if ( (LA52_5==FORALL) ) {s = 24;}
+                        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;}
 
-                        else if ( (LA52_5==ID) ) {s = 25;}
-
-                        else if ( (LA52_5==RIGHT_PAREN) && (synpred7())) {s = 13;}
-
-                        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<=82)) && (synpred7())) {s = 12;}
-
                          
-                        input.seek(index52_5);
+                        input.seek(index52_64);
                         if ( s>=0 ) return s;
                         break;
                     case 3 : 
-                        int LA52_30 = input.LA(1);
+                        int LA52_66 = input.LA(1);
 
                          
-                        int index52_30 = input.index();
+                        int index52_66 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred7()) ) {s = 13;}
+                        if ( (LA52_66==LEFT_SQUARE) ) {s = 34;}
 
-                        else if ( (true) ) {s = 3;}
+                        else if ( (LA52_66==LEFT_PAREN) ) {s = 35;}
 
+                        else if ( (LA52_66==DOT) ) {s = 33;}
+
+                        else if ( (LA52_66==RIGHT_PAREN) && (synpred7())) {s = 8;}
+
+                        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_30);
+                        input.seek(index52_66);
                         if ( s>=0 ) return s;
                         break;
                     case 4 : 
-                        int LA52_17 = input.LA(1);
+                        int LA52_50 = input.LA(1);
 
                          
-                        int index52_17 = input.index();
+                        int index52_50 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_17==LEFT_PAREN) ) {s = 41;}
+                        if ( (synpred7()) ) {s = 67;}
 
-                        else if ( (LA52_17==RIGHT_PAREN) && (synpred7())) {s = 13;}
+                        else if ( (true) ) {s = 3;}
 
-                        else if ( ((LA52_17>=PACKAGE && LA52_17<=GLOBAL)||LA52_17==COMMA||(LA52_17>=QUERY && LA52_17<=82)) && (synpred7())) {s = 12;}
-
                          
-                        input.seek(index52_17);
+                        input.seek(index52_50);
                         if ( s>=0 ) return s;
                         break;
                     case 5 : 
-                        int LA52_38 = input.LA(1);
+                        int LA52_15 = input.LA(1);
 
                          
-                        int index52_38 = input.index();
+                        int index52_15 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred7()) ) {s = 67;}
+                        if ( (LA52_15==RIGHT_PAREN) && (synpred7())) {s = 8;}
 
-                        else if ( (true) ) {s = 3;}
+                        else if ( (LA52_15==ID) ) {s = 38;}
 
+                        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_38);
+                        input.seek(index52_15);
                         if ( s>=0 ) return s;
                         break;
                     case 6 : 
-                        int LA52_44 = input.LA(1);
+                        int LA52_21 = input.LA(1);
 
                          
-                        int index52_44 = input.index();
+                        int index52_21 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_44==RIGHT_SQUARE) ) {s = 80;}
+                        if ( (synpred7()) ) {s = 13;}
 
-                        else if ( (LA52_44==RIGHT_PAREN) && (synpred7())) {s = 13;}
+                        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<=82)) && (synpred7())) {s = 12;}
-
-                        else if ( (LA52_44==LEFT_PAREN) && (synpred7())) {s = 67;}
-
                          
-                        input.seek(index52_44);
+                        input.seek(index52_21);
                         if ( s>=0 ) return s;
                         break;
                     case 7 : 
-                        int LA52_18 = input.LA(1);
+                        int LA52_55 = input.LA(1);
 
                          
-                        int index52_18 = input.index();
+                        int index52_55 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred7()) ) {s = 13;}
+                        if ( (synpred7()) ) {s = 67;}
 
                         else if ( (true) ) {s = 3;}
 
                          
-                        input.seek(index52_18);
+                        input.seek(index52_55);
                         if ( s>=0 ) return s;
                         break;
                     case 8 : 
-                        int LA52_48 = input.LA(1);
+                        int LA52_28 = input.LA(1);
 
                          
-                        int index52_48 = input.index();
+                        int index52_28 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred7()) ) {s = 67;}
+                        if ( (synpred7()) ) {s = 13;}
 
                         else if ( (true) ) {s = 3;}
 
                          
-                        input.seek(index52_48);
+                        input.seek(index52_28);
                         if ( s>=0 ) return s;
                         break;
                     case 9 : 
-                        int LA52_66 = input.LA(1);
+                        int LA52_31 = input.LA(1);
 
                          
-                        int index52_66 = input.index();
+                        int index52_31 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_66==LEFT_SQUARE) ) {s = 34;}
+                        if ( (synpred7()) ) {s = 13;}
 
-                        else if ( (LA52_66==LEFT_PAREN) ) {s = 35;}
+                        else if ( (true) ) {s = 3;}
 
-                        else if ( (LA52_66==DOT) ) {s = 33;}
-
-                        else if ( (LA52_66==RIGHT_PAREN) && (synpred7())) {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<=82)) && (synpred7())) {s = 12;}
-
                          
-                        input.seek(index52_66);
+                        input.seek(index52_31);
                         if ( s>=0 ) return s;
                         break;
                     case 10 : 
-                        int LA52_10 = input.LA(1);
+                        int LA52_30 = input.LA(1);
 
                          
-                        int index52_10 = input.index();
+                        int index52_30 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_10==LEFT_PAREN) ) {s = 31;}
+                        if ( (synpred7()) ) {s = 13;}
 
-                        else if ( (LA52_10==RIGHT_PAREN) && (synpred7())) {s = 13;}
+                        else if ( (true) ) {s = 3;}
 
-                        else if ( ((LA52_10>=PACKAGE && LA52_10<=GLOBAL)||LA52_10==COMMA||(LA52_10>=QUERY && LA52_10<=82)) && (synpred7())) {s = 12;}
-
                          
-                        input.seek(index52_10);
+                        input.seek(index52_30);
                         if ( s>=0 ) return s;
                         break;
                     case 11 : 
-                        int LA52_42 = input.LA(1);
+                        int LA52_0 = input.LA(1);
 
                          
-                        int index52_42 = input.index();
+                        int index52_0 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_42==ID) ) {s = 77;}
+                        if ( (LA52_0==LEFT_SQUARE) && (synpred6())) {s = 1;}
 
-                        else if ( (LA52_42==LEFT_PAREN) ) {s = 78;}
+                        else if ( (LA52_0==LEFT_PAREN) ) {s = 2;}
 
-                        else if ( (LA52_42==RIGHT_PAREN) && (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==74) ) {s = 3;}
 
-                        else if ( ((LA52_42>=PACKAGE && LA52_42<=EVENT)||(LA52_42>=DOT && LA52_42<=GLOBAL)||LA52_42==COMMA||(LA52_42>=QUERY && LA52_42<=82)) && (synpred7())) {s = 12;}
-
                          
-                        input.seek(index52_42);
+                        input.seek(index52_0);
                         if ( s>=0 ) return s;
                         break;
                     case 12 : 
-                        int LA52_34 = input.LA(1);
+                        int LA52_48 = input.LA(1);
 
                          
-                        int index52_34 = input.index();
+                        int index52_48 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_34==RIGHT_SQUARE) ) {s = 68;}
+                        if ( (LA52_48==76) ) {s = 85;}
 
-                        else if ( (LA52_34==RIGHT_PAREN) && (synpred7())) {s = 13;}
+                        else if ( (LA52_48==DOT) ) {s = 86;}
 
-                        else if ( ((LA52_34>=PACKAGE && LA52_34<=GLOBAL)||LA52_34==COMMA||(LA52_34>=QUERY && LA52_34<=LEFT_SQUARE)||(LA52_34>=THEN && LA52_34<=82)) && (synpred7())) {s = 12;}
+                        else if ( (LA52_48==LEFT_SQUARE) ) {s = 87;}
 
-                        else if ( (LA52_34==LEFT_PAREN) && (synpred7())) {s = 67;}
+                        else if ( (LA52_48==LEFT_PAREN) ) {s = 88;}
 
+                        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_34);
+                        input.seek(index52_48);
                         if ( s>=0 ) return s;
                         break;
                     case 13 : 
-                        int LA52_58 = input.LA(1);
+                        int LA52_47 = input.LA(1);
 
                          
-                        int index52_58 = input.index();
+                        int index52_47 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_58==RIGHT_SQUARE) ) {s = 96;}
+                        if ( (LA52_47==76) ) {s = 81;}
 
-                        else if ( (LA52_58==RIGHT_PAREN) && (synpred7())) {s = 13;}
+                        else if ( (LA52_47==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<=82)) && (synpred7())) {s = 12;}
+                        else if ( (LA52_47==DOT) ) {s = 82;}
 
-                        else if ( (LA52_58==LEFT_PAREN) && (synpred7())) {s = 67;}
+                        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<=75)||(LA52_47>=77 && LA52_47<=83)) && (synpred7())) {s = 13;}
+
                          
-                        input.seek(index52_58);
+                        input.seek(index52_47);
                         if ( s>=0 ) return s;
                         break;
                     case 14 : 
-                        int LA52_62 = input.LA(1);
+                        int LA52_25 = input.LA(1);
 
                          
-                        int index52_62 = input.index();
+                        int index52_25 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_62==RIGHT_SQUARE) ) {s = 100;}
+                        if ( (LA52_25==76) ) {s = 52;}
 
-                        else if ( (LA52_62==RIGHT_PAREN) && (synpred7())) {s = 13;}
+                        else if ( (LA52_25==DOT) ) {s = 53;}
 
-                        else if ( ((LA52_62>=PACKAGE && LA52_62<=GLOBAL)||LA52_62==COMMA||(LA52_62>=QUERY && LA52_62<=LEFT_SQUARE)||(LA52_62>=THEN && LA52_62<=82)) && (synpred7())) {s = 12;}
+                        else if ( (LA52_25==LEFT_SQUARE) ) {s = 54;}
 
-                        else if ( (LA52_62==LEFT_PAREN) && (synpred7())) {s = 67;}
+                        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_62);
+                        input.seek(index52_25);
                         if ( s>=0 ) return s;
                         break;
                     case 15 : 
-                        int LA52_59 = input.LA(1);
+                        int LA52_24 = input.LA(1);
 
                          
-                        int index52_59 = input.index();
+                        int index52_24 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred7()) ) {s = 67;}
+                        if ( (LA52_24==LEFT_PAREN) ) {s = 51;}
 
-                        else if ( (true) ) {s = 3;}
+                        else if ( (LA52_24==RIGHT_PAREN) && (synpred7())) {s = 8;}
 
+                        else if ( ((LA52_24>=PACKAGE && LA52_24<=GLOBAL)||LA52_24==COMMA||(LA52_24>=QUERY && LA52_24<=83)) && (synpred7())) {s = 13;}
+
                          
-                        input.seek(index52_59);
+                        input.seek(index52_24);
                         if ( s>=0 ) return s;
                         break;
                     case 16 : 
-                        int LA52_33 = input.LA(1);
+                        int LA52_39 = input.LA(1);
 
                          
-                        int index52_33 = input.index();
+                        int index52_39 = 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<=IN)||LA52_33==THEN) ) {s = 66;}
+                        if ( (synpred7()) ) {s = 67;}
 
-                        else if ( (LA52_33==RIGHT_PAREN) && (synpred7())) {s = 13;}
+                        else if ( (true) ) {s = 3;}
 
-                        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>=FLOAT && LA52_33<=RIGHT_SQUARE)||(LA52_33>=EOL && LA52_33<=82)) && (synpred7())) {s = 12;}
-
-                        else if ( (LA52_33==LEFT_PAREN) && (synpred7())) {s = 67;}
-
                          
-                        input.seek(index52_33);
+                        input.seek(index52_39);
                         if ( s>=0 ) return s;
                         break;
                     case 17 : 
-                        int LA52_57 = input.LA(1);
+                        int LA52_6 = input.LA(1);
 
                          
-                        int index52_57 = input.index();
+                        int index52_6 = 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<=IN)||LA52_57==THEN) ) {s = 95;}
+                        if ( (LA52_6==LEFT_PAREN) ) {s = 26;}
 
-                        else if ( (LA52_57==RIGHT_PAREN) && (synpred7())) {s = 13;}
+                        else if ( (LA52_6==ID) ) {s = 27;}
 
-                        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>=FLOAT && LA52_57<=RIGHT_SQUARE)||(LA52_57>=EOL && LA52_57<=82)) && (synpred7())) {s = 12;}
+                        else if ( (LA52_6==RIGHT_PAREN) && (synpred7())) {s = 8;}
 
-                        else if ( (LA52_57==LEFT_PAREN) && (synpred7())) {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;}
 
                          
-                        input.seek(index52_57);
+                        input.seek(index52_6);
                         if ( s>=0 ) return s;
                         break;
                     case 18 : 
-                        int LA52_61 = input.LA(1);
+                        int LA52_33 = input.LA(1);
 
                          
-                        int index52_61 = input.index();
+                        int index52_33 = 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<=IN)||LA52_61==THEN) ) {s = 99;}
+                        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 ( (LA52_61==RIGHT_PAREN) && (synpred7())) {s = 13;}
+                        else if ( (LA52_33==RIGHT_PAREN) && (synpred7())) {s = 8;}
 
-                        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>=FLOAT && LA52_61<=RIGHT_SQUARE)||(LA52_61>=EOL && LA52_61<=82)) && (synpred7())) {s = 12;}
+                        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_61==LEFT_PAREN) && (synpred7())) {s = 67;}
+                        else if ( (LA52_33==LEFT_PAREN) && (synpred7())) {s = 67;}
 
                          
-                        input.seek(index52_61);
+                        input.seek(index52_33);
                         if ( s>=0 ) return s;
                         break;
                     case 19 : 
-                        int LA52_64 = input.LA(1);
+                        int LA52_57 = input.LA(1);
 
                          
-                        int index52_64 = input.index();
+                        int index52_57 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_64==DOT) ) {s = 101;}
+                        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_64==LEFT_SQUARE) ) {s = 102;}
+                        else if ( (LA52_57==RIGHT_PAREN) && (synpred7())) {s = 8;}
 
-                        else if ( (LA52_64==LEFT_PAREN) ) {s = 103;}
+                        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_64==RIGHT_PAREN) && (synpred7())) {s = 13;}
+                        else if ( (LA52_57==LEFT_PAREN) && (synpred7())) {s = 67;}
 
-                        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<=82)) && (synpred7())) {s = 12;}
-
                          
-                        input.seek(index52_64);
+                        input.seek(index52_57);
                         if ( s>=0 ) return s;
                         break;
                     case 20 : 
-                        int LA52_24 = input.LA(1);
+                        int LA52_61 = input.LA(1);
 
                          
-                        int index52_24 = input.index();
+                        int index52_61 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_24==LEFT_PAREN) ) {s = 51;}
+                        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_24==RIGHT_PAREN) && (synpred7())) {s = 13;}
+                        else if ( (LA52_61==RIGHT_PAREN) && (synpred7())) {s = 8;}
 
-                        else if ( ((LA52_24>=PACKAGE && LA52_24<=GLOBAL)||LA52_24==COMMA||(LA52_24>=QUERY && LA52_24<=82)) && (synpred7())) {s = 12;}
+                        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_24);
+                        input.seek(index52_61);
                         if ( s>=0 ) return s;
                         break;
                     case 21 : 
-                        int LA52_7 = input.LA(1);
+                        int LA52_32 = input.LA(1);
 
                          
-                        int index52_7 = input.index();
+                        int index52_32 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_7==LEFT_PAREN) ) {s = 26;}
+                        if ( (LA52_32==ID) ) {s = 64;}
 
-                        else if ( (LA52_7==ID) ) {s = 27;}
+                        else if ( (LA52_32==LEFT_PAREN) ) {s = 65;}
 
-                        else if ( (LA52_7==RIGHT_PAREN) && (synpred7())) {s = 13;}
+                        else if ( (LA52_32==RIGHT_PAREN) && (synpred7())) {s = 8;}
 
-                        else if ( ((LA52_7>=PACKAGE && LA52_7<=EVENT)||(LA52_7>=DOT && LA52_7<=GLOBAL)||LA52_7==COMMA||(LA52_7>=QUERY && LA52_7<=82)) && (synpred7())) {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;}
 
                          
-                        input.seek(index52_7);
+                        input.seek(index52_32);
                         if ( s>=0 ) return s;
                         break;
                     case 22 : 
-                        int LA52_21 = input.LA(1);
+                        int LA52_56 = input.LA(1);
 
                          
-                        int index52_21 = input.index();
+                        int index52_56 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_21==LEFT_PAREN) ) {s = 46;}
+                        if ( (LA52_56==ID) ) {s = 93;}
 
-                        else if ( (LA52_21==ID) ) {s = 47;}
+                        else if ( (LA52_56==LEFT_PAREN) ) {s = 94;}
 
-                        else if ( (LA52_21==RIGHT_PAREN) && (synpred7())) {s = 13;}
+                        else if ( (LA52_56==RIGHT_PAREN) && (synpred7())) {s = 8;}
 
-                        else if ( ((LA52_21>=PACKAGE && LA52_21<=EVENT)||(LA52_21>=DOT && LA52_21<=GLOBAL)||LA52_21==COMMA||(LA52_21>=QUERY && LA52_21<=82)) && (synpred7())) {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;}
 
                          
-                        input.seek(index52_21);
+                        input.seek(index52_56);
                         if ( s>=0 ) return s;
                         break;
                     case 23 : 
-                        int LA52_29 = input.LA(1);
+                        int LA52_60 = input.LA(1);
 
                          
-                        int index52_29 = input.index();
+                        int index52_60 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_29==75) ) {s = 60;}
+                        if ( (LA52_60==ID) ) {s = 97;}
 
-                        else if ( (LA52_29==DOT) ) {s = 61;}
+                        else if ( (LA52_60==LEFT_PAREN) ) {s = 98;}
 
-                        else if ( (LA52_29==LEFT_SQUARE) ) {s = 62;}
+                        else if ( (LA52_60==RIGHT_PAREN) && (synpred7())) {s = 8;}
 
-                        else if ( (LA52_29==LEFT_PAREN) ) {s = 63;}
+                        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_29==RIGHT_PAREN) && (synpred7())) {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<=74)||(LA52_29>=76 && LA52_29<=82)) && (synpred7())) {s = 12;}
-
                          
-                        input.seek(index52_29);
+                        input.seek(index52_60);
                         if ( s>=0 ) return s;
                         break;
                     case 24 : 
-                        int LA52_27 = input.LA(1);
+                        int LA52_5 = input.LA(1);
 
                          
-                        int index52_27 = input.index();
+                        int index52_5 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_27==75) ) {s = 56;}
+                        if ( (LA52_5==RIGHT_PAREN) && (synpred7())) {s = 8;}
 
-                        else if ( (LA52_27==DOT) ) {s = 57;}
+                        else if ( (LA52_5==EXISTS) ) {s = 20;}
 
-                        else if ( (LA52_27==LEFT_SQUARE) ) {s = 58;}
+                        else if ( (LA52_5==LEFT_PAREN) ) {s = 21;}
 
-                        else if ( (LA52_27==LEFT_PAREN) ) {s = 59;}
+                        else if ( (LA52_5==NOT) ) {s = 22;}
 
-                        else if ( (LA52_27==RIGHT_PAREN) && (synpred7())) {s = 13;}
+                        else if ( (LA52_5==EVAL) ) {s = 23;}
 
-                        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<=74)||(LA52_27>=76 && LA52_27<=82)) && (synpred7())) {s = 12;}
+                        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_27);
+                        input.seek(index52_5);
                         if ( s>=0 ) return s;
                         break;
                     case 25 : 
-                        int LA52_11 = input.LA(1);
+                        int LA52_36 = input.LA(1);
 
                          
-                        int index52_11 = input.index();
+                        int index52_36 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_11==75) ) {s = 32;}
+                        if ( (synpred7()) ) {s = 67;}
 
-                        else if ( (LA52_11==DOT) ) {s = 33;}
+                        else if ( (true) ) {s = 3;}
 
-                        else if ( (LA52_11==LEFT_SQUARE) ) {s = 34;}
-
-                        else if ( (LA52_11==LEFT_PAREN) ) {s = 35;}
-
-                        else if ( (LA52_11==RIGHT_PAREN) && (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<=74)||(LA52_11>=76 && LA52_11<=82)) && (synpred7())) {s = 12;}
-
                          
-                        input.seek(index52_11);
+                        input.seek(index52_36);
                         if ( s>=0 ) return s;
                         break;
                     case 26 : 
-                        int LA52_4 = input.LA(1);
+                        int LA52_29 = input.LA(1);
 
                          
-                        int index52_4 = input.index();
+                        int index52_29 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_4==EXISTS) ) {s = 14;}
+                        if ( (LA52_29==76) ) {s = 60;}
 
-                        else if ( (LA52_4==NOT) ) {s = 15;}
+                        else if ( (LA52_29==DOT) ) {s = 61;}
 
-                        else if ( (LA52_4==EVAL) ) {s = 16;}
+                        else if ( (LA52_29==LEFT_SQUARE) ) {s = 62;}
 
-                        else if ( (LA52_4==FORALL) ) {s = 17;}
+                        else if ( (LA52_29==LEFT_PAREN) ) {s = 63;}
 
-                        else if ( (LA52_4==LEFT_PAREN) ) {s = 18;}
+                        else if ( (LA52_29==RIGHT_PAREN) && (synpred7())) {s = 8;}
 
-                        else if ( (LA52_4==ID) ) {s = 19;}
+                        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;}
 
-                        else if ( (LA52_4==RIGHT_PAREN) && (synpred7())) {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<=82)) && (synpred7())) {s = 12;}
-
                          
-                        input.seek(index52_4);
+                        input.seek(index52_29);
                         if ( s>=0 ) return s;
                         break;
                     case 27 : 
-                        int LA52_28 = input.LA(1);
+                        int LA52_27 = input.LA(1);
 
                          
-                        int index52_28 = input.index();
+                        int index52_27 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred7()) ) {s = 13;}
+                        if ( (LA52_27==76) ) {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) && (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_28);
+                        input.seek(index52_27);
                         if ( s>=0 ) return s;
                         break;
                     case 28 : 
-                        int LA52_40 = input.LA(1);
+                        int LA52_12 = input.LA(1);
 
                          
-                        int index52_40 = input.index();
+                        int index52_12 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred7()) ) {s = 67;}
+                        if ( (LA52_12==76) ) {s = 32;}
 
-                        else if ( (true) ) {s = 3;}
+                        else if ( (LA52_12==DOT) ) {s = 33;}
 
+                        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_40);
+                        input.seek(index52_12);
                         if ( s>=0 ) return s;
                         break;
                     case 29 : 
-                        int LA52_8 = input.LA(1);
+                        int LA52_18 = input.LA(1);
 
                          
-                        int index52_8 = input.index();
+                        int index52_18 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_8==LEFT_PAREN) ) {s = 28;}
+                        if ( (synpred7()) ) {s = 13;}
 
-                        else if ( (LA52_8==ID) ) {s = 29;}
+                        else if ( (true) ) {s = 3;}
 
-                        else if ( (LA52_8==RIGHT_PAREN) && (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<=82)) && (synpred7())) {s = 12;}
-
                          
-                        input.seek(index52_8);
+                        input.seek(index52_18);
                         if ( s>=0 ) return s;
                         break;
                     case 30 : 
-                        int LA52_45 = input.LA(1);
+                        int LA52_43 = input.LA(1);
 
                          
-                        int index52_45 = input.index();
+                        int index52_43 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred7()) ) {s = 67;}
+                        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 ( (true) ) {s = 3;}
+                        else if ( (LA52_43==RIGHT_PAREN) && (synpred7())) {s = 8;}
 
+                        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_43==LEFT_PAREN) && (synpred7())) {s = 67;}
+
                          
-                        input.seek(index52_45);
+                        input.seek(index52_43);
                         if ( s>=0 ) return s;
                         break;
                     case 31 : 
-                        int LA52_54 = input.LA(1);
+                        int LA52_41 = input.LA(1);
 
                          
-                        int index52_54 = input.index();
+                        int index52_41 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred7()) ) {s = 67;}
@@ -8310,336 +8385,320 @@
                         else if ( (true) ) {s = 3;}
 
                          
-                        input.seek(index52_54);
+                        input.seek(index52_41);
                         if ( s>=0 ) return s;
                         break;
                     case 32 : 
-                        int LA52_39 = input.LA(1);
+                        int LA52_44 = input.LA(1);
 
                          
-                        int index52_39 = input.index();
+                        int index52_44 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_39==75) ) {s = 73;}
+                        if ( (LA52_44==RIGHT_SQUARE) ) {s = 80;}
 
-                        else if ( (LA52_39==DOT) ) {s = 74;}
+                        else if ( (LA52_44==RIGHT_PAREN) && (synpred7())) {s = 8;}
 
-                        else if ( (LA52_39==LEFT_SQUARE) ) {s = 75;}
+                        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_39==LEFT_PAREN) ) {s = 76;}
+                        else if ( (LA52_44==LEFT_PAREN) && (synpred7())) {s = 67;}
 
-                        else if ( (LA52_39==RIGHT_PAREN) && (synpred7())) {s = 13;}
-
-                        else if ( ((LA52_39>=PACKAGE && LA52_39<=ID)||LA52_39==GLOBAL||LA52_39==COMMA||(LA52_39>=QUERY && LA52_39<=RIGHT_CURLY)||(LA52_39>=RIGHT_SQUARE && LA52_39<=74)||(LA52_39>=76 && LA52_39<=82)) && (synpred7())) {s = 12;}
-
                          
-                        input.seek(index52_39);
+                        input.seek(index52_44);
                         if ( s>=0 ) return s;
                         break;
                     case 33 : 
-                        int LA52_37 = input.LA(1);
+                        int LA52_34 = input.LA(1);
 
                          
-                        int index52_37 = input.index();
+                        int index52_34 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_37==75) ) {s = 69;}
+                        if ( (LA52_34==RIGHT_SQUARE) ) {s = 68;}
 
-                        else if ( (LA52_37==DOT) ) {s = 70;}
+                        else if ( (LA52_34==RIGHT_PAREN) && (synpred7())) {s = 8;}
 
-                        else if ( (LA52_37==LEFT_SQUARE) ) {s = 71;}
+                        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_37==LEFT_PAREN) ) {s = 72;}
+                        else if ( (LA52_34==LEFT_PAREN) && (synpred7())) {s = 67;}
 
-                        else if ( (LA52_37==RIGHT_PAREN) && (synpred7())) {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<=74)||(LA52_37>=76 && LA52_37<=82)) && (synpred7())) {s = 12;}
-
                          
-                        input.seek(index52_37);
+                        input.seek(index52_34);
                         if ( s>=0 ) return s;
                         break;
                     case 34 : 
-                        int LA52_19 = input.LA(1);
+                        int LA52_58 = input.LA(1);
 
                          
-                        int index52_19 = input.index();
+                        int index52_58 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_19==75) ) {s = 42;}
+                        if ( (LA52_58==RIGHT_SQUARE) ) {s = 96;}
 
-                        else if ( (LA52_19==DOT) ) {s = 43;}
+                        else if ( (LA52_58==RIGHT_PAREN) && (synpred7())) {s = 8;}
 
-                        else if ( (LA52_19==LEFT_SQUARE) ) {s = 44;}
+                        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_19==LEFT_PAREN) ) {s = 45;}
+                        else if ( (LA52_58==LEFT_PAREN) && (synpred7())) {s = 67;}
 
-                        else if ( (LA52_19==RIGHT_PAREN) && (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<=74)||(LA52_19>=76 && LA52_19<=82)) && (synpred7())) {s = 12;}
-
                          
-                        input.seek(index52_19);
+                        input.seek(index52_58);
                         if ( s>=0 ) return s;
                         break;
                     case 35 : 
-                        int LA52_0 = input.LA(1);
+                        int LA52_62 = input.LA(1);
 
                          
-                        int index52_0 = input.index();
+                        int index52_62 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_0==LEFT_SQUARE) && (synpred6())) {s = 1;}
+                        if ( (LA52_62==RIGHT_SQUARE) ) {s = 100;}
 
-                        else if ( (LA52_0==LEFT_PAREN) ) {s = 2;}
+                        else if ( (LA52_62==RIGHT_PAREN) && (synpred7())) {s = 8;}
 
-                        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==73) ) {s = 3;}
+                        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_62==LEFT_PAREN) && (synpred7())) {s = 67;}
+
                          
-                        input.seek(index52_0);
+                        input.seek(index52_62);
                         if ( s>=0 ) return s;
                         break;
                     case 36 : 
-                        int LA52_31 = input.LA(1);
+                        int LA52_35 = input.LA(1);
 
                          
-                        int index52_31 = input.index();
+                        int index52_35 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred7()) ) {s = 13;}
+                        if ( (synpred7()) ) {s = 67;}
 
                         else if ( (true) ) {s = 3;}
 
                          
-                        input.seek(index52_31);
+                        input.seek(index52_35);
                         if ( s>=0 ) return s;
                         break;
                     case 37 : 
-                        int LA52_20 = input.LA(1);
+                        int LA52_63 = input.LA(1);
 
                          
-                        int index52_20 = input.index();
+                        int index52_63 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred7()) ) {s = 13;}
+                        if ( (synpred7()) ) {s = 67;}
 
                         else if ( (true) ) {s = 3;}
 
                          
-                        input.seek(index52_20);
+                        input.seek(index52_63);
                         if ( s>=0 ) return s;
                         break;
                     case 38 : 
-                        int LA52_26 = input.LA(1);
+                        int LA52_65 = input.LA(1);
 
                          
-                        int index52_26 = input.index();
+                        int index52_65 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred7()) ) {s = 13;}
+                        if ( (synpred7()) ) {s = 67;}
 
                         else if ( (true) ) {s = 3;}
 
                          
-                        input.seek(index52_26);
+                        input.seek(index52_65);
                         if ( s>=0 ) return s;
                         break;
                     case 39 : 
-                        int LA52_2 = input.LA(1);
+                        int LA52_46 = input.LA(1);
 
                          
-                        int index52_2 = input.index();
+                        int index52_46 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_2==AND) ) {s = 4;}
+                        if ( (synpred7()) ) {s = 67;}
 
-                        else if ( (LA52_2==OR) ) {s = 5;}
+                        else if ( (true) ) {s = 3;}
 
-                        else if ( (LA52_2==LEFT_PAREN) ) {s = 6;}
-
-                        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<=82)) && (synpred7())) {s = 12;}
-
-                        else if ( (LA52_2==RIGHT_PAREN) && (synpred7())) {s = 13;}
-
                          
-                        input.seek(index52_2);
+                        input.seek(index52_46);
                         if ( s>=0 ) return s;
                         break;
                     case 40 : 
-                        int LA52_43 = input.LA(1);
+                        int LA52_40 = input.LA(1);
 
                          
-                        int index52_43 = input.index();
+                        int index52_40 = 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<=IN)||LA52_43==THEN) ) {s = 79;}
+                        if ( (synpred7()) ) {s = 67;}
 
-                        else if ( (LA52_43==RIGHT_PAREN) && (synpred7())) {s = 13;}
+                        else if ( (true) ) {s = 3;}
 
-                        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>=FLOAT && LA52_43<=RIGHT_SQUARE)||(LA52_43>=EOL && LA52_43<=82)) && (synpred7())) {s = 12;}
-
-                        else if ( (LA52_43==LEFT_PAREN) && (synpred7())) {s = 67;}
-
                          
-                        input.seek(index52_43);
+                        input.seek(index52_40);
                         if ( s>=0 ) return s;
                         break;
                     case 41 : 
-                        int LA52_32 = input.LA(1);
+                        int LA52_38 = input.LA(1);
 
                          
-                        int index52_32 = input.index();
+                        int index52_38 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_32==ID) ) {s = 64;}
+                        if ( (LA52_38==76) ) {s = 73;}
 
-                        else if ( (LA52_32==LEFT_PAREN) ) {s = 65;}
+                        else if ( (LA52_38==DOT) ) {s = 74;}
 
-                        else if ( (LA52_32==RIGHT_PAREN) && (synpred7())) {s = 13;}
+                        else if ( (LA52_38==LEFT_SQUARE) ) {s = 75;}
 
-                        else if ( ((LA52_32>=PACKAGE && LA52_32<=EVENT)||(LA52_32>=DOT && LA52_32<=GLOBAL)||LA52_32==COMMA||(LA52_32>=QUERY && LA52_32<=82)) && (synpred7())) {s = 12;}
+                        else if ( (LA52_38==LEFT_PAREN) ) {s = 76;}
 
+                        else if ( (LA52_38==RIGHT_PAREN) && (synpred7())) {s = 8;}
+
+                        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;}
+
                          
-                        input.seek(index52_32);
+                        input.seek(index52_38);
                         if ( s>=0 ) return s;
                         break;
                     case 42 : 
-                        int LA52_56 = input.LA(1);
+                        int LA52_37 = input.LA(1);
 
                          
-                        int index52_56 = input.index();
+                        int index52_37 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_56==ID) ) {s = 93;}
+                        if ( (LA52_37==76) ) {s = 69;}
 
-                        else if ( (LA52_56==LEFT_PAREN) ) {s = 94;}
+                        else if ( (LA52_37==DOT) ) {s = 70;}
 
-                        else if ( (LA52_56==RIGHT_PAREN) && (synpred7())) {s = 13;}
+                        else if ( (LA52_37==LEFT_SQUARE) ) {s = 71;}
 
-                        else if ( ((LA52_56>=PACKAGE && LA52_56<=EVENT)||(LA52_56>=DOT && LA52_56<=GLOBAL)||LA52_56==COMMA||(LA52_56>=QUERY && LA52_56<=82)) && (synpred7())) {s = 12;}
+                        else if ( (LA52_37==LEFT_PAREN) ) {s = 72;}
 
+                        else if ( (LA52_37==RIGHT_PAREN) && (synpred7())) {s = 8;}
+
+                        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;}
+
                          
-                        input.seek(index52_56);
+                        input.seek(index52_37);
                         if ( s>=0 ) return s;
                         break;
                     case 43 : 
-                        int LA52_60 = input.LA(1);
+                        int LA52_19 = input.LA(1);
 
                          
-                        int index52_60 = input.index();
+                        int index52_19 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_60==ID) ) {s = 97;}
+                        if ( (LA52_19==76) ) {s = 42;}
 
-                        else if ( (LA52_60==LEFT_PAREN) ) {s = 98;}
+                        else if ( (LA52_19==DOT) ) {s = 43;}
 
-                        else if ( (LA52_60==RIGHT_PAREN) && (synpred7())) {s = 13;}
+                        else if ( (LA52_19==LEFT_SQUARE) ) {s = 44;}
 
-                        else if ( ((LA52_60>=PACKAGE && LA52_60<=EVENT)||(LA52_60>=DOT && LA52_60<=GLOBAL)||LA52_60==COMMA||(LA52_60>=QUERY && LA52_60<=82)) && (synpred7())) {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_60);
+                        input.seek(index52_19);
                         if ( s>=0 ) return s;
                         break;
                     case 44 : 
-                        int LA52_47 = input.LA(1);
+                        int LA52_9 = input.LA(1);
 
                          
-                        int index52_47 = input.index();
+                        int index52_9 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_47==75) ) {s = 81;}
+                        if ( (LA52_9==LEFT_PAREN) ) {s = 28;}
 
-                        else if ( (LA52_47==RIGHT_PAREN) && (synpred7())) {s = 13;}
+                        else if ( (LA52_9==ID) ) {s = 29;}
 
-                        else if ( (LA52_47==DOT) ) {s = 82;}
+                        else if ( (LA52_9==RIGHT_PAREN) && (synpred7())) {s = 8;}
 
-                        else if ( (LA52_47==LEFT_PAREN) ) {s = 83;}
+                        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_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<=74)||(LA52_47>=76 && LA52_47<=82)) && (synpred7())) {s = 12;}
-
                          
-                        input.seek(index52_47);
+                        input.seek(index52_9);
                         if ( s>=0 ) return s;
                         break;
                     case 45 : 
-                        int LA52_25 = input.LA(1);
+                        int LA52_2 = input.LA(1);
 
                          
-                        int index52_25 = input.index();
+                        int index52_2 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_25==75) ) {s = 52;}
+                        if ( (LA52_2==AND) ) {s = 4;}
 
-                        else if ( (LA52_25==RIGHT_PAREN) && (synpred7())) {s = 13;}
+                        else if ( (LA52_2==OR) ) {s = 5;}
 
-                        else if ( (LA52_25==DOT) ) {s = 53;}
+                        else if ( (LA52_2==EXISTS) ) {s = 6;}
 
-                        else if ( (LA52_25==LEFT_PAREN) ) {s = 54;}
+                        else if ( (LA52_2==LEFT_PAREN) ) {s = 7;}
 
-                        else if ( (LA52_25==LEFT_SQUARE) ) {s = 55;}
+                        else if ( (LA52_2==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<=74)||(LA52_25>=76 && LA52_25<=82)) && (synpred7())) {s = 12;}
+                        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_25);
+                        input.seek(index52_2);
                         if ( s>=0 ) return s;
                         break;
                     case 46 : 
-                        int LA52_49 = input.LA(1);
+                        int LA52_10 = input.LA(1);
 
                          
-                        int index52_49 = input.index();
+                        int index52_10 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_49==75) ) {s = 85;}
+                        if ( (LA52_10==LEFT_PAREN) ) {s = 30;}
 
-                        else if ( (LA52_49==DOT) ) {s = 86;}
+                        else if ( (LA52_10==RIGHT_PAREN) && (synpred7())) {s = 8;}
 
-                        else if ( (LA52_49==LEFT_SQUARE) ) {s = 87;}
+                        else if ( ((LA52_10>=PACKAGE && LA52_10<=GLOBAL)||LA52_10==COMMA||(LA52_10>=QUERY && LA52_10<=83)) && (synpred7())) {s = 13;}
 
-                        else if ( (LA52_49==LEFT_PAREN) ) {s = 88;}
-
-                        else if ( (LA52_49==RIGHT_PAREN) && (synpred7())) {s = 13;}
-
-                        else if ( ((LA52_49>=PACKAGE && LA52_49<=ID)||LA52_49==GLOBAL||LA52_49==COMMA||(LA52_49>=QUERY && LA52_49<=RIGHT_CURLY)||(LA52_49>=RIGHT_SQUARE && LA52_49<=74)||(LA52_49>=76 && LA52_49<=82)) && (synpred7())) {s = 12;}
-
                          
-                        input.seek(index52_49);
+                        input.seek(index52_10);
                         if ( s>=0 ) return s;
                         break;
                     case 47 : 
-                        int LA52_46 = input.LA(1);
+                        int LA52_52 = input.LA(1);
 
                          
-                        int index52_46 = input.index();
+                        int index52_52 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred7()) ) {s = 67;}
+                        if ( (LA52_52==RIGHT_PAREN) && (synpred7())) {s = 8;}
 
-                        else if ( (true) ) {s = 3;}
+                        else if ( (LA52_52==ID) ) {s = 89;}
 
+                        else if ( (LA52_52==LEFT_PAREN) ) {s = 90;}
+
+                        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;}
+
                          
-                        input.seek(index52_46);
+                        input.seek(index52_52);
                         if ( s>=0 ) return s;
                         break;
                     case 48 : 
-                        int LA52_35 = input.LA(1);
+                        int LA52_51 = input.LA(1);
 
                          
-                        int index52_35 = input.index();
+                        int index52_51 = input.index();
                         input.rewind();
                         s = -1;
                         if ( (synpred7()) ) {s = 67;}
@@ -8647,7 +8706,7 @@
                         else if ( (true) ) {s = 3;}
 
                          
-                        input.seek(index52_35);
+                        input.seek(index52_51);
                         if ( s>=0 ) return s;
                         break;
                     case 49 : 
@@ -8657,9 +8716,9 @@
                         int index52_23 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_23==RIGHT_PAREN) && (synpred7())) {s = 13;}
+                        if ( (LA52_23==RIGHT_PAREN) && (synpred7())) {s = 8;}
 
-                        else if ( ((LA52_23>=PACKAGE && LA52_23<=GLOBAL)||LA52_23==COMMA||(LA52_23>=QUERY && LA52_23<=82)) && (synpred7())) {s = 12;}
+                        else if ( ((LA52_23>=PACKAGE && LA52_23<=GLOBAL)||LA52_23==COMMA||(LA52_23>=QUERY && LA52_23<=83)) && (synpred7())) {s = 13;}
 
                         else if ( (LA52_23==LEFT_PAREN) ) {s = 50;}
 
@@ -8668,218 +8727,236 @@
                         if ( s>=0 ) return s;
                         break;
                     case 50 : 
-                        int LA52_63 = input.LA(1);
+                        int LA52_20 = input.LA(1);
 
                          
-                        int index52_63 = 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) && (synpred7())) {s = 8;}
+
+                        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;}
+
                          
-                        input.seek(index52_63);
+                        input.seek(index52_20);
                         if ( s>=0 ) return s;
                         break;
                     case 51 : 
-                        int LA52_50 = input.LA(1);
+                        int LA52_17 = input.LA(1);
 
                          
-                        int index52_50 = input.index();
+                        int index52_17 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred7()) ) {s = 67;}
+                        if ( (LA52_17==LEFT_PAREN) ) {s = 41;}
 
-                        else if ( (true) ) {s = 3;}
+                        else if ( (LA52_17==RIGHT_PAREN) && (synpred7())) {s = 8;}
 
+                        else if ( ((LA52_17>=PACKAGE && LA52_17<=GLOBAL)||LA52_17==COMMA||(LA52_17>=QUERY && LA52_17<=83)) && (synpred7())) {s = 13;}
+
                          
-                        input.seek(index52_50);
+                        input.seek(index52_17);
                         if ( s>=0 ) return s;
                         break;
                     case 52 : 
-                        int LA52_22 = input.LA(1);
+                        int LA52_26 = input.LA(1);
 
                          
-                        int index52_22 = input.index();
+                        int index52_26 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_22==LEFT_PAREN) ) {s = 48;}
+                        if ( (synpred7()) ) {s = 13;}
 
-                        else if ( (LA52_22==ID) ) {s = 49;}
+                        else if ( (true) ) {s = 3;}
 
-                        else if ( (LA52_22==RIGHT_PAREN) && (synpred7())) {s = 13;}
-
-                        else if ( ((LA52_22>=PACKAGE && LA52_22<=EVENT)||(LA52_22>=DOT && LA52_22<=GLOBAL)||LA52_22==COMMA||(LA52_22>=QUERY && LA52_22<=82)) && (synpred7())) {s = 12;}
-
                          
-                        input.seek(index52_22);
+                        input.seek(index52_26);
                         if ( s>=0 ) return s;
                         break;
                     case 53 : 
-                        int LA52_36 = input.LA(1);
+                        int LA52_11 = input.LA(1);
 
                          
-                        int index52_36 = input.index();
+                        int index52_11 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred7()) ) {s = 67;}
+                        if ( (LA52_11==LEFT_PAREN) ) {s = 31;}
 
-                        else if ( (true) ) {s = 3;}
+                        else if ( (LA52_11==RIGHT_PAREN) && (synpred7())) {s = 8;}
 
+                        else if ( ((LA52_11>=PACKAGE && LA52_11<=GLOBAL)||LA52_11==COMMA||(LA52_11>=QUERY && LA52_11<=83)) && (synpred7())) {s = 13;}
+
                          
-                        input.seek(index52_36);
+                        input.seek(index52_11);
                         if ( s>=0 ) return s;
                         break;
                     case 54 : 
-                        int LA52_41 = input.LA(1);
+                        int LA52_4 = input.LA(1);
 
                          
-                        int index52_41 = input.index();
+                        int index52_4 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred7()) ) {s = 67;}
+                        if ( (LA52_4==EXISTS) ) {s = 14;}
 
-                        else if ( (true) ) {s = 3;}
+                        else if ( (LA52_4==NOT) ) {s = 15;}
 
+                        else if ( (LA52_4==EVAL) ) {s = 16;}
+
+                        else if ( (LA52_4==FORALL) ) {s = 17;}
+
+                        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_41);
+                        input.seek(index52_4);
                         if ( s>=0 ) return s;
                         break;
                     case 55 : 
-                        int LA52_9 = input.LA(1);
+                        int LA52_49 = input.LA(1);
 
                          
-                        int index52_9 = input.index();
+                        int index52_49 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_9==LEFT_PAREN) ) {s = 30;}
+                        if ( (synpred7()) ) {s = 67;}
 
-                        else if ( (LA52_9==RIGHT_PAREN) && (synpred7())) {s = 13;}
+                        else if ( (true) ) {s = 3;}
 
-                        else if ( ((LA52_9>=PACKAGE && LA52_9<=GLOBAL)||LA52_9==COMMA||(LA52_9>=QUERY && LA52_9<=82)) && (synpred7())) {s = 12;}
-
                          
-                        input.seek(index52_9);
+                        input.seek(index52_49);
                         if ( s>=0 ) return s;
                         break;
                     case 56 : 
-                        int LA52_65 = input.LA(1);
+                        int LA52_14 = input.LA(1);
 
                          
-                        int index52_65 = input.index();
+                        int index52_14 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred7()) ) {s = 67;}
+                        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) && (synpred7())) {s = 8;}
+
+                        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;}
+
                          
-                        input.seek(index52_65);
+                        input.seek(index52_14);
                         if ( s>=0 ) return s;
                         break;
                     case 57 : 
-                        int LA52_16 = input.LA(1);
+                        int LA52_59 = input.LA(1);
 
                          
-                        int index52_16 = input.index();
+                        int index52_59 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_16==LEFT_PAREN) ) {s = 40;}
+                        if ( (synpred7()) ) {s = 67;}
 
-                        else if ( (LA52_16==RIGHT_PAREN) && (synpred7())) {s = 13;}
+                        else if ( (true) ) {s = 3;}
 
-                        else if ( ((LA52_16>=PACKAGE && LA52_16<=GLOBAL)||LA52_16==COMMA||(LA52_16>=QUERY && LA52_16<=82)) && (synpred7())) {s = 12;}
-
                          
-                        input.seek(index52_16);
+                        input.seek(index52_59);
                         if ( s>=0 ) return s;
                         break;
                     case 58 : 
-                        int LA52_51 = input.LA(1);
+                        int LA52_22 = input.LA(1);
 
                          
-                        int index52_51 = input.index();
+                        int index52_22 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred7()) ) {s = 67;}
+                        if ( (LA52_22==RIGHT_PAREN) && (synpred7())) {s = 8;}
 
-                        else if ( (true) ) {s = 3;}
+                        else if ( (LA52_22==ID) ) {s = 48;}
 
+                        else if ( (LA52_22==LEFT_PAREN) ) {s = 49;}
+
+                        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;}
+
                          
-                        input.seek(index52_51);
+                        input.seek(index52_22);
                         if ( s>=0 ) return s;
                         break;
                     case 59 : 
-                        int LA52_6 = input.LA(1);
+                        int LA52_42 = input.LA(1);
 
                          
-                        int index52_6 = input.index();
+                        int index52_42 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (synpred7()) ) {s = 13;}
+                        if ( (LA52_42==ID) ) {s = 77;}
 
-                        else if ( (true) ) {s = 3;}
+                        else if ( (LA52_42==LEFT_PAREN) ) {s = 78;}
 
+                        else if ( (LA52_42==RIGHT_PAREN) && (synpred7())) {s = 8;}
+
+                        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;}
+
                          
-                        input.seek(index52_6);
+                        input.seek(index52_42);
                         if ( s>=0 ) return s;
                         break;
                     case 60 : 
-                        int LA52_15 = input.LA(1);
+                        int LA52_7 = input.LA(1);
 
                          
-                        int index52_15 = input.index();
+                        int index52_7 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_15==LEFT_PAREN) ) {s = 38;}
+                        if ( (synpred7()) ) {s = 13;}
 
-                        else if ( (LA52_15==ID) ) {s = 39;}
+                        else if ( (true) ) {s = 3;}
 
-                        else if ( (LA52_15==RIGHT_PAREN) && (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<=82)) && (synpred7())) {s = 12;}
-
                          
-                        input.seek(index52_15);
+                        input.seek(index52_7);
                         if ( s>=0 ) return s;
                         break;
                     case 61 : 
-                        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>=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==ID) ) {s = 37;}
+                        else if ( (LA52_53==RIGHT_PAREN) && (synpred7())) {s = 8;}
 
-                        else if ( (LA52_14==RIGHT_PAREN) && (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==TILDE||(LA52_53>=FLOAT && LA52_53<=RIGHT_SQUARE)||(LA52_53>=EOL && LA52_53<=83)) && (synpred7())) {s = 13;}
 
-                        else if ( ((LA52_14>=PACKAGE && LA52_14<=EVENT)||(LA52_14>=DOT && LA52_14<=GLOBAL)||LA52_14==COMMA||(LA52_14>=QUERY && LA52_14<=82)) && (synpred7())) {s = 12;}
+                        else if ( (LA52_53==LEFT_PAREN) && (synpred7())) {s = 67;}
 
                          
-                        input.seek(index52_14);
+                        input.seek(index52_53);
                         if ( s>=0 ) return s;
                         break;
                     case 62 : 
-                        int LA52_55 = input.LA(1);
+                        int LA52_16 = input.LA(1);
 
                          
-                        int index52_55 = input.index();
+                        int index52_16 = input.index();
                         input.rewind();
                         s = -1;
-                        if ( (LA52_55==RIGHT_SQUARE) ) {s = 92;}
+                        if ( (LA52_16==RIGHT_PAREN) && (synpred7())) {s = 8;}
 
-                        else if ( (LA52_55==RIGHT_PAREN) && (synpred7())) {s = 13;}
+                        else if ( ((LA52_16>=PACKAGE && LA52_16<=GLOBAL)||LA52_16==COMMA||(LA52_16>=QUERY && LA52_16<=83)) && (synpred7())) {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<=82)) && (synpred7())) {s = 12;}
+                        else if ( (LA52_16==LEFT_PAREN) ) {s = 40;}
 
-                        else if ( (LA52_55==LEFT_PAREN) && (synpred7())) {s = 67;}
-
                          
-                        input.seek(index52_55);
+                        input.seek(index52_16);
                         if ( s>=0 ) return s;
                         break;
             }
@@ -8897,7 +8974,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\122\1\0\1\122\1\uffff\1\122\13\0";
+        "\1\46\1\uffff\2\123\1\0\1\123\1\uffff\1\123\13\0";
     static final String DFA64_acceptS =
         "\1\uffff\1\2\4\uffff\1\1\14\uffff";
     static final String DFA64_specialS =
@@ -8907,17 +8984,19 @@
             "",
             "\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"+
-            "\1\10\1\11\1\12\1\3\6\uffff\1\1\16\uffff\6\6",
-            "\1\1\1\uffff\1\13\35\uffff\1\1\10\uffff\6\1\4\uffff\1\1\20\uffff"+
+            "\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"+
             "\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\14\2\6\2\uffff\1\1\1\uffff\1\6\16\uffff\6\1",
+            "\17\1\20\1\21\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\14\2\6\2\uffff\1\1\1\uffff\1\6\16\uffff\6\1",
+            "\17\1\20\1\21\1\1\1\14\2\6\2\uffff\1\1\1\uffff\1\6\16\uffff"+
+            "\6\1",
             "\1\uffff",
             "\1\uffff",
             "\1\uffff",
@@ -8961,7 +9040,7 @@
             this.transition = DFA64_transition;
         }
         public String getDescription() {
-            return "()* loopback of 1413:3: ( options {backtrack=true; } : DOUBLE_PIPE and_restr_connective[or] )*";
+            return "()* loopback of 1409:3: ( options {backtrack=true; } : DOUBLE_PIPE and_restr_connective[or] )*";
         }
         public int specialStateTransition(int s, IntStream input) throws NoViableAltException {
         	int _s = s;
@@ -8990,36 +9069,82 @@
         }
     }
     static final String DFA65_eotS =
-        "\32\uffff";
+        "\70\uffff";
     static final String DFA65_eofS =
-        "\1\1\31\uffff";
+        "\1\1\13\uffff\1\4\1\uffff\5\4\45\uffff";
     static final String DFA65_minS =
-        "\1\14\1\uffff\1\4\1\11\2\4\1\uffff\1\4\22\0";
+        "\1\14\1\uffff\1\4\1\11\1\uffff\7\4\1\11\6\4\1\11\1\0\2\4\41\0";
     static final String DFA65_maxS =
-        "\1\46\1\uffff\4\122\1\uffff\1\122\22\0";
+        "\1\46\1\uffff\2\123\1\uffff\7\123\1\75\1\123\5\77\1\123\1\0\2\123"+
+        "\41\0";
     static final String DFA65_acceptS =
-        "\1\uffff\1\2\4\uffff\1\1\23\uffff";
+        "\1\uffff\1\2\2\uffff\1\1\63\uffff";
     static final String DFA65_specialS =
-        "\32\uffff}>";
+        "\24\uffff\1\0\43\uffff}>";
     static final String[] DFA65_transitionS = {
             "\2\1\26\uffff\1\1\1\uffff\1\2",
             "",
-            "\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"+
-            "\1\10\1\11\1\12\1\3\6\uffff\1\1\16\uffff\6\6",
-            "\1\1\1\uffff\1\13\35\uffff\1\1\10\uffff\6\1\4\uffff\1\1\20\uffff"+
+            "\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"+
             "\6\1",
-            "\5\1\1\uffff\1\1\1\15\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"+
-            "\16\1\17\1\20\1\21\1\22\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\1\uffff\1\24\1\25\1"+
-            "\26\1\27\1\30\1\23\2\6\2\uffff\1\1\1\uffff\1\6\16\uffff\6\1",
             "",
-            "\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\1\uffff\1\24\1\25\1"+
-            "\26\1\27\1\30\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\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",
@@ -9036,6 +9161,22 @@
             "\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"
     };
 
@@ -9069,12 +9210,37 @@
             this.transition = DFA65_transition;
         }
         public String getDescription() {
-            return "()* loopback of 1436:3: ( options {backtrack=true; } : t= DOUBLE_AMPER constraint_expression[and] )*";
+            return "()* loopback of 1432: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_73_in_opt_semicolon39 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_74_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});
@@ -9088,42 +9254,42 @@
     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[]{0x40FDE083028FC5F0L});
-    public static final BitSet FOLLOW_dotted_name_in_package_statement214 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000200L});
+    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,0x0000000000000200L});
+    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,0x0000000000000200L});
+    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,0x0000000000000200L});
+    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,0x0000000000000400L});
-    public static final BitSet FOLLOW_DOT_in_import_name415 = new BitSet(new long[]{0x40FDE083028FC5F0L});
-    public static final BitSet FOLLOW_identifier_in_import_name419 = new BitSet(new long[]{0x0000000000000202L,0x0000000000000400L});
-    public static final BitSet FOLLOW_74_in_import_name443 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_GLOBAL_in_global477 = new BitSet(new long[]{0x40FDE083028FC5F0L});
-    public static final BitSet FOLLOW_dotted_name_in_global488 = new BitSet(new long[]{0x40FDE083028FC5F0L});
-    public static final BitSet FOLLOW_identifier_in_global499 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000200L});
+    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[]{0x40FDE083028FC5F0L});
-    public static final BitSet FOLLOW_dotted_name_in_function530 = new BitSet(new long[]{0x40FDE083028FC5F0L});
+    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[]{0x40FDE083028FE5F0L});
-    public static final BitSet FOLLOW_dotted_name_in_function553 = new BitSet(new long[]{0x40FDE083028FC5F0L});
+    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[]{0x40FDE083028FC5F0L});
-    public static final BitSet FOLLOW_dotted_name_in_function576 = new BitSet(new long[]{0x40FDE083028FC5F0L});
+    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[]{0x0400000000000000L});
+    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[]{0x1000000000000002L});
-    public static final BitSet FOLLOW_LEFT_SQUARE_in_argument644 = new BitSet(new long[]{0x2000000000000000L});
-    public static final BitSet FOLLOW_RIGHT_SQUARE_in_argument646 = new BitSet(new long[]{0x1000000000000002L});
+    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});
@@ -9134,26 +9300,26 @@
     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,0x0000000000000200L});
+    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,0x0000000000000200L});
+    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,0x0000000000000200L});
+    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[]{0x40FDE083028FC5F0L});
-    public static final BitSet FOLLOW_identifier_in_template_slot974 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000200L});
+    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[]{0x40000007FADC0000L});
-    public static final BitSet FOLLOW_rule_attributes_in_rule1020 = new BitSet(new long[]{0x4000000000040000L});
-    public static final BitSet FOLLOW_WHEN_in_rule1032 = new BitSet(new long[]{0x40000F0000000900L,0x0000000000000800L});
-    public static final BitSet FOLLOW_75_in_rule1034 = new BitSet(new long[]{0x40000F0000000900L});
-    public static final BitSet FOLLOW_normal_lhs_block_in_rule1045 = new BitSet(new long[]{0x4000000000000000L});
+    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,0x0000000000000800L});
-    public static final BitSet FOLLOW_75_in_rule_attributes1077 = new BitSet(new long[]{0x00000007FAD00000L});
+    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});
@@ -9210,17 +9376,17 @@
     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,0x0000000000000200L});
-    public static final BitSet FOLLOW_lhs_not_in_lhs_unary1996 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000200L});
-    public static final BitSet FOLLOW_lhs_eval_in_lhs_unary2015 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000200L});
-    public static final BitSet FOLLOW_lhs_forall_in_lhs_unary2034 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000200L});
+    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,0x0000000000000200L});
-    public static final BitSet FOLLOW_pattern_source_in_lhs_unary2068 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000200L});
+    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[]{0x40FFF083028FC5F0L});
+    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});
@@ -9265,8 +9431,8 @@
     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[]{0x40FDE083028FC5F0L});
-    public static final BitSet FOLLOW_identifier_in_expression_chain2992 = new BitSet(new long[]{0x1000000000000A02L});
+    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});
@@ -9274,8 +9440,8 @@
     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,0x0000000000000800L});
-    public static final BitSet FOLLOW_75_in_fact_binding3172 = new BitSet(new long[]{0x0000000000000900L});
+    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});
@@ -9283,113 +9449,120 @@
     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[]{0x40FDE483028FEDF0L});
+    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[]{0x40FDE483028FCDF0L});
+    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[]{0x40FDE483028FCDF0L});
+    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[]{0x40FDE483028FCDF0L});
+    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[]{0x40FDE483028FCDF0L});
+    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,0x0000000000000800L});
-    public static final BitSet FOLLOW_75_in_field_constraint3588 = new BitSet(new long[]{0x40FDE083028FC5F0L});
-    public static final BitSet FOLLOW_accessor_path_in_field_constraint3607 = new BitSet(new long[]{0x00FC020000000802L,0x000000000007F000L});
-    public static final BitSet FOLLOW_or_restr_connective_in_field_constraint3635 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_76_in_field_constraint3655 = new BitSet(new long[]{0x0000000000000800L});
-    public static final BitSet FOLLOW_predicate_in_field_constraint3657 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_accessor_path_in_field_constraint3683 = new BitSet(new long[]{0x00FC020000000800L,0x000000000007E000L});
-    public static final BitSet FOLLOW_or_restr_connective_in_field_constraint3705 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_and_restr_connective_in_or_restr_connective3756 = new BitSet(new long[]{0x0000001000000002L});
-    public static final BitSet FOLLOW_DOUBLE_PIPE_in_or_restr_connective3780 = new BitSet(new long[]{0x00FC020000000800L,0x000000000007E000L});
-    public static final BitSet FOLLOW_and_restr_connective_in_or_restr_connective3791 = new BitSet(new long[]{0x0000001000000002L});
-    public static final BitSet FOLLOW_constraint_expression_in_and_restr_connective3823 = new BitSet(new long[]{0x0000004000000002L});
-    public static final BitSet FOLLOW_DOUBLE_AMPER_in_and_restr_connective3844 = new BitSet(new long[]{0x00FC020000000800L,0x000000000007E000L});
-    public static final BitSet FOLLOW_constraint_expression_in_and_restr_connective3855 = new BitSet(new long[]{0x0000004000000002L});
-    public static final BitSet FOLLOW_compound_operator_in_constraint_expression3892 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_simple_operator_in_constraint_expression3899 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_constraint_expression3906 = new BitSet(new long[]{0x00FC020000000800L,0x000000000007E000L});
-    public static final BitSet FOLLOW_or_restr_connective_in_constraint_expression3915 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_constraint_expression3921 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_77_in_simple_operator3952 = new BitSet(new long[]{0x43FDE08307AFCDF0L});
-    public static final BitSet FOLLOW_78_in_simple_operator3960 = new BitSet(new long[]{0x43FDE08307AFCDF0L});
-    public static final BitSet FOLLOW_79_in_simple_operator3968 = new BitSet(new long[]{0x43FDE08307AFCDF0L});
-    public static final BitSet FOLLOW_80_in_simple_operator3976 = new BitSet(new long[]{0x43FDE08307AFCDF0L});
-    public static final BitSet FOLLOW_81_in_simple_operator3984 = new BitSet(new long[]{0x43FDE08307AFCDF0L});
-    public static final BitSet FOLLOW_82_in_simple_operator3992 = new BitSet(new long[]{0x43FDE08307AFCDF0L});
-    public static final BitSet FOLLOW_CONTAINS_in_simple_operator4000 = new BitSet(new long[]{0x43FDE08307AFCDF0L});
-    public static final BitSet FOLLOW_NOT_in_simple_operator4008 = new BitSet(new long[]{0x0004000000000000L});
-    public static final BitSet FOLLOW_CONTAINS_in_simple_operator4012 = new BitSet(new long[]{0x43FDE08307AFCDF0L});
-    public static final BitSet FOLLOW_EXCLUDES_in_simple_operator4020 = new BitSet(new long[]{0x43FDE08307AFCDF0L});
-    public static final BitSet FOLLOW_MATCHES_in_simple_operator4028 = new BitSet(new long[]{0x43FDE08307AFCDF0L});
-    public static final BitSet FOLLOW_SOUNDSLIKE_in_simple_operator4036 = new BitSet(new long[]{0x43FDE08307AFCDF0L});
-    public static final BitSet FOLLOW_NOT_in_simple_operator4044 = new BitSet(new long[]{0x0010000000000000L});
-    public static final BitSet FOLLOW_MATCHES_in_simple_operator4048 = new BitSet(new long[]{0x43FDE08307AFCDF0L});
-    public static final BitSet FOLLOW_MEMBEROF_in_simple_operator4056 = new BitSet(new long[]{0x43FDE08307AFCDF0L});
-    public static final BitSet FOLLOW_NOT_in_simple_operator4064 = new BitSet(new long[]{0x0040000000000000L});
-    public static final BitSet FOLLOW_MEMBEROF_in_simple_operator4068 = new BitSet(new long[]{0x43FDE08307AFCDF0L});
-    public static final BitSet FOLLOW_expression_value_in_simple_operator4082 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_IN_in_compound_operator4112 = new BitSet(new long[]{0x0000000000000800L});
-    public static final BitSet FOLLOW_NOT_in_compound_operator4124 = new BitSet(new long[]{0x0080000000000000L});
-    public static final BitSet FOLLOW_IN_in_compound_operator4126 = new BitSet(new long[]{0x0000000000000800L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_compound_operator4141 = new BitSet(new long[]{0x43FDE08307AFCDF0L});
-    public static final BitSet FOLLOW_expression_value_in_compound_operator4145 = new BitSet(new long[]{0x0000000000003000L});
-    public static final BitSet FOLLOW_COMMA_in_compound_operator4152 = new BitSet(new long[]{0x43FDE08307AFCDF0L});
-    public static final BitSet FOLLOW_expression_value_in_compound_operator4156 = new BitSet(new long[]{0x0000000000003000L});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_compound_operator4165 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_accessor_path_in_expression_value4199 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_literal_constraint_in_expression_value4219 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_paren_chunk_in_expression_value4233 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_STRING_in_literal_constraint4276 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_INT_in_literal_constraint4287 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_FLOAT_in_literal_constraint4300 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_BOOL_in_literal_constraint4311 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_NULL_in_literal_constraint4323 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_paren_chunk_in_predicate4361 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_CURLY_in_curly_chunk4379 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x000000000007FFFFL});
-    public static final BitSet FOLLOW_set_in_curly_chunk4383 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x000000000007FFFFL});
-    public static final BitSet FOLLOW_curly_chunk_in_curly_chunk4392 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x000000000007FFFFL});
-    public static final BitSet FOLLOW_RIGHT_CURLY_in_curly_chunk4397 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_PAREN_in_paren_chunk4411 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x000000000007FFFFL});
-    public static final BitSet FOLLOW_set_in_paren_chunk4415 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x000000000007FFFFL});
-    public static final BitSet FOLLOW_paren_chunk_in_paren_chunk4424 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x000000000007FFFFL});
-    public static final BitSet FOLLOW_RIGHT_PAREN_in_paren_chunk4429 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_SQUARE_in_square_chunk4442 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x000000000007FFFFL});
-    public static final BitSet FOLLOW_set_in_square_chunk4446 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x000000000007FFFFL});
-    public static final BitSet FOLLOW_square_chunk_in_square_chunk4455 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x000000000007FFFFL});
-    public static final BitSet FOLLOW_RIGHT_SQUARE_in_square_chunk4460 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_qualified_id4489 = new BitSet(new long[]{0x1000000000000202L});
-    public static final BitSet FOLLOW_DOT_in_qualified_id4495 = new BitSet(new long[]{0x40FDE083028FC5F0L});
-    public static final BitSet FOLLOW_identifier_in_qualified_id4497 = new BitSet(new long[]{0x1000000000000202L});
-    public static final BitSet FOLLOW_LEFT_SQUARE_in_qualified_id4506 = new BitSet(new long[]{0x2000000000000000L});
-    public static final BitSet FOLLOW_RIGHT_SQUARE_in_qualified_id4508 = new BitSet(new long[]{0x1000000000000002L});
-    public static final BitSet FOLLOW_identifier_in_dotted_name4542 = new BitSet(new long[]{0x1000000000000202L});
-    public static final BitSet FOLLOW_DOT_in_dotted_name4548 = new BitSet(new long[]{0x40FDE083028FC5F0L});
-    public static final BitSet FOLLOW_identifier_in_dotted_name4552 = new BitSet(new long[]{0x1000000000000202L});
-    public static final BitSet FOLLOW_LEFT_SQUARE_in_dotted_name4561 = new BitSet(new long[]{0x2000000000000000L});
-    public static final BitSet FOLLOW_RIGHT_SQUARE_in_dotted_name4563 = new BitSet(new long[]{0x1000000000000002L});
-    public static final BitSet FOLLOW_accessor_element_in_accessor_path4597 = new BitSet(new long[]{0x0000000000000202L});
-    public static final BitSet FOLLOW_DOT_in_accessor_path4603 = new BitSet(new long[]{0x40FDE083028FC5F0L});
-    public static final BitSet FOLLOW_accessor_element_in_accessor_path4607 = new BitSet(new long[]{0x0000000000000202L});
-    public static final BitSet FOLLOW_identifier_in_accessor_element4645 = new BitSet(new long[]{0x1000000000000002L});
-    public static final BitSet FOLLOW_square_chunk_in_accessor_element4652 = new BitSet(new long[]{0x1000000000000002L});
-    public static final BitSet FOLLOW_THEN_in_rhs_chunk4673 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x000000000007FFFFL});
-    public static final BitSet FOLLOW_set_in_rhs_chunk4681 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x000000000007FFFFL});
-    public static final BitSet FOLLOW_END_in_rhs_chunk4705 = new BitSet(new long[]{0x0000000000000002L,0x0000000000000200L});
-    public static final BitSet FOLLOW_opt_semicolon_in_rhs_chunk4707 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_name4741 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_STRING_in_name4749 = 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_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});
@@ -9398,9 +9571,9 @@
     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_synpred83780 = new BitSet(new long[]{0x00FC020000000800L,0x000000000007E000L});
-    public static final BitSet FOLLOW_and_restr_connective_in_synpred83791 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_DOUBLE_AMPER_in_synpred93844 = new BitSet(new long[]{0x00FC020000000800L,0x000000000007E000L});
-    public static final BitSet FOLLOW_constraint_expression_in_synpred93855 = 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});
 
 }
\ No newline at end of file

Modified: labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/lang/MVELDumper.java
===================================================================
--- labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/lang/MVELDumper.java	2007-12-02 06:37:00 UTC (rev 16966)
+++ labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/lang/MVELDumper.java	2007-12-02 11:01:29 UTC (rev 16967)
@@ -55,7 +55,7 @@
     }
 
     public void visitVariableRestrictionDescr(final VariableRestrictionDescr descr) {
-        this.template = processRestriction( descr.getEvaluator(), descr.getIdentifier() );
+        this.template = processRestriction( descr.getEvaluator(), descr.isNegated(), descr.getIdentifier() );
     }
 
     public void visitFieldBindingDescr(final FieldBindingDescr descr) {
@@ -75,11 +75,11 @@
         } else if( descr.getType() == LiteralRestrictionDescr.TYPE_STRING ) {
             text = "\"" + text + "\"";
         }
-        this.template = processRestriction( descr.getEvaluator(), text );
+        this.template = processRestriction( descr.getEvaluator(), descr.isNegated(), text );
     }
 
     public void visitQualifiedIdentifierRestrictionDescr(final QualifiedIdentifierRestrictionDescr descr) {
-        this.template = processRestriction( descr.getEvaluator(), descr.getText() );
+        this.template = processRestriction( descr.getEvaluator(), descr.isNegated(), descr.getText() );
     }
 
     public void visitRestrictionConnectiveDescr(final RestrictionConnectiveDescr descr) {
@@ -91,7 +91,7 @@
     }
 
     public void visitReturnValueRestrictionDescr(final ReturnValueRestrictionDescr descr) {
-        this.template = processRestriction( descr.getEvaluator(), "( "+descr.getContent().toString()+" )" );
+        this.template = processRestriction( descr.getEvaluator(), descr.isNegated(),  "( "+descr.getContent().toString()+" )" );
     }
 
     private String processFieldConstraint(final RestrictionConnectiveDescr restriction) {
@@ -115,8 +115,9 @@
     }
 
     private String processRestriction(String evaluator,
+                                      boolean isNegated,
                                       String value) {
-        Operator op = Operator.determineOperator( evaluator );
+        Operator op = Operator.determineOperator( evaluator, isNegated );
         if( op == Operator.MEMBEROF ) {
             evaluator = "contains";
             return evaluatorPrefix( evaluator ) + 

Added: labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/lang/descr/EvaluatorBasedRestrictionDescr.java
===================================================================
--- labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/lang/descr/EvaluatorBasedRestrictionDescr.java	                        (rev 0)
+++ labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/lang/descr/EvaluatorBasedRestrictionDescr.java	2007-12-02 11:01:29 UTC (rev 16967)
@@ -0,0 +1,83 @@
+/*
+ * 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 1, 2007
+ */
+package org.drools.lang.descr;
+
+/**
+ * This is a super class for all restrictions that are based on
+ * evaluators.
+ * 
+ * @author etirelli
+ */
+public class EvaluatorBasedRestrictionDescr extends RestrictionDescr {
+
+    private static final long serialVersionUID = -9051550222783766557L;
+
+    private String            evaluator;
+    private boolean           negated;
+    private String            parameterText;
+
+    /**
+     * Creates a new EvaluatorBasedRestriction
+     * 
+     * @param evaluator the evaluator ID to be used in this restriction
+     * @param isNegated true if the evaluator is boolean negated
+     * @param parameterText the parameter text, in case there is any. null otherwise.
+     */
+    public EvaluatorBasedRestrictionDescr(final String evaluator,
+                                          final boolean isNegated,
+                                          final String parameterText) {
+        this.evaluator = evaluator;
+        this.negated = isNegated;
+        this.parameterText = parameterText;
+
+    }
+
+    /**
+     * Returns the evaluator ID for this restriction
+     * @return
+     */
+    public String getEvaluator() {
+        return this.evaluator;
+    }
+
+    /**
+     * Returns true if this evaluator is boolean negated.
+     * Example: "contains" is boolean negated if you want to check the elements that are not contained ("not contains")
+     * 
+     * @return the negated
+     */
+    public boolean isNegated() {
+        return negated;
+    }
+
+    /**
+     * In case there is any parameter text, this method returns it. Returns null otherwise.
+     * A parameter text is evaluator parameters like "after[1,10]". In the previous example,
+     * the parameter text will be "1,10".
+     * 
+     * @return the parameterText
+     */
+    public String getParameterText() {
+        return parameterText;
+    }
+    
+    public String toString() {
+        return ( this.isNegated() ? "not " : "" ) + this.getEvaluator() + ( this.getParameterText() != null ? "["+this.getParameterText()+"]" : "");
+    }
+
+}

Modified: labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/lang/descr/ForallDescr.java
===================================================================
--- labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/lang/descr/ForallDescr.java	2007-12-02 06:37:00 UTC (rev 16966)
+++ labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/lang/descr/ForallDescr.java	2007-12-02 11:01:29 UTC (rev 16967)
@@ -28,14 +28,14 @@
     implements
     ConditionalElementDescr {
 
-    private static final long serialVersionUID = 400L;
+    private static final long   serialVersionUID = 400L;
 
-    private static final String BASE_IDENTIFIER = "$__forallBaseIdentifier";
+    private static final String BASE_IDENTIFIER  = "$__forallBaseIdentifier";
 
-    private List              patterns;
+    private List<BaseDescr>     patterns;
 
     public ForallDescr() {
-        this.patterns = new ArrayList( 2 );
+        this.patterns = new ArrayList<BaseDescr>( 2 );
     }
 
     /* (non-Javadoc)
@@ -45,10 +45,11 @@
         // cast to make sure we are adding a pattern descriptor
         this.patterns.add( baseDescr );
     }
-    
-    public void insertBeforeLast(final Class clazz ,final BaseDescr baseDescr ) { 
+
+    public void insertBeforeLast(final Class clazz,
+                                 final BaseDescr baseDescr) {
         throw new UnsupportedOperationException( "Can't add descriptors to " + this.getClass().getName() );
-    }    
+    }
 
     /* (non-Javadoc)
      * @see org.drools.lang.descr.ConditionalElementDescr#getDescrs()
@@ -62,9 +63,9 @@
      * @return
      */
     public PatternDescr getBasePattern() {
-        if( this.patterns.size() > 1 ) {
+        if ( this.patterns.size() > 1 ) {
             return (PatternDescr) this.patterns.get( 0 );
-        } else if( this.patterns.size() == 1 ) {
+        } else if ( this.patterns.size() == 1 ) {
             // in case there is only one pattern, we do a rewrite, so:
             // forall( Cheese( type == "stilton" ) )
             // becomes
@@ -83,18 +84,21 @@
      * @return
      */
     public List getRemainingPatterns() {
-        if( this.patterns.size() > 1 ) {
+        if ( this.patterns.size() > 1 ) {
             return this.patterns.subList( 1,
                                           this.patterns.size() );
-        } else if( this.patterns.size() == 1 ) {
+        } else if ( this.patterns.size() == 1 ) {
             // in case there is only one pattern, we do a rewrite, so:
             // forall( Cheese( type == "stilton" ) )
             // becomes
             // forall( BASE_IDENTIFIER : Cheese() Cheese( this == BASE_IDENTIFIER, type == "stilton" ) )
             PatternDescr original = (PatternDescr) this.patterns.get( 0 );
             PatternDescr remaining = (PatternDescr) original.clone();
-            VariableRestrictionDescr restr = new VariableRestrictionDescr( "==", BASE_IDENTIFIER );
-            FieldConstraintDescr constr = new FieldConstraintDescr("this");
+            VariableRestrictionDescr restr = new VariableRestrictionDescr( "==",
+                                                                           false,
+                                                                           null,
+                                                                           BASE_IDENTIFIER );
+            FieldConstraintDescr constr = new FieldConstraintDescr( "this" );
             constr.addRestriction( restr );
             remaining.addConstraint( constr );
             return Collections.singletonList( remaining );
@@ -103,6 +107,6 @@
     }
 
     public void addOrMerge(BaseDescr baseDescr) {
-        this.patterns.add( baseDescr );        
+        this.patterns.add( baseDescr );
     }
 }

Modified: labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/lang/descr/LiteralRestrictionDescr.java
===================================================================
--- labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/lang/descr/LiteralRestrictionDescr.java	2007-12-02 06:37:00 UTC (rev 16966)
+++ labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/lang/descr/LiteralRestrictionDescr.java	2007-12-02 11:01:29 UTC (rev 16967)
@@ -21,45 +21,49 @@
  * a constraint on a single field of a pattern. 
  * The "text" contains the content. 
  */
-public class LiteralRestrictionDescr extends RestrictionDescr {
+public class LiteralRestrictionDescr extends EvaluatorBasedRestrictionDescr {
     public static final int   TYPE_NULL        = 1;
     public static final int   TYPE_NUMBER      = 2;
     public static final int   TYPE_STRING      = 3;
     public static final int   TYPE_BOOLEAN     = 4;
 
-    /**
-     * 
-     */
+
     private static final long serialVersionUID = 400L;
-    private String            evaluator;
-    private String            text;
     private int               type;
 
     public LiteralRestrictionDescr(final String evaluator,
                                    final String text) {
         this( evaluator,
+              false,
+              null,
               text,
               TYPE_STRING );// default type is string if not specified
     }
 
     public LiteralRestrictionDescr(final String evaluator,
+                                   final boolean isNegated,
+                                   final String text) {
+        this( evaluator,
+              isNegated,
+              null,
+              text,
+              TYPE_STRING );// default type is string if not specified
+    }
+
+    public LiteralRestrictionDescr(final String evaluator,
+                                   final boolean isNegated,
+                                   final String parameterText,
                                    final String text,
                                    final int type) {
-        this.text = text;
-        this.evaluator = evaluator;
+        super( evaluator,
+               isNegated,
+               parameterText );
+        this.setText( text );
         this.type = type;
     }
 
-    public String getEvaluator() {
-        return this.evaluator;
-    }
-
-    public String getText() {
-        return this.text;
-    }
-
     public String toString() {
-        return "[LiteralRestriction: " + this.evaluator + " " + this.text + "]";
+        return "[LiteralRestriction: " + super.toString() + " " + this.getText() + "]";
 
     }
 

Modified: labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/lang/descr/PredicateDescr.java
===================================================================
--- labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/lang/descr/PredicateDescr.java	2007-12-02 06:37:00 UTC (rev 16966)
+++ labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/lang/descr/PredicateDescr.java	2007-12-02 11:01:29 UTC (rev 16967)
@@ -21,27 +21,12 @@
      * 
      */
     private static final long serialVersionUID = 400L;
-    //private final String fieldName;
     private Object            content;
 
-    //private final String declaration;
     private String[]          declarations;
 
     private String            classMethodName;
 
-    //    public PredicateDescr(final String fieldName,
-    //                          final String declaration) {
-    //        this.fieldName = fieldName;
-    //        this.declaration = declaration;
-    //    }
-    //
-    //    public PredicateDescr(final String fieldName,
-    //                          final String declaration,
-    //                          final String text) {
-    //        this.fieldName = fieldName;
-    //        this.declaration = declaration;
-    //        this.text = text;
-    //    }
     public PredicateDescr(final Object text) {
         this.content = text;
     }
@@ -49,10 +34,6 @@
     public PredicateDescr() {
     }
 
-    //    public String getFieldName() {
-    //        return this.fieldName;
-    //    }
-
     public String getClassMethodName() {
         return this.classMethodName;
     }
@@ -69,10 +50,6 @@
         this.content = text;
     }
 
-    //    public String getDeclaration() {
-    //        return this.declaration;
-    //    }
-
     public void setDeclarations(final String[] declarations) {
         this.declarations = declarations;
     }

Modified: labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/lang/descr/QualifiedIdentifierRestrictionDescr.java
===================================================================
--- labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/lang/descr/QualifiedIdentifierRestrictionDescr.java	2007-12-02 06:37:00 UTC (rev 16966)
+++ labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/lang/descr/QualifiedIdentifierRestrictionDescr.java	2007-12-02 11:01:29 UTC (rev 16967)
@@ -22,33 +22,21 @@
  * field of a pattern. 
  * The "text" contains the content. 
  */
-public class QualifiedIdentifierRestrictionDescr extends RestrictionDescr {
-    /**
-     * 
-     */
+public class QualifiedIdentifierRestrictionDescr extends EvaluatorBasedRestrictionDescr {
+
     private static final long serialVersionUID = 400L;
-    private String            evaluator;
-    private String            text;
 
     public QualifiedIdentifierRestrictionDescr(final String evaluator,
-                                   final String text) {
-        this.text = text;
-        this.evaluator = evaluator;
+                                               final boolean isNegated,
+                                               final String parameterText,
+                                               final String text) {
+        super( evaluator,
+               isNegated,
+               parameterText );
+        this.setText( text );
     }
-    
-    public void setText(String text) {
-        this.text = text;
-    }
-    
-    public String getEvaluator() {
-        return this.evaluator;
-    }
 
-    public String getText() {
-        return this.text;
-    }
-
     public String toString() {
-        return "[QualifiedIndentifierRestr: " + this.evaluator + " " + this.text + " ]";
+        return "[QualifiedIndentifierRestr: " + super.toString() + " " + this.getText() + " ]";
     }
 }
\ No newline at end of file

Modified: labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/lang/descr/RestrictionConnectiveDescr.java
===================================================================
--- labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/lang/descr/RestrictionConnectiveDescr.java	2007-12-02 06:37:00 UTC (rev 16966)
+++ labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/lang/descr/RestrictionConnectiveDescr.java	2007-12-02 11:01:29 UTC (rev 16967)
@@ -13,57 +13,74 @@
  */
 public class RestrictionConnectiveDescr extends RestrictionDescr {
 
-    private static final long serialVersionUID = 400L;
-    public final static int   AND              = 0;
-    public final static int   OR               = 1;
+    private static final long                     serialVersionUID = 400L;
 
-    private int               connective;
-    private List              restrictions;
+    public final static RestrictionConnectiveType AND              = RestrictionConnectiveType.AND;
+    public final static RestrictionConnectiveType OR               = RestrictionConnectiveType.OR;
 
-    public RestrictionConnectiveDescr(final int connective) {
+    private RestrictionConnectiveType             connective;
+    private List<RestrictionDescr>                restrictions;
+
+    public RestrictionConnectiveDescr(final RestrictionConnectiveType connective) {
         super();
         this.connective = connective;
-        this.restrictions = Collections.EMPTY_LIST;
+        this.restrictions = Collections.emptyList();
     }
 
-    public int getConnective() {
+    public RestrictionConnectiveType getConnective() {
         return this.connective;
     }
-    
-    public void addRestriction( RestrictionDescr restriction ) {
-        if( this.restrictions == Collections.EMPTY_LIST ) {
-            this.restrictions = new ArrayList();
+
+    public void addRestriction(RestrictionDescr restriction) {
+        if ( this.restrictions == Collections.EMPTY_LIST ) {
+            this.restrictions = new ArrayList<RestrictionDescr>();
         }
         this.restrictions.add( restriction );
     }
-    
-    public void addOrMerge( RestrictionDescr restriction ) {
-        if(( restriction instanceof RestrictionConnectiveDescr ) &&
-           ((RestrictionConnectiveDescr)restriction).connective == this.connective ) {
-            if( this.restrictions == Collections.EMPTY_LIST ) {
-                this.restrictions = new ArrayList();
+
+    public void addOrMerge(RestrictionDescr restriction) {
+        if ( (restriction instanceof RestrictionConnectiveDescr) && ((RestrictionConnectiveDescr) restriction).connective == this.connective ) {
+            if ( this.restrictions == Collections.EMPTY_LIST ) {
+                this.restrictions = new ArrayList<RestrictionDescr>();
             }
-            this.restrictions.addAll( ((RestrictionConnectiveDescr)restriction).getRestrictions() );
+            this.restrictions.addAll( ((RestrictionConnectiveDescr) restriction).getRestrictions() );
         } else {
             this.addRestriction( restriction );
         }
     }
-    
-    public List getRestrictions() {
+
+    public List<RestrictionDescr> getRestrictions() {
         return this.restrictions;
     }
-    
+
     public String toString() {
-        final String connectiveStr = this.connective == OR ? " || " : " && ";
         final StringBuffer buf = new StringBuffer();
         buf.append( "( " );
-        for( Iterator it = this.restrictions.iterator(); it.hasNext(); ) {
+        for ( Iterator it = this.restrictions.iterator(); it.hasNext(); ) {
             buf.append( it.next().toString() );
-            if( it.hasNext() ) {
-                buf.append( connectiveStr );
+            if ( it.hasNext() ) {
+                buf.append( this.connective.toString() );
             }
         }
         buf.append( "  )" );
         return buf.toString();
     }
+
+    /**
+     * The connective types that can be used for a restriction
+     * 
+     * @author etirelli
+     */
+    public static enum RestrictionConnectiveType {
+        AND {
+            public String toString() {
+                return "&&";
+            }
+        },
+        OR {
+            public String toString() {
+                return "||";
+            }
+        };
+    }
 }

Modified: labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/lang/descr/ReturnValueRestrictionDescr.java
===================================================================
--- labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/lang/descr/ReturnValueRestrictionDescr.java	2007-12-02 06:37:00 UTC (rev 16966)
+++ labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/lang/descr/ReturnValueRestrictionDescr.java	2007-12-02 11:01:29 UTC (rev 16967)
@@ -16,24 +16,42 @@
  * limitations under the License.
  */
 
-public class ReturnValueRestrictionDescr extends RestrictionDescr {
-    /**
-     * 
-     */
+public class ReturnValueRestrictionDescr extends EvaluatorBasedRestrictionDescr {
+
     private static final long serialVersionUID = 400L;
-    private String            evaluator;
     private Object            content;
     private String[]          declarations;
-
     private String            classMethodName;
 
-    public ReturnValueRestrictionDescr(final String evaluator) {
-        this.evaluator = evaluator;
+    public ReturnValueRestrictionDescr(final String evaluator ) {
+        super( evaluator,
+               false,
+               null );
     }
 
+    public ReturnValueRestrictionDescr(final String evaluator, 
+                                       final Object content ) {
+        super( evaluator,
+               false,
+               null );
+        this.content = content;
+    }
+
+    public ReturnValueRestrictionDescr(final String evaluator, 
+                                       final boolean isNegated,
+                                       final String parameterText ) {
+        super( evaluator,
+               isNegated,
+               parameterText );
+    }
+
     public ReturnValueRestrictionDescr(final String evaluator,
+                                       final boolean isNegated,
+                                       final String parameterText, 
                                        final Object content) {
-        this.evaluator = evaluator;
+        super( evaluator,
+               isNegated,
+               parameterText );
         this.content = content;
     }
 
@@ -45,10 +63,6 @@
         this.classMethodName = classMethodName;
     }
 
-    public String getEvaluator() {
-        return this.evaluator;
-    }
-
     public Object getContent() {
         return this.content;
     }
@@ -66,6 +80,6 @@
     }
 
     public String toString() {
-        return "[ReturnValue: " + this.evaluator + " " + this.content + "]";
+        return "[ReturnValue: " + super.toString() + " " + this.content + "]";
     }
 }
\ No newline at end of file

Modified: labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/lang/descr/VariableRestrictionDescr.java
===================================================================
--- labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/lang/descr/VariableRestrictionDescr.java	2007-12-02 06:37:00 UTC (rev 16966)
+++ labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/lang/descr/VariableRestrictionDescr.java	2007-12-02 11:01:29 UTC (rev 16967)
@@ -16,29 +16,34 @@
  * limitations under the License.
  */
 
-public class VariableRestrictionDescr extends RestrictionDescr {
-    /**
-     * 
-     */
+public class VariableRestrictionDescr extends EvaluatorBasedRestrictionDescr {
+
     private static final long serialVersionUID = 400L;
-    private String            evaluator;
-    private String            declarationIdentifier;
 
     public VariableRestrictionDescr(final String evaluator,
-                                    final String identifier) {
-        this.declarationIdentifier = identifier;
-        this.evaluator = evaluator;
+                                    final String identifier ) {
+        super( evaluator,
+               false,
+               null );
+        this.setText( identifier );
     }
 
-    public String getEvaluator() {
-        return this.evaluator;
+    public VariableRestrictionDescr(final String evaluator,
+                                    final boolean isNegated,
+                                    final String parameterText,
+                                    final String identifier ) {
+        super( evaluator,
+               isNegated,
+               parameterText );
+        this.setText( identifier );
     }
 
     public String getIdentifier() {
-        return this.declarationIdentifier;
+        return this.getText();
     }
     
     public String toString() {
-        return "[VariableRestriction: " + evaluator + " " + declarationIdentifier + " ]";
+        return "[VariableRestriction: " + super.toString() + " " + this.getText() + " ]";
     }
+
 }
\ No newline at end of file

Modified: labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/rule/builder/PatternBuilder.java
===================================================================
--- labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/rule/builder/PatternBuilder.java	2007-12-02 06:37:00 UTC (rev 16966)
+++ labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/rule/builder/PatternBuilder.java	2007-12-02 11:01:29 UTC (rev 16967)
@@ -624,7 +624,8 @@
         final Evaluator evaluator = getEvaluator( context,
                                                   variableRestrictionDescr,
                                                   extractor.getValueType(),
-                                                  variableRestrictionDescr.getEvaluator() );
+                                                  variableRestrictionDescr.getEvaluator(),
+                                                  variableRestrictionDescr.isNegated() );
         if ( evaluator == null ) {
             return null;
         }
@@ -656,7 +657,8 @@
         final Evaluator evaluator = getEvaluator( context,
                                                   literalRestrictionDescr,
                                                   extractor.getValueType(),
-                                                  literalRestrictionDescr.getEvaluator() );
+                                                  literalRestrictionDescr.getEvaluator(),
+                                                  literalRestrictionDescr.isNegated() );
         if ( evaluator == null ) {
             return null;
         }
@@ -703,7 +705,8 @@
                 final Evaluator evaluator = getEvaluator( context,
                                                           qiRestrictionDescr,
                                                           extractor.getValueType(),
-                                                          qiRestrictionDescr.getEvaluator() );
+                                                          qiRestrictionDescr.getEvaluator(),
+                                                          qiRestrictionDescr.isNegated() );
                 if ( evaluator == null ) {
                     return null;
                 }
@@ -738,7 +741,8 @@
         final Evaluator evaluator = getEvaluator( context,
                                                   qiRestrictionDescr,
                                                   extractor.getValueType(),
-                                                  qiRestrictionDescr.getEvaluator() );
+                                                  qiRestrictionDescr.getEvaluator(),
+                                                  qiRestrictionDescr.isNegated() );
         if ( evaluator == null ) {
             return null;
         }
@@ -777,7 +781,8 @@
         final Evaluator evaluator = getEvaluator( context,
                                                   returnValueRestrictionDescr,
                                                   extractor.getValueType(),
-                                                  returnValueRestrictionDescr.getEvaluator() );
+                                                  returnValueRestrictionDescr.getEvaluator(),
+                                                  returnValueRestrictionDescr.isNegated() );
         if ( evaluator == null ) {
             return null;
         }
@@ -837,9 +842,10 @@
     private Evaluator getEvaluator(final RuleBuildContext context,
                                    final BaseDescr descr,
                                    final ValueType valueType,
-                                   final String evaluatorString) {
+                                   final String evaluatorString,
+                                   final boolean isNegated ) {
 
-        final Evaluator evaluator = valueType.getEvaluator( Operator.determineOperator( evaluatorString ) );
+        final Evaluator evaluator = valueType.getEvaluator( Operator.determineOperator( evaluatorString, isNegated ) );
 
         if ( evaluator == null ) {
             context.getErrors().add( new RuleError( context.getRule(),

Modified: labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/xml/LiteralRestrictionHandler.java
===================================================================
--- labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/xml/LiteralRestrictionHandler.java	2007-12-02 06:37:00 UTC (rev 16966)
+++ labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/xml/LiteralRestrictionHandler.java	2007-12-02 11:01:29 UTC (rev 16967)
@@ -65,15 +65,20 @@
         this.xmlPackageReader.startConfiguration( localName,
                                                   attrs );
 
-        final String evaluator = attrs.getValue( "evaluator" );
+        String evaluator = attrs.getValue( "evaluator" );
+        boolean isNegated = false;
         if ( evaluator == null || evaluator.trim().equals( "" ) ) {
             throw new SAXParseException( "<literal-restriction> requires an 'evaluator' attribute",
                                          this.xmlPackageReader.getLocator() );
+        } else if( evaluator.startsWith( "not " ) ) {
+            evaluator = evaluator.substring( 4 );
+            isNegated = true;
         }
 
         final String text = attrs.getValue( "value" );
 
         final LiteralRestrictionDescr literalDescr = new LiteralRestrictionDescr( evaluator,
+                                                                                  isNegated,
                                                                                   text );
 
         return literalDescr;

Modified: labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/xml/QualifiedIdentifierRestrictionHandler.java
===================================================================
--- labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/xml/QualifiedIdentifierRestrictionHandler.java	2007-12-02 06:37:00 UTC (rev 16966)
+++ labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/xml/QualifiedIdentifierRestrictionHandler.java	2007-12-02 11:01:29 UTC (rev 16967)
@@ -64,15 +64,21 @@
         this.xmlPackageReader.startConfiguration( localName,
                                                   attrs );
 
-        final String evaluator = attrs.getValue( "evaluator" );
+        String evaluator = attrs.getValue( "evaluator" );
+        boolean isNegated = false;
         if ( evaluator == null || evaluator.trim().equals( "" ) ) {
             throw new SAXParseException( "<bound-variable> requires an 'evaluator' attribute",
                                          this.xmlPackageReader.getLocator() );
+        } else if( evaluator.startsWith( "not " ) ) {
+            evaluator = evaluator.substring( 4 );
+            isNegated = true;
         }
 
 //        qualifiedIdentifierRestricionDescr.set
 
         final QualifiedIdentifierRestrictionDescr qualifiedIdentifierRestricionDescr = new QualifiedIdentifierRestrictionDescr( evaluator,
+                                                                                                                                isNegated,
+                                                                                                                                null,
                                                                                                                                 null );
 
         return qualifiedIdentifierRestricionDescr;

Modified: labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/xml/ReturnValueRestrictionHandler.java
===================================================================
--- labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/xml/ReturnValueRestrictionHandler.java	2007-12-02 06:37:00 UTC (rev 16966)
+++ labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/xml/ReturnValueRestrictionHandler.java	2007-12-02 11:01:29 UTC (rev 16967)
@@ -65,13 +65,17 @@
                         final Attributes attrs) throws SAXException {
         this.xmlPackageReader.startConfiguration( localName,
                                                   attrs );
-        final String evaluator = attrs.getValue( "evaluator" );
+        String evaluator = attrs.getValue( "evaluator" );
+        boolean isNegated = false;
         if ( evaluator == null || evaluator.trim().equals( "" ) ) {
             throw new SAXParseException( "<return-value-restriction> requires an 'evaluator' attribute",
                                          this.xmlPackageReader.getLocator() );
+        } else if( evaluator.startsWith( "not " ) ) {
+            evaluator = evaluator.substring( 4 );
+            isNegated = true;
         }
 
-        final ReturnValueRestrictionDescr returnValueDescr = new ReturnValueRestrictionDescr( evaluator );
+        final ReturnValueRestrictionDescr returnValueDescr = new ReturnValueRestrictionDescr( evaluator, isNegated, null );
 
         return returnValueDescr;
     }

Modified: labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/xml/VariableRestrictionsHandler.java
===================================================================
--- labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/xml/VariableRestrictionsHandler.java	2007-12-02 06:37:00 UTC (rev 16966)
+++ labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/java/org/drools/xml/VariableRestrictionsHandler.java	2007-12-02 11:01:29 UTC (rev 16967)
@@ -61,10 +61,14 @@
         this.xmlPackageReader.startConfiguration( localName,
                                                   attrs );
 
-        final String evaluator = attrs.getValue( "evaluator" );
+        String evaluator = attrs.getValue( "evaluator" );
+        boolean isNegated = false;
         if ( evaluator == null || evaluator.trim().equals( "" ) ) {
             throw new SAXParseException( "<bound-variable> requires an 'evaluator' attribute",
                                          this.xmlPackageReader.getLocator() );
+        } else if( evaluator.startsWith( "not " ) ) {
+            evaluator = evaluator.substring( 4 );
+            isNegated = true;
         }
 
         final String identifier = attrs.getValue( "identifier" );
@@ -74,6 +78,8 @@
         }
 
         final VariableRestrictionDescr variableDescr = new VariableRestrictionDescr( evaluator,
+                                                                                     isNegated,
+                                                                                     null,
                                                                                      identifier );
 
         return variableDescr;

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-02 06:37:00 UTC (rev 16966)
+++ labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/resources/org/drools/lang/DRL.g	2007-12-02 11:01:29 UTC (rev 16967)
@@ -1352,15 +1352,13 @@
 		    }
 		}
 		(
-			( options {backtrack=true;}
-			: or_restr_connective[top]
+			or_restr_connective[top]
 			{
 				// we must add now as we didn't before
 				if( $ID != null) {
 				    $base.addDescr( fc );
 				}
 			}
-			)
 		|
 			'->' predicate[$base] 
 		)?
@@ -1383,10 +1381,8 @@
 			$base.addDescr( fc );
 		    }
 		}
-		( options {backtrack=true;}
-		: or_restr_connective[top]
+		or_restr_connective[top]
 		)
-		)
 	;
 	catch[ NoViableAltException nvae ] {
 	    if( input.LT(1) != null ) {
@@ -1409,7 +1405,7 @@
 		RestrictionConnectiveDescr or = new RestrictionConnectiveDescr(RestrictionConnectiveDescr.OR);
 	}
 	:
-		and_restr_connective[or] 
+		and_restr_connective[or]
 		( 
 			options {backtrack=true;}
 			: DOUBLE_PIPE 
@@ -1432,7 +1428,7 @@
 		RestrictionConnectiveDescr and = new RestrictionConnectiveDescr(RestrictionConnectiveDescr.AND);
 	}
 	:
-		constraint_expression[and] 
+		constraint_expression[and]
 		(	options {backtrack=true;}
 		:	t=DOUBLE_AMPER 
 			{
@@ -1452,12 +1448,12 @@
 constraint_expression[RestrictionConnectiveDescr base]
         :	
 		( compound_operator[$base]
-		| simple_operator[$base]
+		| simple_operator[$base] 
 		| LEFT_PAREN 
 		{
 			location.setType(Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR);
 		}
-		or_restr_connective[$base] 
+		or_restr_connective[$base]
 		RIGHT_PAREN
  		)
 	;	
@@ -1465,6 +1461,8 @@
 simple_operator[RestrictionConnectiveDescr base]
 	@init {
 		String op = null;
+		String paramText = null;
+		boolean isNegated = false;
 	}
 	:
 		(	t='=='
@@ -1473,29 +1471,31 @@
 		|	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
+                |       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?
 		)
 		{
   		    location.setType(Location.LOCATION_LHS_INSIDE_CONDITION_ARGUMENT);
                     location.setProperty(Location.LOCATION_PROPERTY_OPERATOR, $t.text);
-		    if( $n != null ) {
-		        op = "not "+$t.text;
-		    } else {
-		        op = $t.text;
-		    }
+ 	            op = $t.text;
+ 	            isNegated = $n != null;
+ 	            if( param != null ) {
+                        paramText = safeSubstring( $param.text, 1, $param.text.length()-1 );
+ 	            } 
 		}
-		rd=expression_value[$base, op]
+		rd=expression_value[$base, op, isNegated, paramText]
 	;	
 	finally {
 		if ( $rd.rd == null && op != null ) {
-		        $base.addRestriction( new LiteralRestrictionDescr(op, null) );
+		        $base.addRestriction( new LiteralRestrictionDescr(op, false, null) );
 		}
 	}
 	
@@ -1522,15 +1522,15 @@
                     	  location.setProperty(Location.LOCATION_PROPERTY_OPERATOR, "in");
 			}	
 		)
-		LEFT_PAREN rd=expression_value[group, op]
-		( COMMA rd=expression_value[group, op]	)* 
+		LEFT_PAREN rd=expression_value[group, op, false, null]
+		( COMMA rd=expression_value[group, op, false, null]	)* 
 		RIGHT_PAREN 
 		{
 			location.setType(Location.LOCATION_LHS_INSIDE_CONDITION_END);
 		}
 	;
 	
-expression_value[RestrictionConnectiveDescr base, String op] returns [RestrictionDescr rd]
+expression_value[RestrictionConnectiveDescr base, String op, boolean isNegated, String paramText] returns [RestrictionDescr rd]
 	@init {
 		$rd = null;
 	}
@@ -1538,18 +1538,18 @@
 		(	ap=accessor_path 
 			{ 
 			        if( $ap.text.indexOf( '.' ) > -1 || $ap.text.indexOf( '[' ) > -1) {
-					$rd = new QualifiedIdentifierRestrictionDescr($op, $ap.text);
+					$rd = new QualifiedIdentifierRestrictionDescr($op, $isNegated, $paramText, $ap.text);
 				} else {
-					$rd = new VariableRestrictionDescr($op, $ap.text);
+					$rd = new VariableRestrictionDescr($op, $isNegated, $paramText, $ap.text);
 				}
 			}						
 		|	lc=literal_constraint 
 			{ 
-				$rd  = new LiteralRestrictionDescr($op, $lc.text, $lc.type );
+				$rd  = new LiteralRestrictionDescr($op, $isNegated, $paramText, $lc.text, $lc.type );
 			}
 		|	rvc=paren_chunk 
 			{ 
-				$rd = new ReturnValueRestrictionDescr($op, safeSubstring( $rvc.text, 1, $rvc.text.length()-1) );							
+				$rd = new ReturnValueRestrictionDescr($op, $isNegated, $paramText, safeSubstring( $rvc.text, 1, $rvc.text.length()-1) );							
 			} 
 		)	
 		{
@@ -1692,12 +1692,11 @@
         |       ACTION	        
         |       REVERSE	        
         |       RESULT	        
-        |       CONTAINS 	
-        |       EXCLUDES 	
+        |       CONTAINS 
+        |       EXCLUDES 
         |       MEMBEROF
         |       MATCHES 
         |       SOUNDSLIKE        
-//        |       NULL	        
         |       WHEN            
         |       THEN	        
         |       END     
@@ -1834,17 +1833,17 @@
 AND	:	'and';
 
 CONTAINS 
-	:	'contains';
-	
+       :       'contains';
+
 EXCLUDES 
-	:	'excludes';
-	
+       :       'excludes';
+
 MEMBEROF
-	:	'memberOf';
+       :       'memberOf';
 
-MATCHES :	'matches';
+MATCHES :      'matches';
 
-SOUNDSLIKE :	'soundslike';
+SOUNDSLIKE :   'soundslike';
 
 IN	:	'in';
 
@@ -1906,6 +1905,8 @@
 	:	'||'
 	;				
 	
+TILDE	:	'~';	
+	
 SH_STYLE_SINGLE_LINE_COMMENT	
 	:	'#' ( options{greedy=false;} : .)* EOL /* ('\r')? '\n'  */
                 { $channel=HIDDEN; setText("//"+getText().substring(1));}

Modified: labs/jbossrules/branches/temporal_rete/drools-compiler/src/test/java/org/drools/integrationtests/CepEspTest.java
===================================================================
--- labs/jbossrules/branches/temporal_rete/drools-compiler/src/test/java/org/drools/integrationtests/CepEspTest.java	2007-12-02 06:37:00 UTC (rev 16966)
+++ labs/jbossrules/branches/temporal_rete/drools-compiler/src/test/java/org/drools/integrationtests/CepEspTest.java	2007-12-02 11:01:29 UTC (rev 16967)
@@ -9,11 +9,12 @@
 import junit.framework.Assert;
 import junit.framework.TestCase;
 
-import org.drools.FactHandle;
+import org.drools.ClockType;
 import org.drools.OrderEvent;
 import org.drools.RuleBase;
 import org.drools.RuleBaseConfiguration;
 import org.drools.RuleBaseFactory;
+import org.drools.TemporalSession;
 import org.drools.StockTick;
 import org.drools.WorkingMemory;
 import org.drools.common.EventFactHandle;
@@ -64,7 +65,7 @@
         final Reader reader = new InputStreamReader( getClass().getResourceAsStream( "test_CEP_SimpleEventAssertion.drl" ) );
         final RuleBase ruleBase = loadRuleBase( reader );
 
-        final WorkingMemory wm = ruleBase.newStatefulSession();
+        final WorkingMemory wm = ruleBase.newTemporalSession( ClockType.PSEUDO_CLOCK );
         final List results = new ArrayList();
 
         wm.setGlobal( "results",
@@ -114,7 +115,7 @@
         final Reader reader = new InputStreamReader( getClass().getResourceAsStream( "test_CEP_SimpleTimeWindow.drl" ) );
         final RuleBase ruleBase = loadRuleBase( reader );
 
-        final WorkingMemory wm = ruleBase.newStatefulSession();
+        final TemporalSession<SessionPseudoClock> wm = ruleBase.newTemporalSession( ClockType.PSEUDO_CLOCK );
         final List results = new ArrayList();
 
         wm.setGlobal( "results",
@@ -122,7 +123,7 @@
 
         // how to initialize the clock?
         // how to configure the clock?
-        SessionPseudoClock clock = (SessionPseudoClock) wm.getSessionClock();
+        SessionPseudoClock clock = wm.getSessionClock();
 
         clock.advanceTime( 10000 ); // 10 seconds
         EventFactHandle handle1 = (EventFactHandle) wm.insert( new OrderEvent( "1",

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-02 06:37:00 UTC (rev 16966)
+++ labs/jbossrules/branches/temporal_rete/drools-compiler/src/test/java/org/drools/lang/RuleParserTest.java	2007-12-02 11:01:29 UTC (rev 16967)
@@ -2579,6 +2579,7 @@
 
         assertEquals( "memberOf",
                       restr.getEvaluator() );
+        assertFalse( restr.isNegated() );
         assertEquals( "$cities",
                       restr.getIdentifier() );
     }
@@ -2603,8 +2604,9 @@
         FieldConstraintDescr fieldConstr = (FieldConstraintDescr) pat.getConstraint().getDescrs().get( 0 );
         VariableRestrictionDescr restr = (VariableRestrictionDescr) fieldConstr.getRestrictions().get( 0 );
 
-        assertEquals( "not memberOf",
+        assertEquals( "memberOf",
                       restr.getEvaluator() );
+        assertTrue( restr.isNegated() );
         assertEquals( "$cities",
                       restr.getIdentifier() );
     }
@@ -3164,8 +3166,9 @@
         FieldConstraintDescr fieldConstr = (FieldConstraintDescr) pat.getConstraint().getDescrs().get( 0 );
         VariableRestrictionDescr restr = (VariableRestrictionDescr) fieldConstr.getRestrictions().get( 0 );
 
-        assertEquals( "not contains",
+        assertEquals( "contains",
                       restr.getEvaluator() );
+        assertTrue( restr.isNegated() );
         assertEquals( "$city",
                       restr.getIdentifier() );
     }
@@ -3188,8 +3191,9 @@
         FieldConstraintDescr fieldConstr = (FieldConstraintDescr) pat.getConstraint().getDescrs().get( 0 );
         LiteralRestrictionDescr restr = (LiteralRestrictionDescr) fieldConstr.getRestrictions().get( 0 );
 
-        assertEquals( "not matches",
+        assertEquals( "matches",
                       restr.getEvaluator() );
+        assertTrue( restr.isNegated() );
         assertEquals( "[abc]*",
                       restr.getText() );
     }
@@ -3391,8 +3395,9 @@
         FieldConstraintDescr fieldConstr = (FieldConstraintDescr) pat.getConstraint().getDescrs().get( 0 );
         QualifiedIdentifierRestrictionDescr restr = (QualifiedIdentifierRestrictionDescr) fieldConstr.getRestrictions().get( 0 );
 
-        assertEquals( "not matches",
+        assertEquals( "matches",
                       restr.getEvaluator() );
+        assertTrue( restr.isNegated() );
         assertEquals( "$c.property",
                       restr.getText() );
     }
@@ -3535,6 +3540,105 @@
 
     }
 
+    public void testPluggableOperators() throws Exception {
+        final DRLParser parser = parseResource( "pluggable_operators.drl" );
+        parser.compilation_unit();
+
+        assertFalse( "Parser should not have raised errors: " + parser.getErrorMessages().toString(),
+                     parser.hasErrors() );
+
+        final PackageDescr pack = parser.getPackageDescr();
+        assertEquals( 1,
+                      pack.getRules().size() );
+        final RuleDescr rule = (RuleDescr) pack.getRules().get( 0 );
+        assertEquals( 5,
+                      rule.getLhs().getDescrs().size() );
+
+        final PatternDescr eventA = (PatternDescr) rule.getLhs().getDescrs().get( 0 );
+        assertEquals( "$a",
+                      eventA.getIdentifier() );
+        assertEquals( "EventA",
+                      eventA.getObjectType() );
+
+        final PatternDescr eventB = (PatternDescr) rule.getLhs().getDescrs().get( 1 );
+        assertEquals( "$b",
+                      eventB.getIdentifier() );
+        assertEquals( "EventB",
+                      eventB.getObjectType() );
+        assertEquals( 1,
+                      eventB.getConstraint().getDescrs().size() );
+        final FieldConstraintDescr fcdB = (FieldConstraintDescr) eventB.getConstraint().getDescrs().get( 0 );
+        assertEquals( 1,
+                      fcdB.getRestrictions().size() );
+        assertTrue( fcdB.getRestrictions().get( 0 ) instanceof VariableRestrictionDescr );
+        final VariableRestrictionDescr rb = (VariableRestrictionDescr) fcdB.getRestrictions().get( 0 );
+        assertEquals( "after",
+                      rb.getEvaluator() );
+        assertEquals( "$a",
+                      rb.getText() );
+        assertEquals( "1,10",
+                      rb.getParameterText() );
+        assertFalse( rb.isNegated() );
+
+        final PatternDescr eventC = (PatternDescr) rule.getLhs().getDescrs().get( 2 );
+        assertEquals( "$c",
+                      eventC.getIdentifier() );
+        assertEquals( "EventC",
+                      eventC.getObjectType() );
+        assertEquals( 1,
+                      eventC.getConstraint().getDescrs().size() );
+        final FieldConstraintDescr fcdC = (FieldConstraintDescr) eventC.getConstraint().getDescrs().get( 0 );
+        assertEquals( 1,
+                      fcdC.getRestrictions().size() );
+        assertTrue( fcdC.getRestrictions().get( 0 ) instanceof VariableRestrictionDescr );
+        final VariableRestrictionDescr rc = (VariableRestrictionDescr) fcdC.getRestrictions().get( 0 );
+        assertEquals( "finishes",
+                      rc.getEvaluator() );
+        assertEquals( "$b",
+                      rc.getText() );
+        assertNull( rc.getParameterText() );
+        assertFalse( rc.isNegated() );
+
+        final PatternDescr eventD = (PatternDescr) rule.getLhs().getDescrs().get( 3 );
+        assertEquals( "$d",
+                      eventD.getIdentifier() );
+        assertEquals( "EventD",
+                      eventD.getObjectType() );
+        assertEquals( 1,
+                      eventD.getConstraint().getDescrs().size() );
+        final FieldConstraintDescr fcdD = (FieldConstraintDescr) eventD.getConstraint().getDescrs().get( 0 );
+        assertEquals( 1,
+                      fcdD.getRestrictions().size() );
+        assertTrue( fcdD.getRestrictions().get( 0 ) instanceof VariableRestrictionDescr );
+        final VariableRestrictionDescr rd = (VariableRestrictionDescr) fcdD.getRestrictions().get( 0 );
+        assertEquals( "starts",
+                      rd.getEvaluator() );
+        assertEquals( "$a",
+                      rd.getText() );
+        assertNull( rd.getParameterText() );
+        assertTrue( rd.isNegated() );
+
+        final PatternDescr eventE = (PatternDescr) rule.getLhs().getDescrs().get( 4 );
+        assertEquals( "$e",
+                      eventE.getIdentifier() );
+        assertEquals( "EventE",
+                      eventE.getObjectType() );
+        assertEquals( 1,
+                      eventE.getConstraint().getDescrs().size() );
+        final FieldConstraintDescr fcdE = (FieldConstraintDescr) eventE.getConstraint().getDescrs().get( 0 );
+        assertEquals( 1,
+                      fcdE.getRestrictions().size() );
+        assertTrue( fcdE.getRestrictions().get( 0 ) instanceof VariableRestrictionDescr );
+        final VariableRestrictionDescr re = (VariableRestrictionDescr) fcdE.getRestrictions().get( 0 );
+        assertEquals( "before",
+                      re.getEvaluator() );
+        assertEquals( "$b",
+                      re.getText() );
+        assertEquals( "1, 10",
+                      re.getParameterText() );
+        assertTrue( re.isNegated() );
+    }
+
     public void testEventImport() throws Exception {
         final DRLParser parser = parseResource( "import_event.drl" );
         parser.compilation_unit();
@@ -3548,9 +3652,9 @@
 
         assertEquals( 1,
                       imports.size() );
-        
+
         final ImportDescr descr = (ImportDescr) imports.get( 0 );
-        
+
         assertTrue( descr.isEvent() );
 
     }

Modified: labs/jbossrules/branches/temporal_rete/drools-compiler/src/test/resources/org/drools/integrationtests/test_CEP_SimpleTimeWindow.drl
===================================================================
--- labs/jbossrules/branches/temporal_rete/drools-compiler/src/test/resources/org/drools/integrationtests/test_CEP_SimpleTimeWindow.drl	2007-12-02 06:37:00 UTC (rev 16966)
+++ labs/jbossrules/branches/temporal_rete/drools-compiler/src/test/resources/org/drools/integrationtests/test_CEP_SimpleTimeWindow.drl	2007-12-02 11:01:29 UTC (rev 16967)
@@ -11,7 +11,7 @@
               OrderEvent( $amt : total ),
               average( $amt ) )
 then
-    System.out.println( "Over threshold: "+$avg );
+    //System.out.println( "Over threshold: "+$avg );
     results.add( $avg );
 end
 

Added: labs/jbossrules/branches/temporal_rete/drools-compiler/src/test/resources/org/drools/lang/pluggable_operators.drl
===================================================================
--- labs/jbossrules/branches/temporal_rete/drools-compiler/src/test/resources/org/drools/lang/pluggable_operators.drl	                        (rev 0)
+++ labs/jbossrules/branches/temporal_rete/drools-compiler/src/test/resources/org/drools/lang/pluggable_operators.drl	2007-12-02 11:01:29 UTC (rev 16967)
@@ -0,0 +1,11 @@
+package org.drools;
+
+rule "test pluggable operators"
+when
+    $a : EventA()
+    $b : EventB( this ~after[1,10] $a )
+    $c : EventC( this ~finishes $b )
+    $d : EventD( this not ~starts $a )
+    $e : EventE( this not ~before [1, 10] $b )
+then
+end
\ No newline at end of file

Added: labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/ClockType.java
===================================================================
--- labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/ClockType.java	                        (rev 0)
+++ labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/ClockType.java	2007-12-02 11:01:29 UTC (rev 16967)
@@ -0,0 +1,48 @@
+/*
+ * 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 Nov 29, 2007
+ */
+package org.drools;
+
+import org.drools.temporal.SessionClock;
+import org.drools.temporal.SessionPseudoClock;
+
+/**
+ * This enum represents all engine supported clocks
+ * 
+ * @author etirelli
+ */
+public enum ClockType {
+//  SYSTEM_CLOCK {
+//      public SessionClock newInstance() {
+//          return new SessionPseudoClock();
+//      }
+//  },
+  
+  /**
+   * A Pseudo clock is a clock that is completely controled by the
+   * client application. It is usually used during simulations or tests
+   */
+  PSEUDO_CLOCK {
+      public SessionPseudoClock createInstance() {
+          return new SessionPseudoClock();
+      }
+  };
+  
+  public abstract SessionClock createInstance();
+  
+}
+

Modified: labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/RuleBase.java
===================================================================
--- labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/RuleBase.java	2007-12-02 06:37:00 UTC (rev 16966)
+++ labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/RuleBase.java	2007-12-02 11:01:29 UTC (rev 16967)
@@ -94,8 +94,25 @@
      */
     StatefulSession newStatefulSession(InputStream stream) throws IOException,
                                                           ClassNotFoundException;
+    
+    /**
+     * Creates a new temporal session using the defined clock type.
+     * 
+     * @param clockType
+     * @return
+     */
+    TemporalSession newTemporalSession(ClockType clockType);
 
     /**
+     * Creates a new temporal session using the defined clock type.
+     * 
+     * @param keepReference maintains a reference in the rulebase to the created session
+     * @param clockType
+     * @return
+     */
+    TemporalSession newTemporalSession(boolean keepReference, ClockType clockType);
+
+    /**
      * RuleBases handle the returning of a Serialized WorkingMemory
      * pass as an InputStream. If the reference is a byte[] then
      * wrap with new ByteArrayInputStream. Optionally the RuleBase retains a

Modified: labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/StatefulSession.java
===================================================================
--- labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/StatefulSession.java	2007-12-02 06:37:00 UTC (rev 16966)
+++ labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/StatefulSession.java	2007-12-02 11:01:29 UTC (rev 16967)
@@ -1,7 +1,6 @@
 package org.drools;
 
 import java.util.Collection;
-import java.util.List;
 
 import org.drools.concurrent.Future;
 import org.drools.spi.AgendaFilter;

Added: labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/TemporalSession.java
===================================================================
--- labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/TemporalSession.java	                        (rev 0)
+++ labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/TemporalSession.java	2007-12-02 11:01:29 UTC (rev 16967)
@@ -0,0 +1,40 @@
+/*
+ * 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 Nov 28, 2007
+ */
+package org.drools;
+
+import org.drools.temporal.SessionClock;
+
+/**
+ * A StatefulTemporalSession is a stateful session with
+ * additional functionalities for temporal reasoning. 
+ * 
+ * @author etirelli
+ *
+ */
+public interface TemporalSession<T extends SessionClock> extends StatefulSession {
+    
+    /**
+     * Returns the session clock instance for this session.
+     * 
+     * The actual session clock implementation is defined by the
+     * RuleBaseConfiguration.setSessionClockImpl() call or by
+     * setting the corresponding system property.
+     */
+    public T getSessionClock();
+    
+}

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-02 06:37:00 UTC (rev 16966)
+++ labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/WorkingMemory.java	2007-12-02 11:01:29 UTC (rev 16967)
@@ -344,13 +344,4 @@
      */
     public void halt();
     
-    /**
-     * Returns the session clock instance for this session.
-     * 
-     * The actual session clock implementation is defined by the
-     * RuleBaseConfiguration.setSessionClockImpl() call or by
-     * setting the corresponding system property.
-     */
-    public SessionClock getSessionClock();
-    
 }
\ No newline at end of file

Modified: labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/base/evaluators/Operator.java
===================================================================
--- labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/base/evaluators/Operator.java	2007-12-02 06:37:00 UTC (rev 16966)
+++ labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/base/evaluators/Operator.java	2007-12-02 11:01:29 UTC (rev 16967)
@@ -10,33 +10,35 @@
 
     private static final long    serialVersionUID = 400L;
 
-    public static final Operator EQUAL            = new Operator( "==" );
-    public static final Operator NOT_EQUAL        = new Operator( "!=" );
-    public static final Operator LESS             = new Operator( "<" );
-    public static final Operator LESS_OR_EQUAL    = new Operator( "<=" );
-    public static final Operator GREATER          = new Operator( ">" );
-    public static final Operator GREATER_OR_EQUAL = new Operator( ">=" );
-    public static final Operator CONTAINS         = new Operator( "contains" );
-    public static final Operator EXCLUDES         = new Operator( "excludes" );
-    public static final Operator NOT_CONTAINS     = new Operator( "not contains" );
-    public static final Operator MATCHES          = new Operator( "matches" );
-    public static final Operator NOT_MATCHES      = new Operator( "not matches" );
-    public static final Operator MEMBEROF         = new Operator( "memberOf" );
-    public static final Operator NOTMEMBEROF      = new Operator( "not memberOf" );
+    public static final Operator EQUAL            = new Operator( "==", false );
+    public static final Operator NOT_EQUAL        = new Operator( "!=", false );
+    public static final Operator LESS             = new Operator( "<", false );
+    public static final Operator LESS_OR_EQUAL    = new Operator( "<=", false );
+    public static final Operator GREATER          = new Operator( ">", false );
+    public static final Operator GREATER_OR_EQUAL = new Operator( ">=", false );
+    public static final Operator CONTAINS         = new Operator( "contains", false );
+    public static final Operator EXCLUDES         = new Operator( "excludes", false );
+    public static final Operator NOT_CONTAINS     = new Operator( "contains", true );
+    public static final Operator MATCHES          = new Operator( "matches", false );
+    public static final Operator NOT_MATCHES      = new Operator( "matches", true );
+    public static final Operator MEMBEROF         = new Operator( "memberOf", false );
+    public static final Operator NOTMEMBEROF      = new Operator( "memberOf", true );
 
-    public static final Operator SOUNDSLIKE       = new Operator("soundslike");
+    public static final Operator SOUNDSLIKE       = new Operator("soundslike", false);
 
     private String               operator;
+    private boolean              isNegated;
 
-    private Operator(final String operator) {
+    private Operator(final String operator, final boolean isNegated) {
         this.operator = operator;
+        this.isNegated = isNegated;
     }
 
     private Object readResolve() throws java.io.ObjectStreamException {
-        return determineOperator( this.operator );
+        return determineOperator( this.operator, this.isNegated );
     }
 
-    public static Operator determineOperator(final String string) {
+    public static Operator determineOperator(final String string, final boolean isNegated) {
         if ( string.equals( "==" ) ) {
             return Operator.EQUAL;
         } else if ( string.equals( "!=" ) ) {
@@ -49,19 +51,19 @@
             return Operator.GREATER;
         } else if ( string.equals( ">=" ) ) {
             return Operator.GREATER_OR_EQUAL;
-        } else if ( string.equals( "contains" ) ) {
+        } else if ( string.equals( "contains" ) && !isNegated ) {
             return Operator.CONTAINS;
-        } else if ( string.equals( "not contains" ) ) {
+        } else if ( string.equals( "contains" ) && isNegated ) {
             return Operator.NOT_CONTAINS;
-        } else if ( string.equals( "matches" ) ) {
+        } else if ( string.equals( "matches" ) && !isNegated ) {
             return Operator.MATCHES;
-        } else if ( string.equals( "not matches" ) ) {
+        } else if ( string.equals( "matches" ) && isNegated ) {
             return Operator.NOT_MATCHES;
         } else if ( string.equals( "excludes" ) ) {
             return Operator.EXCLUDES;
-        } else if ( string.equals( "memberOf" ) ) {
+        } else if ( string.equals( "memberOf" ) && !isNegated ) {
             return Operator.MEMBEROF;
-        } else if ( string.equals( "not memberOf" ) ) {
+        } else if ( string.equals( "memberOf" )  && isNegated ) {
             return Operator.NOTMEMBEROF;
         } else if ( string.equals( "soundslike" ) ) {
             return Operator.SOUNDSLIKE;

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-02 06:37:00 UTC (rev 16966)
+++ labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java	2007-12-02 11:01:29 UTC (rev 16967)
@@ -1363,19 +1363,6 @@
         return this.ruleFlowEventSupport;
     }
     
-    public SessionClock getSessionClock() {
-        if( this.sessionClock == null ) {
-            try {
-                this.sessionClock = this.ruleBase.getConfiguration().getSessionClockClass().newInstance();
-            } catch ( InstantiationException e ) {
-                throw new RuntimeDroolsException("Not possible to create a session clock instance for class: "+this.ruleBase.getConfiguration().getSessionClockClass().getName(), e);
-            } catch ( IllegalAccessException e ) {
-                throw new RuntimeDroolsException("Not possible to create a session clock instance for class: "+this.ruleBase.getConfiguration().getSessionClockClass().getName(), e);
-            }
-        }
-        return this.sessionClock;
-    }
-
     /**
      * Sets the AsyncExceptionHandler to handle exceptions thrown by the Agenda
      * Scheduler used for duration rules.

Modified: labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/reteoo/ReteooFactHandleFactory.java
===================================================================
--- labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/reteoo/ReteooFactHandleFactory.java	2007-12-02 06:37:00 UTC (rev 16966)
+++ labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/reteoo/ReteooFactHandleFactory.java	2007-12-02 11:01:29 UTC (rev 16967)
@@ -16,6 +16,7 @@
  * limitations under the License.
  */
 
+import org.drools.TemporalSession;
 import org.drools.WorkingMemory;
 import org.drools.common.AbstractFactHandleFactory;
 import org.drools.common.DefaultFactHandle;
@@ -37,7 +38,7 @@
                                                      final boolean isEvent,
                                                      final WorkingMemory workingMemory ) {
         if ( isEvent ) {
-            SessionClock clock = workingMemory.getSessionClock(); 
+            SessionClock clock = ((TemporalSession) workingMemory).getSessionClock(); 
             return new EventFactHandle( id,
                                         object,
                                         recency,

Modified: labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/reteoo/ReteooRuleBase.java
===================================================================
--- labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/reteoo/ReteooRuleBase.java	2007-12-02 06:37:00 UTC (rev 16966)
+++ labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/reteoo/ReteooRuleBase.java	2007-12-02 11:01:29 UTC (rev 16967)
@@ -21,11 +21,13 @@
 import java.io.ObjectOutput;
 import java.io.Serializable;
 
+import org.drools.ClockType;
 import org.drools.FactException;
 import org.drools.FactHandle;
 import org.drools.RuleBase;
 import org.drools.RuleBaseConfiguration;
 import org.drools.StatefulSession;
+import org.drools.TemporalSession;
 import org.drools.StatelessSession;
 import org.drools.common.AbstractRuleBase;
 import org.drools.common.DefaultFactHandle;
@@ -40,6 +42,8 @@
 import org.drools.spi.PropagationContext;
 import org.drools.spi.RuleBaseUpdateListener;
 import org.drools.spi.RuleBaseUpdateListenerFactory;
+import org.drools.temporal.SessionClock;
+import org.drools.temporal.SessionPseudoClock;
 
 /**
  * Implementation of <code>RuleBase</code>.
@@ -214,10 +218,22 @@
                                  workingMemory );
     }
 
+    public synchronized StatefulSession newStatefulSession( final boolean keepReference ) {
+        return newStatefulSession( keepReference, null );
+    }
+    
+    public synchronized TemporalSession newTemporalSession( final ClockType clockType ) {
+        return (TemporalSession) newStatefulSession( true, clockType);
+    }
+    
+    public synchronized TemporalSession newTemporalSession( final boolean keepReference, final ClockType clockType ) {
+        return (TemporalSession) newStatefulSession( keepReference, clockType );
+    }
+    
     /**
      * @see RuleBase
      */
-    public synchronized StatefulSession newStatefulSession(final boolean keepReference) {
+    private StatefulSession newStatefulSession( final boolean keepReference, final ClockType clockType ) {
         if ( this.config.isSequential() ) {
             throw new RuntimeException( "Cannot have a stateful rule session, with sequential configuration set to true" );
         }
@@ -225,9 +241,16 @@
 
         synchronized ( this.pkgs ) {
             ExecutorService executor = this.config.getExecutorService();
-            session = new ReteooStatefulSession( nextWorkingMemoryCounter(),
-                                                 this,
-                                                 executor );
+            if( clockType == null ) {
+                session = new ReteooStatefulSession( nextWorkingMemoryCounter(),
+                                                     this,
+                                                     executor );
+            } else {
+                session = new ReteooTemporalSession( nextWorkingMemoryCounter(),
+                                                             this,
+                                                             executor,
+                                                             clockType.createInstance() );
+            }
 
             executor.setCommandExecutor( new CommandExecutor( session ) );
 
@@ -283,4 +306,5 @@
         Serializable {
         private static final long serialVersionUID = 400L;
     }
+    
 }

Modified: labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/reteoo/ReteooStatefulSession.java
===================================================================
--- labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/reteoo/ReteooStatefulSession.java	2007-12-02 06:37:00 UTC (rev 16966)
+++ labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/reteoo/ReteooStatefulSession.java	2007-12-02 11:01:29 UTC (rev 16967)
@@ -1,7 +1,6 @@
 package org.drools.reteoo;
 
 import java.util.Collection;
-import java.util.List;
 
 import org.drools.FactHandle;
 import org.drools.StatefulSession;
@@ -11,13 +10,16 @@
 import org.drools.concurrent.ExecutorService;
 import org.drools.concurrent.FireAllRules;
 import org.drools.concurrent.Future;
+import org.drools.concurrent.RetractObject;
 import org.drools.concurrent.UpdateObject;
-import org.drools.concurrent.RetractObject;
 import org.drools.spi.AgendaFilter;
 
 public class ReteooStatefulSession extends ReteooWorkingMemory
     implements
     StatefulSession {
+
+    private static final long serialVersionUID = -7604606748985073069L;
+    
     private final ExecutorService executor;
 
     public ReteooStatefulSession(final int id,

Added: labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/reteoo/ReteooTemporalSession.java
===================================================================
--- labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/reteoo/ReteooTemporalSession.java	                        (rev 0)
+++ labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/reteoo/ReteooTemporalSession.java	2007-12-02 11:01:29 UTC (rev 16967)
@@ -0,0 +1,53 @@
+/*
+ * 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 Nov 28, 2007
+ */
+package org.drools.reteoo;
+
+import org.drools.TemporalSession;
+import org.drools.common.InternalRuleBase;
+import org.drools.concurrent.ExecutorService;
+import org.drools.temporal.SessionClock;
+
+/**
+ * ReteooStatefulTemporalSession implements a temporal enabled session
+ * for Reteoo rulebases
+ * 
+ * @author etirelli
+ */
+public class ReteooTemporalSession<T extends SessionClock> extends ReteooStatefulSession
+    implements
+    TemporalSession<T> {
+
+    private static final long serialVersionUID = -2129661675928809928L;
+    
+    private T sessionClock;
+
+    public ReteooTemporalSession(int id,
+                                         InternalRuleBase ruleBase,
+                                         ExecutorService executorService,
+                                         T clock) {
+        super( id,
+               ruleBase,
+               executorService );
+        this.sessionClock = clock;
+    }
+
+    public T getSessionClock() {
+        return this.sessionClock;
+    }
+    
+}

Modified: labs/jbossrules/branches/temporal_rete/drools-core/src/test/java/org/drools/base/EvaluatorFactoryTest.java
===================================================================
--- labs/jbossrules/branches/temporal_rete/drools-core/src/test/java/org/drools/base/EvaluatorFactoryTest.java	2007-12-02 06:37:00 UTC (rev 16966)
+++ labs/jbossrules/branches/temporal_rete/drools-core/src/test/java/org/drools/base/EvaluatorFactoryTest.java	2007-12-02 11:01:29 UTC (rev 16967)
@@ -588,7 +588,9 @@
         final Extractor extractor = new MockExtractor();
         for ( int i = 0; i < data.length; i++ ) {
             final Object[] row = data[i];
-            final Evaluator evaluator = valueType.getEvaluator( Operator.determineOperator( (String) row[1] ) );
+            boolean isNegated = ((String) row[1]).startsWith("not ");
+            String evaluatorStr =  isNegated ? ((String)row[1]).substring( 4 ) : (String)row[1];
+            final Evaluator evaluator = valueType.getEvaluator( Operator.determineOperator( evaluatorStr, isNegated ) );
             checkEvaluatorMethodWithFieldValue( valueType,
                                                 extractor,
                                                 row,

Modified: labs/jbossrules/branches/temporal_rete/drools-jsr94/src/main/java/org/drools/jsr94/rules/Jsr94FactHandleFactory.java
===================================================================
--- labs/jbossrules/branches/temporal_rete/drools-jsr94/src/main/java/org/drools/jsr94/rules/Jsr94FactHandleFactory.java	2007-12-02 06:37:00 UTC (rev 16966)
+++ labs/jbossrules/branches/temporal_rete/drools-jsr94/src/main/java/org/drools/jsr94/rules/Jsr94FactHandleFactory.java	2007-12-02 11:01:29 UTC (rev 16967)
@@ -16,6 +16,7 @@
  * limitations under the License.
  */
 
+import org.drools.TemporalSession;
 import org.drools.WorkingMemory;
 import org.drools.common.AbstractFactHandleFactory;
 import org.drools.common.InternalFactHandle;
@@ -40,7 +41,7 @@
                                                      final boolean isEvent,
                                                      final WorkingMemory workingMemory ) {
         if ( isEvent ) {
-            SessionClock clock = workingMemory.getSessionClock(); 
+            SessionClock clock = ((TemporalSession) workingMemory).getSessionClock(); 
             return new Jsr94EventFactHandle( id,
                                              object,
                                              recency,




More information about the jboss-svn-commits mailing list