[jboss-svn-commits] JBL Code SVN: r6028 - in labs/jbossrules/trunk/drools-compiler/src: main/java/org/drools/lang main/java/org/drools/lang/descr main/resources/org/drools/lang test/java/org/drools/lang

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Wed Aug 30 12:14:46 EDT 2006


Author: michael.neale at jboss.com
Date: 2006-08-30 12:14:33 -0400 (Wed, 30 Aug 2006)
New Revision: 6028

Modified:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/RuleParser.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/RuleParserLexer.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/PackageDescr.java
   labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/lang/drl.g
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/RuleParserTest.java
Log:
Function imports (static imports)

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/RuleParser.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/RuleParser.java	2006-08-30 15:59:19 UTC (rev 6027)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/RuleParser.java	2006-08-30 16:14:33 UTC (rev 6028)
@@ -1,15 +1,15 @@
-// $ANTLR 3.0ea8 D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g 2006-08-30 13:06:30
-
-	package org.drools.lang;
-	import java.util.List;
-	import java.util.ArrayList;
-	import java.util.Iterator;
-	import java.util.Map;	
-	import java.util.HashMap;	
-	import java.util.StringTokenizer;
-	import org.drools.lang.descr.*;
+// $ANTLR 3.0ea8 /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g 2006-08-30 17:14:27
 
+	package org.drools.lang;
+	import java.util.List;
+	import java.util.ArrayList;
+	import java.util.Iterator;
+	import java.util.Map;	
+	import java.util.HashMap;	
+	import java.util.StringTokenizer;
+	import org.drools.lang.descr.*;
 
+
 import org.antlr.runtime.*;
 import java.util.Stack;
 import java.util.List;
@@ -17,7 +17,7 @@
 
 public class RuleParser extends Parser {
     public static final String[] tokenNames = new String[] {
-        "<invalid>", "<EOR>", "<DOWN>", "<UP>", "EOL", "ID", "INT", "BOOL", "STRING", "FLOAT", "MISC", "WS", "SH_STYLE_SINGLE_LINE_COMMENT", "C_STYLE_SINGLE_LINE_COMMENT", "MULTI_LINE_COMMENT", "\';\'", "\'package\'", "\'import\'", "\'.\'", "\'.*\'", "\'expander\'", "\'global\'", "\'function\'", "\'(\'", "\',\'", "\')\'", "\'{\'", "\'}\'", "\'query\'", "\'end\'", "\'template\'", "\'rule\'", "\'when\'", "\':\'", "\'then\'", "\'attributes\'", "\'salience\'", "\'no-loop\'", "\'auto-focus\'", "\'activation-group\'", "\'agenda-group\'", "\'duration\'", "\'from\'", "\'null\'", "\'=>\'", "\'or\'", "\'||\'", "\'&\'", "\'|\'", "\'->\'", "\'and\'", "\'&&\'", "\'exists\'", "\'not\'", "\'eval\'", "\'[\'", "\']\'", "\'use\'", "\'==\'", "\'=\'", "\'>\'", "\'>=\'", "\'<\'", "\'<=\'", "\'!=\'", "\'contains\'", "\'matches\'", "\'excludes\'"
+        "<invalid>", "<EOR>", "<DOWN>", "<UP>", "EOL", "ID", "INT", "BOOL", "STRING", "FLOAT", "MISC", "WS", "SH_STYLE_SINGLE_LINE_COMMENT", "C_STYLE_SINGLE_LINE_COMMENT", "MULTI_LINE_COMMENT", "\';\'", "\'package\'", "\'import\'", "\'function\'", "\'.\'", "\'.*\'", "\'expander\'", "\'global\'", "\'(\'", "\',\'", "\')\'", "\'{\'", "\'}\'", "\'query\'", "\'end\'", "\'template\'", "\'rule\'", "\'when\'", "\':\'", "\'then\'", "\'attributes\'", "\'salience\'", "\'no-loop\'", "\'auto-focus\'", "\'activation-group\'", "\'agenda-group\'", "\'duration\'", "\'from\'", "\'null\'", "\'=>\'", "\'or\'", "\'||\'", "\'&\'", "\'|\'", "\'->\'", "\'and\'", "\'&&\'", "\'exists\'", "\'not\'", "\'eval\'", "\'[\'", "\']\'", "\'use\'", "\'==\'", "\'=\'", "\'>\'", "\'>=\'", "\'<\'", "\'<=\'", "\'!=\'", "\'contains\'", "\'matches\'", "\'excludes\'"
     };
     public static final int BOOL=7;
     public static final int INT=6;
@@ -38,279 +38,279 @@
 
     public String[] getTokenNames() { return tokenNames; }
 
-    
-    	private ExpanderResolver expanderResolver;
-    	private Expander expander;
-    	private boolean expanderDebug = false;
-    	private PackageDescr packageDescr;
-    	private List errors = new ArrayList();
-    	private String source = "unknown";
-    	private int lineOffset = 0;
-    	private DescrFactory factory = new DescrFactory();
-    	
-    	
-    	private boolean parserDebug = false;
-    	
-    	public void setParserDebug(boolean parserDebug) {
-    		this.parserDebug = parserDebug;
-    	}
-    	
-    	public void debug(String message) {
-    		if ( parserDebug ) 
-    			System.err.println( "drl parser: " + message );
-    	}
-    	
-    	public void setSource(String source) {
-    		this.source = source;
-    	}
-    	
-    	public DescrFactory getFactory() {
-    		return factory;
-    	}	
-    
-    	/**
-    	 * This may be set to enable debuggin of DSLs/expanders.
-    	 * If set to true, expander stuff will be sent to the Std out.
-    	 */	
-    	public void setExpanderDebug(boolean status) {
-    		expanderDebug = status;
-    	}
-    	public String getSource() {
-    		return this.source;
-    	}
-    	
-    	public PackageDescr getPackageDescr() {
-    		return packageDescr;
-    	}
-    	
-    	private int offset(int line) {
-    		return line + lineOffset;
-    	}
-    	
-    	/**
-    	 * This will set the offset to record when reparsing. Normally is zero of course 
-    	 */
-    	public void setLineOffset(int i) {
-    	 	this.lineOffset = i;
-    	}
-    	
-    	public void setExpanderResolver(ExpanderResolver expanderResolver) {
-    		this.expanderResolver = expanderResolver;
-    	}
-    	
-    	public ExpanderResolver getExpanderResolver() {
-    		return expanderResolver;
-    	}
-    	
-    	/** Expand the LHS */
-    	private String runWhenExpander(String text, int line) throws RecognitionException {
-    		String expanded = text.trim();
-    		if (expanded.startsWith(">")) {
-    			expanded = expanded.substring(1);  //escape !!
-    		} else {
-    			try {
-    				expanded = expander.expand( "when", text );			
-    			} catch (Exception e) {
-    				this.errors.add(new ExpanderException("Unable to expand: " + text + ". Due to " + e.getMessage(), line));
-    				return "";
-    			}
-    		}
-    		if (expanderDebug) {
-    			System.out.println("Expanding LHS: " + text + " ----> " + expanded + " --> from line: " + line);
-    		}
-    		return expanded;			
-    	}
-    	
-        	/** This will apply a list of constraints to an LHS block */
-        	private String applyConstraints(List constraints, String block) {
-        		//apply the constraints as a comma seperated list inside the previous block
-        		//the block will end in something like "foo()" and the constraint patterns will be put in the ()
-        		if (constraints == null) {
-        			return block;
-        		}
-        		StringBuffer list = new StringBuffer();    		
-        		for (Iterator iter = constraints.iterator(); iter.hasNext();) {
-    				String con = (String) iter.next();
-    				list.append("\n\t\t");
-    				list.append(con);
-    				if (iter.hasNext()) {
-    					list.append(",");					
-    				}			
-    			}
-        		if (block.endsWith("()")) {
-        			return block.substring(0, block.length() - 2) + "(" + list.toString() + ")";
-        		} else {
-        			return block + "(" + list.toString() + ")";
-        		}
-        	}  
-        	
-            	/** Reparse the results of the expansion */
-        	private void reparseLhs(String text, AndDescr descrs) throws RecognitionException {
-        		CharStream charStream = new ANTLRStringStream( text  + " \n  then"); //need to then so it knows when to end... werd...
-        		RuleParserLexer lexer = new RuleParserLexer( charStream );
-        		TokenStream tokenStream = new CommonTokenStream( lexer );
-        		RuleParser parser = new RuleParser( tokenStream );
-        		parser.setLineOffset( descrs.getLine() );
-        		parser.normal_lhs_block(descrs);
-                
-                    if (parser.hasErrors()) {
-        			this.errors.addAll(parser.getErrors());
-        		}
-    		if (expanderDebug) {
-    			System.out.println("Reparsing LHS: " + text + " --> successful:" + !parser.hasErrors());
-    		}    		
-        		
-        	}
-    	
-    	/** Expand a line on the RHS */
-    	private String runThenExpander(String text, int startLine) {
-    		//System.err.println( "expand THEN [" + text + "]" );
-    		StringTokenizer lines = new StringTokenizer( text, "\n\r" );
-    
-    		StringBuffer expanded = new StringBuffer();
-    		
-    		String eol = System.getProperty( "line.separator" );
-    				
-    		while ( lines.hasMoreTokens() ) {
-    			startLine++;
-    			String line = lines.nextToken();
-    			line = line.trim();
-    			if ( line.length() > 0 ) {
-    				if ( line.startsWith( ">" ) ) {
-    					expanded.append( line.substring( 1 ) );
-    					expanded.append( eol );
-    				} else {
-    					try {
-    						expanded.append( expander.expand( "then", line ) );
-    						expanded.append( eol );
-    					} catch (Exception e) {
-    						this.errors.add(new ExpanderException("Unable to expand: " + line + ". Due to " + e.getMessage(), startLine));			
-    					}
-    				}
-    			}
-    		}
-    		
-    		if (expanderDebug) {
-    			System.out.println("Expanding RHS: " + text + " ----> " + expanded.toString() + " --> from line starting: " + startLine);
-    		}		
-    		
-    		return expanded.toString();
-    	}
-    	
-    
-    	
-    	private String getString(Token token) {
-    		String orig = token.getText();
-    		return orig.substring( 1, orig.length() -1 );
-    	}
-    	
-    	public void reportError(RecognitionException ex) {
-    	        // if we've already reported an error and have not matched a token
-                    // yet successfully, don't report any errors.
-                    if ( errorRecovery ) {
-                            return;
-                    }
-                    errorRecovery = true;
-    
-    		ex.line = offset(ex.line); //add the offset if there is one
-    		errors.add( ex ); 
-    	}
-         	
-         	/** return the raw RecognitionException errors */
-         	public List getErrors() {
-         		return errors;
-         	}
-         	
-         	/** Return a list of pretty strings summarising the errors */
-         	public List getErrorMessages() {
-         		List messages = new ArrayList();
-     		for ( Iterator errorIter = errors.iterator() ; errorIter.hasNext() ; ) {
-         	     		messages.add( createErrorMessage( (RecognitionException) errorIter.next() ) );
-         	     	}
-         	     	return messages;
-         	}
-         	
-         	/** return true if any parser errors were accumulated */
-         	public boolean hasErrors() {
-      		return ! errors.isEmpty();
-         	}
-         	
-         	/** This will take a RecognitionException, and create a sensible error message out of it */
-         	public String createErrorMessage(RecognitionException e)
-            {
-    		StringBuffer message = new StringBuffer();		
-                    message.append( source + ":"+e.line+":"+e.charPositionInLine+" ");
-                    if ( e instanceof MismatchedTokenException ) {
-                            MismatchedTokenException mte = (MismatchedTokenException)e;
-                            message.append("mismatched token: "+
-                                                               e.token+
-                                                               "; expecting type "+
-                                                               tokenNames[mte.expecting]);
-                    }
-                    else if ( e instanceof MismatchedTreeNodeException ) {
-                            MismatchedTreeNodeException mtne = (MismatchedTreeNodeException)e;
-                            message.append("mismatched tree node: "+
-                                                               mtne.foundNode+
-                                                               "; expecting type "+
-                                                               tokenNames[mtne.expecting]);
-                    }
-                    else if ( e instanceof NoViableAltException ) {
-                            NoViableAltException nvae = (NoViableAltException)e;
-    			message.append( "Unexpected token '" + e.token.getText() + "'" );
-                            /*
-                            message.append("decision=<<"+nvae.grammarDecisionDescription+">>"+
-                                                               " state "+nvae.stateNumber+
-                                                               " (decision="+nvae.decisionNumber+
-                                                               ") no viable alt; token="+
-                                                               e.token);
-                                                               */
-                    }
-                    else if ( e instanceof EarlyExitException ) {
-                            EarlyExitException eee = (EarlyExitException)e;
-                            message.append("required (...)+ loop (decision="+
-                                                               eee.decisionNumber+
-                                                               ") did not match anything; token="+
-                                                               e.token);
-                    }
-                    else if ( e instanceof MismatchedSetException ) {
-                            MismatchedSetException mse = (MismatchedSetException)e;
-                            message.append("mismatched token '"+
-                                                               e.token+
-                                                               "' expecting set "+mse.expecting);
-                    }
-                    else if ( e instanceof MismatchedNotSetException ) {
-                            MismatchedNotSetException mse = (MismatchedNotSetException)e;
-                            message.append("mismatched token '"+
-                                                               e.token+
-                                                               "' expecting set "+mse.expecting);
-                    }
-                    else if ( e instanceof FailedPredicateException ) {
-                            FailedPredicateException fpe = (FailedPredicateException)e;
-                            message.append("rule "+fpe.ruleName+" failed predicate: {"+
-                                                               fpe.predicateText+"}?");
-                    } else if (e instanceof GeneralParseException) {
-    			message.append(" " + e.getMessage());
-    		}
-                   	return message.toString();
-            }   
-            
-            void checkTrailingSemicolon(String text, int line) {
-            	if (text.trim().endsWith( ";" ) ) {
-            		this.errors.add( new GeneralParseException( "Trailing semi-colon not allowed", offset(line) ) );
-            	}
-            }
-          
 
+    	private ExpanderResolver expanderResolver;
+    	private Expander expander;
+    	private boolean expanderDebug = false;
+    	private PackageDescr packageDescr;
+    	private List errors = new ArrayList();
+    	private String source = "unknown";
+    	private int lineOffset = 0;
+    	private DescrFactory factory = new DescrFactory();
+    	
+    	
+    	private boolean parserDebug = false;
+    	
+    	public void setParserDebug(boolean parserDebug) {
+    		this.parserDebug = parserDebug;
+    	}
+    	
+    	public void debug(String message) {
+    		if ( parserDebug ) 
+    			System.err.println( "drl parser: " + message );
+    	}
+    	
+    	public void setSource(String source) {
+    		this.source = source;
+    	}
+    	
+    	public DescrFactory getFactory() {
+    		return factory;
+    	}	
 
+    	/**
+    	 * This may be set to enable debuggin of DSLs/expanders.
+    	 * If set to true, expander stuff will be sent to the Std out.
+    	 */	
+    	public void setExpanderDebug(boolean status) {
+    		expanderDebug = status;
+    	}
+    	public String getSource() {
+    		return this.source;
+    	}
+    	
+    	public PackageDescr getPackageDescr() {
+    		return packageDescr;
+    	}
+    	
+    	private int offset(int line) {
+    		return line + lineOffset;
+    	}
+    	
+    	/**
+    	 * This will set the offset to record when reparsing. Normally is zero of course 
+    	 */
+    	public void setLineOffset(int i) {
+    	 	this.lineOffset = i;
+    	}
+    	
+    	public void setExpanderResolver(ExpanderResolver expanderResolver) {
+    		this.expanderResolver = expanderResolver;
+    	}
+    	
+    	public ExpanderResolver getExpanderResolver() {
+    		return expanderResolver;
+    	}
+    	
+    	/** Expand the LHS */
+    	private String runWhenExpander(String text, int line) throws RecognitionException {
+    		String expanded = text.trim();
+    		if (expanded.startsWith(">")) {
+    			expanded = expanded.substring(1);  //escape !!
+    		} else {
+    			try {
+    				expanded = expander.expand( "when", text );			
+    			} catch (Exception e) {
+    				this.errors.add(new ExpanderException("Unable to expand: " + text + ". Due to " + e.getMessage(), line));
+    				return "";
+    			}
+    		}
+    		if (expanderDebug) {
+    			System.out.println("Expanding LHS: " + text + " ----> " + expanded + " --> from line: " + line);
+    		}
+    		return expanded;			
+    	}
+    	
+        	/** This will apply a list of constraints to an LHS block */
+        	private String applyConstraints(List constraints, String block) {
+        		//apply the constraints as a comma seperated list inside the previous block
+        		//the block will end in something like "foo()" and the constraint patterns will be put in the ()
+        		if (constraints == null) {
+        			return block;
+        		}
+        		StringBuffer list = new StringBuffer();    		
+        		for (Iterator iter = constraints.iterator(); iter.hasNext();) {
+    				String con = (String) iter.next();
+    				list.append("\n\t\t");
+    				list.append(con);
+    				if (iter.hasNext()) {
+    					list.append(",");					
+    				}			
+    			}
+        		if (block.endsWith("()")) {
+        			return block.substring(0, block.length() - 2) + "(" + list.toString() + ")";
+        		} else {
+        			return block + "(" + list.toString() + ")";
+        		}
+        	}  
+        	
+            	/** Reparse the results of the expansion */
+        	private void reparseLhs(String text, AndDescr descrs) throws RecognitionException {
+        		CharStream charStream = new ANTLRStringStream( text  + " \n  then"); //need to then so it knows when to end... werd...
+        		RuleParserLexer lexer = new RuleParserLexer( charStream );
+        		TokenStream tokenStream = new CommonTokenStream( lexer );
+        		RuleParser parser = new RuleParser( tokenStream );
+        		parser.setLineOffset( descrs.getLine() );
+        		parser.normal_lhs_block(descrs);
+                
+                    if (parser.hasErrors()) {
+        			this.errors.addAll(parser.getErrors());
+        		}
+    		if (expanderDebug) {
+    			System.out.println("Reparsing LHS: " + text + " --> successful:" + !parser.hasErrors());
+    		}    		
+        		
+        	}
+    	
+    	/** Expand a line on the RHS */
+    	private String runThenExpander(String text, int startLine) {
+    		//System.err.println( "expand THEN [" + text + "]" );
+    		StringTokenizer lines = new StringTokenizer( text, "\n\r" );
 
+    		StringBuffer expanded = new StringBuffer();
+    		
+    		String eol = System.getProperty( "line.separator" );
+    				
+    		while ( lines.hasMoreTokens() ) {
+    			startLine++;
+    			String line = lines.nextToken();
+    			line = line.trim();
+    			if ( line.length() > 0 ) {
+    				if ( line.startsWith( ">" ) ) {
+    					expanded.append( line.substring( 1 ) );
+    					expanded.append( eol );
+    				} else {
+    					try {
+    						expanded.append( expander.expand( "then", line ) );
+    						expanded.append( eol );
+    					} catch (Exception e) {
+    						this.errors.add(new ExpanderException("Unable to expand: " + line + ". Due to " + e.getMessage(), startLine));			
+    					}
+    				}
+    			}
+    		}
+    		
+    		if (expanderDebug) {
+    			System.out.println("Expanding RHS: " + text + " ----> " + expanded.toString() + " --> from line starting: " + startLine);
+    		}		
+    		
+    		return expanded.toString();
+    	}
+    	
+
+    	
+    	private String getString(Token token) {
+    		String orig = token.getText();
+    		return orig.substring( 1, orig.length() -1 );
+    	}
+    	
+    	public void reportError(RecognitionException ex) {
+    	        // if we've already reported an error and have not matched a token
+                    // yet successfully, don't report any errors.
+                    if ( errorRecovery ) {
+                            return;
+                    }
+                    errorRecovery = true;
+
+    		ex.line = offset(ex.line); //add the offset if there is one
+    		errors.add( ex ); 
+    	}
+         	
+         	/** return the raw RecognitionException errors */
+         	public List getErrors() {
+         		return errors;
+         	}
+         	
+         	/** Return a list of pretty strings summarising the errors */
+         	public List getErrorMessages() {
+         		List messages = new ArrayList();
+     		for ( Iterator errorIter = errors.iterator() ; errorIter.hasNext() ; ) {
+         	     		messages.add( createErrorMessage( (RecognitionException) errorIter.next() ) );
+         	     	}
+         	     	return messages;
+         	}
+         	
+         	/** return true if any parser errors were accumulated */
+         	public boolean hasErrors() {
+      		return ! errors.isEmpty();
+         	}
+         	
+         	/** This will take a RecognitionException, and create a sensible error message out of it */
+         	public String createErrorMessage(RecognitionException e)
+            {
+    		StringBuffer message = new StringBuffer();		
+                    message.append( source + ":"+e.line+":"+e.charPositionInLine+" ");
+                    if ( e instanceof MismatchedTokenException ) {
+                            MismatchedTokenException mte = (MismatchedTokenException)e;
+                            message.append("mismatched token: "+
+                                                               e.token+
+                                                               "; expecting type "+
+                                                               tokenNames[mte.expecting]);
+                    }
+                    else if ( e instanceof MismatchedTreeNodeException ) {
+                            MismatchedTreeNodeException mtne = (MismatchedTreeNodeException)e;
+                            message.append("mismatched tree node: "+
+                                                               mtne.foundNode+
+                                                               "; expecting type "+
+                                                               tokenNames[mtne.expecting]);
+                    }
+                    else if ( e instanceof NoViableAltException ) {
+                            NoViableAltException nvae = (NoViableAltException)e;
+    			message.append( "Unexpected token '" + e.token.getText() + "'" );
+                            /*
+                            message.append("decision=<<"+nvae.grammarDecisionDescription+">>"+
+                                                               " state "+nvae.stateNumber+
+                                                               " (decision="+nvae.decisionNumber+
+                                                               ") no viable alt; token="+
+                                                               e.token);
+                                                               */
+                    }
+                    else if ( e instanceof EarlyExitException ) {
+                            EarlyExitException eee = (EarlyExitException)e;
+                            message.append("required (...)+ loop (decision="+
+                                                               eee.decisionNumber+
+                                                               ") did not match anything; token="+
+                                                               e.token);
+                    }
+                    else if ( e instanceof MismatchedSetException ) {
+                            MismatchedSetException mse = (MismatchedSetException)e;
+                            message.append("mismatched token '"+
+                                                               e.token+
+                                                               "' expecting set "+mse.expecting);
+                    }
+                    else if ( e instanceof MismatchedNotSetException ) {
+                            MismatchedNotSetException mse = (MismatchedNotSetException)e;
+                            message.append("mismatched token '"+
+                                                               e.token+
+                                                               "' expecting set "+mse.expecting);
+                    }
+                    else if ( e instanceof FailedPredicateException ) {
+                            FailedPredicateException fpe = (FailedPredicateException)e;
+                            message.append("rule "+fpe.ruleName+" failed predicate: {"+
+                                                               fpe.predicateText+"}?");
+                    } else if (e instanceof GeneralParseException) {
+    			message.append(" " + e.getMessage());
+    		}
+                   	return message.toString();
+            }   
+            
+            void checkTrailingSemicolon(String text, int line) {
+            	if (text.trim().endsWith( ";" ) ) {
+            		this.errors.add( new GeneralParseException( "Trailing semi-colon not allowed", offset(line) ) );
+            	}
+            }
+          
+
+
+
     // $ANTLR start opt_eol
-    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:282:1: opt_eol : ( (';'|EOL))* ;
+    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:282:1: opt_eol : ( (';'|EOL))* ;
     public void opt_eol() throws RecognitionException {   
         try {
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:283:17: ( ( (';'|EOL))* )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:283:17: ( (';'|EOL))*
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:283:17: ( ( (';'|EOL))* )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:283:17: ( (';'|EOL))*
             {
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:283:17: ( (';'|EOL))*
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:283:17: ( (';'|EOL))*
             loop1:
             do {
                 int alt1=2;
@@ -325,7 +325,7 @@
 
                 switch (alt1) {
             	case 1 :
-            	    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:283:18: (';'|EOL)
+            	    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:283:18: (';'|EOL)
             	    {
             	    if ( input.LA(1)==EOL||input.LA(1)==15 ) {
             	        input.consume();
@@ -362,7 +362,7 @@
 
 
     // $ANTLR start compilation_unit
-    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:286:1: compilation_unit : opt_eol prolog (r= rule | q= query | t= template | extra_statement )* ;
+    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:286:1: compilation_unit : opt_eol prolog (r= rule | q= query | t= template | extra_statement )* ;
     public void compilation_unit() throws RecognitionException {   
         RuleDescr r = null;
 
@@ -372,8 +372,8 @@
 
 
         try {
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:287:17: ( opt_eol prolog (r= rule | q= query | t= template | extra_statement )* )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:287:17: opt_eol prolog (r= rule | q= query | t= template | extra_statement )*
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:287:17: ( opt_eol prolog (r= rule | q= query | t= template | extra_statement )* )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:287:17: opt_eol prolog (r= rule | q= query | t= template | extra_statement )*
             {
             following.push(FOLLOW_opt_eol_in_compilation_unit57);
             opt_eol();
@@ -383,14 +383,14 @@
             prolog();
             following.pop();
 
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:289:17: (r= rule | q= query | t= template | extra_statement )*
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:289:17: (r= rule | q= query | t= template | extra_statement )*
             loop2:
             do {
                 int alt2=5;
                 alt2 = dfa2.predict(input); 
                 switch (alt2) {
             	case 1 :
-            	    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:289:25: r= rule
+            	    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:289:25: r= rule
             	    {
             	    following.push(FOLLOW_rule_in_compilation_unit70);
             	    r=rule();
@@ -401,7 +401,7 @@
             	    }
             	    break;
             	case 2 :
-            	    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:290:25: q= query
+            	    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:290:25: q= query
             	    {
             	    following.push(FOLLOW_query_in_compilation_unit83);
             	    q=query();
@@ -412,7 +412,7 @@
             	    }
             	    break;
             	case 3 :
-            	    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:291:25: t= template
+            	    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:291:25: t= template
             	    {
             	    following.push(FOLLOW_template_in_compilation_unit93);
             	    t=template();
@@ -423,7 +423,7 @@
             	    }
             	    break;
             	case 4 :
-            	    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:292:25: extra_statement
+            	    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:292:25: extra_statement
             	    {
             	    following.push(FOLLOW_extra_statement_in_compilation_unit101);
             	    extra_statement();
@@ -454,29 +454,29 @@
 
 
     // $ANTLR start prolog
-    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:296:1: prolog : opt_eol (name= package_statement )? ( extra_statement | expander )* opt_eol ;
+    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:296:1: prolog : opt_eol (name= package_statement )? ( extra_statement | expander )* opt_eol ;
     public void prolog() throws RecognitionException {   
         String name = null;
 
 
-        
-        		String packageName = "";
+
+        		String packageName = "";
         	
         try {
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:300:17: ( opt_eol (name= package_statement )? ( extra_statement | expander )* opt_eol )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:300:17: opt_eol (name= package_statement )? ( extra_statement | expander )* opt_eol
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:300:17: ( opt_eol (name= package_statement )? ( extra_statement | expander )* opt_eol )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:300:17: opt_eol (name= package_statement )? ( extra_statement | expander )* opt_eol
             {
             following.push(FOLLOW_opt_eol_in_prolog125);
             opt_eol();
             following.pop();
 
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:301:17: (name= package_statement )?
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:301:17: (name= package_statement )?
             int alt3=2;
             int LA3_0 = input.LA(1);
             if ( LA3_0==16 ) {
                 alt3=1;
             }
-            else if ( LA3_0==-1||LA3_0==EOL||LA3_0==15||LA3_0==17||(LA3_0>=20 && LA3_0<=22)||LA3_0==28||(LA3_0>=30 && LA3_0<=31) ) {
+            else if ( LA3_0==-1||LA3_0==EOL||LA3_0==15||(LA3_0>=17 && LA3_0<=18)||(LA3_0>=21 && LA3_0<=22)||LA3_0==28||(LA3_0>=30 && LA3_0<=31) ) {
                 alt3=2;
             }
             else {
@@ -487,7 +487,7 @@
             }
             switch (alt3) {
                 case 1 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:301:19: name= package_statement
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:301:19: name= package_statement
                     {
                     following.push(FOLLOW_package_statement_in_prolog133);
                     name=package_statement();
@@ -500,17 +500,17 @@
 
             }
 
-             
-            			this.packageDescr = new PackageDescr( name ); 
+             
+            			this.packageDescr = new PackageDescr( name ); 
             		
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:305:17: ( extra_statement | expander )*
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:305:17: ( extra_statement | expander )*
             loop4:
             do {
                 int alt4=3;
                 alt4 = dfa4.predict(input); 
                 switch (alt4) {
             	case 1 :
-            	    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:305:25: extra_statement
+            	    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:305:25: extra_statement
             	    {
             	    following.push(FOLLOW_extra_statement_in_prolog148);
             	    extra_statement();
@@ -520,7 +520,7 @@
             	    }
             	    break;
             	case 2 :
-            	    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:306:25: expander
+            	    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:306:25: expander
             	    {
             	    following.push(FOLLOW_expander_in_prolog154);
             	    expander();
@@ -555,18 +555,18 @@
 
 
     // $ANTLR start package_statement
-    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:312:1: package_statement returns [String packageName] : 'package' opt_eol name= dotted_name ( ';' )? opt_eol ;
+    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:312:1: package_statement returns [String packageName] : 'package' opt_eol name= dotted_name ( ';' )? opt_eol ;
     public String package_statement() throws RecognitionException {   
         String packageName;
         String name = null;
 
 
-        
-        		packageName = null;
+
+        		packageName = null;
         	
         try {
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:317:17: ( 'package' opt_eol name= dotted_name ( ';' )? opt_eol )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:317:17: 'package' opt_eol name= dotted_name ( ';' )? opt_eol
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:317:17: ( 'package' opt_eol name= dotted_name ( ';' )? opt_eol )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:317:17: 'package' opt_eol name= dotted_name ( ';' )? opt_eol
             {
             match(input,16,FOLLOW_16_in_package_statement190); 
             following.push(FOLLOW_opt_eol_in_package_statement192);
@@ -577,13 +577,13 @@
             name=dotted_name();
             following.pop();
 
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:317:52: ( ';' )?
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:317:52: ( ';' )?
             int alt5=2;
             int LA5_0 = input.LA(1);
             if ( LA5_0==15 ) {
                 alt5=1;
             }
-            else if ( LA5_0==-1||LA5_0==EOL||LA5_0==17||(LA5_0>=20 && LA5_0<=22)||LA5_0==28||(LA5_0>=30 && LA5_0<=31) ) {
+            else if ( LA5_0==-1||LA5_0==EOL||(LA5_0>=17 && LA5_0<=18)||(LA5_0>=21 && LA5_0<=22)||LA5_0==28||(LA5_0>=30 && LA5_0<=31) ) {
                 alt5=2;
             }
             else {
@@ -594,7 +594,7 @@
             }
             switch (alt5) {
                 case 1 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:317:52: ';'
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:317:52: ';'
                     {
                     match(input,15,FOLLOW_15_in_package_statement198); 
 
@@ -607,8 +607,8 @@
             opt_eol();
             following.pop();
 
-            
-            			packageName = name;
+
+            			packageName = name;
             		
 
             }
@@ -626,14 +626,14 @@
 
 
     // $ANTLR start import_statement
-    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:323:1: import_statement : 'import' opt_eol name= import_name ( ';' )? opt_eol ;
+    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:323:1: import_statement : 'import' opt_eol name= import_name ( ';' )? opt_eol ;
     public void import_statement() throws RecognitionException {   
         String name = null;
 
 
         try {
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:324:17: ( 'import' opt_eol name= import_name ( ';' )? opt_eol )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:324:17: 'import' opt_eol name= import_name ( ';' )? opt_eol
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:324:17: ( 'import' opt_eol name= import_name ( ';' )? opt_eol )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:324:17: 'import' opt_eol name= import_name ( ';' )? opt_eol
             {
             match(input,17,FOLLOW_17_in_import_statement217); 
             following.push(FOLLOW_opt_eol_in_import_statement219);
@@ -644,13 +644,13 @@
             name=import_name();
             following.pop();
 
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:324:51: ( ';' )?
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:324:51: ( ';' )?
             int alt6=2;
             int LA6_0 = input.LA(1);
             if ( LA6_0==15 ) {
                 alt6=1;
             }
-            else if ( LA6_0==-1||LA6_0==EOL||LA6_0==17||(LA6_0>=20 && LA6_0<=22)||LA6_0==28||(LA6_0>=30 && LA6_0<=31) ) {
+            else if ( LA6_0==-1||LA6_0==EOL||(LA6_0>=17 && LA6_0<=18)||(LA6_0>=21 && LA6_0<=22)||LA6_0==28||(LA6_0>=30 && LA6_0<=31) ) {
                 alt6=2;
             }
             else {
@@ -661,7 +661,7 @@
             }
             switch (alt6) {
                 case 1 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:324:51: ';'
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:324:51: ';'
                     {
                     match(input,15,FOLLOW_15_in_import_statement225); 
 
@@ -674,9 +674,9 @@
             opt_eol();
             following.pop();
 
-            
-            			if (packageDescr != null) 
-            				packageDescr.addImport( name );
+
+            			if (packageDescr != null) 
+            				packageDescr.addImport( name );
             		
 
             }
@@ -693,71 +693,140 @@
     // $ANTLR end import_statement
 
 
+    // $ANTLR start function_import_statement
+    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:331:1: function_import_statement : 'import' 'function' opt_eol name= import_name ( ';' )? opt_eol ;
+    public void function_import_statement() throws RecognitionException {   
+        String name = null;
+
+
+        try {
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:332:17: ( 'import' 'function' opt_eol name= import_name ( ';' )? opt_eol )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:332:17: 'import' 'function' opt_eol name= import_name ( ';' )? opt_eol
+            {
+            match(input,17,FOLLOW_17_in_function_import_statement244); 
+            match(input,18,FOLLOW_18_in_function_import_statement246); 
+            following.push(FOLLOW_opt_eol_in_function_import_statement248);
+            opt_eol();
+            following.pop();
+
+            following.push(FOLLOW_import_name_in_function_import_statement252);
+            name=import_name();
+            following.pop();
+
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:332:62: ( ';' )?
+            int alt7=2;
+            int LA7_0 = input.LA(1);
+            if ( LA7_0==15 ) {
+                alt7=1;
+            }
+            else if ( LA7_0==-1||LA7_0==EOL||(LA7_0>=17 && LA7_0<=18)||(LA7_0>=21 && LA7_0<=22)||LA7_0==28||(LA7_0>=30 && LA7_0<=31) ) {
+                alt7=2;
+            }
+            else {
+                NoViableAltException nvae =
+                    new NoViableAltException("332:62: ( \';\' )?", 7, 0, input);
+
+                throw nvae;
+            }
+            switch (alt7) {
+                case 1 :
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:332:62: ';'
+                    {
+                    match(input,15,FOLLOW_15_in_function_import_statement254); 
+
+                    }
+                    break;
+
+            }
+
+            following.push(FOLLOW_opt_eol_in_function_import_statement257);
+            opt_eol();
+            following.pop();
+
+
+            			if (packageDescr != null) 
+            				packageDescr.addFunctionImport( name );
+            		
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+        }
+        return ;
+    }
+    // $ANTLR end function_import_statement
+
+
     // $ANTLR start import_name
-    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:331:1: import_name returns [String name] : id= ID ( '.' id= ID )* (star= '.*' )? ;
+    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:340:1: import_name returns [String name] : id= ID ( '.' id= ID )* (star= '.*' )? ;
     public String import_name() throws RecognitionException {   
         String name;
         Token id=null;
         Token star=null;
 
-        
-        		name = null;
+
+        		name = null;
         	
         try {
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:336:17: (id= ID ( '.' id= ID )* (star= '.*' )? )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:336:17: id= ID ( '.' id= ID )* (star= '.*' )?
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:345:17: (id= ID ( '.' id= ID )* (star= '.*' )? )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:345:17: id= ID ( '.' id= ID )* (star= '.*' )?
             {
             id=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_import_name259); 
+            match(input,ID,FOLLOW_ID_in_import_name289); 
              name=id.getText(); 
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:336:46: ( '.' id= ID )*
-            loop7:
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:345:46: ( '.' id= ID )*
+            loop8:
             do {
-                int alt7=2;
-                int LA7_0 = input.LA(1);
-                if ( LA7_0==18 ) {
-                    alt7=1;
+                int alt8=2;
+                int LA8_0 = input.LA(1);
+                if ( LA8_0==19 ) {
+                    alt8=1;
                 }
 
 
-                switch (alt7) {
+                switch (alt8) {
             	case 1 :
-            	    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:336:48: '.' id= ID
+            	    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:345:48: '.' id= ID
             	    {
-            	    match(input,18,FOLLOW_18_in_import_name265); 
+            	    match(input,19,FOLLOW_19_in_import_name295); 
             	    id=(Token)input.LT(1);
-            	    match(input,ID,FOLLOW_ID_in_import_name269); 
+            	    match(input,ID,FOLLOW_ID_in_import_name299); 
             	     name = name + "." + id.getText(); 
 
             	    }
             	    break;
 
             	default :
-            	    break loop7;
+            	    break loop8;
                 }
             } while (true);
 
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:336:99: (star= '.*' )?
-            int alt8=2;
-            int LA8_0 = input.LA(1);
-            if ( LA8_0==19 ) {
-                alt8=1;
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:345:99: (star= '.*' )?
+            int alt9=2;
+            int LA9_0 = input.LA(1);
+            if ( LA9_0==20 ) {
+                alt9=1;
             }
-            else if ( LA8_0==-1||LA8_0==EOL||LA8_0==15||LA8_0==17||(LA8_0>=20 && LA8_0<=22)||LA8_0==28||(LA8_0>=30 && LA8_0<=31) ) {
-                alt8=2;
+            else if ( LA9_0==-1||LA9_0==EOL||LA9_0==15||(LA9_0>=17 && LA9_0<=18)||(LA9_0>=21 && LA9_0<=22)||LA9_0==28||(LA9_0>=30 && LA9_0<=31) ) {
+                alt9=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("336:99: (star= \'.*\' )?", 8, 0, input);
+                    new NoViableAltException("345:99: (star= \'.*\' )?", 9, 0, input);
 
                 throw nvae;
             }
-            switch (alt8) {
+            switch (alt9) {
                 case 1 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:336:100: star= '.*'
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:345:100: star= '.*'
                     {
                     star=(Token)input.LT(1);
-                    match(input,19,FOLLOW_19_in_import_name279); 
+                    match(input,20,FOLLOW_20_in_import_name309); 
                      name = name + star.getText(); 
 
                     }
@@ -781,39 +850,39 @@
 
 
     // $ANTLR start expander
-    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:338:1: expander : 'expander' (name= dotted_name )? ( ';' )? opt_eol ;
+    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:347:1: expander : 'expander' (name= dotted_name )? ( ';' )? opt_eol ;
     public void expander() throws RecognitionException {   
         String name = null;
 
 
-        
-        		String config=null;
+
+        		String config=null;
         	
         try {
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:342:17: ( 'expander' (name= dotted_name )? ( ';' )? opt_eol )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:342:17: 'expander' (name= dotted_name )? ( ';' )? opt_eol
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:351:17: ( 'expander' (name= dotted_name )? ( ';' )? opt_eol )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:351:17: 'expander' (name= dotted_name )? ( ';' )? opt_eol
             {
-            match(input,20,FOLLOW_20_in_expander299); 
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:342:28: (name= dotted_name )?
-            int alt9=2;
-            int LA9_0 = input.LA(1);
-            if ( LA9_0==ID ) {
-                alt9=1;
+            match(input,21,FOLLOW_21_in_expander329); 
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:351:28: (name= dotted_name )?
+            int alt10=2;
+            int LA10_0 = input.LA(1);
+            if ( LA10_0==ID ) {
+                alt10=1;
             }
-            else if ( LA9_0==-1||LA9_0==EOL||LA9_0==15||LA9_0==17||(LA9_0>=20 && LA9_0<=22)||LA9_0==28||(LA9_0>=30 && LA9_0<=31) ) {
-                alt9=2;
+            else if ( LA10_0==-1||LA10_0==EOL||LA10_0==15||(LA10_0>=17 && LA10_0<=18)||(LA10_0>=21 && LA10_0<=22)||LA10_0==28||(LA10_0>=30 && LA10_0<=31) ) {
+                alt10=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("342:28: (name= dotted_name )?", 9, 0, input);
+                    new NoViableAltException("351:28: (name= dotted_name )?", 10, 0, input);
 
                 throw nvae;
             }
-            switch (alt9) {
+            switch (alt10) {
                 case 1 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:342:29: name= dotted_name
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:351:29: name= dotted_name
                     {
-                    following.push(FOLLOW_dotted_name_in_expander304);
+                    following.push(FOLLOW_dotted_name_in_expander334);
                     name=dotted_name();
                     following.pop();
 
@@ -823,42 +892,42 @@
 
             }
 
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:342:48: ( ';' )?
-            int alt10=2;
-            int LA10_0 = input.LA(1);
-            if ( LA10_0==15 ) {
-                alt10=1;
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:351:48: ( ';' )?
+            int alt11=2;
+            int LA11_0 = input.LA(1);
+            if ( LA11_0==15 ) {
+                alt11=1;
             }
-            else if ( LA10_0==-1||LA10_0==EOL||LA10_0==17||(LA10_0>=20 && LA10_0<=22)||LA10_0==28||(LA10_0>=30 && LA10_0<=31) ) {
-                alt10=2;
+            else if ( LA11_0==-1||LA11_0==EOL||(LA11_0>=17 && LA11_0<=18)||(LA11_0>=21 && LA11_0<=22)||LA11_0==28||(LA11_0>=30 && LA11_0<=31) ) {
+                alt11=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("342:48: ( \';\' )?", 10, 0, input);
+                    new NoViableAltException("351:48: ( \';\' )?", 11, 0, input);
 
                 throw nvae;
             }
-            switch (alt10) {
+            switch (alt11) {
                 case 1 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:342:48: ';'
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:351:48: ';'
                     {
-                    match(input,15,FOLLOW_15_in_expander308); 
+                    match(input,15,FOLLOW_15_in_expander338); 
 
                     }
                     break;
 
             }
 
-            following.push(FOLLOW_opt_eol_in_expander311);
+            following.push(FOLLOW_opt_eol_in_expander341);
             opt_eol();
             following.pop();
 
-            
-            			if (expanderResolver == null) 
-            				throw new IllegalArgumentException("Unable to use expander. Make sure a expander or dsl config is being passed to the parser. [ExpanderResolver was not set].");
-            			if ( expander != null )
-            				throw new IllegalArgumentException( "Only one 'expander' statement per file is allowed" );
-            			expander = expanderResolver.get( name, config );
+
+            			if (expanderResolver == null) 
+            				throw new IllegalArgumentException("Unable to use expander. Make sure a expander or dsl config is being passed to the parser. [ExpanderResolver was not set].");
+            			if ( expander != null )
+            				throw new IllegalArgumentException( "Only one 'expander' statement per file is allowed" );
+            			expander = expanderResolver.get( name, config );
             		
 
             }
@@ -876,57 +945,57 @@
 
 
     // $ANTLR start global
-    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:352:1: global : 'global' type= dotted_name id= ID ( ';' )? opt_eol ;
+    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:361:1: global : 'global' type= dotted_name id= ID ( ';' )? opt_eol ;
     public void global() throws RecognitionException {   
         Token id=null;
         String type = null;
 
 
-        
+
         	
         try {
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:356:17: ( 'global' type= dotted_name id= ID ( ';' )? opt_eol )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:356:17: 'global' type= dotted_name id= ID ( ';' )? opt_eol
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:365:17: ( 'global' type= dotted_name id= ID ( ';' )? opt_eol )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:365:17: 'global' type= dotted_name id= ID ( ';' )? opt_eol
             {
-            match(input,21,FOLLOW_21_in_global335); 
-            following.push(FOLLOW_dotted_name_in_global339);
+            match(input,22,FOLLOW_22_in_global365); 
+            following.push(FOLLOW_dotted_name_in_global369);
             type=dotted_name();
             following.pop();
 
             id=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_global343); 
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:356:49: ( ';' )?
-            int alt11=2;
-            int LA11_0 = input.LA(1);
-            if ( LA11_0==15 ) {
-                alt11=1;
+            match(input,ID,FOLLOW_ID_in_global373); 
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:365:49: ( ';' )?
+            int alt12=2;
+            int LA12_0 = input.LA(1);
+            if ( LA12_0==15 ) {
+                alt12=1;
             }
-            else if ( LA11_0==-1||LA11_0==EOL||LA11_0==17||(LA11_0>=20 && LA11_0<=22)||LA11_0==28||(LA11_0>=30 && LA11_0<=31) ) {
-                alt11=2;
+            else if ( LA12_0==-1||LA12_0==EOL||(LA12_0>=17 && LA12_0<=18)||(LA12_0>=21 && LA12_0<=22)||LA12_0==28||(LA12_0>=30 && LA12_0<=31) ) {
+                alt12=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("356:49: ( \';\' )?", 11, 0, input);
+                    new NoViableAltException("365:49: ( \';\' )?", 12, 0, input);
 
                 throw nvae;
             }
-            switch (alt11) {
+            switch (alt12) {
                 case 1 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:356:49: ';'
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:365:49: ';'
                     {
-                    match(input,15,FOLLOW_15_in_global345); 
+                    match(input,15,FOLLOW_15_in_global375); 
 
                     }
                     break;
 
             }
 
-            following.push(FOLLOW_opt_eol_in_global348);
+            following.push(FOLLOW_opt_eol_in_global378);
             opt_eol();
             following.pop();
 
-            
-            			packageDescr.addGlobal( id.getText(), type );
+
+            			packageDescr.addGlobal( id.getText(), type );
             		
 
             }
@@ -944,7 +1013,7 @@
 
 
     // $ANTLR start function
-    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:362:1: function : 'function' opt_eol (retType= dotted_name )? opt_eol name= ID opt_eol '(' opt_eol ( (paramType= dotted_name )? opt_eol paramName= argument_name opt_eol ( ',' opt_eol (paramType= dotted_name )? opt_eol paramName= argument_name opt_eol )* )? ')' opt_eol '{' body= curly_chunk '}' opt_eol ;
+    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:371:1: function : 'function' opt_eol (retType= dotted_name )? opt_eol name= ID opt_eol '(' opt_eol ( (paramType= dotted_name )? opt_eol paramName= argument_name opt_eol ( ',' opt_eol (paramType= dotted_name )? opt_eol paramName= argument_name opt_eol )* )? ')' opt_eol '{' body= curly_chunk '}' opt_eol ;
     public void function() throws RecognitionException {   
         Token name=null;
         String retType = null;
@@ -956,26 +1025,26 @@
         String body = null;
 
 
-        
-        		FunctionDescr f = null;
+
+        		FunctionDescr f = null;
         	
         try {
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:367:17: ( 'function' opt_eol (retType= dotted_name )? opt_eol name= ID opt_eol '(' opt_eol ( (paramType= dotted_name )? opt_eol paramName= argument_name opt_eol ( ',' opt_eol (paramType= dotted_name )? opt_eol paramName= argument_name opt_eol )* )? ')' opt_eol '{' body= curly_chunk '}' opt_eol )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:367:17: 'function' opt_eol (retType= dotted_name )? opt_eol name= ID opt_eol '(' opt_eol ( (paramType= dotted_name )? opt_eol paramName= argument_name opt_eol ( ',' opt_eol (paramType= dotted_name )? opt_eol paramName= argument_name opt_eol )* )? ')' opt_eol '{' body= curly_chunk '}' opt_eol
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:376:17: ( 'function' opt_eol (retType= dotted_name )? opt_eol name= ID opt_eol '(' opt_eol ( (paramType= dotted_name )? opt_eol paramName= argument_name opt_eol ( ',' opt_eol (paramType= dotted_name )? opt_eol paramName= argument_name opt_eol )* )? ')' opt_eol '{' body= curly_chunk '}' opt_eol )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:376:17: 'function' opt_eol (retType= dotted_name )? opt_eol name= ID opt_eol '(' opt_eol ( (paramType= dotted_name )? opt_eol paramName= argument_name opt_eol ( ',' opt_eol (paramType= dotted_name )? opt_eol paramName= argument_name opt_eol )* )? ')' opt_eol '{' body= curly_chunk '}' opt_eol
             {
-            match(input,22,FOLLOW_22_in_function372); 
-            following.push(FOLLOW_opt_eol_in_function374);
+            match(input,18,FOLLOW_18_in_function402); 
+            following.push(FOLLOW_opt_eol_in_function404);
             opt_eol();
             following.pop();
 
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:367:36: (retType= dotted_name )?
-            int alt12=2;
-            alt12 = dfa12.predict(input); 
-            switch (alt12) {
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:376:36: (retType= dotted_name )?
+            int alt13=2;
+            alt13 = dfa13.predict(input); 
+            switch (alt13) {
                 case 1 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:367:37: retType= dotted_name
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:376:37: retType= dotted_name
                     {
-                    following.push(FOLLOW_dotted_name_in_function379);
+                    following.push(FOLLOW_dotted_name_in_function409);
                     retType=dotted_name();
                     following.pop();
 
@@ -985,52 +1054,52 @@
 
             }
 
-            following.push(FOLLOW_opt_eol_in_function383);
+            following.push(FOLLOW_opt_eol_in_function413);
             opt_eol();
             following.pop();
 
             name=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_function387); 
-            following.push(FOLLOW_opt_eol_in_function389);
+            match(input,ID,FOLLOW_ID_in_function417); 
+            following.push(FOLLOW_opt_eol_in_function419);
             opt_eol();
             following.pop();
 
-            
-            			//System.err.println( "function :: " + name.getText() );
-            			f = new FunctionDescr( name.getText(), retType );
+
+            			//System.err.println( "function :: " + name.getText() );
+            			f = new FunctionDescr( name.getText(), retType );
             		
-            match(input,23,FOLLOW_23_in_function398); 
-            following.push(FOLLOW_opt_eol_in_function400);
+            match(input,23,FOLLOW_23_in_function428); 
+            following.push(FOLLOW_opt_eol_in_function430);
             opt_eol();
             following.pop();
 
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:373:25: ( (paramType= dotted_name )? opt_eol paramName= argument_name opt_eol ( ',' opt_eol (paramType= dotted_name )? opt_eol paramName= argument_name opt_eol )* )?
-            int alt16=2;
-            int LA16_0 = input.LA(1);
-            if ( (LA16_0>=EOL && LA16_0<=ID)||LA16_0==15 ) {
-                alt16=1;
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:382:25: ( (paramType= dotted_name )? opt_eol paramName= argument_name opt_eol ( ',' opt_eol (paramType= dotted_name )? opt_eol paramName= argument_name opt_eol )* )?
+            int alt17=2;
+            int LA17_0 = input.LA(1);
+            if ( (LA17_0>=EOL && LA17_0<=ID)||LA17_0==15 ) {
+                alt17=1;
             }
-            else if ( LA16_0==25 ) {
-                alt16=2;
+            else if ( LA17_0==25 ) {
+                alt17=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("373:25: ( (paramType= dotted_name )? opt_eol paramName= argument_name opt_eol ( \',\' opt_eol (paramType= dotted_name )? opt_eol paramName= argument_name opt_eol )* )?", 16, 0, input);
+                    new NoViableAltException("382:25: ( (paramType= dotted_name )? opt_eol paramName= argument_name opt_eol ( \',\' opt_eol (paramType= dotted_name )? opt_eol paramName= argument_name opt_eol )* )?", 17, 0, input);
 
                 throw nvae;
             }
-            switch (alt16) {
+            switch (alt17) {
                 case 1 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:373:33: (paramType= dotted_name )? opt_eol paramName= argument_name opt_eol ( ',' opt_eol (paramType= dotted_name )? opt_eol paramName= argument_name opt_eol )*
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:382:33: (paramType= dotted_name )? opt_eol paramName= argument_name opt_eol ( ',' opt_eol (paramType= dotted_name )? opt_eol paramName= argument_name opt_eol )*
                     {
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:373:33: (paramType= dotted_name )?
-                    int alt13=2;
-                    alt13 = dfa13.predict(input); 
-                    switch (alt13) {
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:382:33: (paramType= dotted_name )?
+                    int alt14=2;
+                    alt14 = dfa14.predict(input); 
+                    switch (alt14) {
                         case 1 :
-                            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:373:34: paramType= dotted_name
+                            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:382:34: paramType= dotted_name
                             {
-                            following.push(FOLLOW_dotted_name_in_function410);
+                            following.push(FOLLOW_dotted_name_in_function440);
                             paramType=dotted_name();
                             following.pop();
 
@@ -1040,48 +1109,48 @@
 
                     }
 
-                    following.push(FOLLOW_opt_eol_in_function414);
+                    following.push(FOLLOW_opt_eol_in_function444);
                     opt_eol();
                     following.pop();
 
-                    following.push(FOLLOW_argument_name_in_function418);
+                    following.push(FOLLOW_argument_name_in_function448);
                     paramName=argument_name();
                     following.pop();
 
-                    following.push(FOLLOW_opt_eol_in_function420);
+                    following.push(FOLLOW_opt_eol_in_function450);
                     opt_eol();
                     following.pop();
 
-                    
-                    					f.addParameter( paramType, paramName );
+
+                    					f.addParameter( paramType, paramName );
                     				
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:377:33: ( ',' opt_eol (paramType= dotted_name )? opt_eol paramName= argument_name opt_eol )*
-                    loop15:
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:386:33: ( ',' opt_eol (paramType= dotted_name )? opt_eol paramName= argument_name opt_eol )*
+                    loop16:
                     do {
-                        int alt15=2;
-                        int LA15_0 = input.LA(1);
-                        if ( LA15_0==24 ) {
-                            alt15=1;
+                        int alt16=2;
+                        int LA16_0 = input.LA(1);
+                        if ( LA16_0==24 ) {
+                            alt16=1;
                         }
 
 
-                        switch (alt15) {
+                        switch (alt16) {
                     	case 1 :
-                    	    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:377:41: ',' opt_eol (paramType= dotted_name )? opt_eol paramName= argument_name opt_eol
+                    	    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:386:41: ',' opt_eol (paramType= dotted_name )? opt_eol paramName= argument_name opt_eol
                     	    {
-                    	    match(input,24,FOLLOW_24_in_function434); 
-                    	    following.push(FOLLOW_opt_eol_in_function436);
+                    	    match(input,24,FOLLOW_24_in_function464); 
+                    	    following.push(FOLLOW_opt_eol_in_function466);
                     	    opt_eol();
                     	    following.pop();
 
-                    	    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:377:53: (paramType= dotted_name )?
-                    	    int alt14=2;
-                    	    alt14 = dfa14.predict(input); 
-                    	    switch (alt14) {
+                    	    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:386:53: (paramType= dotted_name )?
+                    	    int alt15=2;
+                    	    alt15 = dfa15.predict(input); 
+                    	    switch (alt15) {
                     	        case 1 :
-                    	            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:377:54: paramType= dotted_name
+                    	            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:386:54: paramType= dotted_name
                     	            {
-                    	            following.push(FOLLOW_dotted_name_in_function441);
+                    	            following.push(FOLLOW_dotted_name_in_function471);
                     	            paramType=dotted_name();
                     	            following.pop();
 
@@ -1091,27 +1160,27 @@
 
                     	    }
 
-                    	    following.push(FOLLOW_opt_eol_in_function445);
+                    	    following.push(FOLLOW_opt_eol_in_function475);
                     	    opt_eol();
                     	    following.pop();
 
-                    	    following.push(FOLLOW_argument_name_in_function449);
+                    	    following.push(FOLLOW_argument_name_in_function479);
                     	    paramName=argument_name();
                     	    following.pop();
 
-                    	    following.push(FOLLOW_opt_eol_in_function451);
+                    	    following.push(FOLLOW_opt_eol_in_function481);
                     	    opt_eol();
                     	    following.pop();
 
-                    	    
-                    	    						f.addParameter( paramType, paramName );
+
+                    	    						f.addParameter( paramType, paramName );
                     	    					
 
                     	    }
                     	    break;
 
                     	default :
-                    	    break loop15;
+                    	    break loop16;
                         }
                     } while (true);
 
@@ -1121,24 +1190,24 @@
 
             }
 
-            match(input,25,FOLLOW_25_in_function476); 
-            following.push(FOLLOW_opt_eol_in_function480);
+            match(input,25,FOLLOW_25_in_function506); 
+            following.push(FOLLOW_opt_eol_in_function510);
             opt_eol();
             following.pop();
 
-            match(input,26,FOLLOW_26_in_function484); 
-            following.push(FOLLOW_curly_chunk_in_function491);
+            match(input,26,FOLLOW_26_in_function514); 
+            following.push(FOLLOW_curly_chunk_in_function521);
             body=curly_chunk();
             following.pop();
 
-            
-            				f.setText( body );
+
+            				f.setText( body );
             			
-            match(input,27,FOLLOW_27_in_function500); 
-            
-            			packageDescr.addFunction( f );
+            match(input,27,FOLLOW_27_in_function530); 
+
+            			packageDescr.addFunction( f );
             		
-            following.push(FOLLOW_opt_eol_in_function508);
+            following.push(FOLLOW_opt_eol_in_function538);
             opt_eol();
             following.pop();
 
@@ -1158,159 +1227,159 @@
 
 
     // $ANTLR start query
-    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:398:1: query returns [QueryDescr query] : opt_eol loc= 'query' queryName= word opt_eol ({...}? expander_lhs_block[lhs] | normal_lhs_block[lhs] ) 'end' opt_eol ;
+    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:407:1: query returns [QueryDescr query] : opt_eol loc= 'query' queryName= word opt_eol ({...}? expander_lhs_block[lhs] | normal_lhs_block[lhs] ) 'end' opt_eol ;
     public QueryDescr query() throws RecognitionException {   
         QueryDescr query;
         Token loc=null;
         String queryName = null;
 
 
-        
-        		query = null;
+
+        		query = null;
         	
         try {
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:403:17: ( opt_eol loc= 'query' queryName= word opt_eol ({...}? expander_lhs_block[lhs] | normal_lhs_block[lhs] ) 'end' opt_eol )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:403:17: opt_eol loc= 'query' queryName= word opt_eol ({...}? expander_lhs_block[lhs] | normal_lhs_block[lhs] ) 'end' opt_eol
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:412:17: ( opt_eol loc= 'query' queryName= word opt_eol ({...}? expander_lhs_block[lhs] | normal_lhs_block[lhs] ) 'end' opt_eol )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:412:17: opt_eol loc= 'query' queryName= word opt_eol ({...}? expander_lhs_block[lhs] | normal_lhs_block[lhs] ) 'end' opt_eol
             {
-            following.push(FOLLOW_opt_eol_in_query532);
+            following.push(FOLLOW_opt_eol_in_query562);
             opt_eol();
             following.pop();
 
             loc=(Token)input.LT(1);
-            match(input,28,FOLLOW_28_in_query538); 
-            following.push(FOLLOW_word_in_query542);
+            match(input,28,FOLLOW_28_in_query568); 
+            following.push(FOLLOW_word_in_query572);
             queryName=word();
             following.pop();
 
-            following.push(FOLLOW_opt_eol_in_query544);
+            following.push(FOLLOW_opt_eol_in_query574);
             opt_eol();
             following.pop();
 
-             
-            			query = new QueryDescr( queryName, null ); 
-            			query.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-            			AndDescr lhs = new AndDescr(); query.setLhs( lhs ); 
-            			lhs.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+             
+            			query = new QueryDescr( queryName, null ); 
+            			query.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+            			AndDescr lhs = new AndDescr(); query.setLhs( lhs ); 
+            			lhs.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
             		
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:411:17: ({...}? expander_lhs_block[lhs] | normal_lhs_block[lhs] )
-            int alt17=2;
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:420:17: ({...}? expander_lhs_block[lhs] | normal_lhs_block[lhs] )
+            int alt18=2;
             switch ( input.LA(1) ) {
             case 23:
-                int LA17_1 = input.LA(2);
+                int LA18_1 = input.LA(2);
                 if (  expander != null  ) {
-                    alt17=1;
+                    alt18=1;
                 }
                 else if ( true ) {
-                    alt17=2;
+                    alt18=2;
                 }
                 else {
                     NoViableAltException nvae =
-                        new NoViableAltException("411:17: ({...}? expander_lhs_block[lhs] | normal_lhs_block[lhs] )", 17, 1, input);
+                        new NoViableAltException("420:17: ({...}? expander_lhs_block[lhs] | normal_lhs_block[lhs] )", 18, 1, input);
 
                     throw nvae;
                 }
                 break;
             case EOL:
-                int LA17_2 = input.LA(2);
+                int LA18_2 = input.LA(2);
                 if (  expander != null  ) {
-                    alt17=1;
+                    alt18=1;
                 }
                 else if ( true ) {
-                    alt17=2;
+                    alt18=2;
                 }
                 else {
                     NoViableAltException nvae =
-                        new NoViableAltException("411:17: ({...}? expander_lhs_block[lhs] | normal_lhs_block[lhs] )", 17, 2, input);
+                        new NoViableAltException("420:17: ({...}? expander_lhs_block[lhs] | normal_lhs_block[lhs] )", 18, 2, input);
 
                     throw nvae;
                 }
                 break;
             case 29:
-                int LA17_3 = input.LA(2);
+                int LA18_3 = input.LA(2);
                 if (  expander != null  ) {
-                    alt17=1;
+                    alt18=1;
                 }
                 else if ( true ) {
-                    alt17=2;
+                    alt18=2;
                 }
                 else {
                     NoViableAltException nvae =
-                        new NoViableAltException("411:17: ({...}? expander_lhs_block[lhs] | normal_lhs_block[lhs] )", 17, 3, input);
+                        new NoViableAltException("420:17: ({...}? expander_lhs_block[lhs] | normal_lhs_block[lhs] )", 18, 3, input);
 
                     throw nvae;
                 }
                 break;
             case 52:
-                int LA17_4 = input.LA(2);
+                int LA18_4 = input.LA(2);
                 if (  expander != null  ) {
-                    alt17=1;
+                    alt18=1;
                 }
                 else if ( true ) {
-                    alt17=2;
+                    alt18=2;
                 }
                 else {
                     NoViableAltException nvae =
-                        new NoViableAltException("411:17: ({...}? expander_lhs_block[lhs] | normal_lhs_block[lhs] )", 17, 4, input);
+                        new NoViableAltException("420:17: ({...}? expander_lhs_block[lhs] | normal_lhs_block[lhs] )", 18, 4, input);
 
                     throw nvae;
                 }
                 break;
             case 53:
-                int LA17_5 = input.LA(2);
+                int LA18_5 = input.LA(2);
                 if (  expander != null  ) {
-                    alt17=1;
+                    alt18=1;
                 }
                 else if ( true ) {
-                    alt17=2;
+                    alt18=2;
                 }
                 else {
                     NoViableAltException nvae =
-                        new NoViableAltException("411:17: ({...}? expander_lhs_block[lhs] | normal_lhs_block[lhs] )", 17, 5, input);
+                        new NoViableAltException("420:17: ({...}? expander_lhs_block[lhs] | normal_lhs_block[lhs] )", 18, 5, input);
 
                     throw nvae;
                 }
                 break;
             case 54:
-                int LA17_6 = input.LA(2);
+                int LA18_6 = input.LA(2);
                 if (  expander != null  ) {
-                    alt17=1;
+                    alt18=1;
                 }
                 else if ( true ) {
-                    alt17=2;
+                    alt18=2;
                 }
                 else {
                     NoViableAltException nvae =
-                        new NoViableAltException("411:17: ({...}? expander_lhs_block[lhs] | normal_lhs_block[lhs] )", 17, 6, input);
+                        new NoViableAltException("420:17: ({...}? expander_lhs_block[lhs] | normal_lhs_block[lhs] )", 18, 6, input);
 
                     throw nvae;
                 }
                 break;
             case ID:
-                int LA17_7 = input.LA(2);
+                int LA18_7 = input.LA(2);
                 if (  expander != null  ) {
-                    alt17=1;
+                    alt18=1;
                 }
                 else if ( true ) {
-                    alt17=2;
+                    alt18=2;
                 }
                 else {
                     NoViableAltException nvae =
-                        new NoViableAltException("411:17: ({...}? expander_lhs_block[lhs] | normal_lhs_block[lhs] )", 17, 7, input);
+                        new NoViableAltException("420:17: ({...}? expander_lhs_block[lhs] | normal_lhs_block[lhs] )", 18, 7, input);
 
                     throw nvae;
                 }
                 break;
             case 15:
-                int LA17_8 = input.LA(2);
+                int LA18_8 = input.LA(2);
                 if (  expander != null  ) {
-                    alt17=1;
+                    alt18=1;
                 }
                 else if ( true ) {
-                    alt17=2;
+                    alt18=2;
                 }
                 else {
                     NoViableAltException nvae =
-                        new NoViableAltException("411:17: ({...}? expander_lhs_block[lhs] | normal_lhs_block[lhs] )", 17, 8, input);
+                        new NoViableAltException("420:17: ({...}? expander_lhs_block[lhs] | normal_lhs_block[lhs] )", 18, 8, input);
 
                     throw nvae;
                 }
@@ -1371,23 +1440,23 @@
             case 65:
             case 66:
             case 67:
-                alt17=1;
+                alt18=1;
                 break;
             default:
                 NoViableAltException nvae =
-                    new NoViableAltException("411:17: ({...}? expander_lhs_block[lhs] | normal_lhs_block[lhs] )", 17, 0, input);
+                    new NoViableAltException("420:17: ({...}? expander_lhs_block[lhs] | normal_lhs_block[lhs] )", 18, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt17) {
+            switch (alt18) {
                 case 1 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:412:25: {...}? expander_lhs_block[lhs]
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:421:25: {...}? expander_lhs_block[lhs]
                     {
                     if ( !( expander != null ) ) {
                         throw new FailedPredicateException(input, "query", " expander != null ");
                     }
-                    following.push(FOLLOW_expander_lhs_block_in_query560);
+                    following.push(FOLLOW_expander_lhs_block_in_query590);
                     expander_lhs_block(lhs);
                     following.pop();
 
@@ -1395,9 +1464,9 @@
                     }
                     break;
                 case 2 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:413:27: normal_lhs_block[lhs]
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:422:27: normal_lhs_block[lhs]
                     {
-                    following.push(FOLLOW_normal_lhs_block_in_query568);
+                    following.push(FOLLOW_normal_lhs_block_in_query598);
                     normal_lhs_block(lhs);
                     following.pop();
 
@@ -1407,8 +1476,8 @@
 
             }
 
-            match(input,29,FOLLOW_29_in_query583); 
-            following.push(FOLLOW_opt_eol_in_query585);
+            match(input,29,FOLLOW_29_in_query613); 
+            following.push(FOLLOW_opt_eol_in_query615);
             opt_eol();
             following.pop();
 
@@ -1428,7 +1497,7 @@
 
 
     // $ANTLR start template
-    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:419:1: template returns [FactTemplateDescr template] : opt_eol loc= 'template' templateName= ID EOL (slot= template_slot )+ 'end' EOL ;
+    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:428:1: template returns [FactTemplateDescr template] : opt_eol loc= 'template' templateName= ID EOL (slot= template_slot )+ 'end' EOL ;
     public FactTemplateDescr template() throws RecognitionException {   
         FactTemplateDescr template;
         Token loc=null;
@@ -1436,63 +1505,63 @@
         FieldTemplateDescr slot = null;
 
 
-        
-        		template = null;		
+
+        		template = null;		
         	
         try {
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:424:17: ( opt_eol loc= 'template' templateName= ID EOL (slot= template_slot )+ 'end' EOL )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:424:17: opt_eol loc= 'template' templateName= ID EOL (slot= template_slot )+ 'end' EOL
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:433:17: ( opt_eol loc= 'template' templateName= ID EOL (slot= template_slot )+ 'end' EOL )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:433:17: opt_eol loc= 'template' templateName= ID EOL (slot= template_slot )+ 'end' EOL
             {
-            following.push(FOLLOW_opt_eol_in_template609);
+            following.push(FOLLOW_opt_eol_in_template639);
             opt_eol();
             following.pop();
 
             loc=(Token)input.LT(1);
-            match(input,30,FOLLOW_30_in_template615); 
+            match(input,30,FOLLOW_30_in_template645); 
             templateName=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_template619); 
-            match(input,EOL,FOLLOW_EOL_in_template621); 
-            
-            			template = new FactTemplateDescr(templateName.getText());
-            			template.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );			
+            match(input,ID,FOLLOW_ID_in_template649); 
+            match(input,EOL,FOLLOW_EOL_in_template651); 
+
+            			template = new FactTemplateDescr(templateName.getText());
+            			template.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );			
             		
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:430:17: (slot= template_slot )+
-            int cnt18=0;
-            loop18:
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:439:17: (slot= template_slot )+
+            int cnt19=0;
+            loop19:
             do {
-                int alt18=2;
-                int LA18_0 = input.LA(1);
-                if ( LA18_0==ID ) {
-                    alt18=1;
+                int alt19=2;
+                int LA19_0 = input.LA(1);
+                if ( LA19_0==ID ) {
+                    alt19=1;
                 }
 
 
-                switch (alt18) {
+                switch (alt19) {
             	case 1 :
-            	    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:431:25: slot= template_slot
+            	    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:440:25: slot= template_slot
             	    {
-            	    following.push(FOLLOW_template_slot_in_template636);
+            	    following.push(FOLLOW_template_slot_in_template666);
             	    slot=template_slot();
             	    following.pop();
 
-            	    
-            	    				template.addFieldTemplate(slot);
+
+            	    				template.addFieldTemplate(slot);
             	    			
 
             	    }
             	    break;
 
             	default :
-            	    if ( cnt18 >= 1 ) break loop18;
+            	    if ( cnt19 >= 1 ) break loop19;
                         EarlyExitException eee =
-                            new EarlyExitException(18, input);
+                            new EarlyExitException(19, input);
                         throw eee;
                 }
-                cnt18++;
+                cnt19++;
             } while (true);
 
-            match(input,29,FOLLOW_29_in_template651); 
-            match(input,EOL,FOLLOW_EOL_in_template653); 
+            match(input,29,FOLLOW_29_in_template681); 
+            match(input,EOL,FOLLOW_EOL_in_template683); 
 
             }
 
@@ -1509,26 +1578,26 @@
 
 
     // $ANTLR start template_slot
-    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:439:1: template_slot returns [FieldTemplateDescr field] : fieldType= dotted_name name= ID (EOL|';');
+    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:448:1: template_slot returns [FieldTemplateDescr field] : fieldType= dotted_name name= ID (EOL|';');
     public FieldTemplateDescr template_slot() throws RecognitionException {   
         FieldTemplateDescr field;
         Token name=null;
         String fieldType = null;
 
 
-        
-        		field = null;
+
+        		field = null;
         	
         try {
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:445:18: (fieldType= dotted_name name= ID (EOL|';'))
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:445:18: fieldType= dotted_name name= ID (EOL|';')
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:454:18: (fieldType= dotted_name name= ID (EOL|';'))
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:454:18: fieldType= dotted_name name= ID (EOL|';')
             {
-            following.push(FOLLOW_dotted_name_in_template_slot685);
+            following.push(FOLLOW_dotted_name_in_template_slot715);
             fieldType=dotted_name();
             following.pop();
 
             name=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_template_slot689); 
+            match(input,ID,FOLLOW_ID_in_template_slot719); 
             if ( input.LA(1)==EOL||input.LA(1)==15 ) {
                 input.consume();
                 errorRecovery=false;
@@ -1536,14 +1605,14 @@
             else {
                 MismatchedSetException mse =
                     new MismatchedSetException(null,input);
-                recoverFromMismatchedSet(input,mse,FOLLOW_set_in_template_slot693);    throw mse;
+                recoverFromMismatchedSet(input,mse,FOLLOW_set_in_template_slot723);    throw mse;
             }
 
-            
-            			
-            			
-            			field = new FieldTemplateDescr(name.getText(), fieldType);
-            			field.setLocation( offset(name.getLine()), name.getCharPositionInLine() );
+
+            			
+            			
+            			field = new FieldTemplateDescr(name.getText(), fieldType);
+            			field.setLocation( offset(name.getLine()), name.getCharPositionInLine() );
             		
 
             }
@@ -1561,7 +1630,7 @@
 
 
     // $ANTLR start rule
-    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:454:1: rule returns [RuleDescr rule] : opt_eol loc= 'rule' ruleName= word opt_eol ( rule_attributes[rule] )? opt_eol ( (loc= 'when' ( ':' )? opt_eol ({...}? expander_lhs_block[lhs] | normal_lhs_block[lhs] ) )? ( opt_eol loc= 'then' ( ':' )? opt_eol ( options {greedy=false; } : any= . )* )? )? 'end' opt_eol ;
+    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:463:1: rule returns [RuleDescr rule] : opt_eol loc= 'rule' ruleName= word opt_eol ( rule_attributes[rule] )? opt_eol ( (loc= 'when' ( ':' )? opt_eol ({...}? expander_lhs_block[lhs] | normal_lhs_block[lhs] ) )? ( opt_eol loc= 'then' ( ':' )? opt_eol ( options {greedy=false; } : any= . )* )? )? 'end' opt_eol ;
     public RuleDescr rule() throws RecognitionException {   
         RuleDescr rule;
         Token loc=null;
@@ -1569,39 +1638,39 @@
         String ruleName = null;
 
 
-        
-        		rule = null;
-        		String consequence = "";
+
+        		rule = null;
+        		String consequence = "";
         	
         try {
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:460:17: ( opt_eol loc= 'rule' ruleName= word opt_eol ( rule_attributes[rule] )? opt_eol ( (loc= 'when' ( ':' )? opt_eol ({...}? expander_lhs_block[lhs] | normal_lhs_block[lhs] ) )? ( opt_eol loc= 'then' ( ':' )? opt_eol ( options {greedy=false; } : any= . )* )? )? 'end' opt_eol )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:460:17: opt_eol loc= 'rule' ruleName= word opt_eol ( rule_attributes[rule] )? opt_eol ( (loc= 'when' ( ':' )? opt_eol ({...}? expander_lhs_block[lhs] | normal_lhs_block[lhs] ) )? ( opt_eol loc= 'then' ( ':' )? opt_eol ( options {greedy=false; } : any= . )* )? )? 'end' opt_eol
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:469:17: ( opt_eol loc= 'rule' ruleName= word opt_eol ( rule_attributes[rule] )? opt_eol ( (loc= 'when' ( ':' )? opt_eol ({...}? expander_lhs_block[lhs] | normal_lhs_block[lhs] ) )? ( opt_eol loc= 'then' ( ':' )? opt_eol ( options {greedy=false; } : any= . )* )? )? 'end' opt_eol )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:469:17: opt_eol loc= 'rule' ruleName= word opt_eol ( rule_attributes[rule] )? opt_eol ( (loc= 'when' ( ':' )? opt_eol ({...}? expander_lhs_block[lhs] | normal_lhs_block[lhs] ) )? ( opt_eol loc= 'then' ( ':' )? opt_eol ( options {greedy=false; } : any= . )* )? )? 'end' opt_eol
             {
-            following.push(FOLLOW_opt_eol_in_rule728);
+            following.push(FOLLOW_opt_eol_in_rule758);
             opt_eol();
             following.pop();
 
             loc=(Token)input.LT(1);
-            match(input,31,FOLLOW_31_in_rule734); 
-            following.push(FOLLOW_word_in_rule738);
+            match(input,31,FOLLOW_31_in_rule764); 
+            following.push(FOLLOW_word_in_rule768);
             ruleName=word();
             following.pop();
 
-            following.push(FOLLOW_opt_eol_in_rule740);
+            following.push(FOLLOW_opt_eol_in_rule770);
             opt_eol();
             following.pop();
 
-             
-            			debug( "start rule: " + ruleName );
-            			rule = new RuleDescr( ruleName, null ); 
-            			rule.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+             
+            			debug( "start rule: " + ruleName );
+            			rule = new RuleDescr( ruleName, null ); 
+            			rule.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
             		
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:467:17: ( rule_attributes[rule] )?
-            int alt19=2;
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:476:17: ( rule_attributes[rule] )?
+            int alt20=2;
             switch ( input.LA(1) ) {
             case 33:
             case 35:
-                alt19=1;
+                alt20=1;
                 break;
             case EOL:
             case 15:
@@ -1612,29 +1681,29 @@
             case 39:
             case 40:
             case 41:
-                alt19=1;
+                alt20=1;
                 break;
             case 32:
-                alt19=1;
+                alt20=1;
                 break;
             case 34:
-                alt19=1;
+                alt20=1;
                 break;
             case 29:
-                alt19=1;
+                alt20=1;
                 break;
             default:
                 NoViableAltException nvae =
-                    new NoViableAltException("467:17: ( rule_attributes[rule] )?", 19, 0, input);
+                    new NoViableAltException("476:17: ( rule_attributes[rule] )?", 20, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt19) {
+            switch (alt20) {
                 case 1 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:467:25: rule_attributes[rule]
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:476:25: rule_attributes[rule]
                     {
-                    following.push(FOLLOW_rule_attributes_in_rule751);
+                    following.push(FOLLOW_rule_attributes_in_rule781);
                     rule_attributes(rule);
                     following.pop();
 
@@ -1644,230 +1713,230 @@
 
             }
 
-            following.push(FOLLOW_opt_eol_in_rule761);
+            following.push(FOLLOW_opt_eol_in_rule791);
             opt_eol();
             following.pop();
 
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:470:17: ( (loc= 'when' ( ':' )? opt_eol ({...}? expander_lhs_block[lhs] | normal_lhs_block[lhs] ) )? ( opt_eol loc= 'then' ( ':' )? opt_eol ( options {greedy=false; } : any= . )* )? )?
-            int alt26=2;
-            int LA26_0 = input.LA(1);
-            if ( LA26_0==EOL||LA26_0==15||LA26_0==32||LA26_0==34 ) {
-                alt26=1;
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:479:17: ( (loc= 'when' ( ':' )? opt_eol ({...}? expander_lhs_block[lhs] | normal_lhs_block[lhs] ) )? ( opt_eol loc= 'then' ( ':' )? opt_eol ( options {greedy=false; } : any= . )* )? )?
+            int alt27=2;
+            int LA27_0 = input.LA(1);
+            if ( LA27_0==EOL||LA27_0==15||LA27_0==32||LA27_0==34 ) {
+                alt27=1;
             }
-            else if ( LA26_0==29 ) {
-                alt26=1;
+            else if ( LA27_0==29 ) {
+                alt27=1;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("470:17: ( (loc= \'when\' ( \':\' )? opt_eol ({...}? expander_lhs_block[lhs] | normal_lhs_block[lhs] ) )? ( opt_eol loc= \'then\' ( \':\' )? opt_eol ( options {greedy=false; } : any= . )* )? )?", 26, 0, input);
+                    new NoViableAltException("479:17: ( (loc= \'when\' ( \':\' )? opt_eol ({...}? expander_lhs_block[lhs] | normal_lhs_block[lhs] ) )? ( opt_eol loc= \'then\' ( \':\' )? opt_eol ( options {greedy=false; } : any= . )* )? )?", 27, 0, input);
 
                 throw nvae;
             }
-            switch (alt26) {
+            switch (alt27) {
                 case 1 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:470:18: (loc= 'when' ( ':' )? opt_eol ({...}? expander_lhs_block[lhs] | normal_lhs_block[lhs] ) )? ( opt_eol loc= 'then' ( ':' )? opt_eol ( options {greedy=false; } : any= . )* )?
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:479:18: (loc= 'when' ( ':' )? opt_eol ({...}? expander_lhs_block[lhs] | normal_lhs_block[lhs] ) )? ( opt_eol loc= 'then' ( ':' )? opt_eol ( options {greedy=false; } : any= . )* )?
                     {
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:470:18: (loc= 'when' ( ':' )? opt_eol ({...}? expander_lhs_block[lhs] | normal_lhs_block[lhs] ) )?
-                    int alt22=2;
-                    int LA22_0 = input.LA(1);
-                    if ( LA22_0==32 ) {
-                        alt22=1;
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:479:18: (loc= 'when' ( ':' )? opt_eol ({...}? expander_lhs_block[lhs] | normal_lhs_block[lhs] ) )?
+                    int alt23=2;
+                    int LA23_0 = input.LA(1);
+                    if ( LA23_0==32 ) {
+                        alt23=1;
                     }
-                    else if ( LA22_0==EOL||LA22_0==15||LA22_0==29||LA22_0==34 ) {
-                        alt22=2;
+                    else if ( LA23_0==EOL||LA23_0==15||LA23_0==29||LA23_0==34 ) {
+                        alt23=2;
                     }
                     else {
                         NoViableAltException nvae =
-                            new NoViableAltException("470:18: (loc= \'when\' ( \':\' )? opt_eol ({...}? expander_lhs_block[lhs] | normal_lhs_block[lhs] ) )?", 22, 0, input);
+                            new NoViableAltException("479:18: (loc= \'when\' ( \':\' )? opt_eol ({...}? expander_lhs_block[lhs] | normal_lhs_block[lhs] ) )?", 23, 0, input);
 
                         throw nvae;
                     }
-                    switch (alt22) {
+                    switch (alt23) {
                         case 1 :
-                            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:470:25: loc= 'when' ( ':' )? opt_eol ({...}? expander_lhs_block[lhs] | normal_lhs_block[lhs] )
+                            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:479:25: loc= 'when' ( ':' )? opt_eol ({...}? expander_lhs_block[lhs] | normal_lhs_block[lhs] )
                             {
                             loc=(Token)input.LT(1);
-                            match(input,32,FOLLOW_32_in_rule770); 
-                            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:470:36: ( ':' )?
-                            int alt20=2;
-                            int LA20_0 = input.LA(1);
-                            if ( LA20_0==33 ) {
-                                int LA20_1 = input.LA(2);
+                            match(input,32,FOLLOW_32_in_rule800); 
+                            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:479:36: ( ':' )?
+                            int alt21=2;
+                            int LA21_0 = input.LA(1);
+                            if ( LA21_0==33 ) {
+                                int LA21_1 = input.LA(2);
                                 if ( !( expander != null ) ) {
-                                    alt20=1;
+                                    alt21=1;
                                 }
                                 else if (  expander != null  ) {
-                                    alt20=2;
+                                    alt21=2;
                                 }
                                 else {
                                     NoViableAltException nvae =
-                                        new NoViableAltException("470:36: ( \':\' )?", 20, 1, input);
+                                        new NoViableAltException("479:36: ( \':\' )?", 21, 1, input);
 
                                     throw nvae;
                                 }
                             }
-                            else if ( (LA20_0>=EOL && LA20_0<=32)||(LA20_0>=34 && LA20_0<=67) ) {
-                                alt20=2;
+                            else if ( (LA21_0>=EOL && LA21_0<=32)||(LA21_0>=34 && LA21_0<=67) ) {
+                                alt21=2;
                             }
                             else {
                                 NoViableAltException nvae =
-                                    new NoViableAltException("470:36: ( \':\' )?", 20, 0, input);
+                                    new NoViableAltException("479:36: ( \':\' )?", 21, 0, input);
 
                                 throw nvae;
                             }
-                            switch (alt20) {
+                            switch (alt21) {
                                 case 1 :
-                                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:470:36: ':'
+                                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:479:36: ':'
                                     {
-                                    match(input,33,FOLLOW_33_in_rule772); 
+                                    match(input,33,FOLLOW_33_in_rule802); 
 
                                     }
                                     break;
 
                             }
 
-                            following.push(FOLLOW_opt_eol_in_rule775);
+                            following.push(FOLLOW_opt_eol_in_rule805);
                             opt_eol();
                             following.pop();
 
-                             
-                            				AndDescr lhs = new AndDescr(); rule.setLhs( lhs ); 
-                            				lhs.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+                             
+                            				AndDescr lhs = new AndDescr(); rule.setLhs( lhs ); 
+                            				lhs.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
                             			
-                            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:475:25: ({...}? expander_lhs_block[lhs] | normal_lhs_block[lhs] )
-                            int alt21=2;
+                            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:484:25: ({...}? expander_lhs_block[lhs] | normal_lhs_block[lhs] )
+                            int alt22=2;
                             switch ( input.LA(1) ) {
                             case 23:
-                                int LA21_1 = input.LA(2);
+                                int LA22_1 = input.LA(2);
                                 if (  expander != null  ) {
-                                    alt21=1;
+                                    alt22=1;
                                 }
                                 else if ( true ) {
-                                    alt21=2;
+                                    alt22=2;
                                 }
                                 else {
                                     NoViableAltException nvae =
-                                        new NoViableAltException("475:25: ({...}? expander_lhs_block[lhs] | normal_lhs_block[lhs] )", 21, 1, input);
+                                        new NoViableAltException("484:25: ({...}? expander_lhs_block[lhs] | normal_lhs_block[lhs] )", 22, 1, input);
 
                                     throw nvae;
                                 }
                                 break;
                             case EOL:
-                                int LA21_2 = input.LA(2);
+                                int LA22_2 = input.LA(2);
                                 if (  expander != null  ) {
-                                    alt21=1;
+                                    alt22=1;
                                 }
                                 else if ( true ) {
-                                    alt21=2;
+                                    alt22=2;
                                 }
                                 else {
                                     NoViableAltException nvae =
-                                        new NoViableAltException("475:25: ({...}? expander_lhs_block[lhs] | normal_lhs_block[lhs] )", 21, 2, input);
+                                        new NoViableAltException("484:25: ({...}? expander_lhs_block[lhs] | normal_lhs_block[lhs] )", 22, 2, input);
 
                                     throw nvae;
                                 }
                                 break;
                             case 15:
-                                int LA21_3 = input.LA(2);
+                                int LA22_3 = input.LA(2);
                                 if (  expander != null  ) {
-                                    alt21=1;
+                                    alt22=1;
                                 }
                                 else if ( true ) {
-                                    alt21=2;
+                                    alt22=2;
                                 }
                                 else {
                                     NoViableAltException nvae =
-                                        new NoViableAltException("475:25: ({...}? expander_lhs_block[lhs] | normal_lhs_block[lhs] )", 21, 3, input);
+                                        new NoViableAltException("484:25: ({...}? expander_lhs_block[lhs] | normal_lhs_block[lhs] )", 22, 3, input);
 
                                     throw nvae;
                                 }
                                 break;
                             case 34:
-                                int LA21_4 = input.LA(2);
+                                int LA22_4 = input.LA(2);
                                 if (  expander != null  ) {
-                                    alt21=1;
+                                    alt22=1;
                                 }
                                 else if ( true ) {
-                                    alt21=2;
+                                    alt22=2;
                                 }
                                 else {
                                     NoViableAltException nvae =
-                                        new NoViableAltException("475:25: ({...}? expander_lhs_block[lhs] | normal_lhs_block[lhs] )", 21, 4, input);
+                                        new NoViableAltException("484:25: ({...}? expander_lhs_block[lhs] | normal_lhs_block[lhs] )", 22, 4, input);
 
                                     throw nvae;
                                 }
                                 break;
                             case 29:
-                                int LA21_5 = input.LA(2);
+                                int LA22_5 = input.LA(2);
                                 if (  expander != null  ) {
-                                    alt21=1;
+                                    alt22=1;
                                 }
                                 else if ( true ) {
-                                    alt21=2;
+                                    alt22=2;
                                 }
                                 else {
                                     NoViableAltException nvae =
-                                        new NoViableAltException("475:25: ({...}? expander_lhs_block[lhs] | normal_lhs_block[lhs] )", 21, 5, input);
+                                        new NoViableAltException("484:25: ({...}? expander_lhs_block[lhs] | normal_lhs_block[lhs] )", 22, 5, input);
 
                                     throw nvae;
                                 }
                                 break;
                             case 52:
-                                int LA21_6 = input.LA(2);
+                                int LA22_6 = input.LA(2);
                                 if (  expander != null  ) {
-                                    alt21=1;
+                                    alt22=1;
                                 }
                                 else if ( true ) {
-                                    alt21=2;
+                                    alt22=2;
                                 }
                                 else {
                                     NoViableAltException nvae =
-                                        new NoViableAltException("475:25: ({...}? expander_lhs_block[lhs] | normal_lhs_block[lhs] )", 21, 6, input);
+                                        new NoViableAltException("484:25: ({...}? expander_lhs_block[lhs] | normal_lhs_block[lhs] )", 22, 6, input);
 
                                     throw nvae;
                                 }
                                 break;
                             case 53:
-                                int LA21_7 = input.LA(2);
+                                int LA22_7 = input.LA(2);
                                 if (  expander != null  ) {
-                                    alt21=1;
+                                    alt22=1;
                                 }
                                 else if ( true ) {
-                                    alt21=2;
+                                    alt22=2;
                                 }
                                 else {
                                     NoViableAltException nvae =
-                                        new NoViableAltException("475:25: ({...}? expander_lhs_block[lhs] | normal_lhs_block[lhs] )", 21, 7, input);
+                                        new NoViableAltException("484:25: ({...}? expander_lhs_block[lhs] | normal_lhs_block[lhs] )", 22, 7, input);
 
                                     throw nvae;
                                 }
                                 break;
                             case 54:
-                                int LA21_8 = input.LA(2);
+                                int LA22_8 = input.LA(2);
                                 if (  expander != null  ) {
-                                    alt21=1;
+                                    alt22=1;
                                 }
                                 else if ( true ) {
-                                    alt21=2;
+                                    alt22=2;
                                 }
                                 else {
                                     NoViableAltException nvae =
-                                        new NoViableAltException("475:25: ({...}? expander_lhs_block[lhs] | normal_lhs_block[lhs] )", 21, 8, input);
+                                        new NoViableAltException("484:25: ({...}? expander_lhs_block[lhs] | normal_lhs_block[lhs] )", 22, 8, input);
 
                                     throw nvae;
                                 }
                                 break;
                             case ID:
-                                int LA21_9 = input.LA(2);
+                                int LA22_9 = input.LA(2);
                                 if (  expander != null  ) {
-                                    alt21=1;
+                                    alt22=1;
                                 }
                                 else if ( true ) {
-                                    alt21=2;
+                                    alt22=2;
                                 }
                                 else {
                                     NoViableAltException nvae =
-                                        new NoViableAltException("475:25: ({...}? expander_lhs_block[lhs] | normal_lhs_block[lhs] )", 21, 9, input);
+                                        new NoViableAltException("484:25: ({...}? expander_lhs_block[lhs] | normal_lhs_block[lhs] )", 22, 9, input);
 
                                     throw nvae;
                                 }
@@ -1927,23 +1996,23 @@
                             case 65:
                             case 66:
                             case 67:
-                                alt21=1;
+                                alt22=1;
                                 break;
                             default:
                                 NoViableAltException nvae =
-                                    new NoViableAltException("475:25: ({...}? expander_lhs_block[lhs] | normal_lhs_block[lhs] )", 21, 0, input);
+                                    new NoViableAltException("484:25: ({...}? expander_lhs_block[lhs] | normal_lhs_block[lhs] )", 22, 0, input);
 
                                 throw nvae;
                             }
 
-                            switch (alt21) {
+                            switch (alt22) {
                                 case 1 :
-                                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:476:33: {...}? expander_lhs_block[lhs]
+                                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:485:33: {...}? expander_lhs_block[lhs]
                                     {
                                     if ( !( expander != null ) ) {
                                         throw new FailedPredicateException(input, "rule", " expander != null ");
                                     }
-                                    following.push(FOLLOW_expander_lhs_block_in_rule793);
+                                    following.push(FOLLOW_expander_lhs_block_in_rule823);
                                     expander_lhs_block(lhs);
                                     following.pop();
 
@@ -1951,9 +2020,9 @@
                                     }
                                     break;
                                 case 2 :
-                                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:477:35: normal_lhs_block[lhs]
+                                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:486:35: normal_lhs_block[lhs]
                                     {
-                                    following.push(FOLLOW_normal_lhs_block_in_rule802);
+                                    following.push(FOLLOW_normal_lhs_block_in_rule832);
                                     normal_lhs_block(lhs);
                                     following.pop();
 
@@ -1969,100 +2038,100 @@
 
                     }
 
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:481:17: ( opt_eol loc= 'then' ( ':' )? opt_eol ( options {greedy=false; } : any= . )* )?
-                    int alt25=2;
-                    int LA25_0 = input.LA(1);
-                    if ( LA25_0==EOL||LA25_0==15||LA25_0==34 ) {
-                        alt25=1;
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:490:17: ( opt_eol loc= 'then' ( ':' )? opt_eol ( options {greedy=false; } : any= . )* )?
+                    int alt26=2;
+                    int LA26_0 = input.LA(1);
+                    if ( LA26_0==EOL||LA26_0==15||LA26_0==34 ) {
+                        alt26=1;
                     }
-                    else if ( LA25_0==29 ) {
-                        alt25=2;
+                    else if ( LA26_0==29 ) {
+                        alt26=2;
                     }
                     else {
                         NoViableAltException nvae =
-                            new NoViableAltException("481:17: ( opt_eol loc= \'then\' ( \':\' )? opt_eol ( options {greedy=false; } : any= . )* )?", 25, 0, input);
+                            new NoViableAltException("490:17: ( opt_eol loc= \'then\' ( \':\' )? opt_eol ( options {greedy=false; } : any= . )* )?", 26, 0, input);
 
                         throw nvae;
                     }
-                    switch (alt25) {
+                    switch (alt26) {
                         case 1 :
-                            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:481:19: opt_eol loc= 'then' ( ':' )? opt_eol ( options {greedy=false; } : any= . )*
+                            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:490:19: opt_eol loc= 'then' ( ':' )? opt_eol ( options {greedy=false; } : any= . )*
                             {
-                            following.push(FOLLOW_opt_eol_in_rule825);
+                            following.push(FOLLOW_opt_eol_in_rule855);
                             opt_eol();
                             following.pop();
 
                             loc=(Token)input.LT(1);
-                            match(input,34,FOLLOW_34_in_rule829); 
-                            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:481:38: ( ':' )?
-                            int alt23=2;
-                            int LA23_0 = input.LA(1);
-                            if ( LA23_0==33 ) {
-                                alt23=1;
+                            match(input,34,FOLLOW_34_in_rule859); 
+                            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:490:38: ( ':' )?
+                            int alt24=2;
+                            int LA24_0 = input.LA(1);
+                            if ( LA24_0==33 ) {
+                                alt24=1;
                             }
-                            else if ( (LA23_0>=EOL && LA23_0<=32)||(LA23_0>=34 && LA23_0<=67) ) {
-                                alt23=2;
+                            else if ( (LA24_0>=EOL && LA24_0<=32)||(LA24_0>=34 && LA24_0<=67) ) {
+                                alt24=2;
                             }
                             else {
                                 NoViableAltException nvae =
-                                    new NoViableAltException("481:38: ( \':\' )?", 23, 0, input);
+                                    new NoViableAltException("490:38: ( \':\' )?", 24, 0, input);
 
                                 throw nvae;
                             }
-                            switch (alt23) {
+                            switch (alt24) {
                                 case 1 :
-                                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:481:38: ':'
+                                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:490:38: ':'
                                     {
-                                    match(input,33,FOLLOW_33_in_rule831); 
+                                    match(input,33,FOLLOW_33_in_rule861); 
 
                                     }
                                     break;
 
                             }
 
-                            following.push(FOLLOW_opt_eol_in_rule835);
+                            following.push(FOLLOW_opt_eol_in_rule865);
                             opt_eol();
                             following.pop();
 
-                            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:482:25: ( options {greedy=false; } : any= . )*
-                            loop24:
+                            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:491:25: ( options {greedy=false; } : any= . )*
+                            loop25:
                             do {
-                                int alt24=2;
-                                int LA24_0 = input.LA(1);
-                                if ( LA24_0==29 ) {
-                                    alt24=2;
+                                int alt25=2;
+                                int LA25_0 = input.LA(1);
+                                if ( LA25_0==29 ) {
+                                    alt25=2;
                                 }
-                                else if ( (LA24_0>=EOL && LA24_0<=28)||(LA24_0>=30 && LA24_0<=67) ) {
-                                    alt24=1;
+                                else if ( (LA25_0>=EOL && LA25_0<=28)||(LA25_0>=30 && LA25_0<=67) ) {
+                                    alt25=1;
                                 }
 
 
-                                switch (alt24) {
+                                switch (alt25) {
                             	case 1 :
-                            	    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:482:52: any= .
+                            	    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:491:52: any= .
                             	    {
                             	    any=(Token)input.LT(1);
                             	    matchAny(input); 
-                            	    
-                            	    					consequence = consequence + " " + any.getText();
+
+                            	    					consequence = consequence + " " + any.getText();
                             	    				
 
                             	    }
                             	    break;
 
                             	default :
-                            	    break loop24;
+                            	    break loop25;
                                 }
                             } while (true);
 
-                            
-                            				if ( expander != null ) {
-                            					String expanded = runThenExpander( consequence, offset(loc.getLine()) );
-                            					rule.setConsequence( expanded );
-                            				} else { 
-                            					rule.setConsequence( consequence ); 
-                            				}
-                            				rule.setConsequenceLocation(offset(loc.getLine()), loc.getCharPositionInLine());
+
+                            				if ( expander != null ) {
+                            					String expanded = runThenExpander( consequence, offset(loc.getLine()) );
+                            					rule.setConsequence( expanded );
+                            				} else { 
+                            					rule.setConsequence( consequence ); 
+                            				}
+                            				rule.setConsequenceLocation(offset(loc.getLine()), loc.getCharPositionInLine());
                             			
 
                             }
@@ -2076,13 +2145,13 @@
 
             }
 
-            match(input,29,FOLLOW_29_in_rule881); 
-            following.push(FOLLOW_opt_eol_in_rule883);
+            match(input,29,FOLLOW_29_in_rule911); 
+            following.push(FOLLOW_opt_eol_in_rule913);
             opt_eol();
             following.pop();
 
-            
-            			debug( "end rule: " + ruleName );
+
+            			debug( "end rule: " + ruleName );
             		
 
             }
@@ -2100,36 +2169,48 @@
 
 
     // $ANTLR start extra_statement
-    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:503:1: extra_statement : ( import_statement | global | function ) ;
+    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:512:1: extra_statement : ( import_statement | function_import_statement | global | function ) ;
     public void extra_statement() throws RecognitionException {   
         try {
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:505:9: ( ( import_statement | global | function ) )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:505:9: ( import_statement | global | function )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:514:9: ( ( import_statement | function_import_statement | global | function ) )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:514:9: ( import_statement | function_import_statement | global | function )
             {
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:505:9: ( import_statement | global | function )
-            int alt27=3;
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:514:9: ( import_statement | function_import_statement | global | function )
+            int alt28=4;
             switch ( input.LA(1) ) {
             case 17:
-                alt27=1;
+                int LA28_1 = input.LA(2);
+                if ( LA28_1==18 ) {
+                    alt28=2;
+                }
+                else if ( (LA28_1>=EOL && LA28_1<=ID)||LA28_1==15 ) {
+                    alt28=1;
+                }
+                else {
+                    NoViableAltException nvae =
+                        new NoViableAltException("514:9: ( import_statement | function_import_statement | global | function )", 28, 1, input);
+
+                    throw nvae;
+                }
                 break;
-            case 21:
-                alt27=2;
-                break;
             case 22:
-                alt27=3;
+                alt28=3;
                 break;
+            case 18:
+                alt28=4;
+                break;
             default:
                 NoViableAltException nvae =
-                    new NoViableAltException("505:9: ( import_statement | global | function )", 27, 0, input);
+                    new NoViableAltException("514:9: ( import_statement | function_import_statement | global | function )", 28, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt27) {
+            switch (alt28) {
                 case 1 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:505:17: import_statement
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:514:17: import_statement
                     {
-                    following.push(FOLLOW_import_statement_in_extra_statement903);
+                    following.push(FOLLOW_import_statement_in_extra_statement933);
                     import_statement();
                     following.pop();
 
@@ -2137,19 +2218,29 @@
                     }
                     break;
                 case 2 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:506:17: global
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:515:17: function_import_statement
                     {
-                    following.push(FOLLOW_global_in_extra_statement908);
-                    global();
+                    following.push(FOLLOW_function_import_statement_in_extra_statement938);
+                    function_import_statement();
                     following.pop();
 
 
                     }
                     break;
                 case 3 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:507:17: function
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:516:17: global
                     {
-                    following.push(FOLLOW_function_in_extra_statement913);
+                    following.push(FOLLOW_global_in_extra_statement943);
+                    global();
+                    following.pop();
+
+
+                    }
+                    break;
+                case 4 :
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:517:17: function
+                    {
+                    following.push(FOLLOW_function_in_extra_statement948);
                     function();
                     following.pop();
 
@@ -2175,128 +2266,128 @@
 
 
     // $ANTLR start rule_attributes
-    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:511:1: rule_attributes[RuleDescr rule] : ( 'attributes' )? ( ':' )? opt_eol ( ( ',' )? a= rule_attribute opt_eol )* ;
+    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:521:1: rule_attributes[RuleDescr rule] : ( 'attributes' )? ( ':' )? opt_eol ( ( ',' )? a= rule_attribute opt_eol )* ;
     public void rule_attributes(RuleDescr rule) throws RecognitionException {   
         AttributeDescr a = null;
 
 
         try {
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:513:25: ( ( 'attributes' )? ( ':' )? opt_eol ( ( ',' )? a= rule_attribute opt_eol )* )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:513:25: ( 'attributes' )? ( ':' )? opt_eol ( ( ',' )? a= rule_attribute opt_eol )*
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:523:25: ( ( 'attributes' )? ( ':' )? opt_eol ( ( ',' )? a= rule_attribute opt_eol )* )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:523:25: ( 'attributes' )? ( ':' )? opt_eol ( ( ',' )? a= rule_attribute opt_eol )*
             {
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:513:25: ( 'attributes' )?
-            int alt28=2;
-            int LA28_0 = input.LA(1);
-            if ( LA28_0==35 ) {
-                alt28=1;
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:523:25: ( 'attributes' )?
+            int alt29=2;
+            int LA29_0 = input.LA(1);
+            if ( LA29_0==35 ) {
+                alt29=1;
             }
-            else if ( LA28_0==EOL||LA28_0==15||LA28_0==24||LA28_0==29||(LA28_0>=32 && LA28_0<=34)||(LA28_0>=36 && LA28_0<=41) ) {
-                alt28=2;
+            else if ( LA29_0==EOL||LA29_0==15||LA29_0==24||LA29_0==29||(LA29_0>=32 && LA29_0<=34)||(LA29_0>=36 && LA29_0<=41) ) {
+                alt29=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("513:25: ( \'attributes\' )?", 28, 0, input);
+                    new NoViableAltException("523:25: ( \'attributes\' )?", 29, 0, input);
 
                 throw nvae;
             }
-            switch (alt28) {
+            switch (alt29) {
                 case 1 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:513:25: 'attributes'
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:523:25: 'attributes'
                     {
-                    match(input,35,FOLLOW_35_in_rule_attributes932); 
+                    match(input,35,FOLLOW_35_in_rule_attributes967); 
 
                     }
                     break;
 
             }
 
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:513:39: ( ':' )?
-            int alt29=2;
-            int LA29_0 = input.LA(1);
-            if ( LA29_0==33 ) {
-                alt29=1;
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:523:39: ( ':' )?
+            int alt30=2;
+            int LA30_0 = input.LA(1);
+            if ( LA30_0==33 ) {
+                alt30=1;
             }
-            else if ( LA29_0==EOL||LA29_0==15||LA29_0==24||LA29_0==29||LA29_0==32||LA29_0==34||(LA29_0>=36 && LA29_0<=41) ) {
-                alt29=2;
+            else if ( LA30_0==EOL||LA30_0==15||LA30_0==24||LA30_0==29||LA30_0==32||LA30_0==34||(LA30_0>=36 && LA30_0<=41) ) {
+                alt30=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("513:39: ( \':\' )?", 29, 0, input);
+                    new NoViableAltException("523:39: ( \':\' )?", 30, 0, input);
 
                 throw nvae;
             }
-            switch (alt29) {
+            switch (alt30) {
                 case 1 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:513:39: ':'
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:523:39: ':'
                     {
-                    match(input,33,FOLLOW_33_in_rule_attributes935); 
+                    match(input,33,FOLLOW_33_in_rule_attributes970); 
 
                     }
                     break;
 
             }
 
-            following.push(FOLLOW_opt_eol_in_rule_attributes938);
+            following.push(FOLLOW_opt_eol_in_rule_attributes973);
             opt_eol();
             following.pop();
 
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:514:25: ( ( ',' )? a= rule_attribute opt_eol )*
-            loop31:
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:524:25: ( ( ',' )? a= rule_attribute opt_eol )*
+            loop32:
             do {
-                int alt31=2;
-                int LA31_0 = input.LA(1);
-                if ( LA31_0==24||(LA31_0>=36 && LA31_0<=41) ) {
-                    alt31=1;
+                int alt32=2;
+                int LA32_0 = input.LA(1);
+                if ( LA32_0==24||(LA32_0>=36 && LA32_0<=41) ) {
+                    alt32=1;
                 }
 
 
-                switch (alt31) {
+                switch (alt32) {
             	case 1 :
-            	    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:514:33: ( ',' )? a= rule_attribute opt_eol
+            	    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:524:33: ( ',' )? a= rule_attribute opt_eol
             	    {
-            	    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:514:33: ( ',' )?
-            	    int alt30=2;
-            	    int LA30_0 = input.LA(1);
-            	    if ( LA30_0==24 ) {
-            	        alt30=1;
+            	    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:524:33: ( ',' )?
+            	    int alt31=2;
+            	    int LA31_0 = input.LA(1);
+            	    if ( LA31_0==24 ) {
+            	        alt31=1;
             	    }
-            	    else if ( (LA30_0>=36 && LA30_0<=41) ) {
-            	        alt30=2;
+            	    else if ( (LA31_0>=36 && LA31_0<=41) ) {
+            	        alt31=2;
             	    }
             	    else {
             	        NoViableAltException nvae =
-            	            new NoViableAltException("514:33: ( \',\' )?", 30, 0, input);
+            	            new NoViableAltException("524:33: ( \',\' )?", 31, 0, input);
 
             	        throw nvae;
             	    }
-            	    switch (alt30) {
+            	    switch (alt31) {
             	        case 1 :
-            	            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:514:33: ','
+            	            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:524:33: ','
             	            {
-            	            match(input,24,FOLLOW_24_in_rule_attributes945); 
+            	            match(input,24,FOLLOW_24_in_rule_attributes980); 
 
             	            }
             	            break;
 
             	    }
 
-            	    following.push(FOLLOW_rule_attribute_in_rule_attributes950);
+            	    following.push(FOLLOW_rule_attribute_in_rule_attributes985);
             	    a=rule_attribute();
             	    following.pop();
 
-            	    following.push(FOLLOW_opt_eol_in_rule_attributes952);
+            	    following.push(FOLLOW_opt_eol_in_rule_attributes987);
             	    opt_eol();
             	    following.pop();
 
-            	    
-            	    					rule.addAttribute( a );
+
+            	    					rule.addAttribute( a );
             	    				
 
             	    }
             	    break;
 
             	default :
-            	    break loop31;
+            	    break loop32;
                 }
             } while (true);
 
@@ -2316,49 +2407,49 @@
 
 
     // $ANTLR start rule_attribute
-    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:521:1: rule_attribute returns [AttributeDescr d] : (a= salience | a= no_loop | a= agenda_group | a= duration | a= activation_group | a= auto_focus );
+    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:531:1: rule_attribute returns [AttributeDescr d] : (a= salience | a= no_loop | a= agenda_group | a= duration | a= activation_group | a= auto_focus );
     public AttributeDescr rule_attribute() throws RecognitionException {   
         AttributeDescr d;
         AttributeDescr a = null;
 
 
-        
-        		d = null;
+
+        		d = null;
         	
         try {
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:526:25: (a= salience | a= no_loop | a= agenda_group | a= duration | a= activation_group | a= auto_focus )
-            int alt32=6;
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:536:25: (a= salience | a= no_loop | a= agenda_group | a= duration | a= activation_group | a= auto_focus )
+            int alt33=6;
             switch ( input.LA(1) ) {
             case 36:
-                alt32=1;
+                alt33=1;
                 break;
             case 37:
-                alt32=2;
+                alt33=2;
                 break;
             case 40:
-                alt32=3;
+                alt33=3;
                 break;
             case 41:
-                alt32=4;
+                alt33=4;
                 break;
             case 39:
-                alt32=5;
+                alt33=5;
                 break;
             case 38:
-                alt32=6;
+                alt33=6;
                 break;
             default:
                 NoViableAltException nvae =
-                    new NoViableAltException("521:1: rule_attribute returns [AttributeDescr d] : (a= salience | a= no_loop | a= agenda_group | a= duration | a= activation_group | a= auto_focus );", 32, 0, input);
+                    new NoViableAltException("531:1: rule_attribute returns [AttributeDescr d] : (a= salience | a= no_loop | a= agenda_group | a= duration | a= activation_group | a= auto_focus );", 33, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt32) {
+            switch (alt33) {
                 case 1 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:526:25: a= salience
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:536:25: a= salience
                     {
-                    following.push(FOLLOW_salience_in_rule_attribute991);
+                    following.push(FOLLOW_salience_in_rule_attribute1026);
                     a=salience();
                     following.pop();
 
@@ -2367,9 +2458,9 @@
                     }
                     break;
                 case 2 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:527:25: a= no_loop
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:537:25: a= no_loop
                     {
-                    following.push(FOLLOW_no_loop_in_rule_attribute1001);
+                    following.push(FOLLOW_no_loop_in_rule_attribute1036);
                     a=no_loop();
                     following.pop();
 
@@ -2378,9 +2469,9 @@
                     }
                     break;
                 case 3 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:528:25: a= agenda_group
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:538:25: a= agenda_group
                     {
-                    following.push(FOLLOW_agenda_group_in_rule_attribute1012);
+                    following.push(FOLLOW_agenda_group_in_rule_attribute1047);
                     a=agenda_group();
                     following.pop();
 
@@ -2389,9 +2480,9 @@
                     }
                     break;
                 case 4 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:529:25: a= duration
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:539:25: a= duration
                     {
-                    following.push(FOLLOW_duration_in_rule_attribute1025);
+                    following.push(FOLLOW_duration_in_rule_attribute1060);
                     a=duration();
                     following.pop();
 
@@ -2400,9 +2491,9 @@
                     }
                     break;
                 case 5 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:530:25: a= activation_group
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:540:25: a= activation_group
                     {
-                    following.push(FOLLOW_activation_group_in_rule_attribute1039);
+                    following.push(FOLLOW_activation_group_in_rule_attribute1074);
                     a=activation_group();
                     following.pop();
 
@@ -2411,9 +2502,9 @@
                     }
                     break;
                 case 6 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:531:25: a= auto_focus
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:541:25: a= auto_focus
                     {
-                    following.push(FOLLOW_auto_focus_in_rule_attribute1050);
+                    following.push(FOLLOW_auto_focus_in_rule_attribute1085);
                     a=auto_focus();
                     following.pop();
 
@@ -2436,60 +2527,60 @@
 
 
     // $ANTLR start salience
-    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:535:1: salience returns [AttributeDescr d ] : loc= 'salience' opt_eol i= INT ( ';' )? opt_eol ;
+    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:545:1: salience returns [AttributeDescr d ] : loc= 'salience' opt_eol i= INT ( ';' )? opt_eol ;
     public AttributeDescr salience() throws RecognitionException {   
         AttributeDescr d;
         Token loc=null;
         Token i=null;
 
-        
-        		d = null;
+
+        		d = null;
         	
         try {
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:540:17: (loc= 'salience' opt_eol i= INT ( ';' )? opt_eol )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:540:17: loc= 'salience' opt_eol i= INT ( ';' )? opt_eol
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:550:17: (loc= 'salience' opt_eol i= INT ( ';' )? opt_eol )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:550:17: loc= 'salience' opt_eol i= INT ( ';' )? opt_eol
             {
             loc=(Token)input.LT(1);
-            match(input,36,FOLLOW_36_in_salience1083); 
-            following.push(FOLLOW_opt_eol_in_salience1085);
+            match(input,36,FOLLOW_36_in_salience1118); 
+            following.push(FOLLOW_opt_eol_in_salience1120);
             opt_eol();
             following.pop();
 
             i=(Token)input.LT(1);
-            match(input,INT,FOLLOW_INT_in_salience1089); 
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:540:46: ( ';' )?
-            int alt33=2;
-            int LA33_0 = input.LA(1);
-            if ( LA33_0==15 ) {
-                alt33=1;
+            match(input,INT,FOLLOW_INT_in_salience1124); 
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:550:46: ( ';' )?
+            int alt34=2;
+            int LA34_0 = input.LA(1);
+            if ( LA34_0==15 ) {
+                alt34=1;
             }
-            else if ( LA33_0==EOL||LA33_0==24||LA33_0==29||LA33_0==32||LA33_0==34||(LA33_0>=36 && LA33_0<=41) ) {
-                alt33=2;
+            else if ( LA34_0==EOL||LA34_0==24||LA34_0==29||LA34_0==32||LA34_0==34||(LA34_0>=36 && LA34_0<=41) ) {
+                alt34=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("540:46: ( \';\' )?", 33, 0, input);
+                    new NoViableAltException("550:46: ( \';\' )?", 34, 0, input);
 
                 throw nvae;
             }
-            switch (alt33) {
+            switch (alt34) {
                 case 1 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:540:46: ';'
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:550:46: ';'
                     {
-                    match(input,15,FOLLOW_15_in_salience1091); 
+                    match(input,15,FOLLOW_15_in_salience1126); 
 
                     }
                     break;
 
             }
 
-            following.push(FOLLOW_opt_eol_in_salience1094);
+            following.push(FOLLOW_opt_eol_in_salience1129);
             opt_eol();
             following.pop();
 
-            
-            			d = new AttributeDescr( "salience", i.getText() );
-            			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+
+            			d = new AttributeDescr( "salience", i.getText() );
+            			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
             		
 
             }
@@ -2507,86 +2598,86 @@
 
 
     // $ANTLR start no_loop
-    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:547:1: no_loop returns [AttributeDescr d] : ( (loc= 'no-loop' opt_eol ( ';' )? opt_eol ) | (loc= 'no-loop' t= BOOL opt_eol ( ';' )? opt_eol ) );
+    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:557:1: no_loop returns [AttributeDescr d] : ( (loc= 'no-loop' opt_eol ( ';' )? opt_eol ) | (loc= 'no-loop' t= BOOL opt_eol ( ';' )? opt_eol ) );
     public AttributeDescr no_loop() throws RecognitionException {   
         AttributeDescr d;
         Token loc=null;
         Token t=null;
 
-        
-        		d = null;
+
+        		d = null;
         	
         try {
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:552:17: ( (loc= 'no-loop' opt_eol ( ';' )? opt_eol ) | (loc= 'no-loop' t= BOOL opt_eol ( ';' )? opt_eol ) )
-            int alt36=2;
-            int LA36_0 = input.LA(1);
-            if ( LA36_0==37 ) {
-                int LA36_1 = input.LA(2);
-                if ( LA36_1==BOOL ) {
-                    alt36=2;
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:562:17: ( (loc= 'no-loop' opt_eol ( ';' )? opt_eol ) | (loc= 'no-loop' t= BOOL opt_eol ( ';' )? opt_eol ) )
+            int alt37=2;
+            int LA37_0 = input.LA(1);
+            if ( LA37_0==37 ) {
+                int LA37_1 = input.LA(2);
+                if ( LA37_1==BOOL ) {
+                    alt37=2;
                 }
-                else if ( LA36_1==EOL||LA36_1==15||LA36_1==24||LA36_1==29||LA36_1==32||LA36_1==34||(LA36_1>=36 && LA36_1<=41) ) {
-                    alt36=1;
+                else if ( LA37_1==EOL||LA37_1==15||LA37_1==24||LA37_1==29||LA37_1==32||LA37_1==34||(LA37_1>=36 && LA37_1<=41) ) {
+                    alt37=1;
                 }
                 else {
                     NoViableAltException nvae =
-                        new NoViableAltException("547:1: no_loop returns [AttributeDescr d] : ( (loc= \'no-loop\' opt_eol ( \';\' )? opt_eol ) | (loc= \'no-loop\' t= BOOL opt_eol ( \';\' )? opt_eol ) );", 36, 1, input);
+                        new NoViableAltException("557:1: no_loop returns [AttributeDescr d] : ( (loc= \'no-loop\' opt_eol ( \';\' )? opt_eol ) | (loc= \'no-loop\' t= BOOL opt_eol ( \';\' )? opt_eol ) );", 37, 1, input);
 
                     throw nvae;
                 }
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("547:1: no_loop returns [AttributeDescr d] : ( (loc= \'no-loop\' opt_eol ( \';\' )? opt_eol ) | (loc= \'no-loop\' t= BOOL opt_eol ( \';\' )? opt_eol ) );", 36, 0, input);
+                    new NoViableAltException("557:1: no_loop returns [AttributeDescr d] : ( (loc= \'no-loop\' opt_eol ( \';\' )? opt_eol ) | (loc= \'no-loop\' t= BOOL opt_eol ( \';\' )? opt_eol ) );", 37, 0, input);
 
                 throw nvae;
             }
-            switch (alt36) {
+            switch (alt37) {
                 case 1 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:552:17: (loc= 'no-loop' opt_eol ( ';' )? opt_eol )
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:562:17: (loc= 'no-loop' opt_eol ( ';' )? opt_eol )
                     {
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:552:17: (loc= 'no-loop' opt_eol ( ';' )? opt_eol )
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:553:25: loc= 'no-loop' opt_eol ( ';' )? opt_eol
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:562:17: (loc= 'no-loop' opt_eol ( ';' )? opt_eol )
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:563:25: loc= 'no-loop' opt_eol ( ';' )? opt_eol
                     {
                     loc=(Token)input.LT(1);
-                    match(input,37,FOLLOW_37_in_no_loop1129); 
-                    following.push(FOLLOW_opt_eol_in_no_loop1131);
+                    match(input,37,FOLLOW_37_in_no_loop1164); 
+                    following.push(FOLLOW_opt_eol_in_no_loop1166);
                     opt_eol();
                     following.pop();
 
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:553:47: ( ';' )?
-                    int alt34=2;
-                    int LA34_0 = input.LA(1);
-                    if ( LA34_0==15 ) {
-                        alt34=1;
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:563:47: ( ';' )?
+                    int alt35=2;
+                    int LA35_0 = input.LA(1);
+                    if ( LA35_0==15 ) {
+                        alt35=1;
                     }
-                    else if ( LA34_0==EOL||LA34_0==24||LA34_0==29||LA34_0==32||LA34_0==34||(LA34_0>=36 && LA34_0<=41) ) {
-                        alt34=2;
+                    else if ( LA35_0==EOL||LA35_0==24||LA35_0==29||LA35_0==32||LA35_0==34||(LA35_0>=36 && LA35_0<=41) ) {
+                        alt35=2;
                     }
                     else {
                         NoViableAltException nvae =
-                            new NoViableAltException("553:47: ( \';\' )?", 34, 0, input);
+                            new NoViableAltException("563:47: ( \';\' )?", 35, 0, input);
 
                         throw nvae;
                     }
-                    switch (alt34) {
+                    switch (alt35) {
                         case 1 :
-                            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:553:47: ';'
+                            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:563:47: ';'
                             {
-                            match(input,15,FOLLOW_15_in_no_loop1133); 
+                            match(input,15,FOLLOW_15_in_no_loop1168); 
 
                             }
                             break;
 
                     }
 
-                    following.push(FOLLOW_opt_eol_in_no_loop1136);
+                    following.push(FOLLOW_opt_eol_in_no_loop1171);
                     opt_eol();
                     following.pop();
 
-                    
-                    				d = new AttributeDescr( "no-loop", "true" );
-                    				d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+
+                    				d = new AttributeDescr( "no-loop", "true" );
+                    				d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
                     			
 
                     }
@@ -2595,52 +2686,52 @@
                     }
                     break;
                 case 2 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:560:17: (loc= 'no-loop' t= BOOL opt_eol ( ';' )? opt_eol )
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:570:17: (loc= 'no-loop' t= BOOL opt_eol ( ';' )? opt_eol )
                     {
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:560:17: (loc= 'no-loop' t= BOOL opt_eol ( ';' )? opt_eol )
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:561:25: loc= 'no-loop' t= BOOL opt_eol ( ';' )? opt_eol
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:570:17: (loc= 'no-loop' t= BOOL opt_eol ( ';' )? opt_eol )
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:571:25: loc= 'no-loop' t= BOOL opt_eol ( ';' )? opt_eol
                     {
                     loc=(Token)input.LT(1);
-                    match(input,37,FOLLOW_37_in_no_loop1161); 
+                    match(input,37,FOLLOW_37_in_no_loop1196); 
                     t=(Token)input.LT(1);
-                    match(input,BOOL,FOLLOW_BOOL_in_no_loop1165); 
-                    following.push(FOLLOW_opt_eol_in_no_loop1167);
+                    match(input,BOOL,FOLLOW_BOOL_in_no_loop1200); 
+                    following.push(FOLLOW_opt_eol_in_no_loop1202);
                     opt_eol();
                     following.pop();
 
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:561:54: ( ';' )?
-                    int alt35=2;
-                    int LA35_0 = input.LA(1);
-                    if ( LA35_0==15 ) {
-                        alt35=1;
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:571:54: ( ';' )?
+                    int alt36=2;
+                    int LA36_0 = input.LA(1);
+                    if ( LA36_0==15 ) {
+                        alt36=1;
                     }
-                    else if ( LA35_0==EOL||LA35_0==24||LA35_0==29||LA35_0==32||LA35_0==34||(LA35_0>=36 && LA35_0<=41) ) {
-                        alt35=2;
+                    else if ( LA36_0==EOL||LA36_0==24||LA36_0==29||LA36_0==32||LA36_0==34||(LA36_0>=36 && LA36_0<=41) ) {
+                        alt36=2;
                     }
                     else {
                         NoViableAltException nvae =
-                            new NoViableAltException("561:54: ( \';\' )?", 35, 0, input);
+                            new NoViableAltException("571:54: ( \';\' )?", 36, 0, input);
 
                         throw nvae;
                     }
-                    switch (alt35) {
+                    switch (alt36) {
                         case 1 :
-                            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:561:54: ';'
+                            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:571:54: ';'
                             {
-                            match(input,15,FOLLOW_15_in_no_loop1169); 
+                            match(input,15,FOLLOW_15_in_no_loop1204); 
 
                             }
                             break;
 
                     }
 
-                    following.push(FOLLOW_opt_eol_in_no_loop1172);
+                    following.push(FOLLOW_opt_eol_in_no_loop1207);
                     opt_eol();
                     following.pop();
 
-                    
-                    				d = new AttributeDescr( "no-loop", t.getText() );
-                    				d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+
+                    				d = new AttributeDescr( "no-loop", t.getText() );
+                    				d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
                     			
 
                     }
@@ -2663,86 +2754,86 @@
 
 
     // $ANTLR start auto_focus
-    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:571:1: auto_focus returns [AttributeDescr d] : ( (loc= 'auto-focus' opt_eol ( ';' )? opt_eol ) | (loc= 'auto-focus' t= BOOL opt_eol ( ';' )? opt_eol ) );
+    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:581:1: auto_focus returns [AttributeDescr d] : ( (loc= 'auto-focus' opt_eol ( ';' )? opt_eol ) | (loc= 'auto-focus' t= BOOL opt_eol ( ';' )? opt_eol ) );
     public AttributeDescr auto_focus() throws RecognitionException {   
         AttributeDescr d;
         Token loc=null;
         Token t=null;
 
-        
-        		d = null;
+
+        		d = null;
         	
         try {
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:576:17: ( (loc= 'auto-focus' opt_eol ( ';' )? opt_eol ) | (loc= 'auto-focus' t= BOOL opt_eol ( ';' )? opt_eol ) )
-            int alt39=2;
-            int LA39_0 = input.LA(1);
-            if ( LA39_0==38 ) {
-                int LA39_1 = input.LA(2);
-                if ( LA39_1==BOOL ) {
-                    alt39=2;
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:586:17: ( (loc= 'auto-focus' opt_eol ( ';' )? opt_eol ) | (loc= 'auto-focus' t= BOOL opt_eol ( ';' )? opt_eol ) )
+            int alt40=2;
+            int LA40_0 = input.LA(1);
+            if ( LA40_0==38 ) {
+                int LA40_1 = input.LA(2);
+                if ( LA40_1==BOOL ) {
+                    alt40=2;
                 }
-                else if ( LA39_1==EOL||LA39_1==15||LA39_1==24||LA39_1==29||LA39_1==32||LA39_1==34||(LA39_1>=36 && LA39_1<=41) ) {
-                    alt39=1;
+                else if ( LA40_1==EOL||LA40_1==15||LA40_1==24||LA40_1==29||LA40_1==32||LA40_1==34||(LA40_1>=36 && LA40_1<=41) ) {
+                    alt40=1;
                 }
                 else {
                     NoViableAltException nvae =
-                        new NoViableAltException("571:1: auto_focus returns [AttributeDescr d] : ( (loc= \'auto-focus\' opt_eol ( \';\' )? opt_eol ) | (loc= \'auto-focus\' t= BOOL opt_eol ( \';\' )? opt_eol ) );", 39, 1, input);
+                        new NoViableAltException("581:1: auto_focus returns [AttributeDescr d] : ( (loc= \'auto-focus\' opt_eol ( \';\' )? opt_eol ) | (loc= \'auto-focus\' t= BOOL opt_eol ( \';\' )? opt_eol ) );", 40, 1, input);
 
                     throw nvae;
                 }
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("571:1: auto_focus returns [AttributeDescr d] : ( (loc= \'auto-focus\' opt_eol ( \';\' )? opt_eol ) | (loc= \'auto-focus\' t= BOOL opt_eol ( \';\' )? opt_eol ) );", 39, 0, input);
+                    new NoViableAltException("581:1: auto_focus returns [AttributeDescr d] : ( (loc= \'auto-focus\' opt_eol ( \';\' )? opt_eol ) | (loc= \'auto-focus\' t= BOOL opt_eol ( \';\' )? opt_eol ) );", 40, 0, input);
 
                 throw nvae;
             }
-            switch (alt39) {
+            switch (alt40) {
                 case 1 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:576:17: (loc= 'auto-focus' opt_eol ( ';' )? opt_eol )
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:586:17: (loc= 'auto-focus' opt_eol ( ';' )? opt_eol )
                     {
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:576:17: (loc= 'auto-focus' opt_eol ( ';' )? opt_eol )
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:577:25: loc= 'auto-focus' opt_eol ( ';' )? opt_eol
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:586:17: (loc= 'auto-focus' opt_eol ( ';' )? opt_eol )
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:587:25: loc= 'auto-focus' opt_eol ( ';' )? opt_eol
                     {
                     loc=(Token)input.LT(1);
-                    match(input,38,FOLLOW_38_in_auto_focus1218); 
-                    following.push(FOLLOW_opt_eol_in_auto_focus1220);
+                    match(input,38,FOLLOW_38_in_auto_focus1253); 
+                    following.push(FOLLOW_opt_eol_in_auto_focus1255);
                     opt_eol();
                     following.pop();
 
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:577:50: ( ';' )?
-                    int alt37=2;
-                    int LA37_0 = input.LA(1);
-                    if ( LA37_0==15 ) {
-                        alt37=1;
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:587:50: ( ';' )?
+                    int alt38=2;
+                    int LA38_0 = input.LA(1);
+                    if ( LA38_0==15 ) {
+                        alt38=1;
                     }
-                    else if ( LA37_0==EOL||LA37_0==24||LA37_0==29||LA37_0==32||LA37_0==34||(LA37_0>=36 && LA37_0<=41) ) {
-                        alt37=2;
+                    else if ( LA38_0==EOL||LA38_0==24||LA38_0==29||LA38_0==32||LA38_0==34||(LA38_0>=36 && LA38_0<=41) ) {
+                        alt38=2;
                     }
                     else {
                         NoViableAltException nvae =
-                            new NoViableAltException("577:50: ( \';\' )?", 37, 0, input);
+                            new NoViableAltException("587:50: ( \';\' )?", 38, 0, input);
 
                         throw nvae;
                     }
-                    switch (alt37) {
+                    switch (alt38) {
                         case 1 :
-                            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:577:50: ';'
+                            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:587:50: ';'
                             {
-                            match(input,15,FOLLOW_15_in_auto_focus1222); 
+                            match(input,15,FOLLOW_15_in_auto_focus1257); 
 
                             }
                             break;
 
                     }
 
-                    following.push(FOLLOW_opt_eol_in_auto_focus1225);
+                    following.push(FOLLOW_opt_eol_in_auto_focus1260);
                     opt_eol();
                     following.pop();
 
-                    
-                    				d = new AttributeDescr( "auto-focus", "true" );
-                    				d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+
+                    				d = new AttributeDescr( "auto-focus", "true" );
+                    				d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
                     			
 
                     }
@@ -2751,52 +2842,52 @@
                     }
                     break;
                 case 2 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:584:17: (loc= 'auto-focus' t= BOOL opt_eol ( ';' )? opt_eol )
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:594:17: (loc= 'auto-focus' t= BOOL opt_eol ( ';' )? opt_eol )
                     {
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:584:17: (loc= 'auto-focus' t= BOOL opt_eol ( ';' )? opt_eol )
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:585:25: loc= 'auto-focus' t= BOOL opt_eol ( ';' )? opt_eol
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:594:17: (loc= 'auto-focus' t= BOOL opt_eol ( ';' )? opt_eol )
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:595:25: loc= 'auto-focus' t= BOOL opt_eol ( ';' )? opt_eol
                     {
                     loc=(Token)input.LT(1);
-                    match(input,38,FOLLOW_38_in_auto_focus1250); 
+                    match(input,38,FOLLOW_38_in_auto_focus1285); 
                     t=(Token)input.LT(1);
-                    match(input,BOOL,FOLLOW_BOOL_in_auto_focus1254); 
-                    following.push(FOLLOW_opt_eol_in_auto_focus1256);
+                    match(input,BOOL,FOLLOW_BOOL_in_auto_focus1289); 
+                    following.push(FOLLOW_opt_eol_in_auto_focus1291);
                     opt_eol();
                     following.pop();
 
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:585:57: ( ';' )?
-                    int alt38=2;
-                    int LA38_0 = input.LA(1);
-                    if ( LA38_0==15 ) {
-                        alt38=1;
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:595:57: ( ';' )?
+                    int alt39=2;
+                    int LA39_0 = input.LA(1);
+                    if ( LA39_0==15 ) {
+                        alt39=1;
                     }
-                    else if ( LA38_0==EOL||LA38_0==24||LA38_0==29||LA38_0==32||LA38_0==34||(LA38_0>=36 && LA38_0<=41) ) {
-                        alt38=2;
+                    else if ( LA39_0==EOL||LA39_0==24||LA39_0==29||LA39_0==32||LA39_0==34||(LA39_0>=36 && LA39_0<=41) ) {
+                        alt39=2;
                     }
                     else {
                         NoViableAltException nvae =
-                            new NoViableAltException("585:57: ( \';\' )?", 38, 0, input);
+                            new NoViableAltException("595:57: ( \';\' )?", 39, 0, input);
 
                         throw nvae;
                     }
-                    switch (alt38) {
+                    switch (alt39) {
                         case 1 :
-                            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:585:57: ';'
+                            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:595:57: ';'
                             {
-                            match(input,15,FOLLOW_15_in_auto_focus1258); 
+                            match(input,15,FOLLOW_15_in_auto_focus1293); 
 
                             }
                             break;
 
                     }
 
-                    following.push(FOLLOW_opt_eol_in_auto_focus1261);
+                    following.push(FOLLOW_opt_eol_in_auto_focus1296);
                     opt_eol();
                     following.pop();
 
-                    
-                    				d = new AttributeDescr( "auto-focus", t.getText() );
-                    				d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+
+                    				d = new AttributeDescr( "auto-focus", t.getText() );
+                    				d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
                     			
 
                     }
@@ -2819,60 +2910,60 @@
 
 
     // $ANTLR start activation_group
-    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:595:1: activation_group returns [AttributeDescr d] : loc= 'activation-group' opt_eol name= STRING ( ';' )? opt_eol ;
+    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:605:1: activation_group returns [AttributeDescr d] : loc= 'activation-group' opt_eol name= STRING ( ';' )? opt_eol ;
     public AttributeDescr activation_group() throws RecognitionException {   
         AttributeDescr d;
         Token loc=null;
         Token name=null;
 
-        
-        		d = null;
+
+        		d = null;
         	
         try {
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:600:17: (loc= 'activation-group' opt_eol name= STRING ( ';' )? opt_eol )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:600:17: loc= 'activation-group' opt_eol name= STRING ( ';' )? opt_eol
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:610:17: (loc= 'activation-group' opt_eol name= STRING ( ';' )? opt_eol )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:610:17: loc= 'activation-group' opt_eol name= STRING ( ';' )? opt_eol
             {
             loc=(Token)input.LT(1);
-            match(input,39,FOLLOW_39_in_activation_group1303); 
-            following.push(FOLLOW_opt_eol_in_activation_group1305);
+            match(input,39,FOLLOW_39_in_activation_group1338); 
+            following.push(FOLLOW_opt_eol_in_activation_group1340);
             opt_eol();
             following.pop();
 
             name=(Token)input.LT(1);
-            match(input,STRING,FOLLOW_STRING_in_activation_group1309); 
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:600:60: ( ';' )?
-            int alt40=2;
-            int LA40_0 = input.LA(1);
-            if ( LA40_0==15 ) {
-                alt40=1;
+            match(input,STRING,FOLLOW_STRING_in_activation_group1344); 
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:610:60: ( ';' )?
+            int alt41=2;
+            int LA41_0 = input.LA(1);
+            if ( LA41_0==15 ) {
+                alt41=1;
             }
-            else if ( LA40_0==EOL||LA40_0==24||LA40_0==29||LA40_0==32||LA40_0==34||(LA40_0>=36 && LA40_0<=41) ) {
-                alt40=2;
+            else if ( LA41_0==EOL||LA41_0==24||LA41_0==29||LA41_0==32||LA41_0==34||(LA41_0>=36 && LA41_0<=41) ) {
+                alt41=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("600:60: ( \';\' )?", 40, 0, input);
+                    new NoViableAltException("610:60: ( \';\' )?", 41, 0, input);
 
                 throw nvae;
             }
-            switch (alt40) {
+            switch (alt41) {
                 case 1 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:600:60: ';'
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:610:60: ';'
                     {
-                    match(input,15,FOLLOW_15_in_activation_group1311); 
+                    match(input,15,FOLLOW_15_in_activation_group1346); 
 
                     }
                     break;
 
             }
 
-            following.push(FOLLOW_opt_eol_in_activation_group1314);
+            following.push(FOLLOW_opt_eol_in_activation_group1349);
             opt_eol();
             following.pop();
 
-            
-            			d = new AttributeDescr( "activation-group", getString( name ) );
-            			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+
+            			d = new AttributeDescr( "activation-group", getString( name ) );
+            			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
             		
 
             }
@@ -2890,60 +2981,60 @@
 
 
     // $ANTLR start agenda_group
-    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:607:1: agenda_group returns [AttributeDescr d] : loc= 'agenda-group' opt_eol name= STRING ( ';' )? opt_eol ;
+    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:617:1: agenda_group returns [AttributeDescr d] : loc= 'agenda-group' opt_eol name= STRING ( ';' )? opt_eol ;
     public AttributeDescr agenda_group() throws RecognitionException {   
         AttributeDescr d;
         Token loc=null;
         Token name=null;
 
-        
-        		d = null;
+
+        		d = null;
         	
         try {
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:612:17: (loc= 'agenda-group' opt_eol name= STRING ( ';' )? opt_eol )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:612:17: loc= 'agenda-group' opt_eol name= STRING ( ';' )? opt_eol
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:622:17: (loc= 'agenda-group' opt_eol name= STRING ( ';' )? opt_eol )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:622:17: loc= 'agenda-group' opt_eol name= STRING ( ';' )? opt_eol
             {
             loc=(Token)input.LT(1);
-            match(input,40,FOLLOW_40_in_agenda_group1343); 
-            following.push(FOLLOW_opt_eol_in_agenda_group1345);
+            match(input,40,FOLLOW_40_in_agenda_group1378); 
+            following.push(FOLLOW_opt_eol_in_agenda_group1380);
             opt_eol();
             following.pop();
 
             name=(Token)input.LT(1);
-            match(input,STRING,FOLLOW_STRING_in_agenda_group1349); 
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:612:56: ( ';' )?
-            int alt41=2;
-            int LA41_0 = input.LA(1);
-            if ( LA41_0==15 ) {
-                alt41=1;
+            match(input,STRING,FOLLOW_STRING_in_agenda_group1384); 
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:622:56: ( ';' )?
+            int alt42=2;
+            int LA42_0 = input.LA(1);
+            if ( LA42_0==15 ) {
+                alt42=1;
             }
-            else if ( LA41_0==EOL||LA41_0==24||LA41_0==29||LA41_0==32||LA41_0==34||(LA41_0>=36 && LA41_0<=41) ) {
-                alt41=2;
+            else if ( LA42_0==EOL||LA42_0==24||LA42_0==29||LA42_0==32||LA42_0==34||(LA42_0>=36 && LA42_0<=41) ) {
+                alt42=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("612:56: ( \';\' )?", 41, 0, input);
+                    new NoViableAltException("622:56: ( \';\' )?", 42, 0, input);
 
                 throw nvae;
             }
-            switch (alt41) {
+            switch (alt42) {
                 case 1 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:612:56: ';'
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:622:56: ';'
                     {
-                    match(input,15,FOLLOW_15_in_agenda_group1351); 
+                    match(input,15,FOLLOW_15_in_agenda_group1386); 
 
                     }
                     break;
 
             }
 
-            following.push(FOLLOW_opt_eol_in_agenda_group1354);
+            following.push(FOLLOW_opt_eol_in_agenda_group1389);
             opt_eol();
             following.pop();
 
-            
-            			d = new AttributeDescr( "agenda-group", getString( name ) );
-            			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+
+            			d = new AttributeDescr( "agenda-group", getString( name ) );
+            			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
             		
 
             }
@@ -2961,60 +3052,60 @@
 
 
     // $ANTLR start duration
-    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:620:1: duration returns [AttributeDescr d] : loc= 'duration' opt_eol i= INT ( ';' )? opt_eol ;
+    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:630:1: duration returns [AttributeDescr d] : loc= 'duration' opt_eol i= INT ( ';' )? opt_eol ;
     public AttributeDescr duration() throws RecognitionException {   
         AttributeDescr d;
         Token loc=null;
         Token i=null;
 
-        
-        		d = null;
+
+        		d = null;
         	
         try {
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:625:17: (loc= 'duration' opt_eol i= INT ( ';' )? opt_eol )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:625:17: loc= 'duration' opt_eol i= INT ( ';' )? opt_eol
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:635:17: (loc= 'duration' opt_eol i= INT ( ';' )? opt_eol )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:635:17: loc= 'duration' opt_eol i= INT ( ';' )? opt_eol
             {
             loc=(Token)input.LT(1);
-            match(input,41,FOLLOW_41_in_duration1386); 
-            following.push(FOLLOW_opt_eol_in_duration1388);
+            match(input,41,FOLLOW_41_in_duration1421); 
+            following.push(FOLLOW_opt_eol_in_duration1423);
             opt_eol();
             following.pop();
 
             i=(Token)input.LT(1);
-            match(input,INT,FOLLOW_INT_in_duration1392); 
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:625:46: ( ';' )?
-            int alt42=2;
-            int LA42_0 = input.LA(1);
-            if ( LA42_0==15 ) {
-                alt42=1;
+            match(input,INT,FOLLOW_INT_in_duration1427); 
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:635:46: ( ';' )?
+            int alt43=2;
+            int LA43_0 = input.LA(1);
+            if ( LA43_0==15 ) {
+                alt43=1;
             }
-            else if ( LA42_0==EOL||LA42_0==24||LA42_0==29||LA42_0==32||LA42_0==34||(LA42_0>=36 && LA42_0<=41) ) {
-                alt42=2;
+            else if ( LA43_0==EOL||LA43_0==24||LA43_0==29||LA43_0==32||LA43_0==34||(LA43_0>=36 && LA43_0<=41) ) {
+                alt43=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("625:46: ( \';\' )?", 42, 0, input);
+                    new NoViableAltException("635:46: ( \';\' )?", 43, 0, input);
 
                 throw nvae;
             }
-            switch (alt42) {
+            switch (alt43) {
                 case 1 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:625:46: ';'
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:635:46: ';'
                     {
-                    match(input,15,FOLLOW_15_in_duration1394); 
+                    match(input,15,FOLLOW_15_in_duration1429); 
 
                     }
                     break;
 
             }
 
-            following.push(FOLLOW_opt_eol_in_duration1397);
+            following.push(FOLLOW_opt_eol_in_duration1432);
             opt_eol();
             following.pop();
 
-            
-            			d = new AttributeDescr( "duration", i.getText() );
-            			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+
+            			d = new AttributeDescr( "duration", i.getText() );
+            			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
             		
 
             }
@@ -3032,34 +3123,34 @@
 
 
     // $ANTLR start normal_lhs_block
-    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:633:1: normal_lhs_block[AndDescr descrs] : (d= lhs opt_eol )* opt_eol ;
+    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:643:1: normal_lhs_block[AndDescr descrs] : (d= lhs opt_eol )* opt_eol ;
     public void normal_lhs_block(AndDescr descrs) throws RecognitionException {   
         PatternDescr d = null;
 
 
         try {
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:635:17: ( (d= lhs opt_eol )* opt_eol )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:635:17: (d= lhs opt_eol )* opt_eol
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:645:17: ( (d= lhs opt_eol )* opt_eol )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:645:17: (d= lhs opt_eol )* opt_eol
             {
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:635:17: (d= lhs opt_eol )*
-            loop43:
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:645:17: (d= lhs opt_eol )*
+            loop44:
             do {
-                int alt43=2;
-                int LA43_0 = input.LA(1);
-                if ( LA43_0==ID||LA43_0==23||(LA43_0>=52 && LA43_0<=54) ) {
-                    alt43=1;
+                int alt44=2;
+                int LA44_0 = input.LA(1);
+                if ( LA44_0==ID||LA44_0==23||(LA44_0>=52 && LA44_0<=54) ) {
+                    alt44=1;
                 }
 
 
-                switch (alt43) {
+                switch (alt44) {
             	case 1 :
-            	    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:635:25: d= lhs opt_eol
+            	    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:645:25: d= lhs opt_eol
             	    {
-            	    following.push(FOLLOW_lhs_in_normal_lhs_block1423);
+            	    following.push(FOLLOW_lhs_in_normal_lhs_block1458);
             	    d=lhs();
             	    following.pop();
 
-            	    following.push(FOLLOW_opt_eol_in_normal_lhs_block1425);
+            	    following.push(FOLLOW_opt_eol_in_normal_lhs_block1460);
             	    opt_eol();
             	    following.pop();
 
@@ -3069,11 +3160,11 @@
             	    break;
 
             	default :
-            	    break loop43;
+            	    break loop44;
                 }
             } while (true);
 
-            following.push(FOLLOW_opt_eol_in_normal_lhs_block1437);
+            following.push(FOLLOW_opt_eol_in_normal_lhs_block1472);
             opt_eol();
             following.pop();
 
@@ -3093,34 +3184,34 @@
 
 
     // $ANTLR start expander_lhs_block
-    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:643:1: expander_lhs_block[AndDescr descrs] : ( options {greedy=false; } : text= paren_chunk loc= EOL ( EOL )* )* ;
+    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:653:1: expander_lhs_block[AndDescr descrs] : ( options {greedy=false; } : text= paren_chunk loc= EOL ( EOL )* )* ;
     public void expander_lhs_block(AndDescr descrs) throws RecognitionException {   
         Token loc=null;
         String text = null;
 
 
-        
-        		String lhsBlock = null;
-        		String eol = System.getProperty( "line.separator" );
-        		List constraints = null;
+
+        		String lhsBlock = null;
+        		String eol = System.getProperty( "line.separator" );
+        		List constraints = null;
         	
         try {
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:650:17: ( ( options {greedy=false; } : text= paren_chunk loc= EOL ( EOL )* )* )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:650:17: ( options {greedy=false; } : text= paren_chunk loc= EOL ( EOL )* )*
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:660:17: ( ( options {greedy=false; } : text= paren_chunk loc= EOL ( EOL )* )* )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:660:17: ( options {greedy=false; } : text= paren_chunk loc= EOL ( EOL )* )*
             {
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:650:17: ( options {greedy=false; } : text= paren_chunk loc= EOL ( EOL )* )*
-            loop45:
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:660:17: ( options {greedy=false; } : text= paren_chunk loc= EOL ( EOL )* )*
+            loop46:
             do {
-                int alt45=2;
+                int alt46=2;
                 switch ( input.LA(1) ) {
                 case 29:
-                    alt45=2;
+                    alt46=2;
                     break;
                 case EOL:
-                    alt45=2;
+                    alt46=2;
                     break;
                 case 34:
-                    alt45=2;
+                    alt46=2;
                     break;
                 case ID:
                 case INT:
@@ -3182,69 +3273,69 @@
                 case 65:
                 case 66:
                 case 67:
-                    alt45=1;
+                    alt46=1;
                     break;
                 case 15:
-                    alt45=2;
+                    alt46=2;
                     break;
 
                 }
 
-                switch (alt45) {
+                switch (alt46) {
             	case 1 :
-            	    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:651:25: text= paren_chunk loc= EOL ( EOL )*
+            	    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:661:25: text= paren_chunk loc= EOL ( EOL )*
             	    {
-            	    following.push(FOLLOW_paren_chunk_in_expander_lhs_block1478);
+            	    following.push(FOLLOW_paren_chunk_in_expander_lhs_block1513);
             	    text=paren_chunk();
             	    following.pop();
 
             	    loc=(Token)input.LT(1);
-            	    match(input,EOL,FOLLOW_EOL_in_expander_lhs_block1482); 
-            	    
-            	    				//only expand non null
-            	    				if (text != null) {
-            	    					if (text.trim().startsWith("-")) {
-            	    						if (constraints == null) {
-            	    							constraints = new ArrayList();
-            	    						}
-            	    						constraints.add(runWhenExpander( text, offset(loc.getLine())));
-            	    					} else {
-            	    						if (constraints != null) {
-            	    							lhsBlock = applyConstraints(constraints, lhsBlock);
-            	    							constraints = null;
-            	    						}
-            	    					
-            	    					
-            	    						if (lhsBlock == null) {					
-            	    							lhsBlock = runWhenExpander( text, offset(loc.getLine()));
-            	    						} else {
-            	    							lhsBlock = lhsBlock + eol + runWhenExpander( text, offset(loc.getLine()));
-            	    						}
-            	    					}
-            	    					text = null;
-            	    				}
+            	    match(input,EOL,FOLLOW_EOL_in_expander_lhs_block1517); 
+
+            	    				//only expand non null
+            	    				if (text != null) {
+            	    					if (text.trim().startsWith("-")) {
+            	    						if (constraints == null) {
+            	    							constraints = new ArrayList();
+            	    						}
+            	    						constraints.add(runWhenExpander( text, offset(loc.getLine())));
+            	    					} else {
+            	    						if (constraints != null) {
+            	    							lhsBlock = applyConstraints(constraints, lhsBlock);
+            	    							constraints = null;
+            	    						}
+            	    					
+            	    					
+            	    						if (lhsBlock == null) {					
+            	    							lhsBlock = runWhenExpander( text, offset(loc.getLine()));
+            	    						} else {
+            	    							lhsBlock = lhsBlock + eol + runWhenExpander( text, offset(loc.getLine()));
+            	    						}
+            	    					}
+            	    					text = null;
+            	    				}
             	    			
-            	    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:677:17: ( EOL )*
-            	    loop44:
+            	    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:687:17: ( EOL )*
+            	    loop45:
             	    do {
-            	        int alt44=2;
-            	        int LA44_0 = input.LA(1);
-            	        if ( LA44_0==EOL ) {
-            	            alt44=1;
+            	        int alt45=2;
+            	        int LA45_0 = input.LA(1);
+            	        if ( LA45_0==EOL ) {
+            	            alt45=1;
             	        }
 
 
-            	        switch (alt44) {
+            	        switch (alt45) {
             	    	case 1 :
-            	    	    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:677:18: EOL
+            	    	    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:687:18: EOL
             	    	    {
-            	    	    match(input,EOL,FOLLOW_EOL_in_expander_lhs_block1497); 
+            	    	    match(input,EOL,FOLLOW_EOL_in_expander_lhs_block1532); 
 
             	    	    }
             	    	    break;
 
             	    	default :
-            	    	    break loop44;
+            	    	    break loop45;
             	        }
             	    } while (true);
 
@@ -3253,16 +3344,16 @@
             	    break;
 
             	default :
-            	    break loop45;
+            	    break loop46;
                 }
             } while (true);
 
-            	
-            			//flush out any constraints left handing before the RHS
-            			lhsBlock = applyConstraints(constraints, lhsBlock);
-            			if (lhsBlock != null) {
-            				reparseLhs(lhsBlock, descrs);
-            			}
+            	
+            			//flush out any constraints left handing before the RHS
+            			lhsBlock = applyConstraints(constraints, lhsBlock);
+            			if (lhsBlock != null) {
+            				reparseLhs(lhsBlock, descrs);
+            			}
             		
 
             }
@@ -3280,20 +3371,20 @@
 
 
     // $ANTLR start lhs
-    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:691:1: lhs returns [PatternDescr d] : l= lhs_or ;
+    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:701:1: lhs returns [PatternDescr d] : l= lhs_or ;
     public PatternDescr lhs() throws RecognitionException {   
         PatternDescr d;
         PatternDescr l = null;
 
 
-        
-        		d=null;
+
+        		d=null;
         	
         try {
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:695:17: (l= lhs_or )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:695:17: l= lhs_or
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:705:17: (l= lhs_or )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:705:17: l= lhs_or
             {
-            following.push(FOLLOW_lhs_or_in_lhs1539);
+            following.push(FOLLOW_lhs_or_in_lhs1574);
             l=lhs_or();
             following.pop();
 
@@ -3314,24 +3405,24 @@
 
 
     // $ANTLR start lhs_column
-    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:699:1: lhs_column returns [PatternDescr d] : (f= fact_binding | f= fact );
+    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:709:1: lhs_column returns [PatternDescr d] : (f= fact_binding | f= fact );
     public PatternDescr lhs_column() throws RecognitionException {   
         PatternDescr d;
         PatternDescr f = null;
 
 
-        
-        		d=null;
+
+        		d=null;
         	
         try {
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:703:17: (f= fact_binding | f= fact )
-            int alt46=2;
-            alt46 = dfa46.predict(input); 
-            switch (alt46) {
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:713:17: (f= fact_binding | f= fact )
+            int alt47=2;
+            alt47 = dfa47.predict(input); 
+            switch (alt47) {
                 case 1 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:703:17: f= fact_binding
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:713:17: f= fact_binding
                     {
-                    following.push(FOLLOW_fact_binding_in_lhs_column1567);
+                    following.push(FOLLOW_fact_binding_in_lhs_column1602);
                     f=fact_binding();
                     following.pop();
 
@@ -3340,9 +3431,9 @@
                     }
                     break;
                 case 2 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:704:17: f= fact
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:714:17: f= fact
                     {
-                    following.push(FOLLOW_fact_in_lhs_column1576);
+                    following.push(FOLLOW_fact_in_lhs_column1611);
                     f=fact();
                     following.pop();
 
@@ -3365,32 +3456,32 @@
 
 
     // $ANTLR start from_statement
-    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:707:1: from_statement returns [FromDescr d] : 'from' opt_eol ds= from_source ;
+    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:717:1: from_statement returns [FromDescr d] : 'from' opt_eol ds= from_source ;
     public FromDescr from_statement() throws RecognitionException {   
         FromDescr d;
         DeclarativeInvokerDescr ds = null;
 
 
-        
-        		d=factory.createFrom();
+
+        		d=factory.createFrom();
         	
         try {
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:712:17: ( 'from' opt_eol ds= from_source )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:712:17: 'from' opt_eol ds= from_source
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:722:17: ( 'from' opt_eol ds= from_source )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:722:17: 'from' opt_eol ds= from_source
             {
-            match(input,42,FOLLOW_42_in_from_statement1604); 
-            following.push(FOLLOW_opt_eol_in_from_statement1606);
+            match(input,42,FOLLOW_42_in_from_statement1639); 
+            following.push(FOLLOW_opt_eol_in_from_statement1641);
             opt_eol();
             following.pop();
 
-            following.push(FOLLOW_from_source_in_from_statement1610);
+            following.push(FOLLOW_from_source_in_from_statement1645);
             ds=from_source();
             following.pop();
 
-            
-             			d.setDataSource(ds);
-             		
+
+             			d.setDataSource(ds);
              		
+             		
 
             }
 
@@ -3407,7 +3498,7 @@
 
 
     // $ANTLR start from_source
-    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:722:1: from_source returns [DeclarativeInvokerDescr ds] : ( (var= ID '.' field= ID ) | (var= ID '.' method= ID opt_eol '(' opt_eol args= argument_list opt_eol ')' ) | (functionName= ID opt_eol '(' opt_eol args= argument_list opt_eol ')' ) );
+    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:732:1: from_source returns [DeclarativeInvokerDescr ds] : ( (var= ID '.' field= ID ) | (var= ID '.' method= ID opt_eol '(' opt_eol args= argument_list opt_eol ')' ) | (functionName= ID opt_eol '(' opt_eol args= argument_list opt_eol ')' ) );
     public DeclarativeInvokerDescr from_source() throws RecognitionException {   
         DeclarativeInvokerDescr ds;
         Token var=null;
@@ -3417,29 +3508,29 @@
         ArrayList args = null;
 
 
-        
-        		ds = null;
+
+        		ds = null;
         	
         try {
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:727:17: ( (var= ID '.' field= ID ) | (var= ID '.' method= ID opt_eol '(' opt_eol args= argument_list opt_eol ')' ) | (functionName= ID opt_eol '(' opt_eol args= argument_list opt_eol ')' ) )
-            int alt47=3;
-            alt47 = dfa47.predict(input); 
-            switch (alt47) {
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:737:17: ( (var= ID '.' field= ID ) | (var= ID '.' method= ID opt_eol '(' opt_eol args= argument_list opt_eol ')' ) | (functionName= ID opt_eol '(' opt_eol args= argument_list opt_eol ')' ) )
+            int alt48=3;
+            alt48 = dfa48.predict(input); 
+            switch (alt48) {
                 case 1 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:727:17: (var= ID '.' field= ID )
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:737:17: (var= ID '.' field= ID )
                     {
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:727:17: (var= ID '.' field= ID )
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:727:18: var= ID '.' field= ID
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:737:17: (var= ID '.' field= ID )
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:737:18: var= ID '.' field= ID
                     {
                     var=(Token)input.LT(1);
-                    match(input,ID,FOLLOW_ID_in_from_source1654); 
-                    match(input,18,FOLLOW_18_in_from_source1656); 
+                    match(input,ID,FOLLOW_ID_in_from_source1689); 
+                    match(input,19,FOLLOW_19_in_from_source1691); 
                     field=(Token)input.LT(1);
-                    match(input,ID,FOLLOW_ID_in_from_source1660); 
-                    
-                    			  FieldAccessDescr fa = new FieldAccessDescr(var.getText(), field.getText());	
-                    			  fa.setLine(var.getLine());
-                    			  ds = fa;
+                    match(input,ID,FOLLOW_ID_in_from_source1695); 
+
+                    			  FieldAccessDescr fa = new FieldAccessDescr(var.getText(), field.getText());	
+                    			  fa.setLine(var.getLine());
+                    			  ds = fa;
                     			 
 
                     }
@@ -3448,39 +3539,39 @@
                     }
                     break;
                 case 2 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:737:17: (var= ID '.' method= ID opt_eol '(' opt_eol args= argument_list opt_eol ')' )
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:747:17: (var= ID '.' method= ID opt_eol '(' opt_eol args= argument_list opt_eol ')' )
                     {
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:737:17: (var= ID '.' method= ID opt_eol '(' opt_eol args= argument_list opt_eol ')' )
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:737:18: var= ID '.' method= ID opt_eol '(' opt_eol args= argument_list opt_eol ')'
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:747:17: (var= ID '.' method= ID opt_eol '(' opt_eol args= argument_list opt_eol ')' )
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:747:18: var= ID '.' method= ID opt_eol '(' opt_eol args= argument_list opt_eol ')'
                     {
                     var=(Token)input.LT(1);
-                    match(input,ID,FOLLOW_ID_in_from_source1687); 
-                    match(input,18,FOLLOW_18_in_from_source1689); 
+                    match(input,ID,FOLLOW_ID_in_from_source1722); 
+                    match(input,19,FOLLOW_19_in_from_source1724); 
                     method=(Token)input.LT(1);
-                    match(input,ID,FOLLOW_ID_in_from_source1693); 
-                    following.push(FOLLOW_opt_eol_in_from_source1695);
+                    match(input,ID,FOLLOW_ID_in_from_source1728); 
+                    following.push(FOLLOW_opt_eol_in_from_source1730);
                     opt_eol();
                     following.pop();
 
-                    match(input,23,FOLLOW_23_in_from_source1698); 
-                    following.push(FOLLOW_opt_eol_in_from_source1700);
+                    match(input,23,FOLLOW_23_in_from_source1733); 
+                    following.push(FOLLOW_opt_eol_in_from_source1735);
                     opt_eol();
                     following.pop();
 
-                    following.push(FOLLOW_argument_list_in_from_source1704);
+                    following.push(FOLLOW_argument_list_in_from_source1739);
                     args=argument_list();
                     following.pop();
 
-                    following.push(FOLLOW_opt_eol_in_from_source1706);
+                    following.push(FOLLOW_opt_eol_in_from_source1741);
                     opt_eol();
                     following.pop();
 
-                    match(input,25,FOLLOW_25_in_from_source1708); 
-                    
-                    			MethodAccessDescr mc = new MethodAccessDescr(var.getText(), method.getText());
-                    			mc.setArguments(args);
-                    			mc.setLine(var.getLine());
-                    			ds = mc;
+                    match(input,25,FOLLOW_25_in_from_source1743); 
+
+                    			MethodAccessDescr mc = new MethodAccessDescr(var.getText(), method.getText());
+                    			mc.setArguments(args);
+                    			mc.setLine(var.getLine());
+                    			ds = mc;
                     			
 
                     }
@@ -3489,36 +3580,36 @@
                     }
                     break;
                 case 3 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:746:17: (functionName= ID opt_eol '(' opt_eol args= argument_list opt_eol ')' )
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:756:17: (functionName= ID opt_eol '(' opt_eol args= argument_list opt_eol ')' )
                     {
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:746:17: (functionName= ID opt_eol '(' opt_eol args= argument_list opt_eol ')' )
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:746:18: functionName= ID opt_eol '(' opt_eol args= argument_list opt_eol ')'
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:756:17: (functionName= ID opt_eol '(' opt_eol args= argument_list opt_eol ')' )
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:756:18: functionName= ID opt_eol '(' opt_eol args= argument_list opt_eol ')'
                     {
                     functionName=(Token)input.LT(1);
-                    match(input,ID,FOLLOW_ID_in_from_source1730); 
-                    following.push(FOLLOW_opt_eol_in_from_source1732);
+                    match(input,ID,FOLLOW_ID_in_from_source1765); 
+                    following.push(FOLLOW_opt_eol_in_from_source1767);
                     opt_eol();
                     following.pop();
 
-                    match(input,23,FOLLOW_23_in_from_source1734); 
-                    following.push(FOLLOW_opt_eol_in_from_source1736);
+                    match(input,23,FOLLOW_23_in_from_source1769); 
+                    following.push(FOLLOW_opt_eol_in_from_source1771);
                     opt_eol();
                     following.pop();
 
-                    following.push(FOLLOW_argument_list_in_from_source1740);
+                    following.push(FOLLOW_argument_list_in_from_source1775);
                     args=argument_list();
                     following.pop();
 
-                    following.push(FOLLOW_opt_eol_in_from_source1742);
+                    following.push(FOLLOW_opt_eol_in_from_source1777);
                     opt_eol();
                     following.pop();
 
-                    match(input,25,FOLLOW_25_in_from_source1744); 
-                    
-                    			FunctionCallDescr fc = new FunctionCallDescr(functionName.getText());
-                    			fc.setLine(functionName.getLine());
-                    			fc.setArguments(args);
-                    			ds = fc;
+                    match(input,25,FOLLOW_25_in_from_source1779); 
+
+                    			FunctionCallDescr fc = new FunctionCallDescr(functionName.getText());
+                    			fc.setLine(functionName.getLine());
+                    			fc.setArguments(args);
+                    			ds = fc;
                     			
 
                     }
@@ -3541,80 +3632,80 @@
 
 
     // $ANTLR start argument_list
-    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:759:1: argument_list returns [ArrayList args] : (param= argument_value ( opt_eol ',' opt_eol param= argument_value )* )? ;
+    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:769:1: argument_list returns [ArrayList args] : (param= argument_value ( opt_eol ',' opt_eol param= argument_value )* )? ;
     public ArrayList argument_list() throws RecognitionException {   
         ArrayList args;
         ArgumentValueDescr param = null;
 
 
-        
-        		args = new ArrayList();
+
+        		args = new ArrayList();
         	
         try {
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:764:17: ( (param= argument_value ( opt_eol ',' opt_eol param= argument_value )* )? )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:764:17: (param= argument_value ( opt_eol ',' opt_eol param= argument_value )* )?
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:774:17: ( (param= argument_value ( opt_eol ',' opt_eol param= argument_value )* )? )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:774:17: (param= argument_value ( opt_eol ',' opt_eol param= argument_value )* )?
             {
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:764:17: (param= argument_value ( opt_eol ',' opt_eol param= argument_value )* )?
-            int alt49=2;
-            int LA49_0 = input.LA(1);
-            if ( (LA49_0>=ID && LA49_0<=FLOAT)||LA49_0==26||LA49_0==43 ) {
-                alt49=1;
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:774:17: (param= argument_value ( opt_eol ',' opt_eol param= argument_value )* )?
+            int alt50=2;
+            int LA50_0 = input.LA(1);
+            if ( (LA50_0>=ID && LA50_0<=FLOAT)||LA50_0==26||LA50_0==43 ) {
+                alt50=1;
             }
-            else if ( LA49_0==EOL||LA49_0==15||LA49_0==25 ) {
-                alt49=2;
+            else if ( LA50_0==EOL||LA50_0==15||LA50_0==25 ) {
+                alt50=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("764:17: (param= argument_value ( opt_eol \',\' opt_eol param= argument_value )* )?", 49, 0, input);
+                    new NoViableAltException("774:17: (param= argument_value ( opt_eol \',\' opt_eol param= argument_value )* )?", 50, 0, input);
 
                 throw nvae;
             }
-            switch (alt49) {
+            switch (alt50) {
                 case 1 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:764:18: param= argument_value ( opt_eol ',' opt_eol param= argument_value )*
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:774:18: param= argument_value ( opt_eol ',' opt_eol param= argument_value )*
                     {
-                    following.push(FOLLOW_argument_value_in_argument_list1787);
+                    following.push(FOLLOW_argument_value_in_argument_list1822);
                     param=argument_value();
                     following.pop();
 
-                    
-                    			if (param != null) {
-                    				args.add(param);
-                    			}
+
+                    			if (param != null) {
+                    				args.add(param);
+                    			}
                     		
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:770:17: ( opt_eol ',' opt_eol param= argument_value )*
-                    loop48:
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:780:17: ( opt_eol ',' opt_eol param= argument_value )*
+                    loop49:
                     do {
-                        int alt48=2;
-                        alt48 = dfa48.predict(input); 
-                        switch (alt48) {
+                        int alt49=2;
+                        alt49 = dfa49.predict(input); 
+                        switch (alt49) {
                     	case 1 :
-                    	    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:771:25: opt_eol ',' opt_eol param= argument_value
+                    	    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:781:25: opt_eol ',' opt_eol param= argument_value
                     	    {
-                    	    following.push(FOLLOW_opt_eol_in_argument_list1803);
+                    	    following.push(FOLLOW_opt_eol_in_argument_list1838);
                     	    opt_eol();
                     	    following.pop();
 
-                    	    match(input,24,FOLLOW_24_in_argument_list1805); 
-                    	    following.push(FOLLOW_opt_eol_in_argument_list1807);
+                    	    match(input,24,FOLLOW_24_in_argument_list1840); 
+                    	    following.push(FOLLOW_opt_eol_in_argument_list1842);
                     	    opt_eol();
                     	    following.pop();
 
-                    	    following.push(FOLLOW_argument_value_in_argument_list1811);
+                    	    following.push(FOLLOW_argument_value_in_argument_list1846);
                     	    param=argument_value();
                     	    following.pop();
 
-                    	    
-                    	    				if (param != null) {
-                    	    					args.add(param);
-                    	    				}
+
+                    	    				if (param != null) {
+                    	    					args.add(param);
+                    	    				}
                     	    			
 
                     	    }
                     	    break;
 
                     	default :
-                    	    break loop48;
+                    	    break loop49;
                         }
                     } while (true);
 
@@ -3640,120 +3731,120 @@
 
 
     // $ANTLR start argument_value
-    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:780:1: argument_value returns [ArgumentValueDescr value] : (t= STRING | t= INT | t= FLOAT | t= BOOL | t= ID | t= 'null' | t= 'null' | m= inline_map ) ;
+    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:790:1: argument_value returns [ArgumentValueDescr value] : (t= STRING | t= INT | t= FLOAT | t= BOOL | t= ID | t= 'null' | t= 'null' | m= inline_map ) ;
     public ArgumentValueDescr argument_value() throws RecognitionException {   
         ArgumentValueDescr value;
         Token t=null;
         ArgumentValueDescr.MapDescr m = null;
 
 
-        
-        		value = null;
-        		String text = null;
+
+        		value = null;
+        		String text = null;
         	
         try {
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:785:17: ( (t= STRING | t= INT | t= FLOAT | t= BOOL | t= ID | t= 'null' | t= 'null' | m= inline_map ) )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:785:17: (t= STRING | t= INT | t= FLOAT | t= BOOL | t= ID | t= 'null' | t= 'null' | m= inline_map )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:795:17: ( (t= STRING | t= INT | t= FLOAT | t= BOOL | t= ID | t= 'null' | t= 'null' | m= inline_map ) )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:795:17: (t= STRING | t= INT | t= FLOAT | t= BOOL | t= ID | t= 'null' | t= 'null' | m= inline_map )
             {
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:785:17: (t= STRING | t= INT | t= FLOAT | t= BOOL | t= ID | t= 'null' | t= 'null' | m= inline_map )
-            int alt50=8;
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:795:17: (t= STRING | t= INT | t= FLOAT | t= BOOL | t= ID | t= 'null' | t= 'null' | m= inline_map )
+            int alt51=8;
             switch ( input.LA(1) ) {
             case STRING:
-                alt50=1;
+                alt51=1;
                 break;
             case INT:
-                alt50=2;
+                alt51=2;
                 break;
             case FLOAT:
-                alt50=3;
+                alt51=3;
                 break;
             case BOOL:
-                alt50=4;
+                alt51=4;
                 break;
             case ID:
-                alt50=5;
+                alt51=5;
                 break;
             case 43:
-                alt50=6;
+                alt51=6;
                 break;
             case 26:
-                alt50=8;
+                alt51=8;
                 break;
             default:
                 NoViableAltException nvae =
-                    new NoViableAltException("785:17: (t= STRING | t= INT | t= FLOAT | t= BOOL | t= ID | t= \'null\' | t= \'null\' | m= inline_map )", 50, 0, input);
+                    new NoViableAltException("795:17: (t= STRING | t= INT | t= FLOAT | t= BOOL | t= ID | t= \'null\' | t= \'null\' | m= inline_map )", 51, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt50) {
+            switch (alt51) {
                 case 1 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:785:25: t= STRING
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:795:25: t= STRING
                     {
                     t=(Token)input.LT(1);
-                    match(input,STRING,FOLLOW_STRING_in_argument_value1851); 
+                    match(input,STRING,FOLLOW_STRING_in_argument_value1886); 
                      text = getString( t );  value=new ArgumentValueDescr(ArgumentValueDescr.STRING, text);
 
                     }
                     break;
                 case 2 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:786:25: t= INT
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:796:25: t= INT
                     {
                     t=(Token)input.LT(1);
-                    match(input,INT,FOLLOW_INT_in_argument_value1862); 
+                    match(input,INT,FOLLOW_INT_in_argument_value1897); 
                      text = t.getText();  value=new ArgumentValueDescr(ArgumentValueDescr.INTEGRAL, text);
 
                     }
                     break;
                 case 3 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:787:25: t= FLOAT
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:797:25: t= FLOAT
                     {
                     t=(Token)input.LT(1);
-                    match(input,FLOAT,FOLLOW_FLOAT_in_argument_value1875); 
+                    match(input,FLOAT,FOLLOW_FLOAT_in_argument_value1910); 
                      text = t.getText(); value=new ArgumentValueDescr(ArgumentValueDescr.DECIMAL, text); 
 
                     }
                     break;
                 case 4 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:788:25: t= BOOL
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:798:25: t= BOOL
                     {
                     t=(Token)input.LT(1);
-                    match(input,BOOL,FOLLOW_BOOL_in_argument_value1886); 
+                    match(input,BOOL,FOLLOW_BOOL_in_argument_value1921); 
                      text = t.getText(); value=new ArgumentValueDescr(ArgumentValueDescr.BOOLEAN, text); 
 
                     }
                     break;
                 case 5 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:789:25: t= ID
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:799:25: t= ID
                     {
                     t=(Token)input.LT(1);
-                    match(input,ID,FOLLOW_ID_in_argument_value1898); 
+                    match(input,ID,FOLLOW_ID_in_argument_value1933); 
                      text = t.getText(); value=new ArgumentValueDescr(ArgumentValueDescr.VARIABLE, text);
 
                     }
                     break;
                 case 6 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:790:25: t= 'null'
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:800:25: t= 'null'
                     {
                     t=(Token)input.LT(1);
-                    match(input,43,FOLLOW_43_in_argument_value1909); 
+                    match(input,43,FOLLOW_43_in_argument_value1944); 
                      text = "null"; value=new ArgumentValueDescr(ArgumentValueDescr.NULL, text);
 
                     }
                     break;
                 case 7 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:791:25: t= 'null'
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:801:25: t= 'null'
                     {
                     t=(Token)input.LT(1);
-                    match(input,43,FOLLOW_43_in_argument_value1920); 
+                    match(input,43,FOLLOW_43_in_argument_value1955); 
                      text = "null"; value=new ArgumentValueDescr(ArgumentValueDescr.NULL, text);
 
                     }
                     break;
                 case 8 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:792:25: m= inline_map
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:802:25: m= inline_map
                     {
-                    following.push(FOLLOW_inline_map_in_argument_value1939);
+                    following.push(FOLLOW_inline_map_in_argument_value1974);
                     m=inline_map();
                     following.pop();
 
@@ -3780,7 +3871,7 @@
 
 
     // $ANTLR start inline_map
-    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:796:1: inline_map returns [ArgumentValueDescr.MapDescr mapDescr] : '{' (key= argument_value '=>' value= argument_value ) ( ( EOL )? ',' ( EOL )? key= argument_value '=>' value= argument_value )* '}' ;
+    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:806:1: inline_map returns [ArgumentValueDescr.MapDescr mapDescr] : '{' (key= argument_value '=>' value= argument_value ) ( ( EOL )? ',' ( EOL )? key= argument_value '=>' value= argument_value )* '}' ;
     public ArgumentValueDescr.MapDescr inline_map() throws RecognitionException {   
         ArgumentValueDescr.MapDescr mapDescr;
         ArgumentValueDescr key = null;
@@ -3788,125 +3879,125 @@
         ArgumentValueDescr value = null;
 
 
-        
-                mapDescr = new ArgumentValueDescr.MapDescr();
+
+                mapDescr = new ArgumentValueDescr.MapDescr();
             
         try {
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:800:8: ( '{' (key= argument_value '=>' value= argument_value ) ( ( EOL )? ',' ( EOL )? key= argument_value '=>' value= argument_value )* '}' )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:800:8: '{' (key= argument_value '=>' value= argument_value ) ( ( EOL )? ',' ( EOL )? key= argument_value '=>' value= argument_value )* '}'
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:810:8: ( '{' (key= argument_value '=>' value= argument_value ) ( ( EOL )? ',' ( EOL )? key= argument_value '=>' value= argument_value )* '}' )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:810:8: '{' (key= argument_value '=>' value= argument_value ) ( ( EOL )? ',' ( EOL )? key= argument_value '=>' value= argument_value )* '}'
             {
-            match(input,26,FOLLOW_26_in_inline_map1979); 
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:801:12: (key= argument_value '=>' value= argument_value )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:801:14: key= argument_value '=>' value= argument_value
+            match(input,26,FOLLOW_26_in_inline_map2014); 
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:811:12: (key= argument_value '=>' value= argument_value )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:811:14: key= argument_value '=>' value= argument_value
             {
-            following.push(FOLLOW_argument_value_in_inline_map1997);
+            following.push(FOLLOW_argument_value_in_inline_map2032);
             key=argument_value();
             following.pop();
 
-            match(input,44,FOLLOW_44_in_inline_map1999); 
-            following.push(FOLLOW_argument_value_in_inline_map2003);
+            match(input,44,FOLLOW_44_in_inline_map2034); 
+            following.push(FOLLOW_argument_value_in_inline_map2038);
             value=argument_value();
             following.pop();
 
-            
-                             if ( key != null ) {
-                                 mapDescr.add( new ArgumentValueDescr.KeyValuePairDescr( key, value ) );
-                             }
+
+                             if ( key != null ) {
+                                 mapDescr.add( new ArgumentValueDescr.KeyValuePairDescr( key, value ) );
+                             }
                          
 
             }
 
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:808:12: ( ( EOL )? ',' ( EOL )? key= argument_value '=>' value= argument_value )*
-            loop53:
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:818:12: ( ( EOL )? ',' ( EOL )? key= argument_value '=>' value= argument_value )*
+            loop54:
             do {
-                int alt53=2;
-                int LA53_0 = input.LA(1);
-                if ( LA53_0==EOL||LA53_0==24 ) {
-                    alt53=1;
+                int alt54=2;
+                int LA54_0 = input.LA(1);
+                if ( LA54_0==EOL||LA54_0==24 ) {
+                    alt54=1;
                 }
 
 
-                switch (alt53) {
+                switch (alt54) {
             	case 1 :
-            	    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:808:14: ( EOL )? ',' ( EOL )? key= argument_value '=>' value= argument_value
+            	    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:818:14: ( EOL )? ',' ( EOL )? key= argument_value '=>' value= argument_value
             	    {
-            	    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:808:14: ( EOL )?
-            	    int alt51=2;
-            	    int LA51_0 = input.LA(1);
-            	    if ( LA51_0==EOL ) {
-            	        alt51=1;
+            	    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:818:14: ( EOL )?
+            	    int alt52=2;
+            	    int LA52_0 = input.LA(1);
+            	    if ( LA52_0==EOL ) {
+            	        alt52=1;
             	    }
-            	    else if ( LA51_0==24 ) {
-            	        alt51=2;
+            	    else if ( LA52_0==24 ) {
+            	        alt52=2;
             	    }
             	    else {
             	        NoViableAltException nvae =
-            	            new NoViableAltException("808:14: ( EOL )?", 51, 0, input);
+            	            new NoViableAltException("818:14: ( EOL )?", 52, 0, input);
 
             	        throw nvae;
             	    }
-            	    switch (alt51) {
+            	    switch (alt52) {
             	        case 1 :
-            	            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:808:15: EOL
+            	            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:818:15: EOL
             	            {
-            	            match(input,EOL,FOLLOW_EOL_in_inline_map2046); 
+            	            match(input,EOL,FOLLOW_EOL_in_inline_map2081); 
 
             	            }
             	            break;
 
             	    }
 
-            	    match(input,24,FOLLOW_24_in_inline_map2050); 
-            	    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:808:25: ( EOL )?
-            	    int alt52=2;
-            	    int LA52_0 = input.LA(1);
-            	    if ( LA52_0==EOL ) {
-            	        alt52=1;
+            	    match(input,24,FOLLOW_24_in_inline_map2085); 
+            	    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:818:25: ( EOL )?
+            	    int alt53=2;
+            	    int LA53_0 = input.LA(1);
+            	    if ( LA53_0==EOL ) {
+            	        alt53=1;
             	    }
-            	    else if ( (LA52_0>=ID && LA52_0<=FLOAT)||LA52_0==26||LA52_0==43 ) {
-            	        alt52=2;
+            	    else if ( (LA53_0>=ID && LA53_0<=FLOAT)||LA53_0==26||LA53_0==43 ) {
+            	        alt53=2;
             	    }
             	    else {
             	        NoViableAltException nvae =
-            	            new NoViableAltException("808:25: ( EOL )?", 52, 0, input);
+            	            new NoViableAltException("818:25: ( EOL )?", 53, 0, input);
 
             	        throw nvae;
             	    }
-            	    switch (alt52) {
+            	    switch (alt53) {
             	        case 1 :
-            	            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:808:26: EOL
+            	            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:818:26: EOL
             	            {
-            	            match(input,EOL,FOLLOW_EOL_in_inline_map2053); 
+            	            match(input,EOL,FOLLOW_EOL_in_inline_map2088); 
 
             	            }
             	            break;
 
             	    }
 
-            	    following.push(FOLLOW_argument_value_in_inline_map2059);
+            	    following.push(FOLLOW_argument_value_in_inline_map2094);
             	    key=argument_value();
             	    following.pop();
 
-            	    match(input,44,FOLLOW_44_in_inline_map2061); 
-            	    following.push(FOLLOW_argument_value_in_inline_map2065);
+            	    match(input,44,FOLLOW_44_in_inline_map2096); 
+            	    following.push(FOLLOW_argument_value_in_inline_map2100);
             	    value=argument_value();
             	    following.pop();
 
-            	    
-            	                     if ( key != null ) {
-            	                         mapDescr.add( new ArgumentValueDescr.KeyValuePairDescr( key, value ) );
-            	                     }
+
+            	                     if ( key != null ) {
+            	                         mapDescr.add( new ArgumentValueDescr.KeyValuePairDescr( key, value ) );
+            	                     }
             	                 
 
             	    }
             	    break;
 
             	default :
-            	    break loop53;
+            	    break loop54;
                 }
             } while (true);
 
-            match(input,27,FOLLOW_27_in_inline_map2101); 
+            match(input,27,FOLLOW_27_in_inline_map2136); 
 
             }
 
@@ -3923,38 +4014,38 @@
 
 
     // $ANTLR start fact_binding
-    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:817:1: fact_binding returns [PatternDescr d] : id= ID opt_eol ':' opt_eol fe= fact_expression[id.getText()] ;
+    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:827:1: fact_binding returns [PatternDescr d] : id= ID opt_eol ':' opt_eol fe= fact_expression[id.getText()] ;
     public PatternDescr fact_binding() throws RecognitionException {   
         PatternDescr d;
         Token id=null;
         PatternDescr fe = null;
 
 
-        
-        		d=null;
-        		boolean multi=false;
+
+        		d=null;
+        		boolean multi=false;
         	
         try {
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:823:17: (id= ID opt_eol ':' opt_eol fe= fact_expression[id.getText()] )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:823:17: id= ID opt_eol ':' opt_eol fe= fact_expression[id.getText()]
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:833:17: (id= ID opt_eol ':' opt_eol fe= fact_expression[id.getText()] )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:833:17: id= ID opt_eol ':' opt_eol fe= fact_expression[id.getText()]
             {
             id=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_fact_binding2133); 
-            following.push(FOLLOW_opt_eol_in_fact_binding2143);
+            match(input,ID,FOLLOW_ID_in_fact_binding2168); 
+            following.push(FOLLOW_opt_eol_in_fact_binding2178);
             opt_eol();
             following.pop();
 
-            match(input,33,FOLLOW_33_in_fact_binding2145); 
-            following.push(FOLLOW_opt_eol_in_fact_binding2147);
+            match(input,33,FOLLOW_33_in_fact_binding2180); 
+            following.push(FOLLOW_opt_eol_in_fact_binding2182);
             opt_eol();
             following.pop();
 
-            following.push(FOLLOW_fact_expression_in_fact_binding2151);
+            following.push(FOLLOW_fact_expression_in_fact_binding2186);
             fe=fact_expression(id.getText());
             following.pop();
 
-            
-             			d=fe;
+
+             			d=fe;
              		
 
             }
@@ -3972,7 +4063,7 @@
 
 
     // $ANTLR start fact_expression
-    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:831:2: fact_expression[String id] returns [PatternDescr pd] : ( '(' opt_eol fe= fact_expression[id] opt_eol ')' | f= fact opt_eol ( ('or'|'||') opt_eol f= fact )* );
+    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:841:2: fact_expression[String id] returns [PatternDescr pd] : ( '(' opt_eol fe= fact_expression[id] opt_eol ')' | f= fact opt_eol ( ('or'|'||') opt_eol f= fact )* );
     public PatternDescr fact_expression(String id) throws RecognitionException {   
         PatternDescr pd;
         PatternDescr fe = null;
@@ -3980,76 +4071,76 @@
         PatternDescr f = null;
 
 
-        
-         		pd = null;
-         		boolean multi = false;
+
+         		pd = null;
+         		boolean multi = false;
          	
         try {
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:836:17: ( '(' opt_eol fe= fact_expression[id] opt_eol ')' | f= fact opt_eol ( ('or'|'||') opt_eol f= fact )* )
-            int alt55=2;
-            int LA55_0 = input.LA(1);
-            if ( LA55_0==23 ) {
-                alt55=1;
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:846:17: ( '(' opt_eol fe= fact_expression[id] opt_eol ')' | f= fact opt_eol ( ('or'|'||') opt_eol f= fact )* )
+            int alt56=2;
+            int LA56_0 = input.LA(1);
+            if ( LA56_0==23 ) {
+                alt56=1;
             }
-            else if ( LA55_0==ID ) {
-                alt55=2;
+            else if ( LA56_0==ID ) {
+                alt56=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("831:2: fact_expression[String id] returns [PatternDescr pd] : ( \'(\' opt_eol fe= fact_expression[id] opt_eol \')\' | f= fact opt_eol ( (\'or\'|\'||\') opt_eol f= fact )* );", 55, 0, input);
+                    new NoViableAltException("841:2: fact_expression[String id] returns [PatternDescr pd] : ( \'(\' opt_eol fe= fact_expression[id] opt_eol \')\' | f= fact opt_eol ( (\'or\'|\'||\') opt_eol f= fact )* );", 56, 0, input);
 
                 throw nvae;
             }
-            switch (alt55) {
+            switch (alt56) {
                 case 1 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:836:17: '(' opt_eol fe= fact_expression[id] opt_eol ')'
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:846:17: '(' opt_eol fe= fact_expression[id] opt_eol ')'
                     {
-                    match(input,23,FOLLOW_23_in_fact_expression2183); 
-                    following.push(FOLLOW_opt_eol_in_fact_expression2185);
+                    match(input,23,FOLLOW_23_in_fact_expression2218); 
+                    following.push(FOLLOW_opt_eol_in_fact_expression2220);
                     opt_eol();
                     following.pop();
 
-                    following.push(FOLLOW_fact_expression_in_fact_expression2189);
+                    following.push(FOLLOW_fact_expression_in_fact_expression2224);
                     fe=fact_expression(id);
                     following.pop();
 
-                    following.push(FOLLOW_opt_eol_in_fact_expression2191);
+                    following.push(FOLLOW_opt_eol_in_fact_expression2226);
                     opt_eol();
                     following.pop();
 
-                    match(input,25,FOLLOW_25_in_fact_expression2193); 
+                    match(input,25,FOLLOW_25_in_fact_expression2228); 
                      pd=fe; 
 
                     }
                     break;
                 case 2 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:837:17: f= fact opt_eol ( ('or'|'||') opt_eol f= fact )*
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:847:17: f= fact opt_eol ( ('or'|'||') opt_eol f= fact )*
                     {
-                    following.push(FOLLOW_fact_in_fact_expression2204);
+                    following.push(FOLLOW_fact_in_fact_expression2239);
                     f=fact();
                     following.pop();
 
-                    following.push(FOLLOW_opt_eol_in_fact_expression2206);
+                    following.push(FOLLOW_opt_eol_in_fact_expression2241);
                     opt_eol();
                     following.pop();
 
-                    
-                     			((ColumnDescr)f).setIdentifier( id );
-                     			pd = f;
+
+                     			((ColumnDescr)f).setIdentifier( id );
+                     			pd = f;
                      		
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:842:17: ( ('or'|'||') opt_eol f= fact )*
-                    loop54:
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:852:17: ( ('or'|'||') opt_eol f= fact )*
+                    loop55:
                     do {
-                        int alt54=2;
-                        int LA54_0 = input.LA(1);
-                        if ( (LA54_0>=45 && LA54_0<=46) ) {
-                            alt54=1;
+                        int alt55=2;
+                        int LA55_0 = input.LA(1);
+                        if ( (LA55_0>=45 && LA55_0<=46) ) {
+                            alt55=1;
                         }
 
 
-                        switch (alt54) {
+                        switch (alt55) {
                     	case 1 :
-                    	    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:842:25: ('or'|'||') opt_eol f= fact
+                    	    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:852:25: ('or'|'||') opt_eol f= fact
                     	    {
                     	    if ( (input.LA(1)>=45 && input.LA(1)<=46) ) {
                     	        input.consume();
@@ -4058,34 +4149,34 @@
                     	    else {
                     	        MismatchedSetException mse =
                     	            new MismatchedSetException(null,input);
-                    	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_fact_expression2219);    throw mse;
+                    	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_fact_expression2254);    throw mse;
                     	    }
 
-                    	    following.push(FOLLOW_opt_eol_in_fact_expression2224);
+                    	    following.push(FOLLOW_opt_eol_in_fact_expression2259);
                     	    opt_eol();
                     	    following.pop();
 
-                    	    	if ( ! multi ) {
-                    	     					PatternDescr first = pd;
-                    	     					pd = new OrDescr();
-                    	     					((OrDescr)pd).addDescr( first );
-                    	     					multi=true;
-                    	     				}
+                    	    	if ( ! multi ) {
+                    	     					PatternDescr first = pd;
+                    	     					pd = new OrDescr();
+                    	     					((OrDescr)pd).addDescr( first );
+                    	     					multi=true;
+                    	     				}
                     	     			
-                    	    following.push(FOLLOW_fact_in_fact_expression2238);
+                    	    following.push(FOLLOW_fact_in_fact_expression2273);
                     	    f=fact();
                     	    following.pop();
 
-                    	    
-                    	     				((ColumnDescr)f).setIdentifier( id );
-                    	     				((OrDescr)pd).addDescr( f );
+
+                    	     				((ColumnDescr)f).setIdentifier( id );
+                    	     				((OrDescr)pd).addDescr( f );
                     	     			
 
                     	    }
                     	    break;
 
                     	default :
-                    	    break loop54;
+                    	    break loop55;
                         }
                     } while (true);
 
@@ -4107,7 +4198,7 @@
 
 
     // $ANTLR start fact
-    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:858:1: fact returns [PatternDescr d] : id= dotted_name opt_eol loc= '(' opt_eol (c= constraints )? opt_eol endLoc= ')' opt_eol ;
+    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:868:1: fact returns [PatternDescr d] : id= dotted_name opt_eol loc= '(' opt_eol (c= constraints )? opt_eol endLoc= ')' opt_eol ;
     public PatternDescr fact() throws RecognitionException {   
         PatternDescr d;
         Token loc=null;
@@ -4117,48 +4208,48 @@
         List c = null;
 
 
-        
-        		d=null;
+
+        		d=null;
         	
         try {
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:862:17: (id= dotted_name opt_eol loc= '(' opt_eol (c= constraints )? opt_eol endLoc= ')' opt_eol )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:862:17: id= dotted_name opt_eol loc= '(' opt_eol (c= constraints )? opt_eol endLoc= ')' opt_eol
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:872:17: (id= dotted_name opt_eol loc= '(' opt_eol (c= constraints )? opt_eol endLoc= ')' opt_eol )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:872:17: id= dotted_name opt_eol loc= '(' opt_eol (c= constraints )? opt_eol endLoc= ')' opt_eol
             {
-            following.push(FOLLOW_dotted_name_in_fact2277);
+            following.push(FOLLOW_dotted_name_in_fact2312);
             id=dotted_name();
             following.pop();
 
-             
-             			d = new ColumnDescr( id ); 
+             
+             			d = new ColumnDescr( id ); 
              		
-            following.push(FOLLOW_opt_eol_in_fact2285);
+            following.push(FOLLOW_opt_eol_in_fact2320);
             opt_eol();
             following.pop();
 
             loc=(Token)input.LT(1);
-            match(input,23,FOLLOW_23_in_fact2293); 
-            
-             				d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+            match(input,23,FOLLOW_23_in_fact2328); 
+
+             				d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
              			
-            following.push(FOLLOW_opt_eol_in_fact2296);
+            following.push(FOLLOW_opt_eol_in_fact2331);
             opt_eol();
             following.pop();
 
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:868:34: (c= constraints )?
-            int alt56=2;
-            alt56 = dfa56.predict(input); 
-            switch (alt56) {
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:878:34: (c= constraints )?
+            int alt57=2;
+            alt57 = dfa57.predict(input); 
+            switch (alt57) {
                 case 1 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:868:41: c= constraints
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:878:41: c= constraints
                     {
-                    following.push(FOLLOW_constraints_in_fact2302);
+                    following.push(FOLLOW_constraints_in_fact2337);
                     c=constraints();
                     following.pop();
 
-                    
-                    		 			for ( Iterator cIter = c.iterator() ; cIter.hasNext() ; ) {
-                     						((ColumnDescr)d).addDescr( (PatternDescr) cIter.next() );
-                     					}
+
+                    		 			for ( Iterator cIter = c.iterator() ; cIter.hasNext() ; ) {
+                     						((ColumnDescr)d).addDescr( (PatternDescr) cIter.next() );
+                     					}
                      				
 
                     }
@@ -4166,18 +4257,18 @@
 
             }
 
-            following.push(FOLLOW_opt_eol_in_fact2321);
+            following.push(FOLLOW_opt_eol_in_fact2356);
             opt_eol();
             following.pop();
 
             endLoc=(Token)input.LT(1);
-            match(input,25,FOLLOW_25_in_fact2325); 
-            following.push(FOLLOW_opt_eol_in_fact2327);
+            match(input,25,FOLLOW_25_in_fact2360); 
+            following.push(FOLLOW_opt_eol_in_fact2362);
             opt_eol();
             following.pop();
 
-            
-             					d.setEndLocation( offset(endLoc.getLine()), endLoc.getCharPositionInLine() );	
+
+             					d.setEndLocation( offset(endLoc.getLine()), endLoc.getCharPositionInLine() );	
              				
 
             }
@@ -4195,76 +4286,76 @@
 
 
     // $ANTLR start constraints
-    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:882:1: constraints returns [List constraints] : opt_eol ( constraint[constraints] | predicate[constraints] ) ( opt_eol ',' opt_eol ( constraint[constraints] | predicate[constraints] ) )* opt_eol ;
+    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:892:1: constraints returns [List constraints] : opt_eol ( constraint[constraints] | predicate[constraints] ) ( opt_eol ',' opt_eol ( constraint[constraints] | predicate[constraints] ) )* opt_eol ;
     public List constraints() throws RecognitionException {   
         List constraints;
-        
-        		constraints = new ArrayList();
+
+        		constraints = new ArrayList();
         	
         try {
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:886:17: ( opt_eol ( constraint[constraints] | predicate[constraints] ) ( opt_eol ',' opt_eol ( constraint[constraints] | predicate[constraints] ) )* opt_eol )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:886:17: opt_eol ( constraint[constraints] | predicate[constraints] ) ( opt_eol ',' opt_eol ( constraint[constraints] | predicate[constraints] ) )* opt_eol
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:896:17: ( opt_eol ( constraint[constraints] | predicate[constraints] ) ( opt_eol ',' opt_eol ( constraint[constraints] | predicate[constraints] ) )* opt_eol )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:896:17: opt_eol ( constraint[constraints] | predicate[constraints] ) ( opt_eol ',' opt_eol ( constraint[constraints] | predicate[constraints] ) )* opt_eol
             {
-            following.push(FOLLOW_opt_eol_in_constraints2359);
+            following.push(FOLLOW_opt_eol_in_constraints2394);
             opt_eol();
             following.pop();
 
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:887:17: ( constraint[constraints] | predicate[constraints] )
-            int alt57=2;
-            int LA57_0 = input.LA(1);
-            if ( LA57_0==EOL||LA57_0==15 ) {
-                alt57=1;
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:897:17: ( constraint[constraints] | predicate[constraints] )
+            int alt58=2;
+            int LA58_0 = input.LA(1);
+            if ( LA58_0==EOL||LA58_0==15 ) {
+                alt58=1;
             }
-            else if ( LA57_0==ID ) {
-                int LA57_2 = input.LA(2);
-                if ( LA57_2==33 ) {
-                    int LA57_3 = input.LA(3);
-                    if ( LA57_3==ID ) {
-                        int LA57_17 = input.LA(4);
-                        if ( LA57_17==49 ) {
-                            alt57=2;
+            else if ( LA58_0==ID ) {
+                int LA58_2 = input.LA(2);
+                if ( LA58_2==33 ) {
+                    int LA58_3 = input.LA(3);
+                    if ( LA58_3==ID ) {
+                        int LA58_17 = input.LA(4);
+                        if ( LA58_17==49 ) {
+                            alt58=2;
                         }
-                        else if ( LA57_17==EOL||LA57_17==15||(LA57_17>=24 && LA57_17<=25)||(LA57_17>=58 && LA57_17<=67) ) {
-                            alt57=1;
+                        else if ( LA58_17==EOL||LA58_17==15||(LA58_17>=24 && LA58_17<=25)||(LA58_17>=58 && LA58_17<=67) ) {
+                            alt58=1;
                         }
                         else {
                             NoViableAltException nvae =
-                                new NoViableAltException("887:17: ( constraint[constraints] | predicate[constraints] )", 57, 17, input);
+                                new NoViableAltException("897:17: ( constraint[constraints] | predicate[constraints] )", 58, 17, input);
 
                             throw nvae;
                         }
                     }
-                    else if ( LA57_3==EOL||LA57_3==15 ) {
-                        alt57=1;
+                    else if ( LA58_3==EOL||LA58_3==15 ) {
+                        alt58=1;
                     }
                     else {
                         NoViableAltException nvae =
-                            new NoViableAltException("887:17: ( constraint[constraints] | predicate[constraints] )", 57, 3, input);
+                            new NoViableAltException("897:17: ( constraint[constraints] | predicate[constraints] )", 58, 3, input);
 
                         throw nvae;
                     }
                 }
-                else if ( LA57_2==EOL||LA57_2==15||(LA57_2>=24 && LA57_2<=25)||(LA57_2>=58 && LA57_2<=67) ) {
-                    alt57=1;
+                else if ( LA58_2==EOL||LA58_2==15||(LA58_2>=24 && LA58_2<=25)||(LA58_2>=58 && LA58_2<=67) ) {
+                    alt58=1;
                 }
                 else {
                     NoViableAltException nvae =
-                        new NoViableAltException("887:17: ( constraint[constraints] | predicate[constraints] )", 57, 2, input);
+                        new NoViableAltException("897:17: ( constraint[constraints] | predicate[constraints] )", 58, 2, input);
 
                     throw nvae;
                 }
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("887:17: ( constraint[constraints] | predicate[constraints] )", 57, 0, input);
+                    new NoViableAltException("897:17: ( constraint[constraints] | predicate[constraints] )", 58, 0, input);
 
                 throw nvae;
             }
-            switch (alt57) {
+            switch (alt58) {
                 case 1 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:887:18: constraint[constraints]
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:897:18: constraint[constraints]
                     {
-                    following.push(FOLLOW_constraint_in_constraints2364);
+                    following.push(FOLLOW_constraint_in_constraints2399);
                     constraint(constraints);
                     following.pop();
 
@@ -4272,9 +4363,9 @@
                     }
                     break;
                 case 2 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:887:42: predicate[constraints]
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:897:42: predicate[constraints]
                     {
-                    following.push(FOLLOW_predicate_in_constraints2367);
+                    following.push(FOLLOW_predicate_in_constraints2402);
                     predicate(constraints);
                     following.pop();
 
@@ -4284,80 +4375,80 @@
 
             }
 
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:888:17: ( opt_eol ',' opt_eol ( constraint[constraints] | predicate[constraints] ) )*
-            loop59:
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:898:17: ( opt_eol ',' opt_eol ( constraint[constraints] | predicate[constraints] ) )*
+            loop60:
             do {
-                int alt59=2;
-                alt59 = dfa59.predict(input); 
-                switch (alt59) {
+                int alt60=2;
+                alt60 = dfa60.predict(input); 
+                switch (alt60) {
             	case 1 :
-            	    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:888:19: opt_eol ',' opt_eol ( constraint[constraints] | predicate[constraints] )
+            	    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:898:19: opt_eol ',' opt_eol ( constraint[constraints] | predicate[constraints] )
             	    {
-            	    following.push(FOLLOW_opt_eol_in_constraints2375);
+            	    following.push(FOLLOW_opt_eol_in_constraints2410);
             	    opt_eol();
             	    following.pop();
 
-            	    match(input,24,FOLLOW_24_in_constraints2377); 
-            	    following.push(FOLLOW_opt_eol_in_constraints2379);
+            	    match(input,24,FOLLOW_24_in_constraints2412); 
+            	    following.push(FOLLOW_opt_eol_in_constraints2414);
             	    opt_eol();
             	    following.pop();
 
-            	    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:888:39: ( constraint[constraints] | predicate[constraints] )
-            	    int alt58=2;
-            	    int LA58_0 = input.LA(1);
-            	    if ( LA58_0==EOL||LA58_0==15 ) {
-            	        alt58=1;
+            	    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:898:39: ( constraint[constraints] | predicate[constraints] )
+            	    int alt59=2;
+            	    int LA59_0 = input.LA(1);
+            	    if ( LA59_0==EOL||LA59_0==15 ) {
+            	        alt59=1;
             	    }
-            	    else if ( LA58_0==ID ) {
-            	        int LA58_2 = input.LA(2);
-            	        if ( LA58_2==33 ) {
-            	            int LA58_3 = input.LA(3);
-            	            if ( LA58_3==ID ) {
-            	                int LA58_17 = input.LA(4);
-            	                if ( LA58_17==49 ) {
-            	                    alt58=2;
+            	    else if ( LA59_0==ID ) {
+            	        int LA59_2 = input.LA(2);
+            	        if ( LA59_2==33 ) {
+            	            int LA59_3 = input.LA(3);
+            	            if ( LA59_3==ID ) {
+            	                int LA59_17 = input.LA(4);
+            	                if ( LA59_17==49 ) {
+            	                    alt59=2;
             	                }
-            	                else if ( LA58_17==EOL||LA58_17==15||(LA58_17>=24 && LA58_17<=25)||(LA58_17>=58 && LA58_17<=67) ) {
-            	                    alt58=1;
+            	                else if ( LA59_17==EOL||LA59_17==15||(LA59_17>=24 && LA59_17<=25)||(LA59_17>=58 && LA59_17<=67) ) {
+            	                    alt59=1;
             	                }
             	                else {
             	                    NoViableAltException nvae =
-            	                        new NoViableAltException("888:39: ( constraint[constraints] | predicate[constraints] )", 58, 17, input);
+            	                        new NoViableAltException("898:39: ( constraint[constraints] | predicate[constraints] )", 59, 17, input);
 
             	                    throw nvae;
             	                }
             	            }
-            	            else if ( LA58_3==EOL||LA58_3==15 ) {
-            	                alt58=1;
+            	            else if ( LA59_3==EOL||LA59_3==15 ) {
+            	                alt59=1;
             	            }
             	            else {
             	                NoViableAltException nvae =
-            	                    new NoViableAltException("888:39: ( constraint[constraints] | predicate[constraints] )", 58, 3, input);
+            	                    new NoViableAltException("898:39: ( constraint[constraints] | predicate[constraints] )", 59, 3, input);
 
             	                throw nvae;
             	            }
             	        }
-            	        else if ( LA58_2==EOL||LA58_2==15||(LA58_2>=24 && LA58_2<=25)||(LA58_2>=58 && LA58_2<=67) ) {
-            	            alt58=1;
+            	        else if ( LA59_2==EOL||LA59_2==15||(LA59_2>=24 && LA59_2<=25)||(LA59_2>=58 && LA59_2<=67) ) {
+            	            alt59=1;
             	        }
             	        else {
             	            NoViableAltException nvae =
-            	                new NoViableAltException("888:39: ( constraint[constraints] | predicate[constraints] )", 58, 2, input);
+            	                new NoViableAltException("898:39: ( constraint[constraints] | predicate[constraints] )", 59, 2, input);
 
             	            throw nvae;
             	        }
             	    }
             	    else {
             	        NoViableAltException nvae =
-            	            new NoViableAltException("888:39: ( constraint[constraints] | predicate[constraints] )", 58, 0, input);
+            	            new NoViableAltException("898:39: ( constraint[constraints] | predicate[constraints] )", 59, 0, input);
 
             	        throw nvae;
             	    }
-            	    switch (alt58) {
+            	    switch (alt59) {
             	        case 1 :
-            	            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:888:40: constraint[constraints]
+            	            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:898:40: constraint[constraints]
             	            {
-            	            following.push(FOLLOW_constraint_in_constraints2382);
+            	            following.push(FOLLOW_constraint_in_constraints2417);
             	            constraint(constraints);
             	            following.pop();
 
@@ -4365,9 +4456,9 @@
             	            }
             	            break;
             	        case 2 :
-            	            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:888:64: predicate[constraints]
+            	            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:898:64: predicate[constraints]
             	            {
-            	            following.push(FOLLOW_predicate_in_constraints2385);
+            	            following.push(FOLLOW_predicate_in_constraints2420);
             	            predicate(constraints);
             	            following.pop();
 
@@ -4382,11 +4473,11 @@
             	    break;
 
             	default :
-            	    break loop59;
+            	    break loop60;
                 }
             } while (true);
 
-            following.push(FOLLOW_opt_eol_in_constraints2393);
+            following.push(FOLLOW_opt_eol_in_constraints2428);
             opt_eol();
             following.pop();
 
@@ -4406,7 +4497,7 @@
 
 
     // $ANTLR start constraint
-    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:892:1: constraint[List constraints] : opt_eol (fb= ID opt_eol ':' opt_eol )? f= ID opt_eol (op= operator opt_eol (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint ) (con= ('&'|'|')op= operator (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint ) )* )? opt_eol ;
+    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:902:1: constraint[List constraints] : opt_eol (fb= ID opt_eol ':' opt_eol )? f= ID opt_eol (op= operator opt_eol (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint ) (con= ('&'|'|')op= operator (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint ) )* )? opt_eol ;
     public void constraint(List constraints) throws RecognitionException {   
         Token fb=null;
         Token f=null;
@@ -4419,32 +4510,32 @@
         String rvc = null;
 
 
-        
-        		PatternDescr d = null;
+
+        		PatternDescr d = null;
         	
         try {
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:896:17: ( opt_eol (fb= ID opt_eol ':' opt_eol )? f= ID opt_eol (op= operator opt_eol (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint ) (con= ('&'|'|')op= operator (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint ) )* )? opt_eol )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:896:17: opt_eol (fb= ID opt_eol ':' opt_eol )? f= ID opt_eol (op= operator opt_eol (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint ) (con= ('&'|'|')op= operator (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint ) )* )? opt_eol
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:906:17: ( opt_eol (fb= ID opt_eol ':' opt_eol )? f= ID opt_eol (op= operator opt_eol (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint ) (con= ('&'|'|')op= operator (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint ) )* )? opt_eol )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:906:17: opt_eol (fb= ID opt_eol ':' opt_eol )? f= ID opt_eol (op= operator opt_eol (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint ) (con= ('&'|'|')op= operator (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint ) )* )? opt_eol
             {
-            following.push(FOLLOW_opt_eol_in_constraint2412);
+            following.push(FOLLOW_opt_eol_in_constraint2447);
             opt_eol();
             following.pop();
 
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:897:17: (fb= ID opt_eol ':' opt_eol )?
-            int alt60=2;
-            alt60 = dfa60.predict(input); 
-            switch (alt60) {
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:907:17: (fb= ID opt_eol ':' opt_eol )?
+            int alt61=2;
+            alt61 = dfa61.predict(input); 
+            switch (alt61) {
                 case 1 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:897:19: fb= ID opt_eol ':' opt_eol
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:907:19: fb= ID opt_eol ':' opt_eol
                     {
                     fb=(Token)input.LT(1);
-                    match(input,ID,FOLLOW_ID_in_constraint2420); 
-                    following.push(FOLLOW_opt_eol_in_constraint2422);
+                    match(input,ID,FOLLOW_ID_in_constraint2455); 
+                    following.push(FOLLOW_opt_eol_in_constraint2457);
                     opt_eol();
                     following.pop();
 
-                    match(input,33,FOLLOW_33_in_constraint2424); 
-                    following.push(FOLLOW_opt_eol_in_constraint2426);
+                    match(input,33,FOLLOW_33_in_constraint2459); 
+                    following.push(FOLLOW_opt_eol_in_constraint2461);
                     opt_eol();
                     following.pop();
 
@@ -4455,68 +4546,68 @@
             }
 
             f=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_constraint2436); 
-            
-            
-            			if ( fb != null ) {
-            				//System.err.println( "fb: " + fb.getText() );
-            				//System.err.println( " f: " + f.getText() );
-            				d = new FieldBindingDescr( f.getText(), fb.getText() );
-            				//System.err.println( "fbd: " + d );
-            				
-            				d.setLocation( offset(f.getLine()), f.getCharPositionInLine() );
-            				constraints.add( d );
-            			} 
-            			FieldConstraintDescr fc = new FieldConstraintDescr(f.getText());
-            			fc.setLocation( offset(f.getLine()), f.getCharPositionInLine() );
-            									
-            			
+            match(input,ID,FOLLOW_ID_in_constraint2471); 
+
+
+            			if ( fb != null ) {
+            				//System.err.println( "fb: " + fb.getText() );
+            				//System.err.println( " f: " + f.getText() );
+            				d = new FieldBindingDescr( f.getText(), fb.getText() );
+            				//System.err.println( "fbd: " + d );
+            				
+            				d.setLocation( offset(f.getLine()), f.getCharPositionInLine() );
+            				constraints.add( d );
+            			} 
+            			FieldConstraintDescr fc = new FieldConstraintDescr(f.getText());
+            			fc.setLocation( offset(f.getLine()), f.getCharPositionInLine() );
+            									
+            			
             		
-            following.push(FOLLOW_opt_eol_in_constraint2450);
+            following.push(FOLLOW_opt_eol_in_constraint2485);
             opt_eol();
             following.pop();
 
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:915:33: (op= operator opt_eol (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint ) (con= ('&'|'|')op= operator (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint ) )* )?
-            int alt64=2;
-            int LA64_0 = input.LA(1);
-            if ( (LA64_0>=58 && LA64_0<=67) ) {
-                alt64=1;
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:925:33: (op= operator opt_eol (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint ) (con= ('&'|'|')op= operator (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint ) )* )?
+            int alt65=2;
+            int LA65_0 = input.LA(1);
+            if ( (LA65_0>=58 && LA65_0<=67) ) {
+                alt65=1;
             }
-            else if ( LA64_0==EOL||LA64_0==15||(LA64_0>=24 && LA64_0<=25) ) {
-                alt64=2;
+            else if ( LA65_0==EOL||LA65_0==15||(LA65_0>=24 && LA65_0<=25) ) {
+                alt65=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("915:33: (op= operator opt_eol (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint ) (con= (\'&\'|\'|\')op= operator (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint ) )* )?", 64, 0, input);
+                    new NoViableAltException("925:33: (op= operator opt_eol (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint ) (con= (\'&\'|\'|\')op= operator (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint ) )* )?", 65, 0, input);
 
                 throw nvae;
             }
-            switch (alt64) {
+            switch (alt65) {
                 case 1 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:915:41: op= operator opt_eol (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint ) (con= ('&'|'|')op= operator (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint ) )*
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:925:41: op= operator opt_eol (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint ) (con= ('&'|'|')op= operator (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint ) )*
                     {
-                    following.push(FOLLOW_operator_in_constraint2456);
+                    following.push(FOLLOW_operator_in_constraint2491);
                     op=operator();
                     following.pop();
 
-                    following.push(FOLLOW_opt_eol_in_constraint2458);
+                    following.push(FOLLOW_opt_eol_in_constraint2493);
                     opt_eol();
                     following.pop();
 
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:917:41: (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint )
-                    int alt61=4;
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:927:41: (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint )
+                    int alt62=4;
                     switch ( input.LA(1) ) {
                     case ID:
-                        int LA61_1 = input.LA(2);
-                        if ( LA61_1==18 ) {
-                            alt61=2;
+                        int LA62_1 = input.LA(2);
+                        if ( LA62_1==19 ) {
+                            alt62=2;
                         }
-                        else if ( LA61_1==EOL||LA61_1==15||(LA61_1>=24 && LA61_1<=25)||(LA61_1>=47 && LA61_1<=48) ) {
-                            alt61=1;
+                        else if ( LA62_1==EOL||LA62_1==15||(LA62_1>=24 && LA62_1<=25)||(LA62_1>=47 && LA62_1<=48) ) {
+                            alt62=1;
                         }
                         else {
                             NoViableAltException nvae =
-                                new NoViableAltException("917:41: (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint )", 61, 1, input);
+                                new NoViableAltException("927:41: (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint )", 62, 1, input);
 
                             throw nvae;
                         }
@@ -4526,85 +4617,85 @@
                     case STRING:
                     case FLOAT:
                     case 43:
-                        alt61=3;
+                        alt62=3;
                         break;
                     case 23:
-                        alt61=4;
+                        alt62=4;
                         break;
                     default:
                         NoViableAltException nvae =
-                            new NoViableAltException("917:41: (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint )", 61, 0, input);
+                            new NoViableAltException("927:41: (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint )", 62, 0, input);
 
                         throw nvae;
                     }
 
-                    switch (alt61) {
+                    switch (alt62) {
                         case 1 :
-                            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:917:49: bvc= ID
+                            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:927:49: bvc= ID
                             {
                             bvc=(Token)input.LT(1);
-                            match(input,ID,FOLLOW_ID_in_constraint2476); 
-                            
-                            							
-                            														
-                            							
-                            							VariableRestrictionDescr vd = new VariableRestrictionDescr(op, bvc.getText());
-                            							fc.addRestriction(vd);
-                            							constraints.add(fc);
-                            							
+                            match(input,ID,FOLLOW_ID_in_constraint2511); 
+
+                            							
+                            														
+                            							
+                            							VariableRestrictionDescr vd = new VariableRestrictionDescr(op, bvc.getText());
+                            							fc.addRestriction(vd);
+                            							constraints.add(fc);
+                            							
                             						
 
                             }
                             break;
                         case 2 :
-                            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:928:49: lc= enum_constraint
+                            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:938:49: lc= enum_constraint
                             {
-                            following.push(FOLLOW_enum_constraint_in_constraint2501);
+                            following.push(FOLLOW_enum_constraint_in_constraint2536);
                             lc=enum_constraint();
                             following.pop();
 
-                             
-                            
-                            							LiteralRestrictionDescr lrd  = new LiteralRestrictionDescr(op, lc, true);
-                            							fc.addRestriction(lrd);
-                            							constraints.add(fc);
-                            							
+                             
+
+                            							LiteralRestrictionDescr lrd  = new LiteralRestrictionDescr(op, lc, true);
+                            							fc.addRestriction(lrd);
+                            							constraints.add(fc);
+                            							
                             						
 
                             }
                             break;
                         case 3 :
-                            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:937:49: lc= literal_constraint
+                            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:947:49: lc= literal_constraint
                             {
-                            following.push(FOLLOW_literal_constraint_in_constraint2533);
+                            following.push(FOLLOW_literal_constraint_in_constraint2568);
                             lc=literal_constraint();
                             following.pop();
 
-                             
-                            							
-                            							LiteralRestrictionDescr lrd  = new LiteralRestrictionDescr(op, lc);
-                            							fc.addRestriction(lrd);
-                            							constraints.add(fc);
-                            							
+                             
+                            							
+                            							LiteralRestrictionDescr lrd  = new LiteralRestrictionDescr(op, lc);
+                            							fc.addRestriction(lrd);
+                            							constraints.add(fc);
+                            							
                             						
 
                             }
                             break;
                         case 4 :
-                            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:945:49: rvc= retval_constraint
+                            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:955:49: rvc= retval_constraint
                             {
-                            following.push(FOLLOW_retval_constraint_in_constraint2553);
+                            following.push(FOLLOW_retval_constraint_in_constraint2588);
                             rvc=retval_constraint();
                             following.pop();
 
-                             
-                            							
-                            							
-                            
-                            							ReturnValueRestrictionDescr rvd = new ReturnValueRestrictionDescr(op, rvc);							
-                            							fc.addRestriction(rvd);
-                            							constraints.add(fc);
-                            							
+                             
+                            							
+                            							
+
+                            							ReturnValueRestrictionDescr rvd = new ReturnValueRestrictionDescr(op, rvc);							
+                            							fc.addRestriction(rvd);
+                            							constraints.add(fc);
+                            							
                             						
 
                             }
@@ -4612,19 +4703,19 @@
 
                     }
 
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:956:41: (con= ('&'|'|')op= operator (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint ) )*
-                    loop63:
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:966:41: (con= ('&'|'|')op= operator (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint ) )*
+                    loop64:
                     do {
-                        int alt63=2;
-                        int LA63_0 = input.LA(1);
-                        if ( (LA63_0>=47 && LA63_0<=48) ) {
-                            alt63=1;
+                        int alt64=2;
+                        int LA64_0 = input.LA(1);
+                        if ( (LA64_0>=47 && LA64_0<=48) ) {
+                            alt64=1;
                         }
 
 
-                        switch (alt63) {
+                        switch (alt64) {
                     	case 1 :
-                    	    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:957:49: con= ('&'|'|')op= operator (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint )
+                    	    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:967:49: con= ('&'|'|')op= operator (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint )
                     	    {
                     	    con=(Token)input.LT(1);
                     	    if ( (input.LA(1)>=47 && input.LA(1)<=48) ) {
@@ -4634,34 +4725,34 @@
                     	    else {
                     	        MismatchedSetException mse =
                     	            new MismatchedSetException(null,input);
-                    	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_constraint2588);    throw mse;
+                    	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_constraint2623);    throw mse;
                     	    }
 
-                    	    
-                    	    							if (con.getText().equals("&") ) {								
-                    	    								fc.addRestriction(new RestrictionConnectiveDescr(RestrictionConnectiveDescr.AND));	
-                    	    							} else {
-                    	    								fc.addRestriction(new RestrictionConnectiveDescr(RestrictionConnectiveDescr.OR));	
-                    	    							}							
+
+                    	    							if (con.getText().equals("&") ) {								
+                    	    								fc.addRestriction(new RestrictionConnectiveDescr(RestrictionConnectiveDescr.AND));	
+                    	    							} else {
+                    	    								fc.addRestriction(new RestrictionConnectiveDescr(RestrictionConnectiveDescr.OR));	
+                    	    							}							
                     	    						
-                    	    following.push(FOLLOW_operator_in_constraint2610);
+                    	    following.push(FOLLOW_operator_in_constraint2645);
                     	    op=operator();
                     	    following.pop();
 
-                    	    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:967:49: (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint )
-                    	    int alt62=4;
+                    	    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:977:49: (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint )
+                    	    int alt63=4;
                     	    switch ( input.LA(1) ) {
                     	    case ID:
-                    	        int LA62_1 = input.LA(2);
-                    	        if ( LA62_1==18 ) {
-                    	            alt62=2;
+                    	        int LA63_1 = input.LA(2);
+                    	        if ( LA63_1==19 ) {
+                    	            alt63=2;
                     	        }
-                    	        else if ( LA62_1==EOL||LA62_1==15||(LA62_1>=24 && LA62_1<=25)||(LA62_1>=47 && LA62_1<=48) ) {
-                    	            alt62=1;
+                    	        else if ( LA63_1==EOL||LA63_1==15||(LA63_1>=24 && LA63_1<=25)||(LA63_1>=47 && LA63_1<=48) ) {
+                    	            alt63=1;
                     	        }
                     	        else {
                     	            NoViableAltException nvae =
-                    	                new NoViableAltException("967:49: (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint )", 62, 1, input);
+                    	                new NoViableAltException("977:49: (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint )", 63, 1, input);
 
                     	            throw nvae;
                     	        }
@@ -4671,72 +4762,72 @@
                     	    case STRING:
                     	    case FLOAT:
                     	    case 43:
-                    	        alt62=3;
+                    	        alt63=3;
                     	        break;
                     	    case 23:
-                    	        alt62=4;
+                    	        alt63=4;
                     	        break;
                     	    default:
                     	        NoViableAltException nvae =
-                    	            new NoViableAltException("967:49: (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint )", 62, 0, input);
+                    	            new NoViableAltException("977:49: (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint )", 63, 0, input);
 
                     	        throw nvae;
                     	    }
 
-                    	    switch (alt62) {
+                    	    switch (alt63) {
                     	        case 1 :
-                    	            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:967:57: bvc= ID
+                    	            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:977:57: bvc= ID
                     	            {
                     	            bvc=(Token)input.LT(1);
-                    	            match(input,ID,FOLLOW_ID_in_constraint2622); 
-                    	            
-                    	            								VariableRestrictionDescr vd = new VariableRestrictionDescr(op, bvc.getText());
-                    	            								fc.addRestriction(vd);
+                    	            match(input,ID,FOLLOW_ID_in_constraint2657); 
+
+                    	            								VariableRestrictionDescr vd = new VariableRestrictionDescr(op, bvc.getText());
+                    	            								fc.addRestriction(vd);
                     	            							
 
                     	            }
                     	            break;
                     	        case 2 :
-                    	            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:973:57: lc= enum_constraint
+                    	            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:983:57: lc= enum_constraint
                     	            {
-                    	            following.push(FOLLOW_enum_constraint_in_constraint2650);
+                    	            following.push(FOLLOW_enum_constraint_in_constraint2685);
                     	            lc=enum_constraint();
                     	            following.pop();
 
-                    	             
-                    	            								LiteralRestrictionDescr lrd  = new LiteralRestrictionDescr(op, lc, true);
-                    	            								fc.addRestriction(lrd);
-                    	            								
+                    	             
+                    	            								LiteralRestrictionDescr lrd  = new LiteralRestrictionDescr(op, lc, true);
+                    	            								fc.addRestriction(lrd);
+                    	            								
                     	            							
 
                     	            }
                     	            break;
                     	        case 3 :
-                    	            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:980:57: lc= literal_constraint
+                    	            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:990:57: lc= literal_constraint
                     	            {
-                    	            following.push(FOLLOW_literal_constraint_in_constraint2685);
+                    	            following.push(FOLLOW_literal_constraint_in_constraint2720);
                     	            lc=literal_constraint();
                     	            following.pop();
 
-                    	             
-                    	            								LiteralRestrictionDescr lrd  = new LiteralRestrictionDescr(op, lc);
-                    	            								fc.addRestriction(lrd);
-                    	            								
+                    	             
+                    	            								LiteralRestrictionDescr lrd  = new LiteralRestrictionDescr(op, lc);
+                    	            								fc.addRestriction(lrd);
+                    	            								
                     	            							
 
                     	            }
                     	            break;
                     	        case 4 :
-                    	            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:986:57: rvc= retval_constraint
+                    	            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:996:57: rvc= retval_constraint
                     	            {
-                    	            following.push(FOLLOW_retval_constraint_in_constraint2707);
+                    	            following.push(FOLLOW_retval_constraint_in_constraint2742);
                     	            rvc=retval_constraint();
                     	            following.pop();
 
-                    	             
-                    	            								ReturnValueRestrictionDescr rvd = new ReturnValueRestrictionDescr(op, rvc);							
-                    	            								fc.addRestriction(rvd);
-                    	            								
+                    	             
+                    	            								ReturnValueRestrictionDescr rvd = new ReturnValueRestrictionDescr(op, rvc);							
+                    	            								fc.addRestriction(rvd);
+                    	            								
                     	            							
 
                     	            }
@@ -4749,7 +4840,7 @@
                     	    break;
 
                     	default :
-                    	    break loop63;
+                    	    break loop64;
                         }
                     } while (true);
 
@@ -4759,7 +4850,7 @@
 
             }
 
-            following.push(FOLLOW_opt_eol_in_constraint2763);
+            following.push(FOLLOW_opt_eol_in_constraint2798);
             opt_eol();
             following.pop();
 
@@ -4779,85 +4870,85 @@
 
 
     // $ANTLR start literal_constraint
-    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:999:1: literal_constraint returns [String text] : (t= STRING | t= INT | t= FLOAT | t= BOOL | t= 'null' ) ;
+    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1009:1: literal_constraint returns [String text] : (t= STRING | t= INT | t= FLOAT | t= BOOL | t= 'null' ) ;
     public String literal_constraint() throws RecognitionException {   
         String text;
         Token t=null;
 
-        
-        		text = null;
+
+        		text = null;
         	
         try {
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1003:17: ( (t= STRING | t= INT | t= FLOAT | t= BOOL | t= 'null' ) )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1003:17: (t= STRING | t= INT | t= FLOAT | t= BOOL | t= 'null' )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1013:17: ( (t= STRING | t= INT | t= FLOAT | t= BOOL | t= 'null' ) )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1013:17: (t= STRING | t= INT | t= FLOAT | t= BOOL | t= 'null' )
             {
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1003:17: (t= STRING | t= INT | t= FLOAT | t= BOOL | t= 'null' )
-            int alt65=5;
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1013:17: (t= STRING | t= INT | t= FLOAT | t= BOOL | t= 'null' )
+            int alt66=5;
             switch ( input.LA(1) ) {
             case STRING:
-                alt65=1;
+                alt66=1;
                 break;
             case INT:
-                alt65=2;
+                alt66=2;
                 break;
             case FLOAT:
-                alt65=3;
+                alt66=3;
                 break;
             case BOOL:
-                alt65=4;
+                alt66=4;
                 break;
             case 43:
-                alt65=5;
+                alt66=5;
                 break;
             default:
                 NoViableAltException nvae =
-                    new NoViableAltException("1003:17: (t= STRING | t= INT | t= FLOAT | t= BOOL | t= \'null\' )", 65, 0, input);
+                    new NoViableAltException("1013:17: (t= STRING | t= INT | t= FLOAT | t= BOOL | t= \'null\' )", 66, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt65) {
+            switch (alt66) {
                 case 1 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1003:25: t= STRING
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1013:25: t= STRING
                     {
                     t=(Token)input.LT(1);
-                    match(input,STRING,FOLLOW_STRING_in_literal_constraint2790); 
+                    match(input,STRING,FOLLOW_STRING_in_literal_constraint2825); 
                      text = getString( t ); 
 
                     }
                     break;
                 case 2 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1004:25: t= INT
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1014:25: t= INT
                     {
                     t=(Token)input.LT(1);
-                    match(input,INT,FOLLOW_INT_in_literal_constraint2801); 
+                    match(input,INT,FOLLOW_INT_in_literal_constraint2836); 
                      text = t.getText(); 
 
                     }
                     break;
                 case 3 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1005:25: t= FLOAT
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1015:25: t= FLOAT
                     {
                     t=(Token)input.LT(1);
-                    match(input,FLOAT,FOLLOW_FLOAT_in_literal_constraint2814); 
+                    match(input,FLOAT,FOLLOW_FLOAT_in_literal_constraint2849); 
                      text = t.getText(); 
 
                     }
                     break;
                 case 4 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1006:25: t= BOOL
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1016:25: t= BOOL
                     {
                     t=(Token)input.LT(1);
-                    match(input,BOOL,FOLLOW_BOOL_in_literal_constraint2825); 
+                    match(input,BOOL,FOLLOW_BOOL_in_literal_constraint2860); 
                      text = t.getText(); 
 
                     }
                     break;
                 case 5 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1007:25: t= 'null'
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1017:25: t= 'null'
                     {
                     t=(Token)input.LT(1);
-                    match(input,43,FOLLOW_43_in_literal_constraint2837); 
+                    match(input,43,FOLLOW_43_in_literal_constraint2872); 
                      text = null; 
 
                     }
@@ -4881,27 +4972,27 @@
 
 
     // $ANTLR start enum_constraint
-    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1011:1: enum_constraint returns [String text] : (cls= ID '.' en= ID ) ;
+    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1021:1: enum_constraint returns [String text] : (cls= ID '.' en= ID ) ;
     public String enum_constraint() throws RecognitionException {   
         String text;
         Token cls=null;
         Token en=null;
 
-        
-        		text = null;
+
+        		text = null;
         	
         try {
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1015:17: ( (cls= ID '.' en= ID ) )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1015:17: (cls= ID '.' en= ID )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1025:17: ( (cls= ID '.' en= ID ) )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1025:17: (cls= ID '.' en= ID )
             {
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1015:17: (cls= ID '.' en= ID )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1015:18: cls= ID '.' en= ID
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1025:17: (cls= ID '.' en= ID )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1025:18: cls= ID '.' en= ID
             {
             cls=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_enum_constraint2868); 
-            match(input,18,FOLLOW_18_in_enum_constraint2870); 
+            match(input,ID,FOLLOW_ID_in_enum_constraint2903); 
+            match(input,19,FOLLOW_19_in_enum_constraint2905); 
             en=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_enum_constraint2874); 
+            match(input,ID,FOLLOW_ID_in_enum_constraint2909); 
 
             }
 
@@ -4922,25 +5013,25 @@
 
 
     // $ANTLR start retval_constraint
-    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1018:1: retval_constraint returns [String text] : '(' c= paren_chunk ')' ;
+    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1028:1: retval_constraint returns [String text] : '(' c= paren_chunk ')' ;
     public String retval_constraint() throws RecognitionException {   
         String text;
         String c = null;
 
 
-        
-        		text = null;
+
+        		text = null;
         	
         try {
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1023:17: ( '(' c= paren_chunk ')' )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1023:17: '(' c= paren_chunk ')'
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1033:17: ( '(' c= paren_chunk ')' )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1033:17: '(' c= paren_chunk ')'
             {
-            match(input,23,FOLLOW_23_in_retval_constraint2903); 
-            following.push(FOLLOW_paren_chunk_in_retval_constraint2908);
+            match(input,23,FOLLOW_23_in_retval_constraint2938); 
+            following.push(FOLLOW_paren_chunk_in_retval_constraint2943);
             c=paren_chunk();
             following.pop();
 
-            match(input,25,FOLLOW_25_in_retval_constraint2911); 
+            match(input,25,FOLLOW_25_in_retval_constraint2946); 
              text = c; 
 
             }
@@ -4958,7 +5049,7 @@
 
 
     // $ANTLR start predicate
-    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1026:1: predicate[List constraints] : decl= ID ':' field= ID '->' '(' text= paren_chunk ')' ;
+    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1036:1: predicate[List constraints] : decl= ID ':' field= ID '->' '(' text= paren_chunk ')' ;
     public void predicate(List constraints) throws RecognitionException {   
         Token decl=null;
         Token field=null;
@@ -4966,24 +5057,24 @@
 
 
         try {
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1028:17: (decl= ID ':' field= ID '->' '(' text= paren_chunk ')' )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1028:17: decl= ID ':' field= ID '->' '(' text= paren_chunk ')'
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1038:17: (decl= ID ':' field= ID '->' '(' text= paren_chunk ')' )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1038:17: decl= ID ':' field= ID '->' '(' text= paren_chunk ')'
             {
             decl=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_predicate2929); 
-            match(input,33,FOLLOW_33_in_predicate2931); 
+            match(input,ID,FOLLOW_ID_in_predicate2964); 
+            match(input,33,FOLLOW_33_in_predicate2966); 
             field=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_predicate2935); 
-            match(input,49,FOLLOW_49_in_predicate2937); 
-            match(input,23,FOLLOW_23_in_predicate2939); 
-            following.push(FOLLOW_paren_chunk_in_predicate2943);
+            match(input,ID,FOLLOW_ID_in_predicate2970); 
+            match(input,49,FOLLOW_49_in_predicate2972); 
+            match(input,23,FOLLOW_23_in_predicate2974); 
+            following.push(FOLLOW_paren_chunk_in_predicate2978);
             text=paren_chunk();
             following.pop();
 
-            match(input,25,FOLLOW_25_in_predicate2945); 
-            
-            			PredicateDescr d = new PredicateDescr(field.getText(), decl.getText(), text );
-            			constraints.add( d );
+            match(input,25,FOLLOW_25_in_predicate2980); 
+
+            			PredicateDescr d = new PredicateDescr(field.getText(), decl.getText(), text );
+            			constraints.add( d );
             		
 
             }
@@ -5001,33 +5092,33 @@
 
 
     // $ANTLR start paren_chunk
-    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1035:1: paren_chunk returns [String text] : ( options {greedy=false; } : '(' c= paren_chunk ')' | any= . )* ;
+    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1045:1: paren_chunk returns [String text] : ( options {greedy=false; } : '(' c= paren_chunk ')' | any= . )* ;
     public String paren_chunk() throws RecognitionException {   
         String text;
         Token any=null;
         String c = null;
 
 
-        
-        		text = null;
+
+        		text = null;
         	
         try {
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1041:18: ( ( options {greedy=false; } : '(' c= paren_chunk ')' | any= . )* )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1041:18: ( options {greedy=false; } : '(' c= paren_chunk ')' | any= . )*
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1051:18: ( ( options {greedy=false; } : '(' c= paren_chunk ')' | any= . )* )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1051:18: ( options {greedy=false; } : '(' c= paren_chunk ')' | any= . )*
             {
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1041:18: ( options {greedy=false; } : '(' c= paren_chunk ')' | any= . )*
-            loop66:
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1051:18: ( options {greedy=false; } : '(' c= paren_chunk ')' | any= . )*
+            loop67:
             do {
-                int alt66=3;
+                int alt67=3;
                 switch ( input.LA(1) ) {
                 case EOL:
-                    alt66=3;
+                    alt67=3;
                     break;
                 case 25:
-                    alt66=3;
+                    alt67=3;
                     break;
                 case 23:
-                    alt66=1;
+                    alt67=1;
                     break;
                 case ID:
                 case INT:
@@ -5090,52 +5181,52 @@
                 case 65:
                 case 66:
                 case 67:
-                    alt66=2;
+                    alt67=2;
                     break;
 
                 }
 
-                switch (alt66) {
+                switch (alt67) {
             	case 1 :
-            	    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1042:25: '(' c= paren_chunk ')'
+            	    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1052:25: '(' c= paren_chunk ')'
             	    {
-            	    match(input,23,FOLLOW_23_in_paren_chunk2991); 
-            	    following.push(FOLLOW_paren_chunk_in_paren_chunk2995);
+            	    match(input,23,FOLLOW_23_in_paren_chunk3026); 
+            	    following.push(FOLLOW_paren_chunk_in_paren_chunk3030);
             	    c=paren_chunk();
             	    following.pop();
 
-            	    match(input,25,FOLLOW_25_in_paren_chunk2997); 
-            	    
-            	    				if ( c == null ) {
-            	    					c = "";
-            	    				}
-            	    				if ( text == null ) {
-            	    					text = "( " + c + " )";
-            	    				} else {
-            	    					text = text + " ( " + c + " )";
-            	    				}
+            	    match(input,25,FOLLOW_25_in_paren_chunk3032); 
+
+            	    				if ( c == null ) {
+            	    					c = "";
+            	    				}
+            	    				if ( text == null ) {
+            	    					text = "( " + c + " )";
+            	    				} else {
+            	    					text = text + " ( " + c + " )";
+            	    				}
             	    			
 
             	    }
             	    break;
             	case 2 :
-            	    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1053:19: any= .
+            	    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1063:19: any= .
             	    {
             	    any=(Token)input.LT(1);
             	    matchAny(input); 
-            	    
-            	    				if ( text == null ) {
-            	    					text = any.getText();
-            	    				} else {
-            	    					text = text + " " + any.getText(); 
-            	    				} 
+
+            	    				if ( text == null ) {
+            	    					text = any.getText();
+            	    				} else {
+            	    					text = text + " " + any.getText(); 
+            	    				} 
             	    			
 
             	    }
             	    break;
 
             	default :
-            	    break loop66;
+            	    break loop67;
                 }
             } while (true);
 
@@ -5155,30 +5246,30 @@
 
 
     // $ANTLR start paren_chunk2
-    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1065:1: paren_chunk2 returns [String text] : ( options {greedy=false; } : '(' c= paren_chunk2 ')' | any= . )* ;
+    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1075:1: paren_chunk2 returns [String text] : ( options {greedy=false; } : '(' c= paren_chunk2 ')' | any= . )* ;
     public String paren_chunk2() throws RecognitionException {   
         String text;
         Token any=null;
         String c = null;
 
 
-        
-        		text = null;
+
+        		text = null;
         	
         try {
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1071:18: ( ( options {greedy=false; } : '(' c= paren_chunk2 ')' | any= . )* )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1071:18: ( options {greedy=false; } : '(' c= paren_chunk2 ')' | any= . )*
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1081:18: ( ( options {greedy=false; } : '(' c= paren_chunk2 ')' | any= . )* )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1081:18: ( options {greedy=false; } : '(' c= paren_chunk2 ')' | any= . )*
             {
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1071:18: ( options {greedy=false; } : '(' c= paren_chunk2 ')' | any= . )*
-            loop67:
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1081:18: ( options {greedy=false; } : '(' c= paren_chunk2 ')' | any= . )*
+            loop68:
             do {
-                int alt67=3;
+                int alt68=3;
                 switch ( input.LA(1) ) {
                 case 25:
-                    alt67=3;
+                    alt68=3;
                     break;
                 case 23:
-                    alt67=1;
+                    alt68=1;
                     break;
                 case EOL:
                 case ID:
@@ -5242,52 +5333,52 @@
                 case 65:
                 case 66:
                 case 67:
-                    alt67=2;
+                    alt68=2;
                     break;
 
                 }
 
-                switch (alt67) {
+                switch (alt68) {
             	case 1 :
-            	    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1072:25: '(' c= paren_chunk2 ')'
+            	    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1082:25: '(' c= paren_chunk2 ')'
             	    {
-            	    match(input,23,FOLLOW_23_in_paren_chunk23068); 
-            	    following.push(FOLLOW_paren_chunk2_in_paren_chunk23072);
+            	    match(input,23,FOLLOW_23_in_paren_chunk23103); 
+            	    following.push(FOLLOW_paren_chunk2_in_paren_chunk23107);
             	    c=paren_chunk2();
             	    following.pop();
 
-            	    match(input,25,FOLLOW_25_in_paren_chunk23074); 
-            	    
-            	    				if ( c == null ) {
-            	    					c = "";
-            	    				}
-            	    				if ( text == null ) {
-            	    					text = "( " + c + " )";
-            	    				} else {
-            	    					text = text + " ( " + c + " )";
-            	    				}
+            	    match(input,25,FOLLOW_25_in_paren_chunk23109); 
+
+            	    				if ( c == null ) {
+            	    					c = "";
+            	    				}
+            	    				if ( text == null ) {
+            	    					text = "( " + c + " )";
+            	    				} else {
+            	    					text = text + " ( " + c + " )";
+            	    				}
             	    			
 
             	    }
             	    break;
             	case 2 :
-            	    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1083:19: any= .
+            	    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1093:19: any= .
             	    {
             	    any=(Token)input.LT(1);
             	    matchAny(input); 
-            	    
-            	    				if ( text == null ) {
-            	    					text = any.getText();
-            	    				} else {
-            	    					text = text + " " + any.getText(); 
-            	    				} 
+
+            	    				if ( text == null ) {
+            	    					text = any.getText();
+            	    				} else {
+            	    					text = text + " " + any.getText(); 
+            	    				} 
             	    			
 
             	    }
             	    break;
 
             	default :
-            	    break loop67;
+            	    break loop68;
                 }
             } while (true);
 
@@ -5307,30 +5398,30 @@
 
 
     // $ANTLR start curly_chunk
-    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1094:1: curly_chunk returns [String text] : ( options {greedy=false; } : '{' c= curly_chunk '}' | any= . )* ;
+    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1104:1: curly_chunk returns [String text] : ( options {greedy=false; } : '{' c= curly_chunk '}' | any= . )* ;
     public String curly_chunk() throws RecognitionException {   
         String text;
         Token any=null;
         String c = null;
 
 
-        
-        		text = null;
+
+        		text = null;
         	
         try {
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1100:17: ( ( options {greedy=false; } : '{' c= curly_chunk '}' | any= . )* )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1100:17: ( options {greedy=false; } : '{' c= curly_chunk '}' | any= . )*
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1110:17: ( ( options {greedy=false; } : '{' c= curly_chunk '}' | any= . )* )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1110:17: ( options {greedy=false; } : '{' c= curly_chunk '}' | any= . )*
             {
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1100:17: ( options {greedy=false; } : '{' c= curly_chunk '}' | any= . )*
-            loop68:
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1110:17: ( options {greedy=false; } : '{' c= curly_chunk '}' | any= . )*
+            loop69:
             do {
-                int alt68=3;
+                int alt69=3;
                 switch ( input.LA(1) ) {
                 case 27:
-                    alt68=3;
+                    alt69=3;
                     break;
                 case 26:
-                    alt68=1;
+                    alt69=1;
                     break;
                 case EOL:
                 case ID:
@@ -5394,54 +5485,54 @@
                 case 65:
                 case 66:
                 case 67:
-                    alt68=2;
+                    alt69=2;
                     break;
 
                 }
 
-                switch (alt68) {
+                switch (alt69) {
             	case 1 :
-            	    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1101:25: '{' c= curly_chunk '}'
+            	    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1111:25: '{' c= curly_chunk '}'
             	    {
-            	    match(input,26,FOLLOW_26_in_curly_chunk3143); 
-            	    following.push(FOLLOW_curly_chunk_in_curly_chunk3147);
+            	    match(input,26,FOLLOW_26_in_curly_chunk3178); 
+            	    following.push(FOLLOW_curly_chunk_in_curly_chunk3182);
             	    c=curly_chunk();
             	    following.pop();
 
-            	    match(input,27,FOLLOW_27_in_curly_chunk3149); 
-            	    
-            	    				//System.err.println( "chunk [" + c + "]" );
-            	    				if ( c == null ) {
-            	    					c = "";
-            	    				}
-            	    				if ( text == null ) {
-            	    					text = "{ " + c + " }";
-            	    				} else {
-            	    					text = text + " { " + c + " }";
-            	    				}
+            	    match(input,27,FOLLOW_27_in_curly_chunk3184); 
+
+            	    				//System.err.println( "chunk [" + c + "]" );
+            	    				if ( c == null ) {
+            	    					c = "";
+            	    				}
+            	    				if ( text == null ) {
+            	    					text = "{ " + c + " }";
+            	    				} else {
+            	    					text = text + " { " + c + " }";
+            	    				}
             	    			
 
             	    }
             	    break;
             	case 2 :
-            	    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1113:19: any= .
+            	    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1123:19: any= .
             	    {
             	    any=(Token)input.LT(1);
             	    matchAny(input); 
-            	    
-            	    				//System.err.println( "any [" + any.getText() + "]" );
-            	    				if ( text == null ) {
-            	    					text = any.getText();
-            	    				} else {
-            	    					text = text + " " + any.getText(); 
-            	    				} 
+
+            	    				//System.err.println( "any [" + any.getText() + "]" );
+            	    				if ( text == null ) {
+            	    					text = any.getText();
+            	    				} else {
+            	    					text = text + " " + any.getText(); 
+            	    				} 
             	    			
 
             	    }
             	    break;
 
             	default :
-            	    break loop68;
+            	    break loop69;
                 }
             } while (true);
 
@@ -5461,7 +5552,7 @@
 
 
     // $ANTLR start lhs_or
-    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1125:1: lhs_or returns [PatternDescr d] : left= lhs_and ( ('or'|'||') opt_eol right= lhs_and )* ;
+    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1135:1: lhs_or returns [PatternDescr d] : left= lhs_and ( ('or'|'||') opt_eol right= lhs_and )* ;
     public PatternDescr lhs_or() throws RecognitionException {   
         PatternDescr d;
         PatternDescr left = null;
@@ -5469,32 +5560,32 @@
         PatternDescr right = null;
 
 
-        
-        		d = null;
+
+        		d = null;
         	
         try {
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1130:17: (left= lhs_and ( ('or'|'||') opt_eol right= lhs_and )* )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1130:17: left= lhs_and ( ('or'|'||') opt_eol right= lhs_and )*
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1140:17: (left= lhs_and ( ('or'|'||') opt_eol right= lhs_and )* )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1140:17: left= lhs_and ( ('or'|'||') opt_eol right= lhs_and )*
             {
              OrDescr or = null; 
-            following.push(FOLLOW_lhs_and_in_lhs_or3207);
+            following.push(FOLLOW_lhs_and_in_lhs_or3242);
             left=lhs_and();
             following.pop();
 
             d = left; 
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1132:17: ( ('or'|'||') opt_eol right= lhs_and )*
-            loop69:
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1142:17: ( ('or'|'||') opt_eol right= lhs_and )*
+            loop70:
             do {
-                int alt69=2;
-                int LA69_0 = input.LA(1);
-                if ( (LA69_0>=45 && LA69_0<=46) ) {
-                    alt69=1;
+                int alt70=2;
+                int LA70_0 = input.LA(1);
+                if ( (LA70_0>=45 && LA70_0<=46) ) {
+                    alt70=1;
                 }
 
 
-                switch (alt69) {
+                switch (alt70) {
             	case 1 :
-            	    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1132:19: ('or'|'||') opt_eol right= lhs_and
+            	    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1142:19: ('or'|'||') opt_eol right= lhs_and
             	    {
             	    if ( (input.LA(1)>=45 && input.LA(1)<=46) ) {
             	        input.consume();
@@ -5503,32 +5594,32 @@
             	    else {
             	        MismatchedSetException mse =
             	            new MismatchedSetException(null,input);
-            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_lhs_or3216);    throw mse;
+            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_lhs_or3251);    throw mse;
             	    }
 
-            	    following.push(FOLLOW_opt_eol_in_lhs_or3221);
+            	    following.push(FOLLOW_opt_eol_in_lhs_or3256);
             	    opt_eol();
             	    following.pop();
 
-            	    following.push(FOLLOW_lhs_and_in_lhs_or3228);
+            	    following.push(FOLLOW_lhs_and_in_lhs_or3263);
             	    right=lhs_and();
             	    following.pop();
 
-            	    
-            	    				if ( or == null ) {
-            	    					or = new OrDescr();
-            	    					or.addDescr( left );
-            	    					d = or;
-            	    				}
-            	    				
-            	    				or.addDescr( right );
+
+            	    				if ( or == null ) {
+            	    					or = new OrDescr();
+            	    					or.addDescr( left );
+            	    					d = or;
+            	    				}
+            	    				
+            	    				or.addDescr( right );
             	    			
 
             	    }
             	    break;
 
             	default :
-            	    break loop69;
+            	    break loop70;
                 }
             } while (true);
 
@@ -5548,7 +5639,7 @@
 
 
     // $ANTLR start lhs_and
-    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1146:1: lhs_and returns [PatternDescr d] : left= lhs_unary ( ('and'|'&&') opt_eol right= lhs_unary )* ;
+    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1156:1: lhs_and returns [PatternDescr d] : left= lhs_unary ( ('and'|'&&') opt_eol right= lhs_unary )* ;
     public PatternDescr lhs_and() throws RecognitionException {   
         PatternDescr d;
         PatternDescr left = null;
@@ -5556,32 +5647,32 @@
         PatternDescr right = null;
 
 
-        
-        		d = null;
+
+        		d = null;
         	
         try {
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1151:17: (left= lhs_unary ( ('and'|'&&') opt_eol right= lhs_unary )* )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1151:17: left= lhs_unary ( ('and'|'&&') opt_eol right= lhs_unary )*
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1161:17: (left= lhs_unary ( ('and'|'&&') opt_eol right= lhs_unary )* )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1161:17: left= lhs_unary ( ('and'|'&&') opt_eol right= lhs_unary )*
             {
              AndDescr and = null; 
-            following.push(FOLLOW_lhs_unary_in_lhs_and3268);
+            following.push(FOLLOW_lhs_unary_in_lhs_and3303);
             left=lhs_unary();
             following.pop();
 
              d = left; 
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1153:17: ( ('and'|'&&') opt_eol right= lhs_unary )*
-            loop70:
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1163:17: ( ('and'|'&&') opt_eol right= lhs_unary )*
+            loop71:
             do {
-                int alt70=2;
-                int LA70_0 = input.LA(1);
-                if ( (LA70_0>=50 && LA70_0<=51) ) {
-                    alt70=1;
+                int alt71=2;
+                int LA71_0 = input.LA(1);
+                if ( (LA71_0>=50 && LA71_0<=51) ) {
+                    alt71=1;
                 }
 
 
-                switch (alt70) {
+                switch (alt71) {
             	case 1 :
-            	    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1153:19: ('and'|'&&') opt_eol right= lhs_unary
+            	    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1163:19: ('and'|'&&') opt_eol right= lhs_unary
             	    {
             	    if ( (input.LA(1)>=50 && input.LA(1)<=51) ) {
             	        input.consume();
@@ -5590,32 +5681,32 @@
             	    else {
             	        MismatchedSetException mse =
             	            new MismatchedSetException(null,input);
-            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_lhs_and3277);    throw mse;
+            	        recoverFromMismatchedSet(input,mse,FOLLOW_set_in_lhs_and3312);    throw mse;
             	    }
 
-            	    following.push(FOLLOW_opt_eol_in_lhs_and3282);
+            	    following.push(FOLLOW_opt_eol_in_lhs_and3317);
             	    opt_eol();
             	    following.pop();
 
-            	    following.push(FOLLOW_lhs_unary_in_lhs_and3289);
+            	    following.push(FOLLOW_lhs_unary_in_lhs_and3324);
             	    right=lhs_unary();
             	    following.pop();
 
-            	    
-            	    				if ( and == null ) {
-            	    					and = new AndDescr();
-            	    					and.addDescr( left );
-            	    					d = and;
-            	    				}
-            	    				
-            	    				and.addDescr( right );
+
+            	    				if ( and == null ) {
+            	    					and = new AndDescr();
+            	    					and.addDescr( left );
+            	    					d = and;
+            	    				}
+            	    				
+            	    				and.addDescr( right );
             	    			
 
             	    }
             	    break;
 
             	default :
-            	    break loop70;
+            	    break loop71;
                 }
             } while (true);
 
@@ -5635,7 +5726,7 @@
 
 
     // $ANTLR start lhs_unary
-    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1167:1: lhs_unary returns [PatternDescr d] : (u= lhs_exist | u= lhs_not | u= lhs_eval | u= lhs_column (fm= from_statement )? | '(' opt_eol u= lhs opt_eol ')' ) ;
+    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1177:1: lhs_unary returns [PatternDescr d] : (u= lhs_exist | u= lhs_not | u= lhs_eval | u= lhs_column (fm= from_statement )? | '(' opt_eol u= lhs opt_eol ')' ) ;
     public PatternDescr lhs_unary() throws RecognitionException {   
         PatternDescr d;
         PatternDescr u = null;
@@ -5643,43 +5734,43 @@
         FromDescr fm = null;
 
 
-        
-        		d = null;
+
+        		d = null;
         	
         try {
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1171:17: ( (u= lhs_exist | u= lhs_not | u= lhs_eval | u= lhs_column (fm= from_statement )? | '(' opt_eol u= lhs opt_eol ')' ) )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1171:17: (u= lhs_exist | u= lhs_not | u= lhs_eval | u= lhs_column (fm= from_statement )? | '(' opt_eol u= lhs opt_eol ')' )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1181:17: ( (u= lhs_exist | u= lhs_not | u= lhs_eval | u= lhs_column (fm= from_statement )? | '(' opt_eol u= lhs opt_eol ')' ) )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1181:17: (u= lhs_exist | u= lhs_not | u= lhs_eval | u= lhs_column (fm= from_statement )? | '(' opt_eol u= lhs opt_eol ')' )
             {
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1171:17: (u= lhs_exist | u= lhs_not | u= lhs_eval | u= lhs_column (fm= from_statement )? | '(' opt_eol u= lhs opt_eol ')' )
-            int alt72=5;
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1181:17: (u= lhs_exist | u= lhs_not | u= lhs_eval | u= lhs_column (fm= from_statement )? | '(' opt_eol u= lhs opt_eol ')' )
+            int alt73=5;
             switch ( input.LA(1) ) {
             case 52:
-                alt72=1;
+                alt73=1;
                 break;
             case 53:
-                alt72=2;
+                alt73=2;
                 break;
             case 54:
-                alt72=3;
+                alt73=3;
                 break;
             case ID:
-                alt72=4;
+                alt73=4;
                 break;
             case 23:
-                alt72=5;
+                alt73=5;
                 break;
             default:
                 NoViableAltException nvae =
-                    new NoViableAltException("1171:17: (u= lhs_exist | u= lhs_not | u= lhs_eval | u= lhs_column (fm= from_statement )? | \'(\' opt_eol u= lhs opt_eol \')\' )", 72, 0, input);
+                    new NoViableAltException("1181:17: (u= lhs_exist | u= lhs_not | u= lhs_eval | u= lhs_column (fm= from_statement )? | \'(\' opt_eol u= lhs opt_eol \')\' )", 73, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt72) {
+            switch (alt73) {
                 case 1 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1171:25: u= lhs_exist
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1181:25: u= lhs_exist
                     {
-                    following.push(FOLLOW_lhs_exist_in_lhs_unary3327);
+                    following.push(FOLLOW_lhs_exist_in_lhs_unary3362);
                     u=lhs_exist();
                     following.pop();
 
@@ -5688,9 +5779,9 @@
                     }
                     break;
                 case 2 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1172:25: u= lhs_not
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1182:25: u= lhs_not
                     {
-                    following.push(FOLLOW_lhs_not_in_lhs_unary3337);
+                    following.push(FOLLOW_lhs_not_in_lhs_unary3372);
                     u=lhs_not();
                     following.pop();
 
@@ -5699,9 +5790,9 @@
                     }
                     break;
                 case 3 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1173:25: u= lhs_eval
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1183:25: u= lhs_eval
                     {
-                    following.push(FOLLOW_lhs_eval_in_lhs_unary3347);
+                    following.push(FOLLOW_lhs_eval_in_lhs_unary3382);
                     u=lhs_eval();
                     following.pop();
 
@@ -5710,33 +5801,33 @@
                     }
                     break;
                 case 4 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1174:25: u= lhs_column (fm= from_statement )?
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1184:25: u= lhs_column (fm= from_statement )?
                     {
-                    following.push(FOLLOW_lhs_column_in_lhs_unary3361);
+                    following.push(FOLLOW_lhs_column_in_lhs_unary3396);
                     u=lhs_column();
                     following.pop();
 
                     d=u;
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1174:45: (fm= from_statement )?
-                    int alt71=2;
-                    int LA71_0 = input.LA(1);
-                    if ( LA71_0==42 ) {
-                        alt71=1;
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1184:45: (fm= from_statement )?
+                    int alt72=2;
+                    int LA72_0 = input.LA(1);
+                    if ( LA72_0==42 ) {
+                        alt72=1;
                     }
-                    else if ( (LA71_0>=EOL && LA71_0<=ID)||LA71_0==15||LA71_0==23||LA71_0==25||LA71_0==29||LA71_0==34||(LA71_0>=45 && LA71_0<=46)||(LA71_0>=50 && LA71_0<=54) ) {
-                        alt71=2;
+                    else if ( (LA72_0>=EOL && LA72_0<=ID)||LA72_0==15||LA72_0==23||LA72_0==25||LA72_0==29||LA72_0==34||(LA72_0>=45 && LA72_0<=46)||(LA72_0>=50 && LA72_0<=54) ) {
+                        alt72=2;
                     }
                     else {
                         NoViableAltException nvae =
-                            new NoViableAltException("1174:45: (fm= from_statement )?", 71, 0, input);
+                            new NoViableAltException("1184:45: (fm= from_statement )?", 72, 0, input);
 
                         throw nvae;
                     }
-                    switch (alt71) {
+                    switch (alt72) {
                         case 1 :
-                            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1174:46: fm= from_statement
+                            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1184:46: fm= from_statement
                             {
-                            following.push(FOLLOW_from_statement_in_lhs_unary3368);
+                            following.push(FOLLOW_from_statement_in_lhs_unary3403);
                             fm=from_statement();
                             following.pop();
 
@@ -5751,22 +5842,22 @@
                     }
                     break;
                 case 5 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1175:25: '(' opt_eol u= lhs opt_eol ')'
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1185:25: '(' opt_eol u= lhs opt_eol ')'
                     {
-                    match(input,23,FOLLOW_23_in_lhs_unary3378); 
-                    following.push(FOLLOW_opt_eol_in_lhs_unary3380);
+                    match(input,23,FOLLOW_23_in_lhs_unary3413); 
+                    following.push(FOLLOW_opt_eol_in_lhs_unary3415);
                     opt_eol();
                     following.pop();
 
-                    following.push(FOLLOW_lhs_in_lhs_unary3384);
+                    following.push(FOLLOW_lhs_in_lhs_unary3419);
                     u=lhs();
                     following.pop();
 
-                    following.push(FOLLOW_opt_eol_in_lhs_unary3386);
+                    following.push(FOLLOW_opt_eol_in_lhs_unary3421);
                     opt_eol();
                     following.pop();
 
-                    match(input,25,FOLLOW_25_in_lhs_unary3388); 
+                    match(input,25,FOLLOW_25_in_lhs_unary3423); 
                     d = u;
 
                     }
@@ -5790,54 +5881,54 @@
 
 
     // $ANTLR start lhs_exist
-    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1179:1: lhs_exist returns [PatternDescr d] : loc= 'exists' ( '(' column= lhs_column ')' | column= lhs_column ) ;
+    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1189:1: lhs_exist returns [PatternDescr d] : loc= 'exists' ( '(' column= lhs_column ')' | column= lhs_column ) ;
     public PatternDescr lhs_exist() throws RecognitionException {   
         PatternDescr d;
         Token loc=null;
         PatternDescr column = null;
 
 
-        
-        		d = null;
+
+        		d = null;
         	
         try {
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1183:17: (loc= 'exists' ( '(' column= lhs_column ')' | column= lhs_column ) )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1183:17: loc= 'exists' ( '(' column= lhs_column ')' | column= lhs_column )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1193:17: (loc= 'exists' ( '(' column= lhs_column ')' | column= lhs_column ) )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1193:17: loc= 'exists' ( '(' column= lhs_column ')' | column= lhs_column )
             {
             loc=(Token)input.LT(1);
-            match(input,52,FOLLOW_52_in_lhs_exist3419); 
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1183:30: ( '(' column= lhs_column ')' | column= lhs_column )
-            int alt73=2;
-            int LA73_0 = input.LA(1);
-            if ( LA73_0==23 ) {
-                alt73=1;
+            match(input,52,FOLLOW_52_in_lhs_exist3454); 
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1193:30: ( '(' column= lhs_column ')' | column= lhs_column )
+            int alt74=2;
+            int LA74_0 = input.LA(1);
+            if ( LA74_0==23 ) {
+                alt74=1;
             }
-            else if ( LA73_0==ID ) {
-                alt73=2;
+            else if ( LA74_0==ID ) {
+                alt74=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("1183:30: ( \'(\' column= lhs_column \')\' | column= lhs_column )", 73, 0, input);
+                    new NoViableAltException("1193:30: ( \'(\' column= lhs_column \')\' | column= lhs_column )", 74, 0, input);
 
                 throw nvae;
             }
-            switch (alt73) {
+            switch (alt74) {
                 case 1 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1183:31: '(' column= lhs_column ')'
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1193:31: '(' column= lhs_column ')'
                     {
-                    match(input,23,FOLLOW_23_in_lhs_exist3422); 
-                    following.push(FOLLOW_lhs_column_in_lhs_exist3426);
+                    match(input,23,FOLLOW_23_in_lhs_exist3457); 
+                    following.push(FOLLOW_lhs_column_in_lhs_exist3461);
                     column=lhs_column();
                     following.pop();
 
-                    match(input,25,FOLLOW_25_in_lhs_exist3428); 
+                    match(input,25,FOLLOW_25_in_lhs_exist3463); 
 
                     }
                     break;
                 case 2 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1183:59: column= lhs_column
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1193:59: column= lhs_column
                     {
-                    following.push(FOLLOW_lhs_column_in_lhs_exist3434);
+                    following.push(FOLLOW_lhs_column_in_lhs_exist3469);
                     column=lhs_column();
                     following.pop();
 
@@ -5847,9 +5938,9 @@
 
             }
 
-             
-            			d = new ExistsDescr( (ColumnDescr) column ); 
-            			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+             
+            			d = new ExistsDescr( (ColumnDescr) column ); 
+            			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
             		
 
             }
@@ -5867,54 +5958,54 @@
 
 
     // $ANTLR start lhs_not
-    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1190:1: lhs_not returns [NotDescr d] : loc= 'not' ( '(' column= lhs_column ')' | column= lhs_column ) ;
+    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1200:1: lhs_not returns [NotDescr d] : loc= 'not' ( '(' column= lhs_column ')' | column= lhs_column ) ;
     public NotDescr lhs_not() throws RecognitionException {   
         NotDescr d;
         Token loc=null;
         PatternDescr column = null;
 
 
-        
-        		d = null;
+
+        		d = null;
         	
         try {
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1194:17: (loc= 'not' ( '(' column= lhs_column ')' | column= lhs_column ) )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1194:17: loc= 'not' ( '(' column= lhs_column ')' | column= lhs_column )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1204:17: (loc= 'not' ( '(' column= lhs_column ')' | column= lhs_column ) )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1204:17: loc= 'not' ( '(' column= lhs_column ')' | column= lhs_column )
             {
             loc=(Token)input.LT(1);
-            match(input,53,FOLLOW_53_in_lhs_not3464); 
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1194:27: ( '(' column= lhs_column ')' | column= lhs_column )
-            int alt74=2;
-            int LA74_0 = input.LA(1);
-            if ( LA74_0==23 ) {
-                alt74=1;
+            match(input,53,FOLLOW_53_in_lhs_not3499); 
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1204:27: ( '(' column= lhs_column ')' | column= lhs_column )
+            int alt75=2;
+            int LA75_0 = input.LA(1);
+            if ( LA75_0==23 ) {
+                alt75=1;
             }
-            else if ( LA74_0==ID ) {
-                alt74=2;
+            else if ( LA75_0==ID ) {
+                alt75=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("1194:27: ( \'(\' column= lhs_column \')\' | column= lhs_column )", 74, 0, input);
+                    new NoViableAltException("1204:27: ( \'(\' column= lhs_column \')\' | column= lhs_column )", 75, 0, input);
 
                 throw nvae;
             }
-            switch (alt74) {
+            switch (alt75) {
                 case 1 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1194:28: '(' column= lhs_column ')'
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1204:28: '(' column= lhs_column ')'
                     {
-                    match(input,23,FOLLOW_23_in_lhs_not3467); 
-                    following.push(FOLLOW_lhs_column_in_lhs_not3471);
+                    match(input,23,FOLLOW_23_in_lhs_not3502); 
+                    following.push(FOLLOW_lhs_column_in_lhs_not3506);
                     column=lhs_column();
                     following.pop();
 
-                    match(input,25,FOLLOW_25_in_lhs_not3474); 
+                    match(input,25,FOLLOW_25_in_lhs_not3509); 
 
                     }
                     break;
                 case 2 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1194:57: column= lhs_column
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1204:57: column= lhs_column
                     {
-                    following.push(FOLLOW_lhs_column_in_lhs_not3480);
+                    following.push(FOLLOW_lhs_column_in_lhs_not3515);
                     column=lhs_column();
                     following.pop();
 
@@ -5924,9 +6015,9 @@
 
             }
 
-            
-            			d = new NotDescr( (ColumnDescr) column ); 
-            			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+
+            			d = new NotDescr( (ColumnDescr) column ); 
+            			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
             		
 
             }
@@ -5944,32 +6035,32 @@
 
 
     // $ANTLR start lhs_eval
-    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1201:1: lhs_eval returns [PatternDescr d] : 'eval' loc= '(' c= paren_chunk2 ')' ;
+    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1211:1: lhs_eval returns [PatternDescr d] : 'eval' loc= '(' c= paren_chunk2 ')' ;
     public PatternDescr lhs_eval() throws RecognitionException {   
         PatternDescr d;
         Token loc=null;
         String c = null;
 
 
-        
-        		d = null;
-        		String text = "";
+
+        		d = null;
+        		String text = "";
         	
         try {
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1206:17: ( 'eval' loc= '(' c= paren_chunk2 ')' )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1206:17: 'eval' loc= '(' c= paren_chunk2 ')'
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1216:17: ( 'eval' loc= '(' c= paren_chunk2 ')' )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1216:17: 'eval' loc= '(' c= paren_chunk2 ')'
             {
-            match(input,54,FOLLOW_54_in_lhs_eval3506); 
+            match(input,54,FOLLOW_54_in_lhs_eval3541); 
             loc=(Token)input.LT(1);
-            match(input,23,FOLLOW_23_in_lhs_eval3510); 
-            following.push(FOLLOW_paren_chunk2_in_lhs_eval3518);
+            match(input,23,FOLLOW_23_in_lhs_eval3545); 
+            following.push(FOLLOW_paren_chunk2_in_lhs_eval3553);
             c=paren_chunk2();
             following.pop();
 
-            match(input,25,FOLLOW_25_in_lhs_eval3522); 
-             
-            			checkTrailingSemicolon( c, offset(loc.getLine()) );
-            			d = new EvalDescr( c ); 
+            match(input,25,FOLLOW_25_in_lhs_eval3557); 
+             
+            			checkTrailingSemicolon( c, offset(loc.getLine()) );
+            			d = new EvalDescr( c ); 
             		
 
             }
@@ -5987,71 +6078,71 @@
 
 
     // $ANTLR start dotted_name
-    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1215:1: dotted_name returns [String name] : id= ID ( '.' id= ID )* ( '[' ']' )* ;
+    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1225:1: dotted_name returns [String name] : id= ID ( '.' id= ID )* ( '[' ']' )* ;
     public String dotted_name() throws RecognitionException {   
         String name;
         Token id=null;
 
-        
-        		name = null;
+
+        		name = null;
         	
         try {
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1220:17: (id= ID ( '.' id= ID )* ( '[' ']' )* )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1220:17: id= ID ( '.' id= ID )* ( '[' ']' )*
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1230:17: (id= ID ( '.' id= ID )* ( '[' ']' )* )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1230:17: id= ID ( '.' id= ID )* ( '[' ']' )*
             {
             id=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_dotted_name3554); 
+            match(input,ID,FOLLOW_ID_in_dotted_name3589); 
              name=id.getText(); 
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1220:46: ( '.' id= ID )*
-            loop75:
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1230:46: ( '.' id= ID )*
+            loop76:
             do {
-                int alt75=2;
-                int LA75_0 = input.LA(1);
-                if ( LA75_0==18 ) {
-                    alt75=1;
+                int alt76=2;
+                int LA76_0 = input.LA(1);
+                if ( LA76_0==19 ) {
+                    alt76=1;
                 }
 
 
-                switch (alt75) {
+                switch (alt76) {
             	case 1 :
-            	    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1220:48: '.' id= ID
+            	    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1230:48: '.' id= ID
             	    {
-            	    match(input,18,FOLLOW_18_in_dotted_name3560); 
+            	    match(input,19,FOLLOW_19_in_dotted_name3595); 
             	    id=(Token)input.LT(1);
-            	    match(input,ID,FOLLOW_ID_in_dotted_name3564); 
+            	    match(input,ID,FOLLOW_ID_in_dotted_name3599); 
             	     name = name + "." + id.getText(); 
 
             	    }
             	    break;
 
             	default :
-            	    break loop75;
+            	    break loop76;
                 }
             } while (true);
 
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1220:99: ( '[' ']' )*
-            loop76:
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1230:99: ( '[' ']' )*
+            loop77:
             do {
-                int alt76=2;
-                int LA76_0 = input.LA(1);
-                if ( LA76_0==55 ) {
-                    alt76=1;
+                int alt77=2;
+                int LA77_0 = input.LA(1);
+                if ( LA77_0==55 ) {
+                    alt77=1;
                 }
 
 
-                switch (alt76) {
+                switch (alt77) {
             	case 1 :
-            	    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1220:101: '[' ']'
+            	    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1230:101: '[' ']'
             	    {
-            	    match(input,55,FOLLOW_55_in_dotted_name3573); 
-            	    match(input,56,FOLLOW_56_in_dotted_name3575); 
+            	    match(input,55,FOLLOW_55_in_dotted_name3608); 
+            	    match(input,56,FOLLOW_56_in_dotted_name3610); 
             	     name = name + "[]";
 
             	    }
             	    break;
 
             	default :
-            	    break loop76;
+            	    break loop77;
                 }
             } while (true);
 
@@ -6071,44 +6162,44 @@
 
 
     // $ANTLR start argument_name
-    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1223:1: argument_name returns [String name] : id= ID ( '[' ']' )* ;
+    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1233:1: argument_name returns [String name] : id= ID ( '[' ']' )* ;
     public String argument_name() throws RecognitionException {   
         String name;
         Token id=null;
 
-        
-        		name = null;
+
+        		name = null;
         	
         try {
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1228:17: (id= ID ( '[' ']' )* )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1228:17: id= ID ( '[' ']' )*
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1238:17: (id= ID ( '[' ']' )* )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1238:17: id= ID ( '[' ']' )*
             {
             id=(Token)input.LT(1);
-            match(input,ID,FOLLOW_ID_in_argument_name3605); 
+            match(input,ID,FOLLOW_ID_in_argument_name3640); 
              name=id.getText(); 
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1228:46: ( '[' ']' )*
-            loop77:
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1238:46: ( '[' ']' )*
+            loop78:
             do {
-                int alt77=2;
-                int LA77_0 = input.LA(1);
-                if ( LA77_0==55 ) {
-                    alt77=1;
+                int alt78=2;
+                int LA78_0 = input.LA(1);
+                if ( LA78_0==55 ) {
+                    alt78=1;
                 }
 
 
-                switch (alt77) {
+                switch (alt78) {
             	case 1 :
-            	    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1228:48: '[' ']'
+            	    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1238:48: '[' ']'
             	    {
-            	    match(input,55,FOLLOW_55_in_argument_name3611); 
-            	    match(input,56,FOLLOW_56_in_argument_name3613); 
+            	    match(input,55,FOLLOW_55_in_argument_name3646); 
+            	    match(input,56,FOLLOW_56_in_argument_name3648); 
             	     name = name + "[]";
 
             	    }
             	    break;
 
             	default :
-            	    break loop77;
+            	    break loop78;
                 }
             } while (true);
 
@@ -6128,146 +6219,146 @@
 
 
     // $ANTLR start word
-    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1232:1: word returns [String word] : (id= ID | 'import' | 'use' | 'rule' | 'query' | 'salience' | 'no-loop' | 'when' | 'then' | 'end' | str= STRING );
+    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1242:1: word returns [String word] : (id= ID | 'import' | 'use' | 'rule' | 'query' | 'salience' | 'no-loop' | 'when' | 'then' | 'end' | str= STRING );
     public String word() throws RecognitionException {   
         String word;
         Token id=null;
         Token str=null;
 
-        
-        		word = null;
+
+        		word = null;
         	
         try {
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1236:17: (id= ID | 'import' | 'use' | 'rule' | 'query' | 'salience' | 'no-loop' | 'when' | 'then' | 'end' | str= STRING )
-            int alt78=11;
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1246:17: (id= ID | 'import' | 'use' | 'rule' | 'query' | 'salience' | 'no-loop' | 'when' | 'then' | 'end' | str= STRING )
+            int alt79=11;
             switch ( input.LA(1) ) {
             case ID:
-                alt78=1;
+                alt79=1;
                 break;
             case 17:
-                alt78=2;
+                alt79=2;
                 break;
             case 57:
-                alt78=3;
+                alt79=3;
                 break;
             case 31:
-                alt78=4;
+                alt79=4;
                 break;
             case 28:
-                alt78=5;
+                alt79=5;
                 break;
             case 36:
-                alt78=6;
+                alt79=6;
                 break;
             case 37:
-                alt78=7;
+                alt79=7;
                 break;
             case 32:
-                alt78=8;
+                alt79=8;
                 break;
             case 34:
-                alt78=9;
+                alt79=9;
                 break;
             case 29:
-                alt78=10;
+                alt79=10;
                 break;
             case STRING:
-                alt78=11;
+                alt79=11;
                 break;
             default:
                 NoViableAltException nvae =
-                    new NoViableAltException("1232:1: word returns [String word] : (id= ID | \'import\' | \'use\' | \'rule\' | \'query\' | \'salience\' | \'no-loop\' | \'when\' | \'then\' | \'end\' | str= STRING );", 78, 0, input);
+                    new NoViableAltException("1242:1: word returns [String word] : (id= ID | \'import\' | \'use\' | \'rule\' | \'query\' | \'salience\' | \'no-loop\' | \'when\' | \'then\' | \'end\' | str= STRING );", 79, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt78) {
+            switch (alt79) {
                 case 1 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1236:17: id= ID
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1246:17: id= ID
                     {
                     id=(Token)input.LT(1);
-                    match(input,ID,FOLLOW_ID_in_word3641); 
+                    match(input,ID,FOLLOW_ID_in_word3676); 
                      word=id.getText(); 
 
                     }
                     break;
                 case 2 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1237:17: 'import'
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1247:17: 'import'
                     {
-                    match(input,17,FOLLOW_17_in_word3653); 
+                    match(input,17,FOLLOW_17_in_word3688); 
                      word="import"; 
 
                     }
                     break;
                 case 3 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1238:17: 'use'
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1248:17: 'use'
                     {
-                    match(input,57,FOLLOW_57_in_word3662); 
+                    match(input,57,FOLLOW_57_in_word3697); 
                      word="use"; 
 
                     }
                     break;
                 case 4 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1239:17: 'rule'
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1249:17: 'rule'
                     {
-                    match(input,31,FOLLOW_31_in_word3674); 
+                    match(input,31,FOLLOW_31_in_word3709); 
                      word="rule"; 
 
                     }
                     break;
                 case 5 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1240:17: 'query'
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1250:17: 'query'
                     {
-                    match(input,28,FOLLOW_28_in_word3685); 
+                    match(input,28,FOLLOW_28_in_word3720); 
                      word="query"; 
 
                     }
                     break;
                 case 6 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1241:17: 'salience'
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1251:17: 'salience'
                     {
-                    match(input,36,FOLLOW_36_in_word3695); 
+                    match(input,36,FOLLOW_36_in_word3730); 
                      word="salience"; 
 
                     }
                     break;
                 case 7 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1242:17: 'no-loop'
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1252:17: 'no-loop'
                     {
-                    match(input,37,FOLLOW_37_in_word3703); 
+                    match(input,37,FOLLOW_37_in_word3738); 
                      word="no-loop"; 
 
                     }
                     break;
                 case 8 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1243:17: 'when'
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1253:17: 'when'
                     {
-                    match(input,32,FOLLOW_32_in_word3711); 
+                    match(input,32,FOLLOW_32_in_word3746); 
                      word="when"; 
 
                     }
                     break;
                 case 9 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1244:17: 'then'
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1254:17: 'then'
                     {
-                    match(input,34,FOLLOW_34_in_word3722); 
+                    match(input,34,FOLLOW_34_in_word3757); 
                      word="then"; 
 
                     }
                     break;
                 case 10 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1245:17: 'end'
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1255:17: 'end'
                     {
-                    match(input,29,FOLLOW_29_in_word3733); 
+                    match(input,29,FOLLOW_29_in_word3768); 
                      word="end"; 
 
                     }
                     break;
                 case 11 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1246:17: str= STRING
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1256:17: str= STRING
                     {
                     str=(Token)input.LT(1);
-                    match(input,STRING,FOLLOW_STRING_in_word3747); 
+                    match(input,STRING,FOLLOW_STRING_in_word3782); 
                      word=getString(str);
 
                     }
@@ -6287,130 +6378,130 @@
 
 
     // $ANTLR start operator
-    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1249:1: operator returns [String str] : ( '==' | '=' | '>' | '>=' | '<' | '<=' | '!=' | 'contains' | 'matches' | 'excludes' );
+    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1259:1: operator returns [String str] : ( '==' | '=' | '>' | '>=' | '<' | '<=' | '!=' | 'contains' | 'matches' | 'excludes' );
     public String operator() throws RecognitionException {   
         String str;
-        
-        		str = null;
+
+        		str = null;
         	
         try {
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1255:17: ( '==' | '=' | '>' | '>=' | '<' | '<=' | '!=' | 'contains' | 'matches' | 'excludes' )
-            int alt79=10;
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1265:17: ( '==' | '=' | '>' | '>=' | '<' | '<=' | '!=' | 'contains' | 'matches' | 'excludes' )
+            int alt80=10;
             switch ( input.LA(1) ) {
             case 58:
-                alt79=1;
+                alt80=1;
                 break;
             case 59:
-                alt79=2;
+                alt80=2;
                 break;
             case 60:
-                alt79=3;
+                alt80=3;
                 break;
             case 61:
-                alt79=4;
+                alt80=4;
                 break;
             case 62:
-                alt79=5;
+                alt80=5;
                 break;
             case 63:
-                alt79=6;
+                alt80=6;
                 break;
             case 64:
-                alt79=7;
+                alt80=7;
                 break;
             case 65:
-                alt79=8;
+                alt80=8;
                 break;
             case 66:
-                alt79=9;
+                alt80=9;
                 break;
             case 67:
-                alt79=10;
+                alt80=10;
                 break;
             default:
                 NoViableAltException nvae =
-                    new NoViableAltException("1249:1: operator returns [String str] : ( \'==\' | \'=\' | \'>\' | \'>=\' | \'<\' | \'<=\' | \'!=\' | \'contains\' | \'matches\' | \'excludes\' );", 79, 0, input);
+                    new NoViableAltException("1259:1: operator returns [String str] : ( \'==\' | \'=\' | \'>\' | \'>=\' | \'<\' | \'<=\' | \'!=\' | \'contains\' | \'matches\' | \'excludes\' );", 80, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt79) {
+            switch (alt80) {
                 case 1 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1255:17: '=='
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1265:17: '=='
                     {
-                    match(input,58,FOLLOW_58_in_operator3776); 
+                    match(input,58,FOLLOW_58_in_operator3811); 
                     str= "==";
 
                     }
                     break;
                 case 2 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1256:18: '='
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1266:18: '='
                     {
-                    match(input,59,FOLLOW_59_in_operator3783); 
+                    match(input,59,FOLLOW_59_in_operator3818); 
                     str="==";
 
                     }
                     break;
                 case 3 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1257:18: '>'
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1267:18: '>'
                     {
-                    match(input,60,FOLLOW_60_in_operator3790); 
+                    match(input,60,FOLLOW_60_in_operator3825); 
                     str=">";
 
                     }
                     break;
                 case 4 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1258:18: '>='
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1268:18: '>='
                     {
-                    match(input,61,FOLLOW_61_in_operator3797); 
+                    match(input,61,FOLLOW_61_in_operator3832); 
                     str=">=";
 
                     }
                     break;
                 case 5 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1259:18: '<'
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1269:18: '<'
                     {
-                    match(input,62,FOLLOW_62_in_operator3806); 
+                    match(input,62,FOLLOW_62_in_operator3841); 
                     str="<";
 
                     }
                     break;
                 case 6 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1260:18: '<='
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1270:18: '<='
                     {
-                    match(input,63,FOLLOW_63_in_operator3813); 
+                    match(input,63,FOLLOW_63_in_operator3848); 
                     str="<=";
 
                     }
                     break;
                 case 7 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1261:18: '!='
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1271:18: '!='
                     {
-                    match(input,64,FOLLOW_64_in_operator3820); 
+                    match(input,64,FOLLOW_64_in_operator3855); 
                     str="!=";
 
                     }
                     break;
                 case 8 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1262:18: 'contains'
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1272:18: 'contains'
                     {
-                    match(input,65,FOLLOW_65_in_operator3827); 
+                    match(input,65,FOLLOW_65_in_operator3862); 
                     str="contains";
 
                     }
                     break;
                 case 9 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1263:18: 'matches'
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1273:18: 'matches'
                     {
-                    match(input,66,FOLLOW_66_in_operator3834); 
+                    match(input,66,FOLLOW_66_in_operator3869); 
                     str="matches";
 
                     }
                     break;
                 case 10 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1264:18: 'excludes'
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1274:18: 'excludes'
                     {
-                    match(input,67,FOLLOW_67_in_operator3841); 
+                    match(input,67,FOLLOW_67_in_operator3876); 
                     str="excludes";
 
                     }
@@ -6429,31 +6520,31 @@
     // $ANTLR end operator
 
 
-    protected DFA2 dfa2 = new DFA2();protected DFA4 dfa4 = new DFA4();protected DFA12 dfa12 = new DFA12();protected DFA13 dfa13 = new DFA13();protected DFA14 dfa14 = new DFA14();protected DFA46 dfa46 = new DFA46();protected DFA47 dfa47 = new DFA47();protected DFA48 dfa48 = new DFA48();protected DFA56 dfa56 = new DFA56();protected DFA59 dfa59 = new DFA59();protected DFA60 dfa60 = new DFA60();
+    protected DFA2 dfa2 = new DFA2();protected DFA4 dfa4 = new DFA4();protected DFA13 dfa13 = new DFA13();protected DFA14 dfa14 = new DFA14();protected DFA15 dfa15 = new DFA15();protected DFA47 dfa47 = new DFA47();protected DFA48 dfa48 = new DFA48();protected DFA49 dfa49 = new DFA49();protected DFA57 dfa57 = new DFA57();protected DFA60 dfa60 = new DFA60();protected DFA61 dfa61 = new DFA61();
     class DFA2 extends DFA {
         public int predict(IntStream input) throws RecognitionException {
             return predict(input, s0);
         }
         DFA.State s1 = new DFA.State() {{alt=5;}};
-        DFA.State s5 = new DFA.State() {{alt=3;}};
         DFA.State s4 = new DFA.State() {{alt=2;}};
         DFA.State s3 = new DFA.State() {{alt=1;}};
+        DFA.State s5 = new DFA.State() {{alt=3;}};
         DFA.State s2 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
                 switch ( input.LA(1) ) {
-                case 30:
-                    return s5;
+                case 28:
+                    return s4;
 
                 case EOL:
                 case 15:
                     return s2;
 
-                case 28:
-                    return s4;
-
                 case 31:
                     return s3;
 
+                case 30:
+                    return s5;
+
                 default:
                     NoViableAltException nvae =
                         new NoViableAltException("", 2, 2, input);
@@ -6482,7 +6573,7 @@
                     return s5;
 
                 case 17:
-                case 21:
+                case 18:
                 case 22:
                     return s6;
 
@@ -6499,12 +6590,24 @@
             return predict(input, s0);
         }
         DFA.State s1 = new DFA.State() {{alt=3;}};
-        DFA.State s11 = new DFA.State() {{alt=1;}};
+        DFA.State s17 = new DFA.State() {{alt=1;}};
+        DFA.State s16 = new DFA.State() {
+            public DFA.State transition(IntStream input) throws RecognitionException {
+                int LA4_16 = input.LA(1);
+                if ( LA4_16==ID ) {return s17;}
+                if ( LA4_16==EOL||LA4_16==15 ) {return s16;}
+
+                NoViableAltException nvae =
+        	    new NoViableAltException("", 4, 16, input);
+
+                throw nvae;
+            }
+        };
         DFA.State s10 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
                 int LA4_10 = input.LA(1);
-                if ( LA4_10==ID ) {return s11;}
-                if ( LA4_10==EOL||LA4_10==15 ) {return s10;}
+                if ( LA4_10==EOL||LA4_10==15 ) {return s16;}
+                if ( LA4_10==ID ) {return s17;}
 
                 NoViableAltException nvae =
         	    new NoViableAltException("", 4, 10, input);
@@ -6512,87 +6615,108 @@
                 throw nvae;
             }
         };
-        DFA.State s5 = new DFA.State() {
+        DFA.State s12 = new DFA.State() {{alt=1;}};
+        DFA.State s11 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
-                int LA4_5 = input.LA(1);
-                if ( LA4_5==EOL||LA4_5==15 ) {return s10;}
-                if ( LA4_5==ID ) {return s11;}
+                int LA4_11 = input.LA(1);
+                if ( LA4_11==ID ) {return s12;}
+                if ( LA4_11==EOL||LA4_11==15 ) {return s11;}
 
                 NoViableAltException nvae =
-        	    new NoViableAltException("", 4, 5, input);
+        	    new NoViableAltException("", 4, 11, input);
 
                 throw nvae;
             }
         };
-        DFA.State s19 = new DFA.State() {{alt=1;}};
-        DFA.State s28 = new DFA.State() {
+        DFA.State s5 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
-                int LA4_28 = input.LA(1);
-                if ( LA4_28==ID ) {return s19;}
-                if ( LA4_28==55 ) {return s18;}
+                switch ( input.LA(1) ) {
+                case 18:
+                    return s10;
 
+                case EOL:
+                case 15:
+                    return s11;
+
+                case ID:
+                    return s12;
+
+                default:
+                    NoViableAltException nvae =
+                        new NoViableAltException("", 4, 5, input);
+
+                    throw nvae;        }
+            }
+        };
+        DFA.State s22 = new DFA.State() {{alt=1;}};
+        DFA.State s33 = new DFA.State() {
+            public DFA.State transition(IntStream input) throws RecognitionException {
+                int LA4_33 = input.LA(1);
+                if ( LA4_33==ID ) {return s22;}
+                if ( LA4_33==55 ) {return s21;}
+
                 NoViableAltException nvae =
-        	    new NoViableAltException("", 4, 28, input);
+        	    new NoViableAltException("", 4, 33, input);
 
                 throw nvae;
             }
         };
-        DFA.State s18 = new DFA.State() {
+        DFA.State s21 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
-                int LA4_18 = input.LA(1);
-                if ( LA4_18==56 ) {return s28;}
+                int LA4_21 = input.LA(1);
+                if ( LA4_21==56 ) {return s33;}
 
                 NoViableAltException nvae =
-        	    new NoViableAltException("", 4, 18, input);
+        	    new NoViableAltException("", 4, 21, input);
 
                 throw nvae;
             }
         };
-        DFA.State s27 = new DFA.State() {
+        DFA.State s32 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
                 switch ( input.LA(1) ) {
                 case 55:
-                    return s18;
+                    return s21;
 
                 case ID:
-                    return s19;
+                    return s22;
 
-                case 18:
-                    return s17;
+                case 19:
+                    return s20;
 
                 default:
                     NoViableAltException nvae =
-                        new NoViableAltException("", 4, 27, input);
+                        new NoViableAltException("", 4, 32, input);
 
                     throw nvae;        }
             }
         };
-        DFA.State s17 = new DFA.State() {
+        DFA.State s20 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
-                int LA4_17 = input.LA(1);
-                if ( LA4_17==ID ) {return s27;}
+                int LA4_20 = input.LA(1);
+                if ( LA4_20==ID ) {return s32;}
 
                 NoViableAltException nvae =
-        	    new NoViableAltException("", 4, 17, input);
+        	    new NoViableAltException("", 4, 20, input);
 
                 throw nvae;
             }
         };
-        DFA.State s12 = new DFA.State() {
+        DFA.State s13 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
                 switch ( input.LA(1) ) {
-                case 18:
-                    return s17;
+                case 19:
+                    return s20;
 
                 case 55:
-                    return s18;
+                    return s21;
 
                 case ID:
-                    return s19;
+                    return s22;
 
                 default:
                     NoViableAltException nvae =
-                        new NoViableAltException("", 4, 12, input);
+                        new NoViableAltException("", 4, 13, input);
 
                     throw nvae;        }
             }
@@ -6600,7 +6724,7 @@
         DFA.State s6 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
                 int LA4_6 = input.LA(1);
-                if ( LA4_6==ID ) {return s12;}
+                if ( LA4_6==ID ) {return s13;}
 
                 NoViableAltException nvae =
         	    new NoViableAltException("", 4, 6, input);
@@ -6608,16 +6732,16 @@
                 throw nvae;
             }
         };
-        DFA.State s115 = new DFA.State() {{alt=1;}};
-        DFA.State s121 = new DFA.State() {{alt=1;}};
-        DFA.State s123 = new DFA.State() {
+        DFA.State s120 = new DFA.State() {{alt=1;}};
+        DFA.State s126 = new DFA.State() {{alt=1;}};
+        DFA.State s128 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
                 switch ( input.LA(1) ) {
                 case 27:
-                    return s121;
+                    return s126;
 
                 case 26:
-                    return s122;
+                    return s127;
 
                 case EOL:
                 case ID:
@@ -6681,23 +6805,23 @@
                 case 65:
                 case 66:
                 case 67:
-                    return s123;
+                    return s128;
 
                 default:
                     NoViableAltException nvae =
-                        new NoViableAltException("", 4, 123, input);
+                        new NoViableAltException("", 4, 128, input);
 
                     throw nvae;        }
             }
         };
-        DFA.State s122 = new DFA.State() {
+        DFA.State s127 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
                 switch ( input.LA(1) ) {
                 case 27:
-                    return s121;
+                    return s126;
 
                 case 26:
-                    return s122;
+                    return s127;
 
                 case EOL:
                 case ID:
@@ -6761,23 +6885,23 @@
                 case 65:
                 case 66:
                 case 67:
-                    return s123;
+                    return s128;
 
                 default:
                     NoViableAltException nvae =
-                        new NoViableAltException("", 4, 122, input);
+                        new NoViableAltException("", 4, 127, input);
 
                     throw nvae;        }
             }
         };
-        DFA.State s116 = new DFA.State() {
+        DFA.State s121 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
                 switch ( input.LA(1) ) {
                 case 27:
-                    return s121;
+                    return s126;
 
                 case 26:
-                    return s122;
+                    return s127;
 
                 case EOL:
                 case ID:
@@ -6841,23 +6965,23 @@
                 case 65:
                 case 66:
                 case 67:
-                    return s123;
+                    return s128;
 
                 default:
                     NoViableAltException nvae =
-                        new NoViableAltException("", 4, 116, input);
+                        new NoViableAltException("", 4, 121, input);
 
                     throw nvae;        }
             }
         };
-        DFA.State s117 = new DFA.State() {
+        DFA.State s122 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
                 switch ( input.LA(1) ) {
                 case 27:
-                    return s115;
+                    return s120;
 
                 case 26:
-                    return s116;
+                    return s121;
 
                 case EOL:
                 case ID:
@@ -6921,23 +7045,23 @@
                 case 65:
                 case 66:
                 case 67:
-                    return s117;
+                    return s122;
 
                 default:
                     NoViableAltException nvae =
-                        new NoViableAltException("", 4, 117, input);
+                        new NoViableAltException("", 4, 122, input);
 
                     throw nvae;        }
             }
         };
-        DFA.State s106 = new DFA.State() {
+        DFA.State s111 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
                 switch ( input.LA(1) ) {
                 case 27:
-                    return s115;
+                    return s120;
 
                 case 26:
-                    return s116;
+                    return s121;
 
                 case EOL:
                 case ID:
@@ -7001,24 +7125,24 @@
                 case 65:
                 case 66:
                 case 67:
-                    return s117;
+                    return s122;
 
                 default:
                     NoViableAltException nvae =
-                        new NoViableAltException("", 4, 106, input);
+                        new NoViableAltException("", 4, 111, input);
 
                     throw nvae;        }
             }
         };
-        DFA.State s107 = new DFA.State() {{alt=1;}};
-        DFA.State s108 = new DFA.State() {
+        DFA.State s112 = new DFA.State() {{alt=1;}};
+        DFA.State s113 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
                 switch ( input.LA(1) ) {
                 case 27:
-                    return s107;
+                    return s112;
 
                 case 26:
-                    return s106;
+                    return s111;
 
                 case EOL:
                 case ID:
@@ -7082,23 +7206,23 @@
                 case 65:
                 case 66:
                 case 67:
-                    return s108;
+                    return s113;
 
                 default:
                     NoViableAltException nvae =
-                        new NoViableAltException("", 4, 108, input);
+                        new NoViableAltException("", 4, 113, input);
 
                     throw nvae;        }
             }
         };
-        DFA.State s88 = new DFA.State() {
+        DFA.State s93 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
                 switch ( input.LA(1) ) {
                 case 26:
-                    return s106;
+                    return s111;
 
                 case 27:
-                    return s107;
+                    return s112;
 
                 case EOL:
                 case ID:
@@ -7162,24 +7286,24 @@
                 case 65:
                 case 66:
                 case 67:
-                    return s108;
+                    return s113;
 
                 default:
                     NoViableAltException nvae =
-                        new NoViableAltException("", 4, 88, input);
+                        new NoViableAltException("", 4, 93, input);
 
                     throw nvae;        }
             }
         };
-        DFA.State s89 = new DFA.State() {{alt=1;}};
-        DFA.State s90 = new DFA.State() {
+        DFA.State s94 = new DFA.State() {{alt=1;}};
+        DFA.State s95 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
                 switch ( input.LA(1) ) {
                 case 27:
-                    return s89;
+                    return s94;
 
                 case 26:
-                    return s88;
+                    return s93;
 
                 case EOL:
                 case ID:
@@ -7243,23 +7367,23 @@
                 case 65:
                 case 66:
                 case 67:
-                    return s90;
+                    return s95;
 
                 default:
                     NoViableAltException nvae =
-                        new NoViableAltException("", 4, 90, input);
+                        new NoViableAltException("", 4, 95, input);
 
                     throw nvae;        }
             }
         };
-        DFA.State s68 = new DFA.State() {
+        DFA.State s73 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
                 switch ( input.LA(1) ) {
                 case 26:
-                    return s88;
+                    return s93;
 
                 case 27:
-                    return s89;
+                    return s94;
 
                 case EOL:
                 case ID:
@@ -7323,24 +7447,24 @@
                 case 65:
                 case 66:
                 case 67:
-                    return s90;
+                    return s95;
 
                 default:
                     NoViableAltException nvae =
-                        new NoViableAltException("", 4, 68, input);
+                        new NoViableAltException("", 4, 73, input);
 
                     throw nvae;        }
             }
         };
-        DFA.State s69 = new DFA.State() {{alt=1;}};
-        DFA.State s70 = new DFA.State() {
+        DFA.State s74 = new DFA.State() {{alt=1;}};
+        DFA.State s75 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
                 switch ( input.LA(1) ) {
                 case 27:
-                    return s69;
+                    return s74;
 
                 case 26:
-                    return s68;
+                    return s73;
 
                 case EOL:
                 case ID:
@@ -7404,23 +7528,23 @@
                 case 65:
                 case 66:
                 case 67:
-                    return s70;
+                    return s75;
 
                 default:
                     NoViableAltException nvae =
-                        new NoViableAltException("", 4, 70, input);
+                        new NoViableAltException("", 4, 75, input);
 
                     throw nvae;        }
             }
         };
-        DFA.State s54 = new DFA.State() {
+        DFA.State s59 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
                 switch ( input.LA(1) ) {
                 case 26:
-                    return s68;
+                    return s73;
 
                 case 27:
-                    return s69;
+                    return s74;
 
                 case EOL:
                 case ID:
@@ -7484,442 +7608,442 @@
                 case 65:
                 case 66:
                 case 67:
-                    return s70;
+                    return s75;
 
                 default:
                     NoViableAltException nvae =
-                        new NoViableAltException("", 4, 54, input);
+                        new NoViableAltException("", 4, 59, input);
 
                     throw nvae;        }
             }
         };
-        DFA.State s53 = new DFA.State() {
+        DFA.State s58 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
-                int LA4_53 = input.LA(1);
-                if ( LA4_53==26 ) {return s54;}
-                if ( LA4_53==EOL||LA4_53==15 ) {return s53;}
+                int LA4_58 = input.LA(1);
+                if ( LA4_58==26 ) {return s59;}
+                if ( LA4_58==EOL||LA4_58==15 ) {return s58;}
 
                 NoViableAltException nvae =
-        	    new NoViableAltException("", 4, 53, input);
+        	    new NoViableAltException("", 4, 58, input);
 
                 throw nvae;
             }
         };
-        DFA.State s36 = new DFA.State() {
+        DFA.State s41 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
-                int LA4_36 = input.LA(1);
-                if ( LA4_36==EOL||LA4_36==15 ) {return s53;}
-                if ( LA4_36==26 ) {return s54;}
+                int LA4_41 = input.LA(1);
+                if ( LA4_41==EOL||LA4_41==15 ) {return s58;}
+                if ( LA4_41==26 ) {return s59;}
 
                 NoViableAltException nvae =
-        	    new NoViableAltException("", 4, 36, input);
+        	    new NoViableAltException("", 4, 41, input);
 
                 throw nvae;
             }
         };
-        DFA.State s103 = new DFA.State() {
+        DFA.State s104 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
                 switch ( input.LA(1) ) {
                 case 25:
-                    return s36;
+                    return s41;
 
                 case 24:
-                    return s51;
+                    return s54;
 
                 case EOL:
                 case 15:
-                    return s103;
+                    return s104;
 
                 default:
                     NoViableAltException nvae =
-                        new NoViableAltException("", 4, 103, input);
+                        new NoViableAltException("", 4, 104, input);
 
                     throw nvae;        }
             }
         };
-        DFA.State s87 = new DFA.State() {
+        DFA.State s88 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
                 switch ( input.LA(1) ) {
                 case 55:
-                    return s60;
+                    return s67;
 
                 case EOL:
                 case 15:
-                    return s103;
+                    return s104;
 
                 case 25:
-                    return s36;
+                    return s41;
 
                 case 24:
-                    return s51;
+                    return s54;
 
                 default:
                     NoViableAltException nvae =
-                        new NoViableAltException("", 4, 87, input);
+                        new NoViableAltException("", 4, 88, input);
 
                     throw nvae;        }
             }
         };
-        DFA.State s83 = new DFA.State() {
+        DFA.State s84 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
                 switch ( input.LA(1) ) {
-                case 25:
-                    return s36;
+                case ID:
+                    return s88;
 
-                case 24:
-                    return s51;
-
                 case EOL:
                 case 15:
-                    return s83;
+                    return s84;
 
-                case ID:
-                    return s87;
+                case 25:
+                    return s41;
 
+                case 24:
+                    return s54;
+
                 default:
                     NoViableAltException nvae =
-                        new NoViableAltException("", 4, 83, input);
+                        new NoViableAltException("", 4, 84, input);
 
                     throw nvae;        }
             }
         };
-        DFA.State s65 = new DFA.State() {
+        DFA.State s66 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
                 switch ( input.LA(1) ) {
                 case 55:
-                    return s48;
+                    return s52;
 
                 case EOL:
                 case 15:
-                    return s83;
+                    return s84;
 
                 case 25:
-                    return s36;
+                    return s41;
 
                 case 24:
-                    return s51;
+                    return s54;
 
-                case 18:
-                    return s17;
+                case 19:
+                    return s20;
 
                 case ID:
-                    return s87;
+                    return s88;
 
                 default:
                     NoViableAltException nvae =
-                        new NoViableAltException("", 4, 65, input);
+                        new NoViableAltException("", 4, 66, input);
 
                     throw nvae;        }
             }
         };
-        DFA.State s64 = new DFA.State() {
+        DFA.State s65 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
-                int LA4_64 = input.LA(1);
-                if ( LA4_64==ID ) {return s65;}
-                if ( LA4_64==EOL||LA4_64==15 ) {return s64;}
+                int LA4_65 = input.LA(1);
+                if ( LA4_65==ID ) {return s66;}
+                if ( LA4_65==EOL||LA4_65==15 ) {return s65;}
 
                 NoViableAltException nvae =
-        	    new NoViableAltException("", 4, 64, input);
+        	    new NoViableAltException("", 4, 65, input);
 
                 throw nvae;
             }
         };
-        DFA.State s51 = new DFA.State() {
+        DFA.State s54 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
-                int LA4_51 = input.LA(1);
-                if ( LA4_51==EOL||LA4_51==15 ) {return s64;}
-                if ( LA4_51==ID ) {return s65;}
+                int LA4_54 = input.LA(1);
+                if ( LA4_54==EOL||LA4_54==15 ) {return s65;}
+                if ( LA4_54==ID ) {return s66;}
 
                 NoViableAltException nvae =
-        	    new NoViableAltException("", 4, 51, input);
+        	    new NoViableAltException("", 4, 54, input);
 
                 throw nvae;
             }
         };
-        DFA.State s61 = new DFA.State() {
+        DFA.State s68 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
                 switch ( input.LA(1) ) {
                 case 24:
-                    return s51;
+                    return s54;
 
                 case 25:
-                    return s36;
+                    return s41;
 
                 case EOL:
                 case 15:
-                    return s61;
+                    return s68;
 
                 default:
                     NoViableAltException nvae =
-                        new NoViableAltException("", 4, 61, input);
+                        new NoViableAltException("", 4, 68, input);
 
                     throw nvae;        }
             }
         };
-        DFA.State s76 = new DFA.State() {
+        DFA.State s89 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
                 switch ( input.LA(1) ) {
                 case EOL:
                 case 15:
-                    return s61;
+                    return s68;
 
                 case 24:
-                    return s51;
+                    return s54;
 
                 case 25:
-                    return s36;
+                    return s41;
 
                 case 55:
-                    return s60;
+                    return s67;
 
                 default:
                     NoViableAltException nvae =
-                        new NoViableAltException("", 4, 76, input);
+                        new NoViableAltException("", 4, 89, input);
 
                     throw nvae;        }
             }
         };
-        DFA.State s60 = new DFA.State() {
+        DFA.State s67 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
-                int LA4_60 = input.LA(1);
-                if ( LA4_60==56 ) {return s76;}
+                int LA4_67 = input.LA(1);
+                if ( LA4_67==56 ) {return s89;}
 
                 NoViableAltException nvae =
-        	    new NoViableAltException("", 4, 60, input);
+        	    new NoViableAltException("", 4, 67, input);
 
                 throw nvae;
             }
         };
-        DFA.State s50 = new DFA.State() {
+        DFA.State s57 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
                 switch ( input.LA(1) ) {
                 case 55:
-                    return s60;
+                    return s67;
 
                 case EOL:
                 case 15:
-                    return s61;
+                    return s68;
 
                 case 24:
-                    return s51;
+                    return s54;
 
                 case 25:
-                    return s36;
+                    return s41;
 
                 default:
                     NoViableAltException nvae =
-                        new NoViableAltException("", 4, 50, input);
+                        new NoViableAltException("", 4, 57, input);
 
                     throw nvae;        }
             }
         };
-        DFA.State s49 = new DFA.State() {
+        DFA.State s53 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
                 switch ( input.LA(1) ) {
                 case ID:
-                    return s50;
+                    return s57;
 
                 case EOL:
                 case 15:
-                    return s49;
+                    return s53;
 
                 case 24:
-                    return s51;
+                    return s54;
 
                 case 25:
-                    return s36;
+                    return s41;
 
                 default:
                     NoViableAltException nvae =
-                        new NoViableAltException("", 4, 49, input);
+                        new NoViableAltException("", 4, 53, input);
 
                     throw nvae;        }
             }
         };
-        DFA.State s55 = new DFA.State() {
+        DFA.State s60 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
                 switch ( input.LA(1) ) {
                 case EOL:
                 case 15:
-                    return s49;
+                    return s53;
 
                 case ID:
-                    return s50;
+                    return s57;
 
                 case 55:
-                    return s48;
+                    return s52;
 
                 case 24:
-                    return s51;
+                    return s54;
 
                 case 25:
-                    return s36;
+                    return s41;
 
                 default:
                     NoViableAltException nvae =
-                        new NoViableAltException("", 4, 55, input);
+                        new NoViableAltException("", 4, 60, input);
 
                     throw nvae;        }
             }
         };
-        DFA.State s48 = new DFA.State() {
+        DFA.State s52 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
-                int LA4_48 = input.LA(1);
-                if ( LA4_48==56 ) {return s55;}
+                int LA4_52 = input.LA(1);
+                if ( LA4_52==56 ) {return s60;}
 
                 NoViableAltException nvae =
-        	    new NoViableAltException("", 4, 48, input);
+        	    new NoViableAltException("", 4, 52, input);
 
                 throw nvae;
             }
         };
-        DFA.State s35 = new DFA.State() {
+        DFA.State s40 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
                 switch ( input.LA(1) ) {
-                case 18:
-                    return s17;
-
                 case 55:
-                    return s48;
+                    return s52;
 
                 case EOL:
                 case 15:
-                    return s49;
+                    return s53;
 
-                case ID:
-                    return s50;
-
                 case 24:
-                    return s51;
+                    return s54;
 
                 case 25:
-                    return s36;
+                    return s41;
 
+                case 19:
+                    return s20;
+
+                case ID:
+                    return s57;
+
                 default:
                     NoViableAltException nvae =
-                        new NoViableAltException("", 4, 35, input);
+                        new NoViableAltException("", 4, 40, input);
 
                     throw nvae;        }
             }
         };
-        DFA.State s34 = new DFA.State() {
+        DFA.State s39 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
                 switch ( input.LA(1) ) {
                 case ID:
-                    return s35;
+                    return s40;
 
                 case EOL:
                 case 15:
-                    return s34;
+                    return s39;
 
                 case 25:
-                    return s36;
+                    return s41;
 
                 default:
                     NoViableAltException nvae =
-                        new NoViableAltException("", 4, 34, input);
+                        new NoViableAltException("", 4, 39, input);
 
                     throw nvae;        }
             }
         };
-        DFA.State s26 = new DFA.State() {
+        DFA.State s29 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
                 switch ( input.LA(1) ) {
                 case EOL:
                 case 15:
-                    return s34;
+                    return s39;
 
                 case ID:
-                    return s35;
+                    return s40;
 
                 case 25:
-                    return s36;
+                    return s41;
 
                 default:
                     NoViableAltException nvae =
-                        new NoViableAltException("", 4, 26, input);
+                        new NoViableAltException("", 4, 29, input);
 
                     throw nvae;        }
             }
         };
-        DFA.State s32 = new DFA.State() {
+        DFA.State s37 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
-                int LA4_32 = input.LA(1);
-                if ( LA4_32==23 ) {return s26;}
-                if ( LA4_32==EOL||LA4_32==15 ) {return s32;}
+                int LA4_37 = input.LA(1);
+                if ( LA4_37==23 ) {return s29;}
+                if ( LA4_37==EOL||LA4_37==15 ) {return s37;}
 
                 NoViableAltException nvae =
-        	    new NoViableAltException("", 4, 32, input);
+        	    new NoViableAltException("", 4, 37, input);
 
                 throw nvae;
             }
         };
-        DFA.State s25 = new DFA.State() {
+        DFA.State s28 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
-                int LA4_25 = input.LA(1);
-                if ( LA4_25==EOL||LA4_25==15 ) {return s32;}
-                if ( LA4_25==23 ) {return s26;}
+                int LA4_28 = input.LA(1);
+                if ( LA4_28==EOL||LA4_28==15 ) {return s37;}
+                if ( LA4_28==23 ) {return s29;}
 
                 NoViableAltException nvae =
-        	    new NoViableAltException("", 4, 25, input);
+        	    new NoViableAltException("", 4, 28, input);
 
                 throw nvae;
             }
         };
-        DFA.State s24 = new DFA.State() {
+        DFA.State s27 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
                 switch ( input.LA(1) ) {
-                case ID:
-                    return s25;
+                case 23:
+                    return s29;
 
                 case EOL:
                 case 15:
-                    return s24;
+                    return s27;
 
-                case 23:
-                    return s26;
+                case ID:
+                    return s28;
 
                 default:
                     NoViableAltException nvae =
-                        new NoViableAltException("", 4, 24, input);
+                        new NoViableAltException("", 4, 27, input);
 
                     throw nvae;        }
             }
         };
-        DFA.State s14 = new DFA.State() {
+        DFA.State s15 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
                 switch ( input.LA(1) ) {
-                case 18:
-                    return s17;
+                case 19:
+                    return s20;
 
                 case 55:
-                    return s18;
+                    return s21;
 
                 case EOL:
                 case 15:
-                    return s24;
+                    return s27;
 
                 case ID:
-                    return s25;
+                    return s28;
 
                 case 23:
-                    return s26;
+                    return s29;
 
                 default:
                     NoViableAltException nvae =
-                        new NoViableAltException("", 4, 14, input);
+                        new NoViableAltException("", 4, 15, input);
 
                     throw nvae;        }
             }
         };
-        DFA.State s13 = new DFA.State() {
+        DFA.State s14 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
-                int LA4_13 = input.LA(1);
-                if ( LA4_13==ID ) {return s14;}
-                if ( LA4_13==EOL||LA4_13==15 ) {return s13;}
+                int LA4_14 = input.LA(1);
+                if ( LA4_14==ID ) {return s15;}
+                if ( LA4_14==EOL||LA4_14==15 ) {return s14;}
 
                 NoViableAltException nvae =
-        	    new NoViableAltException("", 4, 13, input);
+        	    new NoViableAltException("", 4, 14, input);
 
                 throw nvae;
             }
@@ -7927,8 +8051,8 @@
         DFA.State s7 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
                 int LA4_7 = input.LA(1);
-                if ( LA4_7==EOL||LA4_7==15 ) {return s13;}
-                if ( LA4_7==ID ) {return s14;}
+                if ( LA4_7==EOL||LA4_7==15 ) {return s14;}
+                if ( LA4_7==ID ) {return s15;}
 
                 NoViableAltException nvae =
         	    new NoViableAltException("", 4, 7, input);
@@ -7951,13 +8075,13 @@
                 case 17:
                     return s5;
 
-                case 21:
+                case 22:
                     return s6;
 
-                case 22:
+                case 18:
                     return s7;
 
-                case 20:
+                case 21:
                     return s9;
 
                 default:
@@ -7968,28 +8092,28 @@
             }
         };
 
-    }class DFA12 extends DFA {
+    }class DFA13 extends DFA {
         public int predict(IntStream input) throws RecognitionException {
             return predict(input, s0);
         }
-        DFA.State s3 = new DFA.State() {{alt=1;}};
+        DFA.State s5 = new DFA.State() {{alt=1;}};
         DFA.State s2 = new DFA.State() {{alt=2;}};
-        DFA.State s5 = new DFA.State() {
+        DFA.State s3 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
                 switch ( input.LA(1) ) {
                 case ID:
-                    return s3;
+                    return s5;
 
                 case EOL:
                 case 15:
-                    return s5;
+                    return s3;
 
                 case 23:
                     return s2;
 
                 default:
                     NoViableAltException nvae =
-                        new NoViableAltException("", 12, 5, input);
+                        new NoViableAltException("", 13, 3, input);
 
                     throw nvae;        }
             }
@@ -7997,45 +8121,45 @@
         DFA.State s1 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
                 switch ( input.LA(1) ) {
-                case ID:
-                case 18:
-                case 55:
-                    return s3;
-
                 case EOL:
                 case 15:
-                    return s5;
+                    return s3;
 
                 case 23:
                     return s2;
 
+                case ID:
+                case 19:
+                case 55:
+                    return s5;
+
                 default:
                     NoViableAltException nvae =
-                        new NoViableAltException("", 12, 1, input);
+                        new NoViableAltException("", 13, 1, input);
 
                     throw nvae;        }
             }
         };
         DFA.State s0 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
-                int LA12_0 = input.LA(1);
-                if ( LA12_0==ID ) {return s1;}
-                if ( LA12_0==EOL||LA12_0==15 ) {return s2;}
+                int LA13_0 = input.LA(1);
+                if ( LA13_0==ID ) {return s1;}
+                if ( LA13_0==EOL||LA13_0==15 ) {return s2;}
 
                 NoViableAltException nvae =
-        	    new NoViableAltException("", 12, 0, input);
+        	    new NoViableAltException("", 13, 0, input);
 
                 throw nvae;
             }
         };
 
-    }class DFA13 extends DFA {
+    }class DFA14 extends DFA {
         public int predict(IntStream input) throws RecognitionException {
             return predict(input, s0);
         }
+        DFA.State s3 = new DFA.State() {{alt=1;}};
         DFA.State s2 = new DFA.State() {{alt=2;}};
-        DFA.State s7 = new DFA.State() {{alt=1;}};
-        DFA.State s4 = new DFA.State() {
+        DFA.State s5 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
                 switch ( input.LA(1) ) {
                 case 24:
@@ -8044,14 +8168,14 @@
 
                 case EOL:
                 case 15:
-                    return s4;
+                    return s5;
 
                 case ID:
-                    return s7;
+                    return s3;
 
                 default:
                     NoViableAltException nvae =
-                        new NoViableAltException("", 13, 4, input);
+                        new NoViableAltException("", 14, 5, input);
 
                     throw nvae;        }
             }
@@ -8061,32 +8185,32 @@
                 switch ( input.LA(1) ) {
                 case EOL:
                 case 15:
+                    return s5;
+
+                case 24:
+                case 25:
+                    return s2;
+
+                case 55:
                     return s4;
 
                 case ID:
-                    return s7;
-
-                case 55:
                     return s3;
 
-                case 24:
-                case 25:
-                    return s2;
-
                 default:
                     NoViableAltException nvae =
-                        new NoViableAltException("", 13, 9, input);
+                        new NoViableAltException("", 14, 9, input);
 
                     throw nvae;        }
             }
         };
-        DFA.State s3 = new DFA.State() {
+        DFA.State s4 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
-                int LA13_3 = input.LA(1);
-                if ( LA13_3==56 ) {return s9;}
+                int LA14_4 = input.LA(1);
+                if ( LA14_4==56 ) {return s9;}
 
                 NoViableAltException nvae =
-        	    new NoViableAltException("", 13, 3, input);
+        	    new NoViableAltException("", 14, 4, input);
 
                 throw nvae;
             }
@@ -8094,42 +8218,42 @@
         DFA.State s1 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
                 switch ( input.LA(1) ) {
-                case 55:
+                case ID:
+                case 19:
                     return s3;
 
+                case 55:
+                    return s4;
+
                 case EOL:
                 case 15:
-                    return s4;
+                    return s5;
 
                 case 24:
                 case 25:
                     return s2;
 
-                case ID:
-                case 18:
-                    return s7;
-
                 default:
                     NoViableAltException nvae =
-                        new NoViableAltException("", 13, 1, input);
+                        new NoViableAltException("", 14, 1, input);
 
                     throw nvae;        }
             }
         };
         DFA.State s0 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
-                int LA13_0 = input.LA(1);
-                if ( LA13_0==ID ) {return s1;}
-                if ( LA13_0==EOL||LA13_0==15 ) {return s2;}
+                int LA14_0 = input.LA(1);
+                if ( LA14_0==ID ) {return s1;}
+                if ( LA14_0==EOL||LA14_0==15 ) {return s2;}
 
                 NoViableAltException nvae =
-        	    new NoViableAltException("", 13, 0, input);
+        	    new NoViableAltException("", 14, 0, input);
 
                 throw nvae;
             }
         };
 
-    }class DFA14 extends DFA {
+    }class DFA15 extends DFA {
         public int predict(IntStream input) throws RecognitionException {
             return predict(input, s0);
         }
@@ -8138,20 +8262,20 @@
         DFA.State s5 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
                 switch ( input.LA(1) ) {
-                case 24:
-                case 25:
-                    return s2;
+                case ID:
+                    return s3;
 
                 case EOL:
                 case 15:
                     return s5;
 
-                case ID:
-                    return s3;
+                case 24:
+                case 25:
+                    return s2;
 
                 default:
                     NoViableAltException nvae =
-                        new NoViableAltException("", 14, 5, input);
+                        new NoViableAltException("", 15, 5, input);
 
                     throw nvae;        }
             }
@@ -8163,30 +8287,30 @@
                 case 15:
                     return s5;
 
-                case 24:
-                case 25:
-                    return s2;
+                case ID:
+                    return s3;
 
                 case 55:
                     return s4;
 
-                case ID:
-                    return s3;
+                case 24:
+                case 25:
+                    return s2;
 
                 default:
                     NoViableAltException nvae =
-                        new NoViableAltException("", 14, 9, input);
+                        new NoViableAltException("", 15, 9, input);
 
                     throw nvae;        }
             }
         };
         DFA.State s4 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
-                int LA14_4 = input.LA(1);
-                if ( LA14_4==56 ) {return s9;}
+                int LA15_4 = input.LA(1);
+                if ( LA15_4==56 ) {return s9;}
 
                 NoViableAltException nvae =
-        	    new NoViableAltException("", 14, 4, input);
+        	    new NoViableAltException("", 15, 4, input);
 
                 throw nvae;
             }
@@ -8195,7 +8319,7 @@
             public DFA.State transition(IntStream input) throws RecognitionException {
                 switch ( input.LA(1) ) {
                 case ID:
-                case 18:
+                case 19:
                     return s3;
 
                 case 55:
@@ -8211,46 +8335,46 @@
 
                 default:
                     NoViableAltException nvae =
-                        new NoViableAltException("", 14, 1, input);
+                        new NoViableAltException("", 15, 1, input);
 
                     throw nvae;        }
             }
         };
         DFA.State s0 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
-                int LA14_0 = input.LA(1);
-                if ( LA14_0==ID ) {return s1;}
-                if ( LA14_0==EOL||LA14_0==15 ) {return s2;}
+                int LA15_0 = input.LA(1);
+                if ( LA15_0==ID ) {return s1;}
+                if ( LA15_0==EOL||LA15_0==15 ) {return s2;}
 
                 NoViableAltException nvae =
-        	    new NoViableAltException("", 14, 0, input);
+        	    new NoViableAltException("", 15, 0, input);
 
                 throw nvae;
             }
         };
 
-    }class DFA46 extends DFA {
+    }class DFA47 extends DFA {
         public int predict(IntStream input) throws RecognitionException {
             return predict(input, s0);
         }
-        DFA.State s3 = new DFA.State() {{alt=1;}};
-        DFA.State s4 = new DFA.State() {{alt=2;}};
-        DFA.State s2 = new DFA.State() {
+        DFA.State s2 = new DFA.State() {{alt=2;}};
+        DFA.State s6 = new DFA.State() {{alt=1;}};
+        DFA.State s4 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
                 switch ( input.LA(1) ) {
                 case 33:
-                    return s3;
+                    return s6;
 
                 case EOL:
                 case 15:
-                    return s2;
+                    return s4;
 
                 case 23:
-                    return s4;
+                    return s2;
 
                 default:
                     NoViableAltException nvae =
-                        new NoViableAltException("", 46, 2, input);
+                        new NoViableAltException("", 47, 4, input);
 
                     throw nvae;        }
             }
@@ -8258,61 +8382,61 @@
         DFA.State s1 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
                 switch ( input.LA(1) ) {
+                case 19:
+                case 23:
+                case 55:
+                    return s2;
+
                 case EOL:
                 case 15:
-                    return s2;
+                    return s4;
 
                 case 33:
-                    return s3;
+                    return s6;
 
-                case 18:
-                case 23:
-                case 55:
-                    return s4;
-
                 default:
                     NoViableAltException nvae =
-                        new NoViableAltException("", 46, 1, input);
+                        new NoViableAltException("", 47, 1, input);
 
                     throw nvae;        }
             }
         };
         DFA.State s0 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
-                int LA46_0 = input.LA(1);
-                if ( LA46_0==ID ) {return s1;}
+                int LA47_0 = input.LA(1);
+                if ( LA47_0==ID ) {return s1;}
 
                 NoViableAltException nvae =
-        	    new NoViableAltException("", 46, 0, input);
+        	    new NoViableAltException("", 47, 0, input);
 
                 throw nvae;
             }
         };
 
-    }class DFA47 extends DFA {
+    }class DFA48 extends DFA {
         public int predict(IntStream input) throws RecognitionException {
             return predict(input, s0);
         }
         DFA.State s8 = new DFA.State() {{alt=1;}};
         DFA.State s27 = new DFA.State() {{alt=2;}};
-        DFA.State s52 = new DFA.State() {
+        DFA.State s54 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
                 switch ( input.LA(1) ) {
-                case 23:
-                case 33:
-                    return s8;
+                case 24:
+                case 25:
+                    return s27;
 
                 case EOL:
                 case 15:
-                    return s52;
+                    return s54;
 
-                case 24:
-                case 25:
-                    return s27;
+                case 23:
+                case 33:
+                    return s8;
 
                 default:
                     NoViableAltException nvae =
-                        new NoViableAltException("", 47, 52, input);
+                        new NoViableAltException("", 48, 54, input);
 
                     throw nvae;        }
             }
@@ -8320,23 +8444,23 @@
         DFA.State s31 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
                 switch ( input.LA(1) ) {
-                case EOL:
-                case 15:
-                    return s52;
-
-                case 18:
+                case 19:
                 case 23:
                 case 33:
                 case 55:
                     return s8;
 
+                case EOL:
+                case 15:
+                    return s54;
+
                 case 24:
                 case 25:
                     return s27;
 
                 default:
                     NoViableAltException nvae =
-                        new NoViableAltException("", 47, 31, input);
+                        new NoViableAltException("", 48, 31, input);
 
                     throw nvae;        }
             }
@@ -8357,18 +8481,18 @@
                 case 15:
                     return s26;
 
+                case ID:
+                    return s31;
+
                 case 23:
                 case 52:
                 case 53:
                 case 54:
                     return s8;
 
-                case ID:
-                    return s31;
-
                 default:
                     NoViableAltException nvae =
-                        new NoViableAltException("", 47, 26, input);
+                        new NoViableAltException("", 48, 26, input);
 
                     throw nvae;        }
             }
@@ -8400,7 +8524,7 @@
 
                 default:
                     NoViableAltException nvae =
-                        new NoViableAltException("", 47, 7, input);
+                        new NoViableAltException("", 48, 7, input);
 
                     throw nvae;        }
             }
@@ -8426,7 +8550,7 @@
 
                 default:
                     NoViableAltException nvae =
-                        new NoViableAltException("", 47, 6, input);
+                        new NoViableAltException("", 48, 6, input);
 
                     throw nvae;        }
             }
@@ -8456,18 +8580,18 @@
 
                 default:
                     NoViableAltException nvae =
-                        new NoViableAltException("", 47, 5, input);
+                        new NoViableAltException("", 48, 5, input);
 
                     throw nvae;        }
             }
         };
         DFA.State s2 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
-                int LA47_2 = input.LA(1);
-                if ( LA47_2==ID ) {return s5;}
+                int LA48_2 = input.LA(1);
+                if ( LA48_2==ID ) {return s5;}
 
                 NoViableAltException nvae =
-        	    new NoViableAltException("", 47, 2, input);
+        	    new NoViableAltException("", 48, 2, input);
 
                 throw nvae;
             }
@@ -8475,29 +8599,29 @@
         DFA.State s3 = new DFA.State() {{alt=3;}};
         DFA.State s1 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
-                int LA47_1 = input.LA(1);
-                if ( LA47_1==18 ) {return s2;}
-                if ( LA47_1==EOL||LA47_1==15||LA47_1==23 ) {return s3;}
+                int LA48_1 = input.LA(1);
+                if ( LA48_1==19 ) {return s2;}
+                if ( LA48_1==EOL||LA48_1==15||LA48_1==23 ) {return s3;}
 
                 NoViableAltException nvae =
-        	    new NoViableAltException("", 47, 1, input);
+        	    new NoViableAltException("", 48, 1, input);
 
                 throw nvae;
             }
         };
         DFA.State s0 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
-                int LA47_0 = input.LA(1);
-                if ( LA47_0==ID ) {return s1;}
+                int LA48_0 = input.LA(1);
+                if ( LA48_0==ID ) {return s1;}
 
                 NoViableAltException nvae =
-        	    new NoViableAltException("", 47, 0, input);
+        	    new NoViableAltException("", 48, 0, input);
 
                 throw nvae;
             }
         };
 
-    }class DFA48 extends DFA {
+    }class DFA49 extends DFA {
         public int predict(IntStream input) throws RecognitionException {
             return predict(input, s0);
         }
@@ -8518,7 +8642,7 @@
 
                 default:
                     NoViableAltException nvae =
-                        new NoViableAltException("", 48, 1, input);
+                        new NoViableAltException("", 49, 1, input);
 
                     throw nvae;        }
             }
@@ -8538,34 +8662,34 @@
 
                 default:
                     NoViableAltException nvae =
-                        new NoViableAltException("", 48, 0, input);
+                        new NoViableAltException("", 49, 0, input);
 
                     throw nvae;        }
             }
         };
 
-    }class DFA56 extends DFA {
+    }class DFA57 extends DFA {
         public int predict(IntStream input) throws RecognitionException {
             return predict(input, s0);
         }
+        DFA.State s3 = new DFA.State() {{alt=2;}};
         DFA.State s2 = new DFA.State() {{alt=1;}};
-        DFA.State s3 = new DFA.State() {{alt=2;}};
         DFA.State s1 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
                 switch ( input.LA(1) ) {
-                case ID:
-                    return s2;
+                case 25:
+                    return s3;
 
                 case EOL:
                 case 15:
                     return s1;
 
-                case 25:
-                    return s3;
+                case ID:
+                    return s2;
 
                 default:
                     NoViableAltException nvae =
-                        new NoViableAltException("", 56, 1, input);
+                        new NoViableAltException("", 57, 1, input);
 
                     throw nvae;        }
             }
@@ -8585,34 +8709,34 @@
 
                 default:
                     NoViableAltException nvae =
-                        new NoViableAltException("", 56, 0, input);
+                        new NoViableAltException("", 57, 0, input);
 
                     throw nvae;        }
             }
         };
 
-    }class DFA59 extends DFA {
+    }class DFA60 extends DFA {
         public int predict(IntStream input) throws RecognitionException {
             return predict(input, s0);
         }
+        DFA.State s2 = new DFA.State() {{alt=2;}};
         DFA.State s3 = new DFA.State() {{alt=1;}};
-        DFA.State s2 = new DFA.State() {{alt=2;}};
         DFA.State s1 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
                 switch ( input.LA(1) ) {
-                case 24:
-                    return s3;
+                case 25:
+                    return s2;
 
                 case EOL:
                 case 15:
                     return s1;
 
-                case 25:
-                    return s2;
+                case 24:
+                    return s3;
 
                 default:
                     NoViableAltException nvae =
-                        new NoViableAltException("", 59, 1, input);
+                        new NoViableAltException("", 60, 1, input);
 
                     throw nvae;        }
             }
@@ -8632,21 +8756,24 @@
 
                 default:
                     NoViableAltException nvae =
-                        new NoViableAltException("", 59, 0, input);
+                        new NoViableAltException("", 60, 0, input);
 
                     throw nvae;        }
             }
         };
 
-    }class DFA60 extends DFA {
+    }class DFA61 extends DFA {
         public int predict(IntStream input) throws RecognitionException {
             return predict(input, s0);
         }
-        DFA.State s3 = new DFA.State() {{alt=2;}};
-        DFA.State s15 = new DFA.State() {{alt=1;}};
+        DFA.State s3 = new DFA.State() {{alt=1;}};
+        DFA.State s4 = new DFA.State() {{alt=2;}};
         DFA.State s2 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
                 switch ( input.LA(1) ) {
+                case 33:
+                    return s3;
+
                 case EOL:
                 case 15:
                     return s2;
@@ -8663,14 +8790,11 @@
                 case 65:
                 case 66:
                 case 67:
-                    return s3;
+                    return s4;
 
-                case 33:
-                    return s15;
-
                 default:
                     NoViableAltException nvae =
-                        new NoViableAltException("", 60, 2, input);
+                        new NoViableAltException("", 61, 2, input);
 
                     throw nvae;        }
             }
@@ -8682,6 +8806,9 @@
                 case 15:
                     return s2;
 
+                case 33:
+                    return s3;
+
                 case 24:
                 case 25:
                 case 58:
@@ -8694,25 +8821,22 @@
                 case 65:
                 case 66:
                 case 67:
-                    return s3;
+                    return s4;
 
-                case 33:
-                    return s15;
-
                 default:
                     NoViableAltException nvae =
-                        new NoViableAltException("", 60, 1, input);
+                        new NoViableAltException("", 61, 1, input);
 
                     throw nvae;        }
             }
         };
         DFA.State s0 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
-                int LA60_0 = input.LA(1);
-                if ( LA60_0==ID ) {return s1;}
+                int LA61_0 = input.LA(1);
+                if ( LA61_0==ID ) {return s1;}
 
                 NoViableAltException nvae =
-        	    new NoViableAltException("", 60, 0, input);
+        	    new NoViableAltException("", 61, 0, input);
 
                 throw nvae;
             }
@@ -8723,15 +8847,15 @@
 
     public static final BitSet FOLLOW_set_in_opt_eol41 = new BitSet(new long[]{0x0000000000008012L});
     public static final BitSet FOLLOW_opt_eol_in_compilation_unit57 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_prolog_in_compilation_unit61 = new BitSet(new long[]{0x0000000000628012L});
-    public static final BitSet FOLLOW_rule_in_compilation_unit70 = new BitSet(new long[]{0x0000000000628012L});
-    public static final BitSet FOLLOW_query_in_compilation_unit83 = new BitSet(new long[]{0x0000000000628012L});
-    public static final BitSet FOLLOW_template_in_compilation_unit93 = new BitSet(new long[]{0x0000000000628012L});
-    public static final BitSet FOLLOW_extra_statement_in_compilation_unit101 = new BitSet(new long[]{0x0000000000628012L});
-    public static final BitSet FOLLOW_opt_eol_in_prolog125 = new BitSet(new long[]{0x0000000000738012L});
-    public static final BitSet FOLLOW_package_statement_in_prolog133 = new BitSet(new long[]{0x0000000000728012L});
-    public static final BitSet FOLLOW_extra_statement_in_prolog148 = new BitSet(new long[]{0x0000000000728012L});
-    public static final BitSet FOLLOW_expander_in_prolog154 = new BitSet(new long[]{0x0000000000728012L});
+    public static final BitSet FOLLOW_prolog_in_compilation_unit61 = new BitSet(new long[]{0x0000000000468012L});
+    public static final BitSet FOLLOW_rule_in_compilation_unit70 = new BitSet(new long[]{0x0000000000468012L});
+    public static final BitSet FOLLOW_query_in_compilation_unit83 = new BitSet(new long[]{0x0000000000468012L});
+    public static final BitSet FOLLOW_template_in_compilation_unit93 = new BitSet(new long[]{0x0000000000468012L});
+    public static final BitSet FOLLOW_extra_statement_in_compilation_unit101 = new BitSet(new long[]{0x0000000000468012L});
+    public static final BitSet FOLLOW_opt_eol_in_prolog125 = new BitSet(new long[]{0x0000000000678012L});
+    public static final BitSet FOLLOW_package_statement_in_prolog133 = new BitSet(new long[]{0x0000000000668012L});
+    public static final BitSet FOLLOW_extra_statement_in_prolog148 = new BitSet(new long[]{0x0000000000668012L});
+    public static final BitSet FOLLOW_expander_in_prolog154 = new BitSet(new long[]{0x0000000000668012L});
     public static final BitSet FOLLOW_opt_eol_in_prolog166 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_16_in_package_statement190 = new BitSet(new long[]{0x0000000000008012L});
     public static final BitSet FOLLOW_opt_eol_in_package_statement192 = new BitSet(new long[]{0x0000000000000020L});
@@ -8743,325 +8867,332 @@
     public static final BitSet FOLLOW_import_name_in_import_statement223 = new BitSet(new long[]{0x0000000000008012L});
     public static final BitSet FOLLOW_15_in_import_statement225 = new BitSet(new long[]{0x0000000000008012L});
     public static final BitSet FOLLOW_opt_eol_in_import_statement228 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_import_name259 = new BitSet(new long[]{0x00000000000C0002L});
-    public static final BitSet FOLLOW_18_in_import_name265 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_ID_in_import_name269 = new BitSet(new long[]{0x00000000000C0002L});
-    public static final BitSet FOLLOW_19_in_import_name279 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_20_in_expander299 = new BitSet(new long[]{0x0000000000008032L});
-    public static final BitSet FOLLOW_dotted_name_in_expander304 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_15_in_expander308 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_opt_eol_in_expander311 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_21_in_global335 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_dotted_name_in_global339 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_ID_in_global343 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_15_in_global345 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_opt_eol_in_global348 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_22_in_function372 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_opt_eol_in_function374 = new BitSet(new long[]{0x0000000000008032L});
-    public static final BitSet FOLLOW_dotted_name_in_function379 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_opt_eol_in_function383 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_ID_in_function387 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_opt_eol_in_function389 = new BitSet(new long[]{0x0000000000800000L});
-    public static final BitSet FOLLOW_23_in_function398 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_opt_eol_in_function400 = new BitSet(new long[]{0x0000000002008032L});
-    public static final BitSet FOLLOW_dotted_name_in_function410 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_opt_eol_in_function414 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_argument_name_in_function418 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_opt_eol_in_function420 = new BitSet(new long[]{0x0000000003000000L});
-    public static final BitSet FOLLOW_24_in_function434 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_opt_eol_in_function436 = new BitSet(new long[]{0x0000000000008032L});
-    public static final BitSet FOLLOW_dotted_name_in_function441 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_opt_eol_in_function445 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_argument_name_in_function449 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_opt_eol_in_function451 = new BitSet(new long[]{0x0000000003000000L});
-    public static final BitSet FOLLOW_25_in_function476 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_opt_eol_in_function480 = new BitSet(new long[]{0x0000000004000000L});
-    public static final BitSet FOLLOW_26_in_function484 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF2L,0x000000000000000FL});
-    public static final BitSet FOLLOW_curly_chunk_in_function491 = new BitSet(new long[]{0x0000000008000000L});
-    public static final BitSet FOLLOW_27_in_function500 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_opt_eol_in_function508 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_opt_eol_in_query532 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_28_in_query538 = new BitSet(new long[]{0x02000035B0020120L});
-    public static final BitSet FOLLOW_word_in_query542 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_opt_eol_in_query544 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF2L,0x000000000000000FL});
-    public static final BitSet FOLLOW_expander_lhs_block_in_query560 = new BitSet(new long[]{0x0000000020000000L});
-    public static final BitSet FOLLOW_normal_lhs_block_in_query568 = new BitSet(new long[]{0x0000000020000000L});
-    public static final BitSet FOLLOW_29_in_query583 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_opt_eol_in_query585 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_opt_eol_in_template609 = new BitSet(new long[]{0x0000000040000000L});
-    public static final BitSet FOLLOW_30_in_template615 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_ID_in_template619 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_EOL_in_template621 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_template_slot_in_template636 = new BitSet(new long[]{0x0000000020000020L});
-    public static final BitSet FOLLOW_29_in_template651 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_EOL_in_template653 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_dotted_name_in_template_slot685 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_ID_in_template_slot689 = new BitSet(new long[]{0x0000000000008010L});
-    public static final BitSet FOLLOW_set_in_template_slot693 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_opt_eol_in_rule728 = new BitSet(new long[]{0x0000000080000000L});
-    public static final BitSet FOLLOW_31_in_rule734 = new BitSet(new long[]{0x02000035B0020120L});
-    public static final BitSet FOLLOW_word_in_rule738 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_opt_eol_in_rule740 = new BitSet(new long[]{0x0000000A00008012L});
-    public static final BitSet FOLLOW_rule_attributes_in_rule751 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_opt_eol_in_rule761 = new BitSet(new long[]{0x0000000120008012L});
-    public static final BitSet FOLLOW_32_in_rule770 = new BitSet(new long[]{0x0000000200008012L});
-    public static final BitSet FOLLOW_33_in_rule772 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_opt_eol_in_rule775 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF2L,0x000000000000000FL});
-    public static final BitSet FOLLOW_expander_lhs_block_in_rule793 = new BitSet(new long[]{0x0000000020008012L});
-    public static final BitSet FOLLOW_normal_lhs_block_in_rule802 = new BitSet(new long[]{0x0000000020008012L});
-    public static final BitSet FOLLOW_opt_eol_in_rule825 = new BitSet(new long[]{0x0000000400000000L});
-    public static final BitSet FOLLOW_34_in_rule829 = new BitSet(new long[]{0x0000000200008012L});
-    public static final BitSet FOLLOW_33_in_rule831 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_opt_eol_in_rule835 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x000000000000000FL});
-    public static final BitSet FOLLOW_29_in_rule881 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_opt_eol_in_rule883 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_import_statement_in_extra_statement903 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_global_in_extra_statement908 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_function_in_extra_statement913 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_35_in_rule_attributes932 = new BitSet(new long[]{0x0000000200008012L});
-    public static final BitSet FOLLOW_33_in_rule_attributes935 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_opt_eol_in_rule_attributes938 = new BitSet(new long[]{0x000003F001000002L});
-    public static final BitSet FOLLOW_24_in_rule_attributes945 = new BitSet(new long[]{0x000003F000000000L});
-    public static final BitSet FOLLOW_rule_attribute_in_rule_attributes950 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_opt_eol_in_rule_attributes952 = new BitSet(new long[]{0x000003F001000002L});
-    public static final BitSet FOLLOW_salience_in_rule_attribute991 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_no_loop_in_rule_attribute1001 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_agenda_group_in_rule_attribute1012 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_duration_in_rule_attribute1025 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_activation_group_in_rule_attribute1039 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_auto_focus_in_rule_attribute1050 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_36_in_salience1083 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_opt_eol_in_salience1085 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_INT_in_salience1089 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_15_in_salience1091 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_opt_eol_in_salience1094 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_37_in_no_loop1129 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_opt_eol_in_no_loop1131 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_15_in_no_loop1133 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_opt_eol_in_no_loop1136 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_37_in_no_loop1161 = new BitSet(new long[]{0x0000000000000080L});
-    public static final BitSet FOLLOW_BOOL_in_no_loop1165 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_opt_eol_in_no_loop1167 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_15_in_no_loop1169 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_opt_eol_in_no_loop1172 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_38_in_auto_focus1218 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_opt_eol_in_auto_focus1220 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_15_in_auto_focus1222 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_opt_eol_in_auto_focus1225 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_38_in_auto_focus1250 = new BitSet(new long[]{0x0000000000000080L});
-    public static final BitSet FOLLOW_BOOL_in_auto_focus1254 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_opt_eol_in_auto_focus1256 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_15_in_auto_focus1258 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_opt_eol_in_auto_focus1261 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_39_in_activation_group1303 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_opt_eol_in_activation_group1305 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_STRING_in_activation_group1309 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_15_in_activation_group1311 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_opt_eol_in_activation_group1314 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_40_in_agenda_group1343 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_opt_eol_in_agenda_group1345 = new BitSet(new long[]{0x0000000000000100L});
-    public static final BitSet FOLLOW_STRING_in_agenda_group1349 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_15_in_agenda_group1351 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_opt_eol_in_agenda_group1354 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_41_in_duration1386 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_opt_eol_in_duration1388 = new BitSet(new long[]{0x0000000000000040L});
-    public static final BitSet FOLLOW_INT_in_duration1392 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_15_in_duration1394 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_opt_eol_in_duration1397 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_lhs_in_normal_lhs_block1423 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_opt_eol_in_normal_lhs_block1425 = new BitSet(new long[]{0x0070000000808032L});
-    public static final BitSet FOLLOW_opt_eol_in_normal_lhs_block1437 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_paren_chunk_in_expander_lhs_block1478 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_EOL_in_expander_lhs_block1482 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF2L,0x000000000000000FL});
-    public static final BitSet FOLLOW_EOL_in_expander_lhs_block1497 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF2L,0x000000000000000FL});
-    public static final BitSet FOLLOW_lhs_or_in_lhs1539 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_fact_binding_in_lhs_column1567 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_fact_in_lhs_column1576 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_42_in_from_statement1604 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_opt_eol_in_from_statement1606 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_from_source_in_from_statement1610 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_from_source1654 = new BitSet(new long[]{0x0000000000040000L});
-    public static final BitSet FOLLOW_18_in_from_source1656 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_ID_in_from_source1660 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_from_source1687 = new BitSet(new long[]{0x0000000000040000L});
-    public static final BitSet FOLLOW_18_in_from_source1689 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_ID_in_from_source1693 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_opt_eol_in_from_source1695 = new BitSet(new long[]{0x0000000000800000L});
-    public static final BitSet FOLLOW_23_in_from_source1698 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_opt_eol_in_from_source1700 = new BitSet(new long[]{0x00000800040003E2L});
-    public static final BitSet FOLLOW_argument_list_in_from_source1704 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_opt_eol_in_from_source1706 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_25_in_from_source1708 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_from_source1730 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_opt_eol_in_from_source1732 = new BitSet(new long[]{0x0000000000800000L});
-    public static final BitSet FOLLOW_23_in_from_source1734 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_opt_eol_in_from_source1736 = new BitSet(new long[]{0x00000800040003E2L});
-    public static final BitSet FOLLOW_argument_list_in_from_source1740 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_opt_eol_in_from_source1742 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_25_in_from_source1744 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_argument_value_in_argument_list1787 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_opt_eol_in_argument_list1803 = new BitSet(new long[]{0x0000000001000000L});
-    public static final BitSet FOLLOW_24_in_argument_list1805 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_opt_eol_in_argument_list1807 = new BitSet(new long[]{0x00000800040003E0L});
-    public static final BitSet FOLLOW_argument_value_in_argument_list1811 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_STRING_in_argument_value1851 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_INT_in_argument_value1862 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_FLOAT_in_argument_value1875 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_BOOL_in_argument_value1886 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_argument_value1898 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_43_in_argument_value1909 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_43_in_argument_value1920 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_inline_map_in_argument_value1939 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_26_in_inline_map1979 = new BitSet(new long[]{0x00000800040003E0L});
-    public static final BitSet FOLLOW_argument_value_in_inline_map1997 = new BitSet(new long[]{0x0000100000000000L});
-    public static final BitSet FOLLOW_44_in_inline_map1999 = new BitSet(new long[]{0x00000800040003E0L});
-    public static final BitSet FOLLOW_argument_value_in_inline_map2003 = new BitSet(new long[]{0x0000000009000010L});
-    public static final BitSet FOLLOW_EOL_in_inline_map2046 = new BitSet(new long[]{0x0000000001000000L});
-    public static final BitSet FOLLOW_24_in_inline_map2050 = new BitSet(new long[]{0x00000800040003F0L});
-    public static final BitSet FOLLOW_EOL_in_inline_map2053 = new BitSet(new long[]{0x00000800040003E0L});
-    public static final BitSet FOLLOW_argument_value_in_inline_map2059 = new BitSet(new long[]{0x0000100000000000L});
-    public static final BitSet FOLLOW_44_in_inline_map2061 = new BitSet(new long[]{0x00000800040003E0L});
-    public static final BitSet FOLLOW_argument_value_in_inline_map2065 = new BitSet(new long[]{0x0000000009000010L});
-    public static final BitSet FOLLOW_27_in_inline_map2101 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_fact_binding2133 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_opt_eol_in_fact_binding2143 = new BitSet(new long[]{0x0000000200000000L});
-    public static final BitSet FOLLOW_33_in_fact_binding2145 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_opt_eol_in_fact_binding2147 = new BitSet(new long[]{0x0000000000800020L});
-    public static final BitSet FOLLOW_fact_expression_in_fact_binding2151 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_23_in_fact_expression2183 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_opt_eol_in_fact_expression2185 = new BitSet(new long[]{0x0000000000800020L});
-    public static final BitSet FOLLOW_fact_expression_in_fact_expression2189 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_opt_eol_in_fact_expression2191 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_25_in_fact_expression2193 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_fact_in_fact_expression2204 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_opt_eol_in_fact_expression2206 = new BitSet(new long[]{0x0000600000000002L});
-    public static final BitSet FOLLOW_set_in_fact_expression2219 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_opt_eol_in_fact_expression2224 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_fact_in_fact_expression2238 = new BitSet(new long[]{0x0000600000000002L});
-    public static final BitSet FOLLOW_dotted_name_in_fact2277 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_opt_eol_in_fact2285 = new BitSet(new long[]{0x0000000000800000L});
-    public static final BitSet FOLLOW_23_in_fact2293 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_opt_eol_in_fact2296 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_constraints_in_fact2302 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_opt_eol_in_fact2321 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_25_in_fact2325 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_opt_eol_in_fact2327 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_opt_eol_in_constraints2359 = new BitSet(new long[]{0x0000000000008032L});
-    public static final BitSet FOLLOW_constraint_in_constraints2364 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_predicate_in_constraints2367 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_opt_eol_in_constraints2375 = new BitSet(new long[]{0x0000000001000000L});
-    public static final BitSet FOLLOW_24_in_constraints2377 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_opt_eol_in_constraints2379 = new BitSet(new long[]{0x0000000000008032L});
-    public static final BitSet FOLLOW_constraint_in_constraints2382 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_predicate_in_constraints2385 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_opt_eol_in_constraints2393 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_opt_eol_in_constraint2412 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_ID_in_constraint2420 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_opt_eol_in_constraint2422 = new BitSet(new long[]{0x0000000200000000L});
-    public static final BitSet FOLLOW_33_in_constraint2424 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_opt_eol_in_constraint2426 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_ID_in_constraint2436 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_opt_eol_in_constraint2450 = new BitSet(new long[]{0xFC00000000008012L,0x000000000000000FL});
-    public static final BitSet FOLLOW_operator_in_constraint2456 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_opt_eol_in_constraint2458 = new BitSet(new long[]{0x00000800008003E0L});
-    public static final BitSet FOLLOW_ID_in_constraint2476 = new BitSet(new long[]{0x0001800000008012L});
-    public static final BitSet FOLLOW_enum_constraint_in_constraint2501 = new BitSet(new long[]{0x0001800000008012L});
-    public static final BitSet FOLLOW_literal_constraint_in_constraint2533 = new BitSet(new long[]{0x0001800000008012L});
-    public static final BitSet FOLLOW_retval_constraint_in_constraint2553 = new BitSet(new long[]{0x0001800000008012L});
-    public static final BitSet FOLLOW_set_in_constraint2588 = new BitSet(new long[]{0xFC00000000000000L,0x000000000000000FL});
-    public static final BitSet FOLLOW_operator_in_constraint2610 = new BitSet(new long[]{0x00000800008003E0L});
-    public static final BitSet FOLLOW_ID_in_constraint2622 = new BitSet(new long[]{0x0001800000008012L});
-    public static final BitSet FOLLOW_enum_constraint_in_constraint2650 = new BitSet(new long[]{0x0001800000008012L});
-    public static final BitSet FOLLOW_literal_constraint_in_constraint2685 = new BitSet(new long[]{0x0001800000008012L});
-    public static final BitSet FOLLOW_retval_constraint_in_constraint2707 = new BitSet(new long[]{0x0001800000008012L});
-    public static final BitSet FOLLOW_opt_eol_in_constraint2763 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_STRING_in_literal_constraint2790 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_INT_in_literal_constraint2801 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_FLOAT_in_literal_constraint2814 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_BOOL_in_literal_constraint2825 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_43_in_literal_constraint2837 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_enum_constraint2868 = new BitSet(new long[]{0x0000000000040000L});
-    public static final BitSet FOLLOW_18_in_enum_constraint2870 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_ID_in_enum_constraint2874 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_23_in_retval_constraint2903 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF2L,0x000000000000000FL});
-    public static final BitSet FOLLOW_paren_chunk_in_retval_constraint2908 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_25_in_retval_constraint2911 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_predicate2929 = new BitSet(new long[]{0x0000000200000000L});
-    public static final BitSet FOLLOW_33_in_predicate2931 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_ID_in_predicate2935 = new BitSet(new long[]{0x0002000000000000L});
-    public static final BitSet FOLLOW_49_in_predicate2937 = new BitSet(new long[]{0x0000000000800000L});
-    public static final BitSet FOLLOW_23_in_predicate2939 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF2L,0x000000000000000FL});
-    public static final BitSet FOLLOW_paren_chunk_in_predicate2943 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_25_in_predicate2945 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_23_in_paren_chunk2991 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF2L,0x000000000000000FL});
-    public static final BitSet FOLLOW_paren_chunk_in_paren_chunk2995 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_25_in_paren_chunk2997 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF2L,0x000000000000000FL});
-    public static final BitSet FOLLOW_23_in_paren_chunk23068 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF2L,0x000000000000000FL});
-    public static final BitSet FOLLOW_paren_chunk2_in_paren_chunk23072 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_25_in_paren_chunk23074 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF2L,0x000000000000000FL});
-    public static final BitSet FOLLOW_26_in_curly_chunk3143 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF2L,0x000000000000000FL});
-    public static final BitSet FOLLOW_curly_chunk_in_curly_chunk3147 = new BitSet(new long[]{0x0000000008000000L});
-    public static final BitSet FOLLOW_27_in_curly_chunk3149 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF2L,0x000000000000000FL});
-    public static final BitSet FOLLOW_lhs_and_in_lhs_or3207 = new BitSet(new long[]{0x0000600000000002L});
-    public static final BitSet FOLLOW_set_in_lhs_or3216 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_opt_eol_in_lhs_or3221 = new BitSet(new long[]{0x0070000000800020L});
-    public static final BitSet FOLLOW_lhs_and_in_lhs_or3228 = new BitSet(new long[]{0x0000600000000002L});
-    public static final BitSet FOLLOW_lhs_unary_in_lhs_and3268 = new BitSet(new long[]{0x000C000000000002L});
-    public static final BitSet FOLLOW_set_in_lhs_and3277 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_opt_eol_in_lhs_and3282 = new BitSet(new long[]{0x0070000000800020L});
-    public static final BitSet FOLLOW_lhs_unary_in_lhs_and3289 = new BitSet(new long[]{0x000C000000000002L});
-    public static final BitSet FOLLOW_lhs_exist_in_lhs_unary3327 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_lhs_not_in_lhs_unary3337 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_lhs_eval_in_lhs_unary3347 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_lhs_column_in_lhs_unary3361 = new BitSet(new long[]{0x0000040000000002L});
-    public static final BitSet FOLLOW_from_statement_in_lhs_unary3368 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_23_in_lhs_unary3378 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_opt_eol_in_lhs_unary3380 = new BitSet(new long[]{0x0070000000800020L});
-    public static final BitSet FOLLOW_lhs_in_lhs_unary3384 = new BitSet(new long[]{0x0000000000008012L});
-    public static final BitSet FOLLOW_opt_eol_in_lhs_unary3386 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_25_in_lhs_unary3388 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_52_in_lhs_exist3419 = new BitSet(new long[]{0x0000000000800020L});
-    public static final BitSet FOLLOW_23_in_lhs_exist3422 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_lhs_column_in_lhs_exist3426 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_25_in_lhs_exist3428 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_lhs_column_in_lhs_exist3434 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_53_in_lhs_not3464 = new BitSet(new long[]{0x0000000000800020L});
-    public static final BitSet FOLLOW_23_in_lhs_not3467 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_lhs_column_in_lhs_not3471 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_25_in_lhs_not3474 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_lhs_column_in_lhs_not3480 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_54_in_lhs_eval3506 = new BitSet(new long[]{0x0000000000800000L});
-    public static final BitSet FOLLOW_23_in_lhs_eval3510 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF2L,0x000000000000000FL});
-    public static final BitSet FOLLOW_paren_chunk2_in_lhs_eval3518 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_25_in_lhs_eval3522 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ID_in_dotted_name3554 = new BitSet(new long[]{0x0080000000040002L});
-    public static final BitSet FOLLOW_18_in_dotted_name3560 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_ID_in_dotted_name3564 = new BitSet(new long[]{0x0080000000040002L});
-    public static final BitSet FOLLOW_55_in_dotted_name3573 = new BitSet(new long[]{0x0100000000000000L});
-    public static final BitSet FOLLOW_56_in_dotted_name3575 = new BitSet(new long[]{0x0080000000000002L});
-    public static final BitSet FOLLOW_ID_in_argument_name3605 = new BitSet(new long[]{0x0080000000000002L});
-    public static final BitSet FOLLOW_55_in_argument_name3611 = new BitSet(new long[]{0x0100000000000000L});
-    public static final BitSet FOLLOW_56_in_argument_name3613 = new BitSet(new long[]{0x0080000000000002L});
-    public static final BitSet FOLLOW_ID_in_word3641 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_17_in_word3653 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_57_in_word3662 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_31_in_word3674 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_28_in_word3685 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_36_in_word3695 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_37_in_word3703 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_32_in_word3711 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_34_in_word3722 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_29_in_word3733 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_STRING_in_word3747 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_58_in_operator3776 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_59_in_operator3783 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_60_in_operator3790 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_61_in_operator3797 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_62_in_operator3806 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_63_in_operator3813 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_64_in_operator3820 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_65_in_operator3827 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_66_in_operator3834 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_67_in_operator3841 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_17_in_function_import_statement244 = new BitSet(new long[]{0x0000000000040000L});
+    public static final BitSet FOLLOW_18_in_function_import_statement246 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_function_import_statement248 = new BitSet(new long[]{0x0000000000000020L});
+    public static final BitSet FOLLOW_import_name_in_function_import_statement252 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_15_in_function_import_statement254 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_function_import_statement257 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_import_name289 = new BitSet(new long[]{0x0000000000180002L});
+    public static final BitSet FOLLOW_19_in_import_name295 = new BitSet(new long[]{0x0000000000000020L});
+    public static final BitSet FOLLOW_ID_in_import_name299 = new BitSet(new long[]{0x0000000000180002L});
+    public static final BitSet FOLLOW_20_in_import_name309 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_21_in_expander329 = new BitSet(new long[]{0x0000000000008032L});
+    public static final BitSet FOLLOW_dotted_name_in_expander334 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_15_in_expander338 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_expander341 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_22_in_global365 = new BitSet(new long[]{0x0000000000000020L});
+    public static final BitSet FOLLOW_dotted_name_in_global369 = new BitSet(new long[]{0x0000000000000020L});
+    public static final BitSet FOLLOW_ID_in_global373 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_15_in_global375 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_global378 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_18_in_function402 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_function404 = new BitSet(new long[]{0x0000000000008032L});
+    public static final BitSet FOLLOW_dotted_name_in_function409 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_function413 = new BitSet(new long[]{0x0000000000000020L});
+    public static final BitSet FOLLOW_ID_in_function417 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_function419 = new BitSet(new long[]{0x0000000000800000L});
+    public static final BitSet FOLLOW_23_in_function428 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_function430 = new BitSet(new long[]{0x0000000002008032L});
+    public static final BitSet FOLLOW_dotted_name_in_function440 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_function444 = new BitSet(new long[]{0x0000000000000020L});
+    public static final BitSet FOLLOW_argument_name_in_function448 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_function450 = new BitSet(new long[]{0x0000000003000000L});
+    public static final BitSet FOLLOW_24_in_function464 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_function466 = new BitSet(new long[]{0x0000000000008032L});
+    public static final BitSet FOLLOW_dotted_name_in_function471 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_function475 = new BitSet(new long[]{0x0000000000000020L});
+    public static final BitSet FOLLOW_argument_name_in_function479 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_function481 = new BitSet(new long[]{0x0000000003000000L});
+    public static final BitSet FOLLOW_25_in_function506 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_function510 = new BitSet(new long[]{0x0000000004000000L});
+    public static final BitSet FOLLOW_26_in_function514 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF2L,0x000000000000000FL});
+    public static final BitSet FOLLOW_curly_chunk_in_function521 = new BitSet(new long[]{0x0000000008000000L});
+    public static final BitSet FOLLOW_27_in_function530 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_function538 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_opt_eol_in_query562 = new BitSet(new long[]{0x0000000010000000L});
+    public static final BitSet FOLLOW_28_in_query568 = new BitSet(new long[]{0x02000035B0020120L});
+    public static final BitSet FOLLOW_word_in_query572 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_query574 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF2L,0x000000000000000FL});
+    public static final BitSet FOLLOW_expander_lhs_block_in_query590 = new BitSet(new long[]{0x0000000020000000L});
+    public static final BitSet FOLLOW_normal_lhs_block_in_query598 = new BitSet(new long[]{0x0000000020000000L});
+    public static final BitSet FOLLOW_29_in_query613 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_query615 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_opt_eol_in_template639 = new BitSet(new long[]{0x0000000040000000L});
+    public static final BitSet FOLLOW_30_in_template645 = new BitSet(new long[]{0x0000000000000020L});
+    public static final BitSet FOLLOW_ID_in_template649 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_EOL_in_template651 = new BitSet(new long[]{0x0000000000000020L});
+    public static final BitSet FOLLOW_template_slot_in_template666 = new BitSet(new long[]{0x0000000020000020L});
+    public static final BitSet FOLLOW_29_in_template681 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_EOL_in_template683 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_dotted_name_in_template_slot715 = new BitSet(new long[]{0x0000000000000020L});
+    public static final BitSet FOLLOW_ID_in_template_slot719 = new BitSet(new long[]{0x0000000000008010L});
+    public static final BitSet FOLLOW_set_in_template_slot723 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_opt_eol_in_rule758 = new BitSet(new long[]{0x0000000080000000L});
+    public static final BitSet FOLLOW_31_in_rule764 = new BitSet(new long[]{0x02000035B0020120L});
+    public static final BitSet FOLLOW_word_in_rule768 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_rule770 = new BitSet(new long[]{0x0000000A00008012L});
+    public static final BitSet FOLLOW_rule_attributes_in_rule781 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_rule791 = new BitSet(new long[]{0x0000000120008012L});
+    public static final BitSet FOLLOW_32_in_rule800 = new BitSet(new long[]{0x0000000200008012L});
+    public static final BitSet FOLLOW_33_in_rule802 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_rule805 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF2L,0x000000000000000FL});
+    public static final BitSet FOLLOW_expander_lhs_block_in_rule823 = new BitSet(new long[]{0x0000000020008012L});
+    public static final BitSet FOLLOW_normal_lhs_block_in_rule832 = new BitSet(new long[]{0x0000000020008012L});
+    public static final BitSet FOLLOW_opt_eol_in_rule855 = new BitSet(new long[]{0x0000000400000000L});
+    public static final BitSet FOLLOW_34_in_rule859 = new BitSet(new long[]{0x0000000200008012L});
+    public static final BitSet FOLLOW_33_in_rule861 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_rule865 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x000000000000000FL});
+    public static final BitSet FOLLOW_29_in_rule911 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_rule913 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_import_statement_in_extra_statement933 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_function_import_statement_in_extra_statement938 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_global_in_extra_statement943 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_function_in_extra_statement948 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_35_in_rule_attributes967 = new BitSet(new long[]{0x0000000200008012L});
+    public static final BitSet FOLLOW_33_in_rule_attributes970 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_rule_attributes973 = new BitSet(new long[]{0x000003F001000002L});
+    public static final BitSet FOLLOW_24_in_rule_attributes980 = new BitSet(new long[]{0x000003F000000000L});
+    public static final BitSet FOLLOW_rule_attribute_in_rule_attributes985 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_rule_attributes987 = new BitSet(new long[]{0x000003F001000002L});
+    public static final BitSet FOLLOW_salience_in_rule_attribute1026 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_no_loop_in_rule_attribute1036 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_agenda_group_in_rule_attribute1047 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_duration_in_rule_attribute1060 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_activation_group_in_rule_attribute1074 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_auto_focus_in_rule_attribute1085 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_36_in_salience1118 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_salience1120 = new BitSet(new long[]{0x0000000000000040L});
+    public static final BitSet FOLLOW_INT_in_salience1124 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_15_in_salience1126 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_salience1129 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_37_in_no_loop1164 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_no_loop1166 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_15_in_no_loop1168 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_no_loop1171 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_37_in_no_loop1196 = new BitSet(new long[]{0x0000000000000080L});
+    public static final BitSet FOLLOW_BOOL_in_no_loop1200 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_no_loop1202 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_15_in_no_loop1204 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_no_loop1207 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_38_in_auto_focus1253 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_auto_focus1255 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_15_in_auto_focus1257 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_auto_focus1260 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_38_in_auto_focus1285 = new BitSet(new long[]{0x0000000000000080L});
+    public static final BitSet FOLLOW_BOOL_in_auto_focus1289 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_auto_focus1291 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_15_in_auto_focus1293 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_auto_focus1296 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_39_in_activation_group1338 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_activation_group1340 = new BitSet(new long[]{0x0000000000000100L});
+    public static final BitSet FOLLOW_STRING_in_activation_group1344 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_15_in_activation_group1346 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_activation_group1349 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_40_in_agenda_group1378 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_agenda_group1380 = new BitSet(new long[]{0x0000000000000100L});
+    public static final BitSet FOLLOW_STRING_in_agenda_group1384 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_15_in_agenda_group1386 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_agenda_group1389 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_41_in_duration1421 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_duration1423 = new BitSet(new long[]{0x0000000000000040L});
+    public static final BitSet FOLLOW_INT_in_duration1427 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_15_in_duration1429 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_duration1432 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_lhs_in_normal_lhs_block1458 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_normal_lhs_block1460 = new BitSet(new long[]{0x0070000000808032L});
+    public static final BitSet FOLLOW_opt_eol_in_normal_lhs_block1472 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_paren_chunk_in_expander_lhs_block1513 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_EOL_in_expander_lhs_block1517 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF2L,0x000000000000000FL});
+    public static final BitSet FOLLOW_EOL_in_expander_lhs_block1532 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF2L,0x000000000000000FL});
+    public static final BitSet FOLLOW_lhs_or_in_lhs1574 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_fact_binding_in_lhs_column1602 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_fact_in_lhs_column1611 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_42_in_from_statement1639 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_from_statement1641 = new BitSet(new long[]{0x0000000000000020L});
+    public static final BitSet FOLLOW_from_source_in_from_statement1645 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_from_source1689 = new BitSet(new long[]{0x0000000000080000L});
+    public static final BitSet FOLLOW_19_in_from_source1691 = new BitSet(new long[]{0x0000000000000020L});
+    public static final BitSet FOLLOW_ID_in_from_source1695 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_from_source1722 = new BitSet(new long[]{0x0000000000080000L});
+    public static final BitSet FOLLOW_19_in_from_source1724 = new BitSet(new long[]{0x0000000000000020L});
+    public static final BitSet FOLLOW_ID_in_from_source1728 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_from_source1730 = new BitSet(new long[]{0x0000000000800000L});
+    public static final BitSet FOLLOW_23_in_from_source1733 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_from_source1735 = new BitSet(new long[]{0x00000800040003E2L});
+    public static final BitSet FOLLOW_argument_list_in_from_source1739 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_from_source1741 = new BitSet(new long[]{0x0000000002000000L});
+    public static final BitSet FOLLOW_25_in_from_source1743 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_from_source1765 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_from_source1767 = new BitSet(new long[]{0x0000000000800000L});
+    public static final BitSet FOLLOW_23_in_from_source1769 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_from_source1771 = new BitSet(new long[]{0x00000800040003E2L});
+    public static final BitSet FOLLOW_argument_list_in_from_source1775 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_from_source1777 = new BitSet(new long[]{0x0000000002000000L});
+    public static final BitSet FOLLOW_25_in_from_source1779 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_argument_value_in_argument_list1822 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_argument_list1838 = new BitSet(new long[]{0x0000000001000000L});
+    public static final BitSet FOLLOW_24_in_argument_list1840 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_argument_list1842 = new BitSet(new long[]{0x00000800040003E0L});
+    public static final BitSet FOLLOW_argument_value_in_argument_list1846 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_STRING_in_argument_value1886 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_INT_in_argument_value1897 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_FLOAT_in_argument_value1910 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_BOOL_in_argument_value1921 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_argument_value1933 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_43_in_argument_value1944 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_43_in_argument_value1955 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_inline_map_in_argument_value1974 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_26_in_inline_map2014 = new BitSet(new long[]{0x00000800040003E0L});
+    public static final BitSet FOLLOW_argument_value_in_inline_map2032 = new BitSet(new long[]{0x0000100000000000L});
+    public static final BitSet FOLLOW_44_in_inline_map2034 = new BitSet(new long[]{0x00000800040003E0L});
+    public static final BitSet FOLLOW_argument_value_in_inline_map2038 = new BitSet(new long[]{0x0000000009000010L});
+    public static final BitSet FOLLOW_EOL_in_inline_map2081 = new BitSet(new long[]{0x0000000001000000L});
+    public static final BitSet FOLLOW_24_in_inline_map2085 = new BitSet(new long[]{0x00000800040003F0L});
+    public static final BitSet FOLLOW_EOL_in_inline_map2088 = new BitSet(new long[]{0x00000800040003E0L});
+    public static final BitSet FOLLOW_argument_value_in_inline_map2094 = new BitSet(new long[]{0x0000100000000000L});
+    public static final BitSet FOLLOW_44_in_inline_map2096 = new BitSet(new long[]{0x00000800040003E0L});
+    public static final BitSet FOLLOW_argument_value_in_inline_map2100 = new BitSet(new long[]{0x0000000009000010L});
+    public static final BitSet FOLLOW_27_in_inline_map2136 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_fact_binding2168 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_fact_binding2178 = new BitSet(new long[]{0x0000000200000000L});
+    public static final BitSet FOLLOW_33_in_fact_binding2180 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_fact_binding2182 = new BitSet(new long[]{0x0000000000800020L});
+    public static final BitSet FOLLOW_fact_expression_in_fact_binding2186 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_23_in_fact_expression2218 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_fact_expression2220 = new BitSet(new long[]{0x0000000000800020L});
+    public static final BitSet FOLLOW_fact_expression_in_fact_expression2224 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_fact_expression2226 = new BitSet(new long[]{0x0000000002000000L});
+    public static final BitSet FOLLOW_25_in_fact_expression2228 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_fact_in_fact_expression2239 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_fact_expression2241 = new BitSet(new long[]{0x0000600000000002L});
+    public static final BitSet FOLLOW_set_in_fact_expression2254 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_fact_expression2259 = new BitSet(new long[]{0x0000000000000020L});
+    public static final BitSet FOLLOW_fact_in_fact_expression2273 = new BitSet(new long[]{0x0000600000000002L});
+    public static final BitSet FOLLOW_dotted_name_in_fact2312 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_fact2320 = new BitSet(new long[]{0x0000000000800000L});
+    public static final BitSet FOLLOW_23_in_fact2328 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_fact2331 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_constraints_in_fact2337 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_fact2356 = new BitSet(new long[]{0x0000000002000000L});
+    public static final BitSet FOLLOW_25_in_fact2360 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_fact2362 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_opt_eol_in_constraints2394 = new BitSet(new long[]{0x0000000000008032L});
+    public static final BitSet FOLLOW_constraint_in_constraints2399 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_predicate_in_constraints2402 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_constraints2410 = new BitSet(new long[]{0x0000000001000000L});
+    public static final BitSet FOLLOW_24_in_constraints2412 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_constraints2414 = new BitSet(new long[]{0x0000000000008032L});
+    public static final BitSet FOLLOW_constraint_in_constraints2417 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_predicate_in_constraints2420 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_constraints2428 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_opt_eol_in_constraint2447 = new BitSet(new long[]{0x0000000000000020L});
+    public static final BitSet FOLLOW_ID_in_constraint2455 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_constraint2457 = new BitSet(new long[]{0x0000000200000000L});
+    public static final BitSet FOLLOW_33_in_constraint2459 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_constraint2461 = new BitSet(new long[]{0x0000000000000020L});
+    public static final BitSet FOLLOW_ID_in_constraint2471 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_constraint2485 = new BitSet(new long[]{0xFC00000000008012L,0x000000000000000FL});
+    public static final BitSet FOLLOW_operator_in_constraint2491 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_constraint2493 = new BitSet(new long[]{0x00000800008003E0L});
+    public static final BitSet FOLLOW_ID_in_constraint2511 = new BitSet(new long[]{0x0001800000008012L});
+    public static final BitSet FOLLOW_enum_constraint_in_constraint2536 = new BitSet(new long[]{0x0001800000008012L});
+    public static final BitSet FOLLOW_literal_constraint_in_constraint2568 = new BitSet(new long[]{0x0001800000008012L});
+    public static final BitSet FOLLOW_retval_constraint_in_constraint2588 = new BitSet(new long[]{0x0001800000008012L});
+    public static final BitSet FOLLOW_set_in_constraint2623 = new BitSet(new long[]{0xFC00000000000000L,0x000000000000000FL});
+    public static final BitSet FOLLOW_operator_in_constraint2645 = new BitSet(new long[]{0x00000800008003E0L});
+    public static final BitSet FOLLOW_ID_in_constraint2657 = new BitSet(new long[]{0x0001800000008012L});
+    public static final BitSet FOLLOW_enum_constraint_in_constraint2685 = new BitSet(new long[]{0x0001800000008012L});
+    public static final BitSet FOLLOW_literal_constraint_in_constraint2720 = new BitSet(new long[]{0x0001800000008012L});
+    public static final BitSet FOLLOW_retval_constraint_in_constraint2742 = new BitSet(new long[]{0x0001800000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_constraint2798 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_STRING_in_literal_constraint2825 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_INT_in_literal_constraint2836 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_FLOAT_in_literal_constraint2849 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_BOOL_in_literal_constraint2860 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_43_in_literal_constraint2872 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_enum_constraint2903 = new BitSet(new long[]{0x0000000000080000L});
+    public static final BitSet FOLLOW_19_in_enum_constraint2905 = new BitSet(new long[]{0x0000000000000020L});
+    public static final BitSet FOLLOW_ID_in_enum_constraint2909 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_23_in_retval_constraint2938 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF2L,0x000000000000000FL});
+    public static final BitSet FOLLOW_paren_chunk_in_retval_constraint2943 = new BitSet(new long[]{0x0000000002000000L});
+    public static final BitSet FOLLOW_25_in_retval_constraint2946 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_predicate2964 = new BitSet(new long[]{0x0000000200000000L});
+    public static final BitSet FOLLOW_33_in_predicate2966 = new BitSet(new long[]{0x0000000000000020L});
+    public static final BitSet FOLLOW_ID_in_predicate2970 = new BitSet(new long[]{0x0002000000000000L});
+    public static final BitSet FOLLOW_49_in_predicate2972 = new BitSet(new long[]{0x0000000000800000L});
+    public static final BitSet FOLLOW_23_in_predicate2974 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF2L,0x000000000000000FL});
+    public static final BitSet FOLLOW_paren_chunk_in_predicate2978 = new BitSet(new long[]{0x0000000002000000L});
+    public static final BitSet FOLLOW_25_in_predicate2980 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_23_in_paren_chunk3026 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF2L,0x000000000000000FL});
+    public static final BitSet FOLLOW_paren_chunk_in_paren_chunk3030 = new BitSet(new long[]{0x0000000002000000L});
+    public static final BitSet FOLLOW_25_in_paren_chunk3032 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF2L,0x000000000000000FL});
+    public static final BitSet FOLLOW_23_in_paren_chunk23103 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF2L,0x000000000000000FL});
+    public static final BitSet FOLLOW_paren_chunk2_in_paren_chunk23107 = new BitSet(new long[]{0x0000000002000000L});
+    public static final BitSet FOLLOW_25_in_paren_chunk23109 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF2L,0x000000000000000FL});
+    public static final BitSet FOLLOW_26_in_curly_chunk3178 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF2L,0x000000000000000FL});
+    public static final BitSet FOLLOW_curly_chunk_in_curly_chunk3182 = new BitSet(new long[]{0x0000000008000000L});
+    public static final BitSet FOLLOW_27_in_curly_chunk3184 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF2L,0x000000000000000FL});
+    public static final BitSet FOLLOW_lhs_and_in_lhs_or3242 = new BitSet(new long[]{0x0000600000000002L});
+    public static final BitSet FOLLOW_set_in_lhs_or3251 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_lhs_or3256 = new BitSet(new long[]{0x0070000000800020L});
+    public static final BitSet FOLLOW_lhs_and_in_lhs_or3263 = new BitSet(new long[]{0x0000600000000002L});
+    public static final BitSet FOLLOW_lhs_unary_in_lhs_and3303 = new BitSet(new long[]{0x000C000000000002L});
+    public static final BitSet FOLLOW_set_in_lhs_and3312 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_lhs_and3317 = new BitSet(new long[]{0x0070000000800020L});
+    public static final BitSet FOLLOW_lhs_unary_in_lhs_and3324 = new BitSet(new long[]{0x000C000000000002L});
+    public static final BitSet FOLLOW_lhs_exist_in_lhs_unary3362 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_lhs_not_in_lhs_unary3372 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_lhs_eval_in_lhs_unary3382 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_lhs_column_in_lhs_unary3396 = new BitSet(new long[]{0x0000040000000002L});
+    public static final BitSet FOLLOW_from_statement_in_lhs_unary3403 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_23_in_lhs_unary3413 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_lhs_unary3415 = new BitSet(new long[]{0x0070000000800020L});
+    public static final BitSet FOLLOW_lhs_in_lhs_unary3419 = new BitSet(new long[]{0x0000000000008012L});
+    public static final BitSet FOLLOW_opt_eol_in_lhs_unary3421 = new BitSet(new long[]{0x0000000002000000L});
+    public static final BitSet FOLLOW_25_in_lhs_unary3423 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_52_in_lhs_exist3454 = new BitSet(new long[]{0x0000000000800020L});
+    public static final BitSet FOLLOW_23_in_lhs_exist3457 = new BitSet(new long[]{0x0000000000000020L});
+    public static final BitSet FOLLOW_lhs_column_in_lhs_exist3461 = new BitSet(new long[]{0x0000000002000000L});
+    public static final BitSet FOLLOW_25_in_lhs_exist3463 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_lhs_column_in_lhs_exist3469 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_53_in_lhs_not3499 = new BitSet(new long[]{0x0000000000800020L});
+    public static final BitSet FOLLOW_23_in_lhs_not3502 = new BitSet(new long[]{0x0000000000000020L});
+    public static final BitSet FOLLOW_lhs_column_in_lhs_not3506 = new BitSet(new long[]{0x0000000002000000L});
+    public static final BitSet FOLLOW_25_in_lhs_not3509 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_lhs_column_in_lhs_not3515 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_54_in_lhs_eval3541 = new BitSet(new long[]{0x0000000000800000L});
+    public static final BitSet FOLLOW_23_in_lhs_eval3545 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF2L,0x000000000000000FL});
+    public static final BitSet FOLLOW_paren_chunk2_in_lhs_eval3553 = new BitSet(new long[]{0x0000000002000000L});
+    public static final BitSet FOLLOW_25_in_lhs_eval3557 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ID_in_dotted_name3589 = new BitSet(new long[]{0x0080000000080002L});
+    public static final BitSet FOLLOW_19_in_dotted_name3595 = new BitSet(new long[]{0x0000000000000020L});
+    public static final BitSet FOLLOW_ID_in_dotted_name3599 = new BitSet(new long[]{0x0080000000080002L});
+    public static final BitSet FOLLOW_55_in_dotted_name3608 = new BitSet(new long[]{0x0100000000000000L});
+    public static final BitSet FOLLOW_56_in_dotted_name3610 = new BitSet(new long[]{0x0080000000000002L});
+    public static final BitSet FOLLOW_ID_in_argument_name3640 = new BitSet(new long[]{0x0080000000000002L});
+    public static final BitSet FOLLOW_55_in_argument_name3646 = new BitSet(new long[]{0x0100000000000000L});
+    public static final BitSet FOLLOW_56_in_argument_name3648 = new BitSet(new long[]{0x0080000000000002L});
+    public static final BitSet FOLLOW_ID_in_word3676 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_17_in_word3688 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_57_in_word3697 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_31_in_word3709 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_28_in_word3720 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_36_in_word3730 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_37_in_word3738 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_32_in_word3746 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_34_in_word3757 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_29_in_word3768 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_STRING_in_word3782 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_58_in_operator3811 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_59_in_operator3818 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_60_in_operator3825 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_61_in_operator3832 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_62_in_operator3841 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_63_in_operator3848 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_64_in_operator3855 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_65_in_operator3862 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_66_in_operator3869 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_67_in_operator3876 = new BitSet(new long[]{0x0000000000000002L});
 
 }
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/RuleParserLexer.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/RuleParserLexer.java	2006-08-30 15:59:19 UTC (rev 6027)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/RuleParserLexer.java	2006-08-30 16:14:33 UTC (rev 6028)
@@ -1,8 +1,8 @@
-// $ANTLR 3.0ea8 D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g 2006-08-30 13:06:31
-
-	package org.drools.lang;
+// $ANTLR 3.0ea8 /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g 2006-08-30 17:14:27
 
+	package org.drools.lang;
 
+
 import org.antlr.runtime.*;
 import java.util.Stack;
 import java.util.List;
@@ -94,8 +94,8 @@
             int charPosition = getCharPositionInLine();
             int channel = Token.DEFAULT_CHANNEL;
             if ( backtracking>0 && alreadyParsedRule(input, 1) ) { return ; }
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:6:7: ( ';' )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:6:7: ';'
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:6:7: ( ';' )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:6:7: ';'
             {
             match(';'); if (failed) return ;
 
@@ -120,8 +120,8 @@
             int charPosition = getCharPositionInLine();
             int channel = Token.DEFAULT_CHANNEL;
             if ( backtracking>0 && alreadyParsedRule(input, 2) ) { return ; }
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:7:7: ( 'package' )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:7:7: 'package'
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:7:7: ( 'package' )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:7:7: 'package'
             {
             match("package"); if (failed) return ;
 
@@ -147,8 +147,8 @@
             int charPosition = getCharPositionInLine();
             int channel = Token.DEFAULT_CHANNEL;
             if ( backtracking>0 && alreadyParsedRule(input, 3) ) { return ; }
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:8:7: ( 'import' )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:8:7: 'import'
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:8:7: ( 'import' )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:8:7: 'import'
             {
             match("import"); if (failed) return ;
 
@@ -174,11 +174,12 @@
             int charPosition = getCharPositionInLine();
             int channel = Token.DEFAULT_CHANNEL;
             if ( backtracking>0 && alreadyParsedRule(input, 4) ) { return ; }
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:9:7: ( '.' )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:9:7: '.'
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:9:7: ( 'function' )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:9:7: 'function'
             {
-            match('.'); if (failed) return ;
+            match("function"); if (failed) return ;
 
+
             }
 
             if ( token==null ) {emit(type,line,charPosition,channel,start,getCharIndex()-1);}
@@ -200,12 +201,11 @@
             int charPosition = getCharPositionInLine();
             int channel = Token.DEFAULT_CHANNEL;
             if ( backtracking>0 && alreadyParsedRule(input, 5) ) { return ; }
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:10:7: ( '.*' )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:10:7: '.*'
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:10:7: ( '.' )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:10:7: '.'
             {
-            match(".*"); if (failed) return ;
+            match('.'); if (failed) return ;
 
-
             }
 
             if ( token==null ) {emit(type,line,charPosition,channel,start,getCharIndex()-1);}
@@ -227,10 +227,10 @@
             int charPosition = getCharPositionInLine();
             int channel = Token.DEFAULT_CHANNEL;
             if ( backtracking>0 && alreadyParsedRule(input, 6) ) { return ; }
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:11:7: ( 'expander' )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:11:7: 'expander'
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:11:7: ( '.*' )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:11:7: '.*'
             {
-            match("expander"); if (failed) return ;
+            match(".*"); if (failed) return ;
 
 
             }
@@ -254,10 +254,10 @@
             int charPosition = getCharPositionInLine();
             int channel = Token.DEFAULT_CHANNEL;
             if ( backtracking>0 && alreadyParsedRule(input, 7) ) { return ; }
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:12:7: ( 'global' )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:12:7: 'global'
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:12:7: ( 'expander' )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:12:7: 'expander'
             {
-            match("global"); if (failed) return ;
+            match("expander"); if (failed) return ;
 
 
             }
@@ -281,10 +281,10 @@
             int charPosition = getCharPositionInLine();
             int channel = Token.DEFAULT_CHANNEL;
             if ( backtracking>0 && alreadyParsedRule(input, 8) ) { return ; }
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:13:7: ( 'function' )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:13:7: 'function'
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:13:7: ( 'global' )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:13:7: 'global'
             {
-            match("function"); if (failed) return ;
+            match("global"); if (failed) return ;
 
 
             }
@@ -308,8 +308,8 @@
             int charPosition = getCharPositionInLine();
             int channel = Token.DEFAULT_CHANNEL;
             if ( backtracking>0 && alreadyParsedRule(input, 9) ) { return ; }
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:14:7: ( '(' )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:14:7: '('
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:14:7: ( '(' )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:14:7: '('
             {
             match('('); if (failed) return ;
 
@@ -334,8 +334,8 @@
             int charPosition = getCharPositionInLine();
             int channel = Token.DEFAULT_CHANNEL;
             if ( backtracking>0 && alreadyParsedRule(input, 10) ) { return ; }
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:15:7: ( ',' )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:15:7: ','
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:15:7: ( ',' )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:15:7: ','
             {
             match(','); if (failed) return ;
 
@@ -360,8 +360,8 @@
             int charPosition = getCharPositionInLine();
             int channel = Token.DEFAULT_CHANNEL;
             if ( backtracking>0 && alreadyParsedRule(input, 11) ) { return ; }
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:16:7: ( ')' )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:16:7: ')'
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:16:7: ( ')' )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:16:7: ')'
             {
             match(')'); if (failed) return ;
 
@@ -386,8 +386,8 @@
             int charPosition = getCharPositionInLine();
             int channel = Token.DEFAULT_CHANNEL;
             if ( backtracking>0 && alreadyParsedRule(input, 12) ) { return ; }
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:17:7: ( '{' )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:17:7: '{'
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:17:7: ( '{' )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:17:7: '{'
             {
             match('{'); if (failed) return ;
 
@@ -412,8 +412,8 @@
             int charPosition = getCharPositionInLine();
             int channel = Token.DEFAULT_CHANNEL;
             if ( backtracking>0 && alreadyParsedRule(input, 13) ) { return ; }
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:18:7: ( '}' )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:18:7: '}'
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:18:7: ( '}' )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:18:7: '}'
             {
             match('}'); if (failed) return ;
 
@@ -438,8 +438,8 @@
             int charPosition = getCharPositionInLine();
             int channel = Token.DEFAULT_CHANNEL;
             if ( backtracking>0 && alreadyParsedRule(input, 14) ) { return ; }
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:19:7: ( 'query' )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:19:7: 'query'
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:19:7: ( 'query' )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:19:7: 'query'
             {
             match("query"); if (failed) return ;
 
@@ -465,8 +465,8 @@
             int charPosition = getCharPositionInLine();
             int channel = Token.DEFAULT_CHANNEL;
             if ( backtracking>0 && alreadyParsedRule(input, 15) ) { return ; }
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:20:7: ( 'end' )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:20:7: 'end'
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:20:7: ( 'end' )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:20:7: 'end'
             {
             match("end"); if (failed) return ;
 
@@ -492,8 +492,8 @@
             int charPosition = getCharPositionInLine();
             int channel = Token.DEFAULT_CHANNEL;
             if ( backtracking>0 && alreadyParsedRule(input, 16) ) { return ; }
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:21:7: ( 'template' )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:21:7: 'template'
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:21:7: ( 'template' )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:21:7: 'template'
             {
             match("template"); if (failed) return ;
 
@@ -519,8 +519,8 @@
             int charPosition = getCharPositionInLine();
             int channel = Token.DEFAULT_CHANNEL;
             if ( backtracking>0 && alreadyParsedRule(input, 17) ) { return ; }
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:22:7: ( 'rule' )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:22:7: 'rule'
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:22:7: ( 'rule' )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:22:7: 'rule'
             {
             match("rule"); if (failed) return ;
 
@@ -546,8 +546,8 @@
             int charPosition = getCharPositionInLine();
             int channel = Token.DEFAULT_CHANNEL;
             if ( backtracking>0 && alreadyParsedRule(input, 18) ) { return ; }
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:23:7: ( 'when' )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:23:7: 'when'
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:23:7: ( 'when' )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:23:7: 'when'
             {
             match("when"); if (failed) return ;
 
@@ -573,8 +573,8 @@
             int charPosition = getCharPositionInLine();
             int channel = Token.DEFAULT_CHANNEL;
             if ( backtracking>0 && alreadyParsedRule(input, 19) ) { return ; }
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:24:7: ( ':' )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:24:7: ':'
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:24:7: ( ':' )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:24:7: ':'
             {
             match(':'); if (failed) return ;
 
@@ -599,8 +599,8 @@
             int charPosition = getCharPositionInLine();
             int channel = Token.DEFAULT_CHANNEL;
             if ( backtracking>0 && alreadyParsedRule(input, 20) ) { return ; }
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:25:7: ( 'then' )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:25:7: 'then'
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:25:7: ( 'then' )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:25:7: 'then'
             {
             match("then"); if (failed) return ;
 
@@ -626,8 +626,8 @@
             int charPosition = getCharPositionInLine();
             int channel = Token.DEFAULT_CHANNEL;
             if ( backtracking>0 && alreadyParsedRule(input, 21) ) { return ; }
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:26:7: ( 'attributes' )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:26:7: 'attributes'
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:26:7: ( 'attributes' )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:26:7: 'attributes'
             {
             match("attributes"); if (failed) return ;
 
@@ -653,8 +653,8 @@
             int charPosition = getCharPositionInLine();
             int channel = Token.DEFAULT_CHANNEL;
             if ( backtracking>0 && alreadyParsedRule(input, 22) ) { return ; }
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:27:7: ( 'salience' )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:27:7: 'salience'
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:27:7: ( 'salience' )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:27:7: 'salience'
             {
             match("salience"); if (failed) return ;
 
@@ -680,8 +680,8 @@
             int charPosition = getCharPositionInLine();
             int channel = Token.DEFAULT_CHANNEL;
             if ( backtracking>0 && alreadyParsedRule(input, 23) ) { return ; }
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:28:7: ( 'no-loop' )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:28:7: 'no-loop'
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:28:7: ( 'no-loop' )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:28:7: 'no-loop'
             {
             match("no-loop"); if (failed) return ;
 
@@ -707,8 +707,8 @@
             int charPosition = getCharPositionInLine();
             int channel = Token.DEFAULT_CHANNEL;
             if ( backtracking>0 && alreadyParsedRule(input, 24) ) { return ; }
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:29:7: ( 'auto-focus' )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:29:7: 'auto-focus'
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:29:7: ( 'auto-focus' )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:29:7: 'auto-focus'
             {
             match("auto-focus"); if (failed) return ;
 
@@ -734,8 +734,8 @@
             int charPosition = getCharPositionInLine();
             int channel = Token.DEFAULT_CHANNEL;
             if ( backtracking>0 && alreadyParsedRule(input, 25) ) { return ; }
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:30:7: ( 'activation-group' )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:30:7: 'activation-group'
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:30:7: ( 'activation-group' )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:30:7: 'activation-group'
             {
             match("activation-group"); if (failed) return ;
 
@@ -761,8 +761,8 @@
             int charPosition = getCharPositionInLine();
             int channel = Token.DEFAULT_CHANNEL;
             if ( backtracking>0 && alreadyParsedRule(input, 26) ) { return ; }
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:31:7: ( 'agenda-group' )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:31:7: 'agenda-group'
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:31:7: ( 'agenda-group' )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:31:7: 'agenda-group'
             {
             match("agenda-group"); if (failed) return ;
 
@@ -788,8 +788,8 @@
             int charPosition = getCharPositionInLine();
             int channel = Token.DEFAULT_CHANNEL;
             if ( backtracking>0 && alreadyParsedRule(input, 27) ) { return ; }
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:32:7: ( 'duration' )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:32:7: 'duration'
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:32:7: ( 'duration' )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:32:7: 'duration'
             {
             match("duration"); if (failed) return ;
 
@@ -815,8 +815,8 @@
             int charPosition = getCharPositionInLine();
             int channel = Token.DEFAULT_CHANNEL;
             if ( backtracking>0 && alreadyParsedRule(input, 28) ) { return ; }
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:33:7: ( 'from' )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:33:7: 'from'
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:33:7: ( 'from' )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:33:7: 'from'
             {
             match("from"); if (failed) return ;
 
@@ -842,8 +842,8 @@
             int charPosition = getCharPositionInLine();
             int channel = Token.DEFAULT_CHANNEL;
             if ( backtracking>0 && alreadyParsedRule(input, 29) ) { return ; }
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:34:7: ( 'null' )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:34:7: 'null'
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:34:7: ( 'null' )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:34:7: 'null'
             {
             match("null"); if (failed) return ;
 
@@ -869,8 +869,8 @@
             int charPosition = getCharPositionInLine();
             int channel = Token.DEFAULT_CHANNEL;
             if ( backtracking>0 && alreadyParsedRule(input, 30) ) { return ; }
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:35:7: ( '=>' )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:35:7: '=>'
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:35:7: ( '=>' )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:35:7: '=>'
             {
             match("=>"); if (failed) return ;
 
@@ -896,8 +896,8 @@
             int charPosition = getCharPositionInLine();
             int channel = Token.DEFAULT_CHANNEL;
             if ( backtracking>0 && alreadyParsedRule(input, 31) ) { return ; }
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:36:7: ( 'or' )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:36:7: 'or'
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:36:7: ( 'or' )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:36:7: 'or'
             {
             match("or"); if (failed) return ;
 
@@ -923,8 +923,8 @@
             int charPosition = getCharPositionInLine();
             int channel = Token.DEFAULT_CHANNEL;
             if ( backtracking>0 && alreadyParsedRule(input, 32) ) { return ; }
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:37:7: ( '||' )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:37:7: '||'
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:37:7: ( '||' )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:37:7: '||'
             {
             match("||"); if (failed) return ;
 
@@ -950,8 +950,8 @@
             int charPosition = getCharPositionInLine();
             int channel = Token.DEFAULT_CHANNEL;
             if ( backtracking>0 && alreadyParsedRule(input, 33) ) { return ; }
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:38:7: ( '&' )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:38:7: '&'
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:38:7: ( '&' )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:38:7: '&'
             {
             match('&'); if (failed) return ;
 
@@ -976,8 +976,8 @@
             int charPosition = getCharPositionInLine();
             int channel = Token.DEFAULT_CHANNEL;
             if ( backtracking>0 && alreadyParsedRule(input, 34) ) { return ; }
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:39:7: ( '|' )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:39:7: '|'
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:39:7: ( '|' )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:39:7: '|'
             {
             match('|'); if (failed) return ;
 
@@ -1002,8 +1002,8 @@
             int charPosition = getCharPositionInLine();
             int channel = Token.DEFAULT_CHANNEL;
             if ( backtracking>0 && alreadyParsedRule(input, 35) ) { return ; }
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:40:7: ( '->' )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:40:7: '->'
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:40:7: ( '->' )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:40:7: '->'
             {
             match("->"); if (failed) return ;
 
@@ -1029,8 +1029,8 @@
             int charPosition = getCharPositionInLine();
             int channel = Token.DEFAULT_CHANNEL;
             if ( backtracking>0 && alreadyParsedRule(input, 36) ) { return ; }
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:41:7: ( 'and' )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:41:7: 'and'
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:41:7: ( 'and' )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:41:7: 'and'
             {
             match("and"); if (failed) return ;
 
@@ -1056,8 +1056,8 @@
             int charPosition = getCharPositionInLine();
             int channel = Token.DEFAULT_CHANNEL;
             if ( backtracking>0 && alreadyParsedRule(input, 37) ) { return ; }
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:42:7: ( '&&' )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:42:7: '&&'
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:42:7: ( '&&' )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:42:7: '&&'
             {
             match("&&"); if (failed) return ;
 
@@ -1083,8 +1083,8 @@
             int charPosition = getCharPositionInLine();
             int channel = Token.DEFAULT_CHANNEL;
             if ( backtracking>0 && alreadyParsedRule(input, 38) ) { return ; }
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:43:7: ( 'exists' )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:43:7: 'exists'
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:43:7: ( 'exists' )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:43:7: 'exists'
             {
             match("exists"); if (failed) return ;
 
@@ -1110,8 +1110,8 @@
             int charPosition = getCharPositionInLine();
             int channel = Token.DEFAULT_CHANNEL;
             if ( backtracking>0 && alreadyParsedRule(input, 39) ) { return ; }
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:44:7: ( 'not' )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:44:7: 'not'
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:44:7: ( 'not' )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:44:7: 'not'
             {
             match("not"); if (failed) return ;
 
@@ -1137,8 +1137,8 @@
             int charPosition = getCharPositionInLine();
             int channel = Token.DEFAULT_CHANNEL;
             if ( backtracking>0 && alreadyParsedRule(input, 40) ) { return ; }
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:45:7: ( 'eval' )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:45:7: 'eval'
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:45:7: ( 'eval' )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:45:7: 'eval'
             {
             match("eval"); if (failed) return ;
 
@@ -1164,8 +1164,8 @@
             int charPosition = getCharPositionInLine();
             int channel = Token.DEFAULT_CHANNEL;
             if ( backtracking>0 && alreadyParsedRule(input, 41) ) { return ; }
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:46:7: ( '[' )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:46:7: '['
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:46:7: ( '[' )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:46:7: '['
             {
             match('['); if (failed) return ;
 
@@ -1190,8 +1190,8 @@
             int charPosition = getCharPositionInLine();
             int channel = Token.DEFAULT_CHANNEL;
             if ( backtracking>0 && alreadyParsedRule(input, 42) ) { return ; }
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:47:7: ( ']' )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:47:7: ']'
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:47:7: ( ']' )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:47:7: ']'
             {
             match(']'); if (failed) return ;
 
@@ -1216,8 +1216,8 @@
             int charPosition = getCharPositionInLine();
             int channel = Token.DEFAULT_CHANNEL;
             if ( backtracking>0 && alreadyParsedRule(input, 43) ) { return ; }
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:48:7: ( 'use' )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:48:7: 'use'
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:48:7: ( 'use' )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:48:7: 'use'
             {
             match("use"); if (failed) return ;
 
@@ -1243,8 +1243,8 @@
             int charPosition = getCharPositionInLine();
             int channel = Token.DEFAULT_CHANNEL;
             if ( backtracking>0 && alreadyParsedRule(input, 44) ) { return ; }
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:49:7: ( '==' )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:49:7: '=='
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:49:7: ( '==' )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:49:7: '=='
             {
             match("=="); if (failed) return ;
 
@@ -1270,8 +1270,8 @@
             int charPosition = getCharPositionInLine();
             int channel = Token.DEFAULT_CHANNEL;
             if ( backtracking>0 && alreadyParsedRule(input, 45) ) { return ; }
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:50:7: ( '=' )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:50:7: '='
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:50:7: ( '=' )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:50:7: '='
             {
             match('='); if (failed) return ;
 
@@ -1296,8 +1296,8 @@
             int charPosition = getCharPositionInLine();
             int channel = Token.DEFAULT_CHANNEL;
             if ( backtracking>0 && alreadyParsedRule(input, 46) ) { return ; }
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:51:7: ( '>' )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:51:7: '>'
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:51:7: ( '>' )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:51:7: '>'
             {
             match('>'); if (failed) return ;
 
@@ -1322,8 +1322,8 @@
             int charPosition = getCharPositionInLine();
             int channel = Token.DEFAULT_CHANNEL;
             if ( backtracking>0 && alreadyParsedRule(input, 47) ) { return ; }
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:52:7: ( '>=' )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:52:7: '>='
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:52:7: ( '>=' )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:52:7: '>='
             {
             match(">="); if (failed) return ;
 
@@ -1349,8 +1349,8 @@
             int charPosition = getCharPositionInLine();
             int channel = Token.DEFAULT_CHANNEL;
             if ( backtracking>0 && alreadyParsedRule(input, 48) ) { return ; }
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:53:7: ( '<' )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:53:7: '<'
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:53:7: ( '<' )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:53:7: '<'
             {
             match('<'); if (failed) return ;
 
@@ -1375,8 +1375,8 @@
             int charPosition = getCharPositionInLine();
             int channel = Token.DEFAULT_CHANNEL;
             if ( backtracking>0 && alreadyParsedRule(input, 49) ) { return ; }
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:54:7: ( '<=' )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:54:7: '<='
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:54:7: ( '<=' )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:54:7: '<='
             {
             match("<="); if (failed) return ;
 
@@ -1402,8 +1402,8 @@
             int charPosition = getCharPositionInLine();
             int channel = Token.DEFAULT_CHANNEL;
             if ( backtracking>0 && alreadyParsedRule(input, 50) ) { return ; }
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:55:7: ( '!=' )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:55:7: '!='
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:55:7: ( '!=' )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:55:7: '!='
             {
             match("!="); if (failed) return ;
 
@@ -1429,8 +1429,8 @@
             int charPosition = getCharPositionInLine();
             int channel = Token.DEFAULT_CHANNEL;
             if ( backtracking>0 && alreadyParsedRule(input, 51) ) { return ; }
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:56:7: ( 'contains' )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:56:7: 'contains'
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:56:7: ( 'contains' )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:56:7: 'contains'
             {
             match("contains"); if (failed) return ;
 
@@ -1456,8 +1456,8 @@
             int charPosition = getCharPositionInLine();
             int channel = Token.DEFAULT_CHANNEL;
             if ( backtracking>0 && alreadyParsedRule(input, 52) ) { return ; }
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:57:7: ( 'matches' )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:57:7: 'matches'
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:57:7: ( 'matches' )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:57:7: 'matches'
             {
             match("matches"); if (failed) return ;
 
@@ -1483,8 +1483,8 @@
             int charPosition = getCharPositionInLine();
             int channel = Token.DEFAULT_CHANNEL;
             if ( backtracking>0 && alreadyParsedRule(input, 53) ) { return ; }
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:58:7: ( 'excludes' )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:58:7: 'excludes'
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:58:7: ( 'excludes' )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:58:7: 'excludes'
             {
             match("excludes"); if (failed) return ;
 
@@ -1510,7 +1510,7 @@
             int charPosition = getCharPositionInLine();
             int channel = Token.DEFAULT_CHANNEL;
             if ( backtracking>0 && alreadyParsedRule(input, 54) ) { return ; }
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1272:17: ( '!' | '@' | '$' | '%' | '^' | '&' | '*' | '_' | '-' | '+' | '?' | '|' | ',' | '{' | '}' | '[' | ']' | '=' | '/' | '(' | ')' | '\'' | '\\' | '||' | '&&' | '<<<' | '++' | '--' | '>>>' | '==' | '+=' | '=+' | '-=' | '=-' | '*=' | '=*' | '/=' | '=/' | '>>=' )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1282:17: ( '!' | '@' | '$' | '%' | '^' | '&' | '*' | '_' | '-' | '+' | '?' | '|' | ',' | '{' | '}' | '[' | ']' | '=' | '/' | '(' | ')' | '\'' | '\\' | '||' | '&&' | '<<<' | '++' | '--' | '>>>' | '==' | '+=' | '=+' | '-=' | '=-' | '*=' | '=*' | '/=' | '=/' | '>>=' )
             int alt1=39;
             switch ( input.LA(1) ) {
             case '!':
@@ -1654,7 +1654,7 @@
                     else {
                         if (backtracking>0) {failed=true; return ;}
                         NoViableAltException nvae =
-                            new NoViableAltException("1271:1: MISC : ( \'!\' | \'@\' | \'$\' | \'%\' | \'^\' | \'&\' | \'*\' | \'_\' | \'-\' | \'+\' | \'?\' | \'|\' | \',\' | \'{\' | \'}\' | \'[\' | \']\' | \'=\' | \'/\' | \'(\' | \')\' | \'\\\'\' | \'\\\\\' | \'||\' | \'&&\' | \'<<<\' | \'++\' | \'--\' | \'>>>\' | \'==\' | \'+=\' | \'=+\' | \'-=\' | \'=-\' | \'*=\' | \'=*\' | \'/=\' | \'=/\' | \'>>=\' );", 1, 46, input);
+                            new NoViableAltException("1281:1: MISC : ( \'!\' | \'@\' | \'$\' | \'%\' | \'^\' | \'&\' | \'*\' | \'_\' | \'-\' | \'+\' | \'?\' | \'|\' | \',\' | \'{\' | \'}\' | \'[\' | \']\' | \'=\' | \'/\' | \'(\' | \')\' | \'\\\'\' | \'\\\\\' | \'||\' | \'&&\' | \'<<<\' | \'++\' | \'--\' | \'>>>\' | \'==\' | \'+=\' | \'=+\' | \'-=\' | \'=-\' | \'*=\' | \'=*\' | \'/=\' | \'=/\' | \'>>=\' );", 1, 46, input);
 
                         throw nvae;
                     }
@@ -1662,7 +1662,7 @@
                 else {
                     if (backtracking>0) {failed=true; return ;}
                     NoViableAltException nvae =
-                        new NoViableAltException("1271:1: MISC : ( \'!\' | \'@\' | \'$\' | \'%\' | \'^\' | \'&\' | \'*\' | \'_\' | \'-\' | \'+\' | \'?\' | \'|\' | \',\' | \'{\' | \'}\' | \'[\' | \']\' | \'=\' | \'/\' | \'(\' | \')\' | \'\\\'\' | \'\\\\\' | \'||\' | \'&&\' | \'<<<\' | \'++\' | \'--\' | \'>>>\' | \'==\' | \'+=\' | \'=+\' | \'-=\' | \'=-\' | \'*=\' | \'=*\' | \'/=\' | \'=/\' | \'>>=\' );", 1, 25, input);
+                        new NoViableAltException("1281:1: MISC : ( \'!\' | \'@\' | \'$\' | \'%\' | \'^\' | \'&\' | \'*\' | \'_\' | \'-\' | \'+\' | \'?\' | \'|\' | \',\' | \'{\' | \'}\' | \'[\' | \']\' | \'=\' | \'/\' | \'(\' | \')\' | \'\\\'\' | \'\\\\\' | \'||\' | \'&&\' | \'<<<\' | \'++\' | \'--\' | \'>>>\' | \'==\' | \'+=\' | \'=+\' | \'-=\' | \'=-\' | \'*=\' | \'=*\' | \'/=\' | \'=/\' | \'>>=\' );", 1, 25, input);
 
                     throw nvae;
                 }
@@ -1670,175 +1670,175 @@
             default:
                 if (backtracking>0) {failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1271:1: MISC : ( \'!\' | \'@\' | \'$\' | \'%\' | \'^\' | \'&\' | \'*\' | \'_\' | \'-\' | \'+\' | \'?\' | \'|\' | \',\' | \'{\' | \'}\' | \'[\' | \']\' | \'=\' | \'/\' | \'(\' | \')\' | \'\\\'\' | \'\\\\\' | \'||\' | \'&&\' | \'<<<\' | \'++\' | \'--\' | \'>>>\' | \'==\' | \'+=\' | \'=+\' | \'-=\' | \'=-\' | \'*=\' | \'=*\' | \'/=\' | \'=/\' | \'>>=\' );", 1, 0, input);
+                    new NoViableAltException("1281:1: MISC : ( \'!\' | \'@\' | \'$\' | \'%\' | \'^\' | \'&\' | \'*\' | \'_\' | \'-\' | \'+\' | \'?\' | \'|\' | \',\' | \'{\' | \'}\' | \'[\' | \']\' | \'=\' | \'/\' | \'(\' | \')\' | \'\\\'\' | \'\\\\\' | \'||\' | \'&&\' | \'<<<\' | \'++\' | \'--\' | \'>>>\' | \'==\' | \'+=\' | \'=+\' | \'-=\' | \'=-\' | \'*=\' | \'=*\' | \'/=\' | \'=/\' | \'>>=\' );", 1, 0, input);
 
                 throw nvae;
             }
 
             switch (alt1) {
                 case 1 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1272:17: '!'
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1282:17: '!'
                     {
                     match('!'); if (failed) return ;
 
                     }
                     break;
                 case 2 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1272:23: '@'
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1282:23: '@'
                     {
                     match('@'); if (failed) return ;
 
                     }
                     break;
                 case 3 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1272:29: '$'
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1282:29: '$'
                     {
                     match('$'); if (failed) return ;
 
                     }
                     break;
                 case 4 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1272:35: '%'
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1282:35: '%'
                     {
                     match('%'); if (failed) return ;
 
                     }
                     break;
                 case 5 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1272:41: '^'
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1282:41: '^'
                     {
                     match('^'); if (failed) return ;
 
                     }
                     break;
                 case 6 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1272:47: '&'
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1282:47: '&'
                     {
                     match('&'); if (failed) return ;
 
                     }
                     break;
                 case 7 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1272:53: '*'
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1282:53: '*'
                     {
                     match('*'); if (failed) return ;
 
                     }
                     break;
                 case 8 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1272:59: '_'
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1282:59: '_'
                     {
                     match('_'); if (failed) return ;
 
                     }
                     break;
                 case 9 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1272:65: '-'
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1282:65: '-'
                     {
                     match('-'); if (failed) return ;
 
                     }
                     break;
                 case 10 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1272:71: '+'
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1282:71: '+'
                     {
                     match('+'); if (failed) return ;
 
                     }
                     break;
                 case 11 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1272:78: '?'
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1282:78: '?'
                     {
                     match('?'); if (failed) return ;
 
                     }
                     break;
                 case 12 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1273:19: '|'
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1283:19: '|'
                     {
                     match('|'); if (failed) return ;
 
                     }
                     break;
                 case 13 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1273:25: ','
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1283:25: ','
                     {
                     match(','); if (failed) return ;
 
                     }
                     break;
                 case 14 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1273:31: '{'
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1283:31: '{'
                     {
                     match('{'); if (failed) return ;
 
                     }
                     break;
                 case 15 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1273:37: '}'
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1283:37: '}'
                     {
                     match('}'); if (failed) return ;
 
                     }
                     break;
                 case 16 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1273:43: '['
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1283:43: '['
                     {
                     match('['); if (failed) return ;
 
                     }
                     break;
                 case 17 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1273:49: ']'
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1283:49: ']'
                     {
                     match(']'); if (failed) return ;
 
                     }
                     break;
                 case 18 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1273:55: '='
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1283:55: '='
                     {
                     match('='); if (failed) return ;
 
                     }
                     break;
                 case 19 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1273:61: '/'
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1283:61: '/'
                     {
                     match('/'); if (failed) return ;
 
                     }
                     break;
                 case 20 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1273:67: '('
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1283:67: '('
                     {
                     match('('); if (failed) return ;
 
                     }
                     break;
                 case 21 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1273:73: ')'
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1283:73: ')'
                     {
                     match(')'); if (failed) return ;
 
                     }
                     break;
                 case 22 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1273:79: '\''
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1283:79: '\''
                     {
                     match('\''); if (failed) return ;
 
                     }
                     break;
                 case 23 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1273:86: '\\'
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1283:86: '\\'
                     {
                     match('\\'); if (failed) return ;
 
                     }
                     break;
                 case 24 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1274:19: '||'
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1284:19: '||'
                     {
                     match("||"); if (failed) return ;
 
@@ -1846,7 +1846,7 @@
                     }
                     break;
                 case 25 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1274:26: '&&'
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1284:26: '&&'
                     {
                     match("&&"); if (failed) return ;
 
@@ -1854,7 +1854,7 @@
                     }
                     break;
                 case 26 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1274:33: '<<<'
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1284:33: '<<<'
                     {
                     match("<<<"); if (failed) return ;
 
@@ -1862,7 +1862,7 @@
                     }
                     break;
                 case 27 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1274:41: '++'
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1284:41: '++'
                     {
                     match("++"); if (failed) return ;
 
@@ -1870,7 +1870,7 @@
                     }
                     break;
                 case 28 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1274:48: '--'
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1284:48: '--'
                     {
                     match("--"); if (failed) return ;
 
@@ -1878,7 +1878,7 @@
                     }
                     break;
                 case 29 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1274:55: '>>>'
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1284:55: '>>>'
                     {
                     match(">>>"); if (failed) return ;
 
@@ -1886,7 +1886,7 @@
                     }
                     break;
                 case 30 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1274:63: '=='
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1284:63: '=='
                     {
                     match("=="); if (failed) return ;
 
@@ -1894,7 +1894,7 @@
                     }
                     break;
                 case 31 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1274:70: '+='
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1284:70: '+='
                     {
                     match("+="); if (failed) return ;
 
@@ -1902,7 +1902,7 @@
                     }
                     break;
                 case 32 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1274:77: '=+'
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1284:77: '=+'
                     {
                     match("=+"); if (failed) return ;
 
@@ -1910,7 +1910,7 @@
                     }
                     break;
                 case 33 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1274:84: '-='
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1284:84: '-='
                     {
                     match("-="); if (failed) return ;
 
@@ -1918,7 +1918,7 @@
                     }
                     break;
                 case 34 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1274:91: '=-'
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1284:91: '=-'
                     {
                     match("=-"); if (failed) return ;
 
@@ -1926,7 +1926,7 @@
                     }
                     break;
                 case 35 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1274:97: '*='
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1284:97: '*='
                     {
                     match("*="); if (failed) return ;
 
@@ -1934,7 +1934,7 @@
                     }
                     break;
                 case 36 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1274:104: '=*'
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1284:104: '=*'
                     {
                     match("=*"); if (failed) return ;
 
@@ -1942,7 +1942,7 @@
                     }
                     break;
                 case 37 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1275:19: '/='
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1285:19: '/='
                     {
                     match("/="); if (failed) return ;
 
@@ -1950,7 +1950,7 @@
                     }
                     break;
                 case 38 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1275:26: '=/'
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1285:26: '=/'
                     {
                     match("=/"); if (failed) return ;
 
@@ -1958,7 +1958,7 @@
                     }
                     break;
                 case 39 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1275:33: '>>='
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1285:33: '>>='
                     {
                     match(">>="); if (failed) return ;
 
@@ -1986,8 +1986,8 @@
             int charPosition = getCharPositionInLine();
             int channel = Token.DEFAULT_CHANNEL;
             if ( backtracking>0 && alreadyParsedRule(input, 55) ) { return ; }
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1279:17: ( (' '|'\t'|'\f'))
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1279:17: (' '|'\t'|'\f')
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1289:17: ( (' '|'\t'|'\f'))
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1289:17: (' '|'\t'|'\f')
             {
             if ( input.LA(1)=='\t'||input.LA(1)=='\f'||input.LA(1)==' ' ) {
                 input.consume();
@@ -2025,10 +2025,10 @@
             int charPosition = getCharPositionInLine();
             int channel = Token.DEFAULT_CHANNEL;
             if ( backtracking>0 && alreadyParsedRule(input, 56) ) { return ; }
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1287:17: ( ( ( '\r\n' )=> '\r\n' | '\r' | '\n' ) )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1287:17: ( ( '\r\n' )=> '\r\n' | '\r' | '\n' )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1297:17: ( ( ( '\r\n' )=> '\r\n' | '\r' | '\n' ) )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1297:17: ( ( '\r\n' )=> '\r\n' | '\r' | '\n' )
             {
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1287:17: ( ( '\r\n' )=> '\r\n' | '\r' | '\n' )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1297:17: ( ( '\r\n' )=> '\r\n' | '\r' | '\n' )
             int alt2=3;
             int LA2_0 = input.LA(1);
             if ( LA2_0=='\r' ) {
@@ -2045,13 +2045,13 @@
             else {
                 if (backtracking>0) {failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1287:17: ( ( \'\\r\\n\' )=> \'\\r\\n\' | \'\\r\' | \'\\n\' )", 2, 0, input);
+                    new NoViableAltException("1297:17: ( ( \'\\r\\n\' )=> \'\\r\\n\' | \'\\r\' | \'\\n\' )", 2, 0, input);
 
                 throw nvae;
             }
             switch (alt2) {
                 case 1 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1287:25: ( '\r\n' )=> '\r\n'
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1297:25: ( '\r\n' )=> '\r\n'
                     {
 
                     match("\r\n"); if (failed) return ;
@@ -2060,14 +2060,14 @@
                     }
                     break;
                 case 2 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1288:25: '\r'
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1298:25: '\r'
                     {
                     match('\r'); if (failed) return ;
 
                     }
                     break;
                 case 3 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1289:25: '\n'
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1299:25: '\n'
                     {
                     match('\n'); if (failed) return ;
 
@@ -2098,10 +2098,10 @@
             int charPosition = getCharPositionInLine();
             int channel = Token.DEFAULT_CHANNEL;
             if ( backtracking>0 && alreadyParsedRule(input, 57) ) { return ; }
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1294:17: ( ( '-' )? ( '0' .. '9' )+ )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1294:17: ( '-' )? ( '0' .. '9' )+
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1304:17: ( ( '-' )? ( '0' .. '9' )+ )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1304:17: ( '-' )? ( '0' .. '9' )+
             {
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1294:17: ( '-' )?
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1304:17: ( '-' )?
             int alt3=2;
             int LA3_0 = input.LA(1);
             if ( LA3_0=='-' ) {
@@ -2113,13 +2113,13 @@
             else {
                 if (backtracking>0) {failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1294:17: ( \'-\' )?", 3, 0, input);
+                    new NoViableAltException("1304:17: ( \'-\' )?", 3, 0, input);
 
                 throw nvae;
             }
             switch (alt3) {
                 case 1 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1294:18: '-'
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1304:18: '-'
                     {
                     match('-'); if (failed) return ;
 
@@ -2128,7 +2128,7 @@
 
             }
 
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1294:23: ( '0' .. '9' )+
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1304:23: ( '0' .. '9' )+
             int cnt4=0;
             loop4:
             do {
@@ -2141,7 +2141,7 @@
 
                 switch (alt4) {
             	case 1 :
-            	    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1294:24: '0' .. '9'
+            	    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1304:24: '0' .. '9'
             	    {
             	    matchRange('0','9'); if (failed) return ;
 
@@ -2180,10 +2180,10 @@
             int charPosition = getCharPositionInLine();
             int channel = Token.DEFAULT_CHANNEL;
             if ( backtracking>0 && alreadyParsedRule(input, 58) ) { return ; }
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1298:17: ( ( '-' )? ( '0' .. '9' )+ '.' ( '0' .. '9' )+ )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1298:17: ( '-' )? ( '0' .. '9' )+ '.' ( '0' .. '9' )+
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1308:17: ( ( '-' )? ( '0' .. '9' )+ '.' ( '0' .. '9' )+ )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1308:17: ( '-' )? ( '0' .. '9' )+ '.' ( '0' .. '9' )+
             {
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1298:17: ( '-' )?
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1308:17: ( '-' )?
             int alt5=2;
             int LA5_0 = input.LA(1);
             if ( LA5_0=='-' ) {
@@ -2195,13 +2195,13 @@
             else {
                 if (backtracking>0) {failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1298:17: ( \'-\' )?", 5, 0, input);
+                    new NoViableAltException("1308:17: ( \'-\' )?", 5, 0, input);
 
                 throw nvae;
             }
             switch (alt5) {
                 case 1 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1298:18: '-'
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1308:18: '-'
                     {
                     match('-'); if (failed) return ;
 
@@ -2210,7 +2210,7 @@
 
             }
 
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1298:23: ( '0' .. '9' )+
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1308:23: ( '0' .. '9' )+
             int cnt6=0;
             loop6:
             do {
@@ -2223,7 +2223,7 @@
 
                 switch (alt6) {
             	case 1 :
-            	    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1298:24: '0' .. '9'
+            	    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1308:24: '0' .. '9'
             	    {
             	    matchRange('0','9'); if (failed) return ;
 
@@ -2241,7 +2241,7 @@
             } while (true);
 
             match('.'); if (failed) return ;
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1298:39: ( '0' .. '9' )+
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1308:39: ( '0' .. '9' )+
             int cnt7=0;
             loop7:
             do {
@@ -2254,7 +2254,7 @@
 
                 switch (alt7) {
             	case 1 :
-            	    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1298:40: '0' .. '9'
+            	    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1308:40: '0' .. '9'
             	    {
             	    matchRange('0','9'); if (failed) return ;
 
@@ -2293,7 +2293,7 @@
             int charPosition = getCharPositionInLine();
             int channel = Token.DEFAULT_CHANNEL;
             if ( backtracking>0 && alreadyParsedRule(input, 59) ) { return ; }
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1302:17: ( ( '"' ( options {greedy=false; } : . )* '"' ) | ( '\'' ( options {greedy=false; } : . )* '\'' ) )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1312:17: ( ( '"' ( options {greedy=false; } : . )* '"' ) | ( '\'' ( options {greedy=false; } : . )* '\'' ) )
             int alt10=2;
             int LA10_0 = input.LA(1);
             if ( LA10_0=='"' ) {
@@ -2305,19 +2305,19 @@
             else {
                 if (backtracking>0) {failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1301:1: STRING : ( ( \'\"\' ( options {greedy=false; } : . )* \'\"\' ) | ( \'\\\'\' ( options {greedy=false; } : . )* \'\\\'\' ) );", 10, 0, input);
+                    new NoViableAltException("1311:1: STRING : ( ( \'\"\' ( options {greedy=false; } : . )* \'\"\' ) | ( \'\\\'\' ( options {greedy=false; } : . )* \'\\\'\' ) );", 10, 0, input);
 
                 throw nvae;
             }
             switch (alt10) {
                 case 1 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1302:17: ( '"' ( options {greedy=false; } : . )* '"' )
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1312:17: ( '"' ( options {greedy=false; } : . )* '"' )
                     {
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1302:17: ( '"' ( options {greedy=false; } : . )* '"' )
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1302:18: '"' ( options {greedy=false; } : . )* '"'
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1312:17: ( '"' ( options {greedy=false; } : . )* '"' )
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1312:18: '"' ( options {greedy=false; } : . )* '"'
                     {
                     match('"'); if (failed) return ;
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1302:22: ( options {greedy=false; } : . )*
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1312:22: ( options {greedy=false; } : . )*
                     loop8:
                     do {
                         int alt8=2;
@@ -2332,7 +2332,7 @@
 
                         switch (alt8) {
                     	case 1 :
-                    	    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1302:49: .
+                    	    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1312:49: .
                     	    {
                     	    matchAny(); if (failed) return ;
 
@@ -2352,13 +2352,13 @@
                     }
                     break;
                 case 2 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1302:61: ( '\'' ( options {greedy=false; } : . )* '\'' )
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1312:61: ( '\'' ( options {greedy=false; } : . )* '\'' )
                     {
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1302:61: ( '\'' ( options {greedy=false; } : . )* '\'' )
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1302:62: '\'' ( options {greedy=false; } : . )* '\''
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1312:61: ( '\'' ( options {greedy=false; } : . )* '\'' )
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1312:62: '\'' ( options {greedy=false; } : . )* '\''
                     {
                     match('\''); if (failed) return ;
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1302:67: ( options {greedy=false; } : . )*
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1312:67: ( options {greedy=false; } : . )*
                     loop9:
                     do {
                         int alt9=2;
@@ -2373,7 +2373,7 @@
 
                         switch (alt9) {
                     	case 1 :
-                    	    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1302:94: .
+                    	    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1312:94: .
                     	    {
                     	    matchAny(); if (failed) return ;
 
@@ -2413,10 +2413,10 @@
             int charPosition = getCharPositionInLine();
             int channel = Token.DEFAULT_CHANNEL;
             if ( backtracking>0 && alreadyParsedRule(input, 60) ) { return ; }
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1306:17: ( ( 'true' | 'false' ) )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1306:17: ( 'true' | 'false' )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1316:17: ( ( 'true' | 'false' ) )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1316:17: ( 'true' | 'false' )
             {
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1306:17: ( 'true' | 'false' )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1316:17: ( 'true' | 'false' )
             int alt11=2;
             int LA11_0 = input.LA(1);
             if ( LA11_0=='t' ) {
@@ -2428,13 +2428,13 @@
             else {
                 if (backtracking>0) {failed=true; return ;}
                 NoViableAltException nvae =
-                    new NoViableAltException("1306:17: ( \'true\' | \'false\' )", 11, 0, input);
+                    new NoViableAltException("1316:17: ( \'true\' | \'false\' )", 11, 0, input);
 
                 throw nvae;
             }
             switch (alt11) {
                 case 1 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1306:18: 'true'
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1316:18: 'true'
                     {
                     match("true"); if (failed) return ;
 
@@ -2442,7 +2442,7 @@
                     }
                     break;
                 case 2 :
-                    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1306:25: 'false'
+                    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1316:25: 'false'
                     {
                     match("false"); if (failed) return ;
 
@@ -2474,8 +2474,8 @@
             int charPosition = getCharPositionInLine();
             int channel = Token.DEFAULT_CHANNEL;
             if ( backtracking>0 && alreadyParsedRule(input, 61) ) { return ; }
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1310:17: ( ('a'..'z'|'A'..'Z'|'_'|'$'|'\u00c0'..'\u00ff') ( ('a'..'z'|'A'..'Z'|'_'|'0'..'9'|'\u00c0'..'\u00ff'))* )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1310:17: ('a'..'z'|'A'..'Z'|'_'|'$'|'\u00c0'..'\u00ff') ( ('a'..'z'|'A'..'Z'|'_'|'0'..'9'|'\u00c0'..'\u00ff'))*
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1320:17: ( ('a'..'z'|'A'..'Z'|'_'|'$'|'\u00c0'..'\u00ff') ( ('a'..'z'|'A'..'Z'|'_'|'0'..'9'|'\u00c0'..'\u00ff'))* )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1320:17: ('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();
@@ -2488,7 +2488,7 @@
                 recover(mse);    throw mse;
             }
 
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1310:65: ( ('a'..'z'|'A'..'Z'|'_'|'0'..'9'|'\u00c0'..'\u00ff'))*
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1320:65: ( ('a'..'z'|'A'..'Z'|'_'|'0'..'9'|'\u00c0'..'\u00ff'))*
             loop12:
             do {
                 int alt12=2;
@@ -2500,7 +2500,7 @@
 
                 switch (alt12) {
             	case 1 :
-            	    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1310:66: ('a'..'z'|'A'..'Z'|'_'|'0'..'9'|'\u00c0'..'\u00ff')
+            	    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1320:66: ('a'..'z'|'A'..'Z'|'_'|'0'..'9'|'\u00c0'..'\u00ff')
             	    {
             	    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();
@@ -2544,11 +2544,11 @@
             int charPosition = getCharPositionInLine();
             int channel = Token.DEFAULT_CHANNEL;
             if ( backtracking>0 && alreadyParsedRule(input, 62) ) { return ; }
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1316:17: ( '#' ( options {greedy=false; } : . )* EOL )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1316:17: '#' ( options {greedy=false; } : . )* EOL
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1326:17: ( '#' ( options {greedy=false; } : . )* EOL )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1326:17: '#' ( options {greedy=false; } : . )* EOL
             {
             match('#'); if (failed) return ;
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1316:21: ( options {greedy=false; } : . )*
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1326:21: ( options {greedy=false; } : . )*
             loop13:
             do {
                 int alt13=2;
@@ -2566,7 +2566,7 @@
 
                 switch (alt13) {
             	case 1 :
-            	    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1316:48: .
+            	    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1326:48: .
             	    {
             	    matchAny(); if (failed) return ;
 
@@ -2604,12 +2604,12 @@
             int charPosition = getCharPositionInLine();
             int channel = Token.DEFAULT_CHANNEL;
             if ( backtracking>0 && alreadyParsedRule(input, 63) ) { return ; }
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1322:17: ( '//' ( options {greedy=false; } : . )* EOL )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1322:17: '//' ( options {greedy=false; } : . )* EOL
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1332:17: ( '//' ( options {greedy=false; } : . )* EOL )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1332:17: '//' ( options {greedy=false; } : . )* EOL
             {
             match("//"); if (failed) return ;
 
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1322:22: ( options {greedy=false; } : . )*
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1332:22: ( options {greedy=false; } : . )*
             loop14:
             do {
                 int alt14=2;
@@ -2627,7 +2627,7 @@
 
                 switch (alt14) {
             	case 1 :
-            	    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1322:49: .
+            	    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1332:49: .
             	    {
             	    matchAny(); if (failed) return ;
 
@@ -2665,12 +2665,12 @@
             int charPosition = getCharPositionInLine();
             int channel = Token.DEFAULT_CHANNEL;
             if ( backtracking>0 && alreadyParsedRule(input, 64) ) { return ; }
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1327:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1327:17: '/*' ( options {greedy=false; } : . )* '*/'
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1337:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1337:17: '/*' ( options {greedy=false; } : . )* '*/'
             {
             match("/*"); if (failed) return ;
 
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1327:22: ( options {greedy=false; } : . )*
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1337:22: ( options {greedy=false; } : . )*
             loop15:
             do {
                 int alt15=2;
@@ -2693,7 +2693,7 @@
 
                 switch (alt15) {
             	case 1 :
-            	    // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1327:48: .
+            	    // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1337:48: .
             	    {
             	    matchAny(); if (failed) return ;
 
@@ -2722,453 +2722,453 @@
     // $ANTLR end MULTI_LINE_COMMENT
 
     public void mTokens() throws RecognitionException {
-        // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1:10: ( T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | T30 | T31 | T32 | T33 | T34 | T35 | T36 | T37 | T38 | T39 | T40 | T41 | T42 | T43 | T44 | T45 | T46 | T47 | T48 | T49 | T50 | T51 | T52 | T53 | T54 | T55 | T56 | T57 | T58 | T59 | T60 | T61 | T62 | T63 | T64 | T65 | T66 | T67 | MISC | WS | EOL | INT | FLOAT | STRING | BOOL | ID | SH_STYLE_SINGLE_LINE_COMMENT | C_STYLE_SINGLE_LINE_COMMENT | MULTI_LINE_COMMENT )
+        // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1:10: ( T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | T30 | T31 | T32 | T33 | T34 | T35 | T36 | T37 | T38 | T39 | T40 | T41 | T42 | T43 | T44 | T45 | T46 | T47 | T48 | T49 | T50 | T51 | T52 | T53 | T54 | T55 | T56 | T57 | T58 | T59 | T60 | T61 | T62 | T63 | T64 | T65 | T66 | T67 | MISC | WS | EOL | INT | FLOAT | STRING | BOOL | ID | SH_STYLE_SINGLE_LINE_COMMENT | C_STYLE_SINGLE_LINE_COMMENT | MULTI_LINE_COMMENT )
         int alt16=64;
         alt16 = dfa16.predict(input); if (failed) return ;
         switch (alt16) {
             case 1 :
-                // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1:10: T15
+                // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1:10: T15
                 {
                 mT15(); if (failed) return ;
 
                 }
                 break;
             case 2 :
-                // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1:14: T16
+                // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1:14: T16
                 {
                 mT16(); if (failed) return ;
 
                 }
                 break;
             case 3 :
-                // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1:18: T17
+                // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1:18: T17
                 {
                 mT17(); if (failed) return ;
 
                 }
                 break;
             case 4 :
-                // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1:22: T18
+                // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1:22: T18
                 {
                 mT18(); if (failed) return ;
 
                 }
                 break;
             case 5 :
-                // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1:26: T19
+                // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1:26: T19
                 {
                 mT19(); if (failed) return ;
 
                 }
                 break;
             case 6 :
-                // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1:30: T20
+                // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1:30: T20
                 {
                 mT20(); if (failed) return ;
 
                 }
                 break;
             case 7 :
-                // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1:34: T21
+                // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1:34: T21
                 {
                 mT21(); if (failed) return ;
 
                 }
                 break;
             case 8 :
-                // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1:38: T22
+                // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1:38: T22
                 {
                 mT22(); if (failed) return ;
 
                 }
                 break;
             case 9 :
-                // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1:42: T23
+                // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1:42: T23
                 {
                 mT23(); if (failed) return ;
 
                 }
                 break;
             case 10 :
-                // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1:46: T24
+                // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1:46: T24
                 {
                 mT24(); if (failed) return ;
 
                 }
                 break;
             case 11 :
-                // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1:50: T25
+                // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1:50: T25
                 {
                 mT25(); if (failed) return ;
 
                 }
                 break;
             case 12 :
-                // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1:54: T26
+                // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1:54: T26
                 {
                 mT26(); if (failed) return ;
 
                 }
                 break;
             case 13 :
-                // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1:58: T27
+                // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1:58: T27
                 {
                 mT27(); if (failed) return ;
 
                 }
                 break;
             case 14 :
-                // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1:62: T28
+                // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1:62: T28
                 {
                 mT28(); if (failed) return ;
 
                 }
                 break;
             case 15 :
-                // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1:66: T29
+                // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1:66: T29
                 {
                 mT29(); if (failed) return ;
 
                 }
                 break;
             case 16 :
-                // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1:70: T30
+                // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1:70: T30
                 {
                 mT30(); if (failed) return ;
 
                 }
                 break;
             case 17 :
-                // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1:74: T31
+                // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1:74: T31
                 {
                 mT31(); if (failed) return ;
 
                 }
                 break;
             case 18 :
-                // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1:78: T32
+                // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1:78: T32
                 {
                 mT32(); if (failed) return ;
 
                 }
                 break;
             case 19 :
-                // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1:82: T33
+                // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1:82: T33
                 {
                 mT33(); if (failed) return ;
 
                 }
                 break;
             case 20 :
-                // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1:86: T34
+                // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1:86: T34
                 {
                 mT34(); if (failed) return ;
 
                 }
                 break;
             case 21 :
-                // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1:90: T35
+                // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1:90: T35
                 {
                 mT35(); if (failed) return ;
 
                 }
                 break;
             case 22 :
-                // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1:94: T36
+                // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1:94: T36
                 {
                 mT36(); if (failed) return ;
 
                 }
                 break;
             case 23 :
-                // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1:98: T37
+                // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1:98: T37
                 {
                 mT37(); if (failed) return ;
 
                 }
                 break;
             case 24 :
-                // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1:102: T38
+                // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1:102: T38
                 {
                 mT38(); if (failed) return ;
 
                 }
                 break;
             case 25 :
-                // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1:106: T39
+                // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1:106: T39
                 {
                 mT39(); if (failed) return ;
 
                 }
                 break;
             case 26 :
-                // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1:110: T40
+                // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1:110: T40
                 {
                 mT40(); if (failed) return ;
 
                 }
                 break;
             case 27 :
-                // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1:114: T41
+                // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1:114: T41
                 {
                 mT41(); if (failed) return ;
 
                 }
                 break;
             case 28 :
-                // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1:118: T42
+                // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1:118: T42
                 {
                 mT42(); if (failed) return ;
 
                 }
                 break;
             case 29 :
-                // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1:122: T43
+                // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1:122: T43
                 {
                 mT43(); if (failed) return ;
 
                 }
                 break;
             case 30 :
-                // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1:126: T44
+                // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1:126: T44
                 {
                 mT44(); if (failed) return ;
 
                 }
                 break;
             case 31 :
-                // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1:130: T45
+                // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1:130: T45
                 {
                 mT45(); if (failed) return ;
 
                 }
                 break;
             case 32 :
-                // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1:134: T46
+                // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1:134: T46
                 {
                 mT46(); if (failed) return ;
 
                 }
                 break;
             case 33 :
-                // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1:138: T47
+                // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1:138: T47
                 {
                 mT47(); if (failed) return ;
 
                 }
                 break;
             case 34 :
-                // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1:142: T48
+                // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1:142: T48
                 {
                 mT48(); if (failed) return ;
 
                 }
                 break;
             case 35 :
-                // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1:146: T49
+                // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1:146: T49
                 {
                 mT49(); if (failed) return ;
 
                 }
                 break;
             case 36 :
-                // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1:150: T50
+                // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1:150: T50
                 {
                 mT50(); if (failed) return ;
 
                 }
                 break;
             case 37 :
-                // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1:154: T51
+                // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1:154: T51
                 {
                 mT51(); if (failed) return ;
 
                 }
                 break;
             case 38 :
-                // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1:158: T52
+                // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1:158: T52
                 {
                 mT52(); if (failed) return ;
 
                 }
                 break;
             case 39 :
-                // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1:162: T53
+                // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1:162: T53
                 {
                 mT53(); if (failed) return ;
 
                 }
                 break;
             case 40 :
-                // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1:166: T54
+                // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1:166: T54
                 {
                 mT54(); if (failed) return ;
 
                 }
                 break;
             case 41 :
-                // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1:170: T55
+                // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1:170: T55
                 {
                 mT55(); if (failed) return ;
 
                 }
                 break;
             case 42 :
-                // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1:174: T56
+                // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1:174: T56
                 {
                 mT56(); if (failed) return ;
 
                 }
                 break;
             case 43 :
-                // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1:178: T57
+                // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1:178: T57
                 {
                 mT57(); if (failed) return ;
 
                 }
                 break;
             case 44 :
-                // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1:182: T58
+                // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1:182: T58
                 {
                 mT58(); if (failed) return ;
 
                 }
                 break;
             case 45 :
-                // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1:186: T59
+                // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1:186: T59
                 {
                 mT59(); if (failed) return ;
 
                 }
                 break;
             case 46 :
-                // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1:190: T60
+                // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1:190: T60
                 {
                 mT60(); if (failed) return ;
 
                 }
                 break;
             case 47 :
-                // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1:194: T61
+                // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1:194: T61
                 {
                 mT61(); if (failed) return ;
 
                 }
                 break;
             case 48 :
-                // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1:198: T62
+                // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1:198: T62
                 {
                 mT62(); if (failed) return ;
 
                 }
                 break;
             case 49 :
-                // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1:202: T63
+                // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1:202: T63
                 {
                 mT63(); if (failed) return ;
 
                 }
                 break;
             case 50 :
-                // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1:206: T64
+                // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1:206: T64
                 {
                 mT64(); if (failed) return ;
 
                 }
                 break;
             case 51 :
-                // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1:210: T65
+                // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1:210: T65
                 {
                 mT65(); if (failed) return ;
 
                 }
                 break;
             case 52 :
-                // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1:214: T66
+                // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1:214: T66
                 {
                 mT66(); if (failed) return ;
 
                 }
                 break;
             case 53 :
-                // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1:218: T67
+                // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1:218: T67
                 {
                 mT67(); if (failed) return ;
 
                 }
                 break;
             case 54 :
-                // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1:222: MISC
+                // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1:222: MISC
                 {
                 mMISC(); if (failed) return ;
 
                 }
                 break;
             case 55 :
-                // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1:227: WS
+                // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1:227: WS
                 {
                 mWS(); if (failed) return ;
 
                 }
                 break;
             case 56 :
-                // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1:230: EOL
+                // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1:230: EOL
                 {
                 mEOL(); if (failed) return ;
 
                 }
                 break;
             case 57 :
-                // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1:234: INT
+                // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1:234: INT
                 {
                 mINT(); if (failed) return ;
 
                 }
                 break;
             case 58 :
-                // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1:238: FLOAT
+                // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1:238: FLOAT
                 {
                 mFLOAT(); if (failed) return ;
 
                 }
                 break;
             case 59 :
-                // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1:244: STRING
+                // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1:244: STRING
                 {
                 mSTRING(); if (failed) return ;
 
                 }
                 break;
             case 60 :
-                // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1:251: BOOL
+                // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1:251: BOOL
                 {
                 mBOOL(); if (failed) return ;
 
                 }
                 break;
             case 61 :
-                // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1:256: ID
+                // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1:256: ID
                 {
                 mID(); if (failed) return ;
 
                 }
                 break;
             case 62 :
-                // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1:259: SH_STYLE_SINGLE_LINE_COMMENT
+                // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1:259: SH_STYLE_SINGLE_LINE_COMMENT
                 {
                 mSH_STYLE_SINGLE_LINE_COMMENT(); if (failed) return ;
 
                 }
                 break;
             case 63 :
-                // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1:288: C_STYLE_SINGLE_LINE_COMMENT
+                // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1:288: C_STYLE_SINGLE_LINE_COMMENT
                 {
                 mC_STYLE_SINGLE_LINE_COMMENT(); if (failed) return ;
 
                 }
                 break;
             case 64 :
-                // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1:316: MULTI_LINE_COMMENT
+                // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1:316: MULTI_LINE_COMMENT
                 {
                 mMULTI_LINE_COMMENT(); if (failed) return ;
 
@@ -3185,8 +3185,8 @@
         int Synpred1_fragment_StartIndex = input.index();
         try {
             if ( backtracking>0 && alreadyParsedRule(input, 66) ) { return ; }
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1287:25: ( '\r\n' )
-            // D:\dev\drools-3.1\drools-compiler\src\main\resources\org\drools\lang\drl2.g:1287:27: '\r\n'
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1297:25: ( '\r\n' )
+            // /home/michael/projects/jboss-rules/drools-compiler/src/main/resources/org/drools/lang/drl.g:1297:27: '\r\n'
             {
             match("\r\n"); if (failed) return ;
 
@@ -3319,103 +3319,93 @@
 
             }
         };
-        DFA.State s59 = new DFA.State() {{alt=5;}};
-        DFA.State s60 = new DFA.State() {{alt=4;}};
-        DFA.State s4 = new DFA.State() {
+        DFA.State s365 = new DFA.State() {{alt=60;}};
+        DFA.State s340 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
-                int LA16_4 = input.LA(1);
-                if ( LA16_4=='*' ) {return s59;}
-                return s60;
+                int LA16_340 = input.LA(1);
+                if ( (LA16_340>='0' && LA16_340<='9')||(LA16_340>='A' && LA16_340<='Z')||LA16_340=='_'||(LA16_340>='a' && LA16_340<='z')||(LA16_340>='\u00C0' && LA16_340<='\u00FF') ) {return s51;}
+                return s365;
 
             }
         };
-        DFA.State s340 = new DFA.State() {{alt=40;}};
         DFA.State s257 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
                 int LA16_257 = input.LA(1);
-                if ( (LA16_257>='0' && LA16_257<='9')||(LA16_257>='A' && LA16_257<='Z')||LA16_257=='_'||(LA16_257>='a' && LA16_257<='z')||(LA16_257>='\u00C0' && LA16_257<='\u00FF') ) {return s51;}
-                return s340;
+                if ( LA16_257=='e' ) {return s340;}
+                return s51;
 
             }
         };
         DFA.State s168 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
                 int LA16_168 = input.LA(1);
-                if ( LA16_168=='l' ) {return s257;}
+                if ( LA16_168=='s' ) {return s257;}
                 return s51;
 
             }
         };
-        DFA.State s61 = new DFA.State() {
+        DFA.State s59 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
-                int LA16_61 = input.LA(1);
-                if ( LA16_61=='a' ) {return s168;}
+                int LA16_59 = input.LA(1);
+                if ( LA16_59=='l' ) {return s168;}
                 return s51;
 
             }
         };
-        DFA.State s524 = new DFA.State() {{alt=6;}};
-        DFA.State s495 = new DFA.State() {
+        DFA.State s343 = new DFA.State() {{alt=28;}};
+        DFA.State s260 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
-                int LA16_495 = input.LA(1);
-                if ( (LA16_495>='0' && LA16_495<='9')||(LA16_495>='A' && LA16_495<='Z')||LA16_495=='_'||(LA16_495>='a' && LA16_495<='z')||(LA16_495>='\u00C0' && LA16_495<='\u00FF') ) {return s51;}
-                return s524;
+                int LA16_260 = input.LA(1);
+                if ( (LA16_260>='0' && LA16_260<='9')||(LA16_260>='A' && LA16_260<='Z')||LA16_260=='_'||(LA16_260>='a' && LA16_260<='z')||(LA16_260>='\u00C0' && LA16_260<='\u00FF') ) {return s51;}
+                return s343;
 
             }
         };
-        DFA.State s456 = new DFA.State() {
+        DFA.State s171 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
-                int LA16_456 = input.LA(1);
-                if ( LA16_456=='r' ) {return s495;}
+                int LA16_171 = input.LA(1);
+                if ( LA16_171=='m' ) {return s260;}
                 return s51;
 
             }
         };
-        DFA.State s408 = new DFA.State() {
+        DFA.State s60 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
-                int LA16_408 = input.LA(1);
-                if ( LA16_408=='e' ) {return s456;}
+                int LA16_60 = input.LA(1);
+                if ( LA16_60=='o' ) {return s171;}
                 return s51;
 
             }
         };
-        DFA.State s342 = new DFA.State() {
+        DFA.State s524 = new DFA.State() {{alt=4;}};
+        DFA.State s495 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
-                int LA16_342 = input.LA(1);
-                if ( LA16_342=='d' ) {return s408;}
-                return s51;
+                int LA16_495 = input.LA(1);
+                if ( (LA16_495>='0' && LA16_495<='9')||(LA16_495>='A' && LA16_495<='Z')||LA16_495=='_'||(LA16_495>='a' && LA16_495<='z')||(LA16_495>='\u00C0' && LA16_495<='\u00FF') ) {return s51;}
+                return s524;
 
             }
         };
-        DFA.State s260 = new DFA.State() {
+        DFA.State s456 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
-                int LA16_260 = input.LA(1);
-                if ( LA16_260=='n' ) {return s342;}
+                int LA16_456 = input.LA(1);
+                if ( LA16_456=='n' ) {return s495;}
                 return s51;
 
             }
         };
-        DFA.State s171 = new DFA.State() {
+        DFA.State s410 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
-                int LA16_171 = input.LA(1);
-                if ( LA16_171=='a' ) {return s260;}
+                int LA16_410 = input.LA(1);
+                if ( LA16_410=='o' ) {return s456;}
                 return s51;
 
             }
         };
-        DFA.State s459 = new DFA.State() {{alt=38;}};
-        DFA.State s411 = new DFA.State() {
-            public DFA.State transition(IntStream input) throws RecognitionException {
-                int LA16_411 = input.LA(1);
-                if ( (LA16_411>='0' && LA16_411<='9')||(LA16_411>='A' && LA16_411<='Z')||LA16_411=='_'||(LA16_411>='a' && LA16_411<='z')||(LA16_411>='\u00C0' && LA16_411<='\u00FF') ) {return s51;}
-                return s459;
-
-            }
-        };
         DFA.State s345 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
                 int LA16_345 = input.LA(1);
-                if ( LA16_345=='s' ) {return s411;}
+                if ( LA16_345=='i' ) {return s410;}
                 return s51;
 
             }
@@ -3428,164 +3418,157 @@
 
             }
         };
-        DFA.State s172 = new DFA.State() {
+        DFA.State s174 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
-                int LA16_172 = input.LA(1);
-                if ( LA16_172=='s' ) {return s263;}
+                int LA16_174 = input.LA(1);
+                if ( LA16_174=='c' ) {return s263;}
                 return s51;
 
             }
         };
-        DFA.State s526 = new DFA.State() {{alt=53;}};
-        DFA.State s498 = new DFA.State() {
+        DFA.State s61 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
-                int LA16_498 = input.LA(1);
-                if ( (LA16_498>='0' && LA16_498<='9')||(LA16_498>='A' && LA16_498<='Z')||LA16_498=='_'||(LA16_498>='a' && LA16_498<='z')||(LA16_498>='\u00C0' && LA16_498<='\u00FF') ) {return s51;}
-                return s526;
+                int LA16_61 = input.LA(1);
+                if ( LA16_61=='n' ) {return s174;}
+                return s51;
 
             }
         };
-        DFA.State s461 = new DFA.State() {
+        DFA.State s4 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
-                int LA16_461 = input.LA(1);
-                if ( LA16_461=='s' ) {return s498;}
-                return s51;
+                switch ( input.LA(1) ) {
+                case 'a':
+                    return s59;
 
+                case 'r':
+                    return s60;
+
+                case 'u':
+                    return s61;
+
+                default:
+                    return s51;
+        	        }
             }
         };
-        DFA.State s414 = new DFA.State() {
+        DFA.State s64 = new DFA.State() {{alt=6;}};
+        DFA.State s65 = new DFA.State() {{alt=5;}};
+        DFA.State s5 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
-                int LA16_414 = input.LA(1);
-                if ( LA16_414=='e' ) {return s461;}
-                return s51;
+                int LA16_5 = input.LA(1);
+                if ( LA16_5=='*' ) {return s64;}
+                return s65;
 
             }
         };
-        DFA.State s348 = new DFA.State() {
+        DFA.State s348 = new DFA.State() {{alt=40;}};
+        DFA.State s266 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
-                int LA16_348 = input.LA(1);
-                if ( LA16_348=='d' ) {return s414;}
-                return s51;
+                int LA16_266 = input.LA(1);
+                if ( (LA16_266>='0' && LA16_266<='9')||(LA16_266>='A' && LA16_266<='Z')||LA16_266=='_'||(LA16_266>='a' && LA16_266<='z')||(LA16_266>='\u00C0' && LA16_266<='\u00FF') ) {return s51;}
+                return s348;
 
             }
         };
-        DFA.State s266 = new DFA.State() {
+        DFA.State s177 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
-                int LA16_266 = input.LA(1);
-                if ( LA16_266=='u' ) {return s348;}
+                int LA16_177 = input.LA(1);
+                if ( LA16_177=='l' ) {return s266;}
                 return s51;
 
             }
         };
-        DFA.State s173 = new DFA.State() {
+        DFA.State s66 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
-                int LA16_173 = input.LA(1);
-                if ( LA16_173=='l' ) {return s266;}
+                int LA16_66 = input.LA(1);
+                if ( LA16_66=='a' ) {return s177;}
                 return s51;
 
             }
         };
-        DFA.State s62 = new DFA.State() {
+        DFA.State s459 = new DFA.State() {{alt=38;}};
+        DFA.State s413 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
-                switch ( input.LA(1) ) {
-                case 'p':
-                    return s171;
+                int LA16_413 = input.LA(1);
+                if ( (LA16_413>='0' && LA16_413<='9')||(LA16_413>='A' && LA16_413<='Z')||LA16_413=='_'||(LA16_413>='a' && LA16_413<='z')||(LA16_413>='\u00C0' && LA16_413<='\u00FF') ) {return s51;}
+                return s459;
 
-                case 'i':
-                    return s172;
-
-                case 'c':
-                    return s173;
-
-                default:
-                    return s51;
-        	        }
             }
         };
-        DFA.State s269 = new DFA.State() {{alt=15;}};
-        DFA.State s176 = new DFA.State() {
+        DFA.State s350 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
-                int LA16_176 = input.LA(1);
-                if ( (LA16_176>='0' && LA16_176<='9')||(LA16_176>='A' && LA16_176<='Z')||LA16_176=='_'||(LA16_176>='a' && LA16_176<='z')||(LA16_176>='\u00C0' && LA16_176<='\u00FF') ) {return s51;}
-                return s269;
+                int LA16_350 = input.LA(1);
+                if ( LA16_350=='s' ) {return s413;}
+                return s51;
 
             }
         };
-        DFA.State s63 = new DFA.State() {
+        DFA.State s269 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
-                int LA16_63 = input.LA(1);
-                if ( LA16_63=='d' ) {return s176;}
+                int LA16_269 = input.LA(1);
+                if ( LA16_269=='t' ) {return s350;}
                 return s51;
 
             }
         };
-        DFA.State s5 = new DFA.State() {
+        DFA.State s180 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
-                switch ( input.LA(1) ) {
-                case 'v':
-                    return s61;
+                int LA16_180 = input.LA(1);
+                if ( LA16_180=='s' ) {return s269;}
+                return s51;
 
-                case 'x':
-                    return s62;
-
-                case 'n':
-                    return s63;
-
-                default:
-                    return s51;
-        	        }
             }
         };
-        DFA.State s464 = new DFA.State() {{alt=7;}};
-        DFA.State s417 = new DFA.State() {
+        DFA.State s526 = new DFA.State() {{alt=53;}};
+        DFA.State s498 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
-                int LA16_417 = input.LA(1);
-                if ( (LA16_417>='0' && LA16_417<='9')||(LA16_417>='A' && LA16_417<='Z')||LA16_417=='_'||(LA16_417>='a' && LA16_417<='z')||(LA16_417>='\u00C0' && LA16_417<='\u00FF') ) {return s51;}
-                return s464;
+                int LA16_498 = input.LA(1);
+                if ( (LA16_498>='0' && LA16_498<='9')||(LA16_498>='A' && LA16_498<='Z')||LA16_498=='_'||(LA16_498>='a' && LA16_498<='z')||(LA16_498>='\u00C0' && LA16_498<='\u00FF') ) {return s51;}
+                return s526;
 
             }
         };
-        DFA.State s351 = new DFA.State() {
+        DFA.State s461 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
-                int LA16_351 = input.LA(1);
-                if ( LA16_351=='l' ) {return s417;}
+                int LA16_461 = input.LA(1);
+                if ( LA16_461=='s' ) {return s498;}
                 return s51;
 
             }
         };
-        DFA.State s271 = new DFA.State() {
+        DFA.State s416 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
-                int LA16_271 = input.LA(1);
-                if ( LA16_271=='a' ) {return s351;}
+                int LA16_416 = input.LA(1);
+                if ( LA16_416=='e' ) {return s461;}
                 return s51;
 
             }
         };
-        DFA.State s179 = new DFA.State() {
+        DFA.State s353 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
-                int LA16_179 = input.LA(1);
-                if ( LA16_179=='b' ) {return s271;}
+                int LA16_353 = input.LA(1);
+                if ( LA16_353=='d' ) {return s416;}
                 return s51;
 
             }
         };
-        DFA.State s66 = new DFA.State() {
+        DFA.State s272 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
-                int LA16_66 = input.LA(1);
-                if ( LA16_66=='o' ) {return s179;}
+                int LA16_272 = input.LA(1);
+                if ( LA16_272=='u' ) {return s353;}
                 return s51;
 
             }
         };
-        DFA.State s6 = new DFA.State() {
+        DFA.State s181 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
-                int LA16_6 = input.LA(1);
-                if ( LA16_6=='l' ) {return s66;}
+                int LA16_181 = input.LA(1);
+                if ( LA16_181=='l' ) {return s272;}
                 return s51;
 
             }
         };
-        DFA.State s528 = new DFA.State() {{alt=8;}};
+        DFA.State s528 = new DFA.State() {{alt=7;}};
         DFA.State s501 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
                 int LA16_501 = input.LA(1);
@@ -3594,34 +3577,34 @@
 
             }
         };
-        DFA.State s466 = new DFA.State() {
+        DFA.State s464 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
-                int LA16_466 = input.LA(1);
-                if ( LA16_466=='n' ) {return s501;}
+                int LA16_464 = input.LA(1);
+                if ( LA16_464=='r' ) {return s501;}
                 return s51;
 
             }
         };
-        DFA.State s420 = new DFA.State() {
+        DFA.State s419 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
-                int LA16_420 = input.LA(1);
-                if ( LA16_420=='o' ) {return s466;}
+                int LA16_419 = input.LA(1);
+                if ( LA16_419=='e' ) {return s464;}
                 return s51;
 
             }
         };
-        DFA.State s354 = new DFA.State() {
+        DFA.State s356 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
-                int LA16_354 = input.LA(1);
-                if ( LA16_354=='i' ) {return s420;}
+                int LA16_356 = input.LA(1);
+                if ( LA16_356=='d' ) {return s419;}
                 return s51;
 
             }
         };
-        DFA.State s274 = new DFA.State() {
+        DFA.State s275 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
-                int LA16_274 = input.LA(1);
-                if ( LA16_274=='t' ) {return s354;}
+                int LA16_275 = input.LA(1);
+                if ( LA16_275=='n' ) {return s356;}
                 return s51;
 
             }
@@ -3629,65 +3612,91 @@
         DFA.State s182 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
                 int LA16_182 = input.LA(1);
-                if ( LA16_182=='c' ) {return s274;}
+                if ( LA16_182=='a' ) {return s275;}
                 return s51;
 
             }
         };
-        DFA.State s69 = new DFA.State() {
+        DFA.State s67 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
-                int LA16_69 = input.LA(1);
-                if ( LA16_69=='n' ) {return s182;}
-                return s51;
+                switch ( input.LA(1) ) {
+                case 'i':
+                    return s180;
 
+                case 'c':
+                    return s181;
+
+                case 'p':
+                    return s182;
+
+                default:
+                    return s51;
+        	        }
             }
         };
-        DFA.State s365 = new DFA.State() {{alt=60;}};
-        DFA.State s357 = new DFA.State() {
+        DFA.State s278 = new DFA.State() {{alt=15;}};
+        DFA.State s185 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
-                int LA16_357 = input.LA(1);
-                if ( (LA16_357>='0' && LA16_357<='9')||(LA16_357>='A' && LA16_357<='Z')||LA16_357=='_'||(LA16_357>='a' && LA16_357<='z')||(LA16_357>='\u00C0' && LA16_357<='\u00FF') ) {return s51;}
-                return s365;
+                int LA16_185 = input.LA(1);
+                if ( (LA16_185>='0' && LA16_185<='9')||(LA16_185>='A' && LA16_185<='Z')||LA16_185=='_'||(LA16_185>='a' && LA16_185<='z')||(LA16_185>='\u00C0' && LA16_185<='\u00FF') ) {return s51;}
+                return s278;
 
             }
         };
-        DFA.State s277 = new DFA.State() {
+        DFA.State s68 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
-                int LA16_277 = input.LA(1);
-                if ( LA16_277=='e' ) {return s357;}
+                int LA16_68 = input.LA(1);
+                if ( LA16_68=='d' ) {return s185;}
                 return s51;
 
             }
         };
-        DFA.State s185 = new DFA.State() {
+        DFA.State s6 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
-                int LA16_185 = input.LA(1);
-                if ( LA16_185=='s' ) {return s277;}
-                return s51;
+                switch ( input.LA(1) ) {
+                case 'v':
+                    return s66;
 
+                case 'x':
+                    return s67;
+
+                case 'n':
+                    return s68;
+
+                default:
+                    return s51;
+        	        }
             }
         };
-        DFA.State s70 = new DFA.State() {
+        DFA.State s467 = new DFA.State() {{alt=8;}};
+        DFA.State s422 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
-                int LA16_70 = input.LA(1);
-                if ( LA16_70=='l' ) {return s185;}
+                int LA16_422 = input.LA(1);
+                if ( (LA16_422>='0' && LA16_422<='9')||(LA16_422>='A' && LA16_422<='Z')||LA16_422=='_'||(LA16_422>='a' && LA16_422<='z')||(LA16_422>='\u00C0' && LA16_422<='\u00FF') ) {return s51;}
+                return s467;
+
+            }
+        };
+        DFA.State s359 = new DFA.State() {
+            public DFA.State transition(IntStream input) throws RecognitionException {
+                int LA16_359 = input.LA(1);
+                if ( LA16_359=='l' ) {return s422;}
                 return s51;
 
             }
         };
-        DFA.State s360 = new DFA.State() {{alt=28;}};
         DFA.State s280 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
                 int LA16_280 = input.LA(1);
-                if ( (LA16_280>='0' && LA16_280<='9')||(LA16_280>='A' && LA16_280<='Z')||LA16_280=='_'||(LA16_280>='a' && LA16_280<='z')||(LA16_280>='\u00C0' && LA16_280<='\u00FF') ) {return s51;}
-                return s360;
+                if ( LA16_280=='a' ) {return s359;}
+                return s51;
 
             }
         };
         DFA.State s188 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
                 int LA16_188 = input.LA(1);
-                if ( LA16_188=='m' ) {return s280;}
+                if ( LA16_188=='b' ) {return s280;}
                 return s51;
 
             }
@@ -3702,19 +3711,10 @@
         };
         DFA.State s7 = new DFA.State() {
             public DFA.State transition(IntStream input) throws RecognitionException {
-                switch ( input.LA(1) ) {
-                case 'u':
-                    return s69;
+                int LA16_7 = input.LA(1);
+                if ( LA16_7=='l' ) {return s71;}
+                return s51;
 
-                case 'a':
-                    return s70;
-
-                case 'r':
-                    return s71;
-
-                default:
-                    return s51;
-        	        }
             }
         };
         DFA.State s74 = new DFA.State() {{alt=9;}};
@@ -4825,16 +4825,16 @@
                 case 'i':
                     return s3;
 
-                case '.':
+                case 'f':
                     return s4;
 
-                case 'e':
+                case '.':
                     return s5;
 
-                case 'g':
+                case 'e':
                     return s6;
 
-                case 'f':
+                case 'g':
                     return s7;
 
                 case '(':

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/PackageDescr.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/PackageDescr.java	2006-08-30 15:59:19 UTC (rev 6027)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/PackageDescr.java	2006-08-30 16:14:33 UTC (rev 6028)
@@ -31,6 +31,7 @@
     private final String      documentation;
 
     private List              imports          = Collections.EMPTY_LIST;
+    private List              functionImports    = Collections.EMPTY_LIST;
     private List              attributes       = Collections.EMPTY_LIST;
     private Map               globals          = Collections.EMPTY_MAP;
     private List              factTemplates    = Collections.EMPTY_LIST;
@@ -66,6 +67,17 @@
     public List getImports() {
         return this.imports;
     }
+    
+    public void addFunctionImport(final String importFunction) {
+        if (this.functionImports == Collections.EMPTY_LIST) {
+            this.functionImports = new ArrayList();
+        }
+        this.functionImports.add( importFunction );
+    }
+        
+    public List getFunctionImports() {
+        return this.functionImports;
+    }
 
     public void addGlobal(final String identifier,
                           final String type) {

Modified: labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/lang/drl.g
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/lang/drl.g	2006-08-30 15:59:19 UTC (rev 6027)
+++ labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/lang/drl.g	2006-08-30 16:14:33 UTC (rev 6028)
@@ -1,1329 +1,1339 @@
-grammar RuleParser; 
-
- at parser::header {
-	package org.drools.lang;
-	import java.util.List;
-	import java.util.ArrayList;
-	import java.util.Iterator;
-	import java.util.Map;	
-	import java.util.HashMap;	
-	import java.util.StringTokenizer;
-	import org.drools.lang.descr.*;
-}
-
- at parser::members {
-	private ExpanderResolver expanderResolver;
-	private Expander expander;
-	private boolean expanderDebug = false;
-	private PackageDescr packageDescr;
-	private List errors = new ArrayList();
-	private String source = "unknown";
-	private int lineOffset = 0;
-	private DescrFactory factory = new DescrFactory();
-	
-	
-	private boolean parserDebug = false;
-	
-	public void setParserDebug(boolean parserDebug) {
-		this.parserDebug = parserDebug;
-	}
-	
-	public void debug(String message) {
-		if ( parserDebug ) 
-			System.err.println( "drl parser: " + message );
-	}
-	
-	public void setSource(String source) {
-		this.source = source;
-	}
-	
-	public DescrFactory getFactory() {
-		return factory;
-	}	
-
-	/**
-	 * This may be set to enable debuggin of DSLs/expanders.
-	 * If set to true, expander stuff will be sent to the Std out.
-	 */	
-	public void setExpanderDebug(boolean status) {
-		expanderDebug = status;
-	}
-	public String getSource() {
-		return this.source;
-	}
-	
-	public PackageDescr getPackageDescr() {
-		return packageDescr;
-	}
-	
-	private int offset(int line) {
-		return line + lineOffset;
-	}
-	
-	/**
-	 * This will set the offset to record when reparsing. Normally is zero of course 
-	 */
-	public void setLineOffset(int i) {
-	 	this.lineOffset = i;
-	}
-	
-	public void setExpanderResolver(ExpanderResolver expanderResolver) {
-		this.expanderResolver = expanderResolver;
-	}
-	
-	public ExpanderResolver getExpanderResolver() {
-		return expanderResolver;
-	}
-	
-	/** Expand the LHS */
-	private String runWhenExpander(String text, int line) throws RecognitionException {
-		String expanded = text.trim();
-		if (expanded.startsWith(">")) {
-			expanded = expanded.substring(1);  //escape !!
-		} else {
-			try {
-				expanded = expander.expand( "when", text );			
-			} catch (Exception e) {
-				this.errors.add(new ExpanderException("Unable to expand: " + text + ". Due to " + e.getMessage(), line));
-				return "";
-			}
-		}
-		if (expanderDebug) {
-			System.out.println("Expanding LHS: " + text + " ----> " + expanded + " --> from line: " + line);
-		}
-		return expanded;			
-	}
-	
-    	/** This will apply a list of constraints to an LHS block */
-    	private String applyConstraints(List constraints, String block) {
-    		//apply the constraints as a comma seperated list inside the previous block
-    		//the block will end in something like "foo()" and the constraint patterns will be put in the ()
-    		if (constraints == null) {
-    			return block;
-    		}
-    		StringBuffer list = new StringBuffer();    		
-    		for (Iterator iter = constraints.iterator(); iter.hasNext();) {
-				String con = (String) iter.next();
-				list.append("\n\t\t");
-				list.append(con);
-				if (iter.hasNext()) {
-					list.append(",");					
-				}			
-			}
-    		if (block.endsWith("()")) {
-    			return block.substring(0, block.length() - 2) + "(" + list.toString() + ")";
-    		} else {
-    			return block + "(" + list.toString() + ")";
-    		}
-    	}  
-    	
-        	/** Reparse the results of the expansion */
-    	private void reparseLhs(String text, AndDescr descrs) throws RecognitionException {
-    		CharStream charStream = new ANTLRStringStream( text  + " \n  then"); //need to then so it knows when to end... werd...
-    		RuleParserLexer lexer = new RuleParserLexer( charStream );
-    		TokenStream tokenStream = new CommonTokenStream( lexer );
-    		RuleParser parser = new RuleParser( tokenStream );
-    		parser.setLineOffset( descrs.getLine() );
-    		parser.normal_lhs_block(descrs);
-            
-                if (parser.hasErrors()) {
-    			this.errors.addAll(parser.getErrors());
-    		}
-		if (expanderDebug) {
-			System.out.println("Reparsing LHS: " + text + " --> successful:" + !parser.hasErrors());
-		}    		
-    		
-    	}
-	
-	/** Expand a line on the RHS */
-	private String runThenExpander(String text, int startLine) {
-		//System.err.println( "expand THEN [" + text + "]" );
-		StringTokenizer lines = new StringTokenizer( text, "\n\r" );
-
-		StringBuffer expanded = new StringBuffer();
-		
-		String eol = System.getProperty( "line.separator" );
-				
-		while ( lines.hasMoreTokens() ) {
-			startLine++;
-			String line = lines.nextToken();
-			line = line.trim();
-			if ( line.length() > 0 ) {
-				if ( line.startsWith( ">" ) ) {
-					expanded.append( line.substring( 1 ) );
-					expanded.append( eol );
-				} else {
-					try {
-						expanded.append( expander.expand( "then", line ) );
-						expanded.append( eol );
-					} catch (Exception e) {
-						this.errors.add(new ExpanderException("Unable to expand: " + line + ". Due to " + e.getMessage(), startLine));			
-					}
-				}
-			}
-		}
-		
-		if (expanderDebug) {
-			System.out.println("Expanding RHS: " + text + " ----> " + expanded.toString() + " --> from line starting: " + startLine);
-		}		
-		
-		return expanded.toString();
-	}
-	
-
-	
-	private String getString(Token token) {
-		String orig = token.getText();
-		return orig.substring( 1, orig.length() -1 );
-	}
-	
-	public void reportError(RecognitionException ex) {
-	        // if we've already reported an error and have not matched a token
-                // yet successfully, don't report any errors.
-                if ( errorRecovery ) {
-                        return;
-                }
-                errorRecovery = true;
-
-		ex.line = offset(ex.line); //add the offset if there is one
-		errors.add( ex ); 
-	}
-     	
-     	/** return the raw RecognitionException errors */
-     	public List getErrors() {
-     		return errors;
-     	}
-     	
-     	/** Return a list of pretty strings summarising the errors */
-     	public List getErrorMessages() {
-     		List messages = new ArrayList();
- 		for ( Iterator errorIter = errors.iterator() ; errorIter.hasNext() ; ) {
-     	     		messages.add( createErrorMessage( (RecognitionException) errorIter.next() ) );
-     	     	}
-     	     	return messages;
-     	}
-     	
-     	/** return true if any parser errors were accumulated */
-     	public boolean hasErrors() {
-  		return ! errors.isEmpty();
-     	}
-     	
-     	/** This will take a RecognitionException, and create a sensible error message out of it */
-     	public String createErrorMessage(RecognitionException e)
-        {
-		StringBuffer message = new StringBuffer();		
-                message.append( source + ":"+e.line+":"+e.charPositionInLine+" ");
-                if ( e instanceof MismatchedTokenException ) {
-                        MismatchedTokenException mte = (MismatchedTokenException)e;
-                        message.append("mismatched token: "+
-                                                           e.token+
-                                                           "; expecting type "+
-                                                           tokenNames[mte.expecting]);
-                }
-                else if ( e instanceof MismatchedTreeNodeException ) {
-                        MismatchedTreeNodeException mtne = (MismatchedTreeNodeException)e;
-                        message.append("mismatched tree node: "+
-                                                           mtne.foundNode+
-                                                           "; expecting type "+
-                                                           tokenNames[mtne.expecting]);
-                }
-                else if ( e instanceof NoViableAltException ) {
-                        NoViableAltException nvae = (NoViableAltException)e;
-			message.append( "Unexpected token '" + e.token.getText() + "'" );
-                        /*
-                        message.append("decision=<<"+nvae.grammarDecisionDescription+">>"+
-                                                           " state "+nvae.stateNumber+
-                                                           " (decision="+nvae.decisionNumber+
-                                                           ") no viable alt; token="+
-                                                           e.token);
-                                                           */
-                }
-                else if ( e instanceof EarlyExitException ) {
-                        EarlyExitException eee = (EarlyExitException)e;
-                        message.append("required (...)+ loop (decision="+
-                                                           eee.decisionNumber+
-                                                           ") did not match anything; token="+
-                                                           e.token);
-                }
-                else if ( e instanceof MismatchedSetException ) {
-                        MismatchedSetException mse = (MismatchedSetException)e;
-                        message.append("mismatched token '"+
-                                                           e.token+
-                                                           "' expecting set "+mse.expecting);
-                }
-                else if ( e instanceof MismatchedNotSetException ) {
-                        MismatchedNotSetException mse = (MismatchedNotSetException)e;
-                        message.append("mismatched token '"+
-                                                           e.token+
-                                                           "' expecting set "+mse.expecting);
-                }
-                else if ( e instanceof FailedPredicateException ) {
-                        FailedPredicateException fpe = (FailedPredicateException)e;
-                        message.append("rule "+fpe.ruleName+" failed predicate: {"+
-                                                           fpe.predicateText+"}?");
-                } else if (e instanceof GeneralParseException) {
-			message.append(" " + e.getMessage());
-		}
-               	return message.toString();
-        }   
-        
-        void checkTrailingSemicolon(String text, int line) {
-        	if (text.trim().endsWith( ";" ) ) {
-        		this.errors.add( new GeneralParseException( "Trailing semi-colon not allowed", offset(line) ) );
-        	}
-        }
-      
-}
-
- at lexer::header {
-	package org.drools.lang;
-}
-
-opt_eol	:
-		(';'|EOL)*	
-	;
-
-compilation_unit
-	:	opt_eol
-		prolog 
-		(	r=rule 	{this.packageDescr.addRule( r ); } 
-		| 	q=query	{this.packageDescr.addRule( q ); }
-		|	t=template	{this.packageDescr.addFactTemplate ( t ); }
-		|	extra_statement 
-		)*
-	;
-	
-prolog
-	@init {
-		String packageName = "";
-	}
-	:	opt_eol
-		( name=package_statement { packageName = name; } )?
-		{ 
-			this.packageDescr = new PackageDescr( name ); 
-		}
-		(	extra_statement
-		|	expander
-		)*
-		
-		opt_eol
-	;
-	
-package_statement returns [String packageName]
-	@init{
-		packageName = null;
-	}
-	:	
-		'package' opt_eol name=dotted_name ';'? opt_eol
-		{
-			packageName = name;
-		}
-	;
-	
-import_statement
-	:	'import' opt_eol name=import_name ';'? opt_eol
-		{
-			if (packageDescr != null) 
-				packageDescr.addImport( name );
-		}	
-	;
-
-import_name returns [String name]
-	@init {
-		name = null;
-	}
-	:	
-		id=ID { name=id.getText(); } ( '.' id=ID { name = name + "." + id.getText(); } )* (star='.*' { name = name + star.getText(); })?
-	;
-expander
-	@init {
-		String config=null;
-	}
-	:	'expander' (name=dotted_name)? ';'? opt_eol
-		{
-			if (expanderResolver == null) 
-				throw new IllegalArgumentException("Unable to use expander. Make sure a expander or dsl config is being passed to the parser. [ExpanderResolver was not set].");
-			if ( expander != null )
-				throw new IllegalArgumentException( "Only one 'expander' statement per file is allowed" );
-			expander = expanderResolver.get( name, config );
-		}
-	;
-	
-global
-	@init {
-	}
-	:
-		'global' type=dotted_name id=ID ';'? opt_eol
-		{
-			packageDescr.addGlobal( id.getText(), type );
-		}
-	;
-	
-function
-	@init {
-		FunctionDescr f = null;
-	}
-	:
-		'function' opt_eol (retType=dotted_name)? opt_eol name=ID opt_eol
-		{
-			//System.err.println( "function :: " + name.getText() );
-			f = new FunctionDescr( name.getText(), retType );
-		} 
-		'(' opt_eol
-			(	(paramType=dotted_name)? opt_eol paramName=argument_name opt_eol
-				{
-					f.addParameter( paramType, paramName );
-				}
-				(	',' opt_eol (paramType=dotted_name)? opt_eol paramName=argument_name opt_eol 
-					{
-						f.addParameter( paramType, paramName );
-					}
-				)*
-			)?
-		')'
-		opt_eol
-		'{'
-			body=curly_chunk
-			{
-				f.setText( body );
-			}
-		'}'
-		{
-			packageDescr.addFunction( f );
-		}
-		opt_eol
-	;
-
-
-query returns [QueryDescr query]
-	@init {
-		query = null;
-	}
-	:
-		opt_eol
-		loc='query' queryName=word opt_eol 
-		{ 
-			query = new QueryDescr( queryName, null ); 
-			query.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-			AndDescr lhs = new AndDescr(); query.setLhs( lhs ); 
-			lhs.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-		}
-		(
-			{ expander != null }? expander_lhs_block[lhs]
-			| normal_lhs_block[lhs]
-		)
-					
-		'end' opt_eol
-	;
-	
-template returns [FactTemplateDescr template]
-	@init {
-		template = null;		
-	}
-	:
-		opt_eol
-		loc='template' templateName=ID EOL
-		{
-			template = new FactTemplateDescr(templateName.getText());
-			template.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );			
-		}
-		(
-			slot=template_slot 
-			{
-				template.addFieldTemplate(slot);
-			}
-		)+
-		'end' EOL		
-	;
-	
-template_slot returns [FieldTemplateDescr field]
-	@init {
-		field = null;
-	}
-	:
-		//name=ID ':' fieldType=dotted_name ( EOL | ';' )
-		 fieldType=dotted_name name=ID ( EOL | ';' )
-		{
-			
-			
-			field = new FieldTemplateDescr(name.getText(), fieldType);
-			field.setLocation( offset(name.getLine()), name.getCharPositionInLine() );
-		}
-	;	
-	
-rule returns [RuleDescr rule]
-	@init {
-		rule = null;
-		String consequence = "";
-	}
-	:
-		opt_eol
-		loc='rule' ruleName=word opt_eol 
-		{ 
-			debug( "start rule: " + ruleName );
-			rule = new RuleDescr( ruleName, null ); 
-			rule.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-		}
-		(	rule_attributes[rule]
-		)?
-		opt_eol
-		((	loc='when' ':'? opt_eol
-			{ 
-				AndDescr lhs = new AndDescr(); rule.setLhs( lhs ); 
-				lhs.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-			}
-			(
-				{ expander != null }? expander_lhs_block[lhs]
-				| normal_lhs_block[lhs]
-			)
-					
-		)?
-		( opt_eol loc='then' ':'?  opt_eol
-			( options{greedy=false;} : any=.
-				{
-					consequence = consequence + " " + any.getText();
-				}
-			)*
-			{
-				if ( expander != null ) {
-					String expanded = runThenExpander( consequence, offset(loc.getLine()) );
-					rule.setConsequence( expanded );
-				} else { 
-					rule.setConsequence( consequence ); 
-				}
-				rule.setConsequenceLocation(offset(loc.getLine()), loc.getCharPositionInLine());
-			})?
-		)?
-		'end' opt_eol
-		{
-			debug( "end rule: " + ruleName );
-		} 
-	;
-	
-extra_statement
-	:
-	(	import_statement
-	|	global
-	|	function
-	)
-	;
-
-rule_attributes[RuleDescr rule]
-	: 
-			'attributes'? ':'? opt_eol
-			(	','? a=rule_attribute opt_eol
-				{
-					rule.addAttribute( a );
-				}
-			)*
-	;
-	
-rule_attribute returns [AttributeDescr d]
-	@init {
-		d = null;
-	}
-	:
-			a=salience { d = a; }
-		|	a=no_loop  { d = a; }
-		|	a=agenda_group  { d = a; }		
-		|	a=duration  { d = a; }			
-		|	a=activation_group { d = a; }	
-		|	a=auto_focus { d = a; }	
-		
-	;
-	
-salience returns [AttributeDescr d ]
-	@init {
-		d = null;
-	}
-	:	
-		loc='salience' opt_eol i=INT ';'? opt_eol
-		{
-			d = new AttributeDescr( "salience", i.getText() );
-			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-		}
-	;
-	
-no_loop returns [AttributeDescr d]
-	@init {
-		d = null;
-	}
-	:
-		(
-			loc='no-loop' opt_eol ';'? opt_eol
-			{
-				d = new AttributeDescr( "no-loop", "true" );
-				d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-			}
-		) 
-		|
-		(
-			loc='no-loop' t=BOOL opt_eol ';'? opt_eol
-			{
-				d = new AttributeDescr( "no-loop", t.getText() );
-				d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-			}
-		
-		)
-		
-	;
-	
-auto_focus returns [AttributeDescr d]
-	@init {
-		d = null;
-	}
-	:
-		(
-			loc='auto-focus' opt_eol ';'? opt_eol
-			{
-				d = new AttributeDescr( "auto-focus", "true" );
-				d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-			}
-		) 
-		|
-		(
-			loc='auto-focus' t=BOOL opt_eol ';'? opt_eol
-			{
-				d = new AttributeDescr( "auto-focus", t.getText() );
-				d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-			}
-		
-		)
-		
-	;	
-	
-activation_group returns [AttributeDescr d]
-	@init {
-		d = null;
-	}
-	:
-		loc='activation-group' opt_eol name=STRING ';'? opt_eol
-		{
-			d = new AttributeDescr( "activation-group", getString( name ) );
-			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-		}
-	;
-
-agenda_group returns [AttributeDescr d]
-	@init {
-		d = null;
-	}
-	:
-		loc='agenda-group' opt_eol name=STRING ';'? opt_eol
-		{
-			d = new AttributeDescr( "agenda-group", getString( name ) );
-			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-		}
-	;		
-
-
-duration returns [AttributeDescr d]
-	@init {
-		d = null;
-	}
-	:
-		loc='duration' opt_eol i=INT ';'? opt_eol
-		{
-			d = new AttributeDescr( "duration", i.getText() );
-			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-		}
-	;		
-	
-
-normal_lhs_block[AndDescr descrs]
-	:
-		(	d=lhs opt_eol
-			{ descrs.addDescr( d ); }
-		)* opt_eol
-	;
-
-	
-
-	
-expander_lhs_block[AndDescr descrs]
-	@init {
-		String lhsBlock = null;
-		String eol = System.getProperty( "line.separator" );
-		List constraints = null;
-	}
-	:
-		(options{greedy=false;} : 
-			text=paren_chunk loc=EOL 
-			{
-				//only expand non null
-				if (text != null) {
-					if (text.trim().startsWith("-")) {
-						if (constraints == null) {
-							constraints = new ArrayList();
-						}
-						constraints.add(runWhenExpander( text, offset(loc.getLine())));
-					} else {
-						if (constraints != null) {
-							lhsBlock = applyConstraints(constraints, lhsBlock);
-							constraints = null;
-						}
-					
-					
-						if (lhsBlock == null) {					
-							lhsBlock = runWhenExpander( text, offset(loc.getLine()));
-						} else {
-							lhsBlock = lhsBlock + eol + runWhenExpander( text, offset(loc.getLine()));
-						}
-					}
-					text = null;
-				}
-			}
-			
-		(EOL)* )* 
-		
-		{	
-			//flush out any constraints left handing before the RHS
-			lhsBlock = applyConstraints(constraints, lhsBlock);
-			if (lhsBlock != null) {
-				reparseLhs(lhsBlock, descrs);
-			}
-		}
-
-	;
-	
-	
-	
-lhs returns [PatternDescr d]
-	@init {
-		d=null;
-	}
-	:	l=lhs_or { d = l; } 
-	;
-
-	
-lhs_column returns [PatternDescr d]
-	@init {
-		d=null;
-	}
-	:	f=fact_binding { d = f; }
-	|	f=fact { d = f; }
-	;
-	
-from_statement returns [FromDescr d]
-	@init {
-		d=factory.createFrom();
-	}
- 	:
- 		'from' opt_eol ds=from_source
- 		{
- 			d.setDataSource(ds);
- 		
- 		}
- 		
- 		
- 		
-	;
-	
-from_source returns [DeclarativeInvokerDescr ds]
-	@init {
-		ds = null;
-	}
-	:
-		(var=ID '.' field=ID 
-		
-			{
-			  FieldAccessDescr fa = new FieldAccessDescr(var.getText(), field.getText());	
-			  fa.setLine(var.getLine());
-			  ds = fa;
-			 }
-	
-		) 
-		|
-		(var=ID '.' method=ID opt_eol  '(' opt_eol args=argument_list opt_eol ')' 
-			{
-			MethodAccessDescr mc = new MethodAccessDescr(var.getText(), method.getText());
-			mc.setArguments(args);
-			mc.setLine(var.getLine());
-			ds = mc;
-			}	
-		)
-		|
-		(functionName=ID opt_eol '(' opt_eol args=argument_list opt_eol ')'
-			{
-			FunctionCallDescr fc = new FunctionCallDescr(functionName.getText());
-			fc.setLine(functionName.getLine());
-			fc.setArguments(args);
-			ds = fc;
-			}
-
-		
-		)
-	
-	;	
-	
-argument_list returns [ArrayList args]
-	@init {
-		args = new ArrayList();
-	}
-	:
-		(param=argument_value  {
-			if (param != null) {
-				args.add(param);
-			}
-		}
-		 
-		(
-			opt_eol ',' opt_eol param=argument_value {
-				if (param != null) {
-					args.add(param);
-				}
-			}
-		)*
-		)?
-	;		
-	
-argument_value returns [ArgumentValueDescr value]
-	@init {
-		value = null;
-		String text = null;
-	}
-	:	(	t=STRING { text = getString( t );  value=new ArgumentValueDescr(ArgumentValueDescr.STRING, text);} 
-		|	t=INT    { text = t.getText();  value=new ArgumentValueDescr(ArgumentValueDescr.INTEGRAL, text);}
-		|	t=FLOAT	 { text = t.getText(); value=new ArgumentValueDescr(ArgumentValueDescr.DECIMAL, text); }
-		|	t=BOOL 	 { text = t.getText(); value=new ArgumentValueDescr(ArgumentValueDescr.BOOLEAN, text); }
-		|	t=ID { text = t.getText(); value=new ArgumentValueDescr(ArgumentValueDescr.VARIABLE, text);}	
-		|	t='null' { text = "null"; value=new ArgumentValueDescr(ArgumentValueDescr.NULL, text);}	
-		|	t='null' { text = "null"; value=new ArgumentValueDescr(ArgumentValueDescr.NULL, text);}			
-		|       m=inline_map {  value=new ArgumentValueDescr(ArgumentValueDescr.MAP, m.getKeyValuePairs() ); }		
-		)
-	;			
-
-inline_map returns [ArgumentValueDescr.MapDescr mapDescr]
-    @init {
-        mapDescr = new ArgumentValueDescr.MapDescr();
-    }	
-    :  '{' 
-           ( key=argument_value '=>' value=argument_value {
-                 if ( key != null ) {
-                     mapDescr.add( new ArgumentValueDescr.KeyValuePairDescr( key, value ) );
-                 }
-             }
-           )
-           
-           ( (EOL)? ',' (EOL)? key=argument_value '=>' value=argument_value {
-                 if ( key != null ) {
-                     mapDescr.add( new ArgumentValueDescr.KeyValuePairDescr( key, value ) );
-                 }
-             }
-           )*           
-       '}'
-    ;
- 	
-fact_binding returns [PatternDescr d]
-	@init {
-		d=null;
-		boolean multi=false;
-	}
- 	:
- 		id=ID 
- 		
- 		opt_eol ':' opt_eol fe=fact_expression[id.getText()]
- 		{
- 			d=fe;
- 		}
-	;
- 
- fact_expression[String id] returns [PatternDescr pd]
- 	@init {
- 		pd = null;
- 		boolean multi = false;
- 	}
- 	:	'(' opt_eol fe=fact_expression[id]opt_eol ')' { pd=fe; }
- 	| 	f=fact opt_eol
- 		{
- 			((ColumnDescr)f).setIdentifier( id );
- 			pd = f;
- 		}
- 		(	('or'|'||') opt_eol
- 			{	if ( ! multi ) {
- 					PatternDescr first = pd;
- 					pd = new OrDescr();
- 					((OrDescr)pd).addDescr( first );
- 					multi=true;
- 				}
- 			}
- 			f=fact
- 			{
- 				((ColumnDescr)f).setIdentifier( id );
- 				((OrDescr)pd).addDescr( f );
- 			}
- 		)*	
-	;
- 
-fact returns [PatternDescr d] 
-	@init {
-		d=null;
-	}
- 	:	id=dotted_name 
- 		{ 
- 			d = new ColumnDescr( id ); 
- 		} opt_eol 
- 		loc='(' {
- 				d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
- 			}opt_eol (	c=constraints
- 				{
-		 			for ( Iterator cIter = c.iterator() ; cIter.hasNext() ; ) {
- 						((ColumnDescr)d).addDescr( (PatternDescr) cIter.next() );
- 					}
- 				}
- 
- 				)? opt_eol endLoc=')' opt_eol
- 				{
- 					d.setEndLocation( offset(endLoc.getLine()), endLoc.getCharPositionInLine() );	
- 				}
- 	;
-	
-	
-constraints returns [List constraints]
-	@init {
-		constraints = new ArrayList();
-	}
-	:	opt_eol
-		(constraint[constraints]|predicate[constraints])
-		( opt_eol ',' opt_eol (constraint[constraints]|predicate[constraints]))*
-		opt_eol
-	;
-	
-constraint[List constraints]
-	@init {
-		PatternDescr d = null;
-	}
-	:	opt_eol
-		( fb=ID opt_eol ':' opt_eol )? 
-		f=ID	
-		{
-
-			if ( fb != null ) {
-				//System.err.println( "fb: " + fb.getText() );
-				//System.err.println( " f: " + f.getText() );
-				d = new FieldBindingDescr( f.getText(), fb.getText() );
-				//System.err.println( "fbd: " + d );
-				
-				d.setLocation( offset(f.getLine()), f.getCharPositionInLine() );
-				constraints.add( d );
-			} 
-			FieldConstraintDescr fc = new FieldConstraintDescr(f.getText());
-			fc.setLocation( offset(f.getLine()), f.getCharPositionInLine() );
-									
-			
-		}				
-			opt_eol (	op=operator opt_eol	
-					
-					(	bvc=ID
-						{
-							
-														
-							
-							VariableRestrictionDescr vd = new VariableRestrictionDescr(op, bvc.getText());
-							fc.addRestriction(vd);
-							constraints.add(fc);
-							
-						}
-					|
-						lc=enum_constraint 
-						{ 
-
-							LiteralRestrictionDescr lrd  = new LiteralRestrictionDescr(op, lc, true);
-							fc.addRestriction(lrd);
-							constraints.add(fc);
-							
-						}						
-					|
-						lc=literal_constraint 
-						{ 
-							
-							LiteralRestrictionDescr lrd  = new LiteralRestrictionDescr(op, lc);
-							fc.addRestriction(lrd);
-							constraints.add(fc);
-							
-						}
-					|	rvc=retval_constraint 
-						{ 
-							
-							
-
-							ReturnValueRestrictionDescr rvd = new ReturnValueRestrictionDescr(op, rvc);							
-							fc.addRestriction(rvd);
-							constraints.add(fc);
-							
-						} 
-					)
-					(
-						con=('&'|'|')
-						{
-							if (con.getText().equals("&") ) {								
-								fc.addRestriction(new RestrictionConnectiveDescr(RestrictionConnectiveDescr.AND));	
-							} else {
-								fc.addRestriction(new RestrictionConnectiveDescr(RestrictionConnectiveDescr.OR));	
-							}							
-						}
-
-						op=operator
-						(	bvc=ID
-							{
-								VariableRestrictionDescr vd = new VariableRestrictionDescr(op, bvc.getText());
-								fc.addRestriction(vd);
-							}
-						|
-							lc=enum_constraint 
-							{ 
-								LiteralRestrictionDescr lrd  = new LiteralRestrictionDescr(op, lc, true);
-								fc.addRestriction(lrd);
-								
-							}						
-						|
-							lc=literal_constraint 
-							{ 
-								LiteralRestrictionDescr lrd  = new LiteralRestrictionDescr(op, lc);
-								fc.addRestriction(lrd);
-								
-							}
-						|	rvc=retval_constraint 
-							{ 
-								ReturnValueRestrictionDescr rvd = new ReturnValueRestrictionDescr(op, rvc);							
-								fc.addRestriction(rvd);
-								
-							} 
-						)						
-						
-					)*
-				)?					
-		opt_eol
-	;
-		
-literal_constraint returns [String text]
-	@init {
-		text = null;
-	}
-	:	(	t=STRING { text = getString( t ); } //t.getText(); text=text.substring( 1, text.length() - 1 ); }
-		|	t=INT    { text = t.getText(); }
-		|	t=FLOAT	 { text = t.getText(); }
-		|	t=BOOL 	 { text = t.getText(); }
-		|	t='null' { text = null; }
-		)
-	;
-	
-enum_constraint returns [String text]
-	@init {
-		text = null;
-	}
-	:	(cls=ID '.' en=ID) { text = cls.getText() + "." + en.getText(); }
-	;	
-	
-retval_constraint returns [String text]
-	@init {
-		text = null;
-	}
-	:	
-		'('  c=paren_chunk  ')' { text = c; }
-	;
-
-predicate[List constraints]
-	:
-		decl=ID ':' field=ID '->' '(' text=paren_chunk ')'
-		{
-			PredicateDescr d = new PredicateDescr(field.getText(), decl.getText(), text );
-			constraints.add( d );
-		}
-	;
-	
-paren_chunk returns [String text]
-	@init {
-		text = null;
-	}
-	
-	:
-		 (	options{greedy=false;} : 
-			'(' c=paren_chunk ')' 	
-			{
-				if ( c == null ) {
-					c = "";
-				}
-				if ( text == null ) {
-					text = "( " + c + " )";
-				} else {
-					text = text + " ( " + c + " )";
-				}
-			} 
-		| any=. 
-			{
-				if ( text == null ) {
-					text = any.getText();
-				} else {
-					text = text + " " + any.getText(); 
-				} 
-			}
-		)* 
-	;
-	
-//NOTE: this is needed as there is a bug in antlr if you sometimes use the same sub rule in multiple places
-paren_chunk2 returns [String text]
-	@init {
-		text = null;
-	}
-	
-	:
-		 (	options{greedy=false;} : 
-			'(' c=paren_chunk2 ')' 	
-			{
-				if ( c == null ) {
-					c = "";
-				}
-				if ( text == null ) {
-					text = "( " + c + " )";
-				} else {
-					text = text + " ( " + c + " )";
-				}
-			} 
-		| any=. 
-			{
-				if ( text == null ) {
-					text = any.getText();
-				} else {
-					text = text + " " + any.getText(); 
-				} 
-			}
-		)* 
-	;
-	
-curly_chunk returns [String text]
-	@init {
-		text = null;
-	}
-	
-	:
-		(	options{greedy=false;} : 
-			'{' c=curly_chunk '}' 	
-			{
-				//System.err.println( "chunk [" + c + "]" );
-				if ( c == null ) {
-					c = "";
-				}
-				if ( text == null ) {
-					text = "{ " + c + " }";
-				} else {
-					text = text + " { " + c + " }";
-				}
-			} 
-		| any=. 
-			{
-				//System.err.println( "any [" + any.getText() + "]" );
-				if ( text == null ) {
-					text = any.getText();
-				} else {
-					text = text + " " + any.getText(); 
-				} 
-			}
-		)*
-	;	
-	
-lhs_or returns [PatternDescr d]
-	@init{
-		d = null;
-	}
-	:	
-		{ OrDescr or = null; }
-		left=lhs_and {d = left; }
-		( ('or'|'||') opt_eol
-			right=lhs_and 
-			{
-				if ( or == null ) {
-					or = new OrDescr();
-					or.addDescr( left );
-					d = or;
-				}
-				
-				or.addDescr( right );
-			}
-		)*
-	;
-	
-lhs_and returns [PatternDescr d]
-	@init{
-		d = null;
-	}
-	:
-		{ AndDescr and = null; }
-		left=lhs_unary { d = left; }
-		( ('and'|'&&') opt_eol
-			right=lhs_unary 
-			{
-				if ( and == null ) {
-					and = new AndDescr();
-					and.addDescr( left );
-					d = and;
-				}
-				
-				and.addDescr( right );
-			}
-		)* 
-	;
-	
-lhs_unary returns [PatternDescr d]
-	@init {
-		d = null;
-	}
-	:	(	u=lhs_exist {d = u;}
-		|	u=lhs_not {d = u;}
-		|	u=lhs_eval {d = u;}				
-		|	u=lhs_column {d=u;} (fm=from_statement {fm.setColumn((ColumnDescr) u); d=fm;})?
-		|	'(' opt_eol u=lhs opt_eol ')' {d = u;}
-		) 
-	;
-	
-lhs_exist returns [PatternDescr d]
-	@init {
-		d = null;
-	}
-	:	loc='exists' ('(' column=lhs_column ')' | column=lhs_column)
-		{ 
-			d = new ExistsDescr( (ColumnDescr) column ); 
-			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-		}	
-	;
-	
-lhs_not	returns [NotDescr d]
-	@init {
-		d = null;
-	}
-	:	loc='not' ('(' column=lhs_column  ')' | column=lhs_column)
-		{
-			d = new NotDescr( (ColumnDescr) column ); 
-			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-		}
-	;
-
-lhs_eval returns [PatternDescr d]
-	@init {
-		d = null;
-		String text = "";
-	}
-	:	'eval' loc='(' 
-			c=paren_chunk2
-		')' 
-		{ 
-			checkTrailingSemicolon( c, offset(loc.getLine()) );
-			d = new EvalDescr( c ); 
-		}
-	;
-	
-dotted_name returns [String name]
-	@init {
-		name = null;
-	}
-	:	
-		id=ID { name=id.getText(); } ( '.' id=ID { name = name + "." + id.getText(); } )* ( '[' ']' { name = name + "[]";})*
-	;
-	
-argument_name returns [String name]
-	@init {
-		name = null;
-	}
-	:
-		id=ID { name=id.getText(); } ( '[' ']' { name = name + "[]";})*
-	;
-
-	
-word returns [String word]
-	@init{
-		word = null;
-	}
-	:	id=ID      { word=id.getText(); }
-	|	'import'   { word="import"; }
-	|	'use'      { word="use"; }
-	|	'rule'     { word="rule"; }
-	|	'query'    { word="query"; }
-	|	'salience' { word="salience"; }
- 	|	'no-loop'  { word="no-loop"; }
-	|	'when'     { word="when"; }
-	|	'then'     { word="then"; }
-	|	'end'      { word="end"; }
-	|	str=STRING { word=getString(str);} 
-	;
-
-operator returns [String str] 	
-	@init {
-		str = null;
-	}
-	:
-
-		'==' {str= "==";}
-		|'=' {str="==";}
-		|'>' {str=">";}
-		|'>=' {str=">=";}		
-		|'<' {str="<";}
-		|'<=' {str="<=";}
-		|'!=' {str="!=";}
-		|'contains' {str="contains";}
-		|'matches' {str="matches";}
-		|'excludes' {str="excludes";}
-					
-						
-	;
-
-
-
-MISC 	:
-		'!' | '@' | '$' | '%' | '^' | '&' | '*' | '_' | '-' | '+'  | '?'
-		| '|' | ',' | '{' | '}' | '[' | ']' | '=' | '/' | '(' | ')' | '\'' | '\\'
-		| '||' | '&&' | '<<<' | '++' | '--' | '>>>' | '==' | '+=' | '=+' | '-=' | '=-' |'*=' | '=*' 
-		| '/=' | '=/' | '>>=' 
-		
-	;
-	
-WS      :       (	' '
-                |	'\t'
-                |	'\f'
-                )
-                { channel=99; }
-        ;
-        
-EOL 	:	     
-   		(       ( '\r\n' )=> '\r\n'  // Evil DOS
-                |       '\r'    // Macintosh
-                |       '\n'    // Unix (the right way)
-                )
-        ;  
-        
-INT	
-	:	('-')?('0'..'9')+
-	;
-
-FLOAT
-	:	('-')?('0'..'9')+ '.' ('0'..'9')+
-	;
-	
-STRING
-	:	('"' ( options{greedy=false;} : .)* '"' ) | ('\'' ( options{greedy=false;} : .)* '\'')
-	;
-	
-BOOL
-	:	('true'|'false') 
-	;	
-	
-ID	
-	:	('a'..'z'|'A'..'Z'|'_'|'$' | '\u00c0'..'\u00ff')('a'..'z'|'A'..'Z'|'_'|'0'..'9' | '\u00c0'..'\u00ff')* 
-	;
-	
-		
-
-SH_STYLE_SINGLE_LINE_COMMENT	
-	:	'#' ( options{greedy=false;} : .)* EOL /* ('\r')? '\n'  */
-                { channel=99; }
-	;
-        
-        
-C_STYLE_SINGLE_LINE_COMMENT	
-	:	'//' ( options{greedy=false;} : .)* EOL // ('\r')? '\n' 
-                { channel=99; }
-	;
-
-MULTI_LINE_COMMENT
-	:	'/*' (options{greedy=false;} : .)* '*/'
-                { channel=99; }
-	;
+grammar RuleParser; 
+
+ at parser::header {
+	package org.drools.lang;
+	import java.util.List;
+	import java.util.ArrayList;
+	import java.util.Iterator;
+	import java.util.Map;	
+	import java.util.HashMap;	
+	import java.util.StringTokenizer;
+	import org.drools.lang.descr.*;
+}
+
+ at parser::members {
+	private ExpanderResolver expanderResolver;
+	private Expander expander;
+	private boolean expanderDebug = false;
+	private PackageDescr packageDescr;
+	private List errors = new ArrayList();
+	private String source = "unknown";
+	private int lineOffset = 0;
+	private DescrFactory factory = new DescrFactory();
+	
+	
+	private boolean parserDebug = false;
+	
+	public void setParserDebug(boolean parserDebug) {
+		this.parserDebug = parserDebug;
+	}
+	
+	public void debug(String message) {
+		if ( parserDebug ) 
+			System.err.println( "drl parser: " + message );
+	}
+	
+	public void setSource(String source) {
+		this.source = source;
+	}
+	
+	public DescrFactory getFactory() {
+		return factory;
+	}	
+
+	/**
+	 * This may be set to enable debuggin of DSLs/expanders.
+	 * If set to true, expander stuff will be sent to the Std out.
+	 */	
+	public void setExpanderDebug(boolean status) {
+		expanderDebug = status;
+	}
+	public String getSource() {
+		return this.source;
+	}
+	
+	public PackageDescr getPackageDescr() {
+		return packageDescr;
+	}
+	
+	private int offset(int line) {
+		return line + lineOffset;
+	}
+	
+	/**
+	 * This will set the offset to record when reparsing. Normally is zero of course 
+	 */
+	public void setLineOffset(int i) {
+	 	this.lineOffset = i;
+	}
+	
+	public void setExpanderResolver(ExpanderResolver expanderResolver) {
+		this.expanderResolver = expanderResolver;
+	}
+	
+	public ExpanderResolver getExpanderResolver() {
+		return expanderResolver;
+	}
+	
+	/** Expand the LHS */
+	private String runWhenExpander(String text, int line) throws RecognitionException {
+		String expanded = text.trim();
+		if (expanded.startsWith(">")) {
+			expanded = expanded.substring(1);  //escape !!
+		} else {
+			try {
+				expanded = expander.expand( "when", text );			
+			} catch (Exception e) {
+				this.errors.add(new ExpanderException("Unable to expand: " + text + ". Due to " + e.getMessage(), line));
+				return "";
+			}
+		}
+		if (expanderDebug) {
+			System.out.println("Expanding LHS: " + text + " ----> " + expanded + " --> from line: " + line);
+		}
+		return expanded;			
+	}
+	
+    	/** This will apply a list of constraints to an LHS block */
+    	private String applyConstraints(List constraints, String block) {
+    		//apply the constraints as a comma seperated list inside the previous block
+    		//the block will end in something like "foo()" and the constraint patterns will be put in the ()
+    		if (constraints == null) {
+    			return block;
+    		}
+    		StringBuffer list = new StringBuffer();    		
+    		for (Iterator iter = constraints.iterator(); iter.hasNext();) {
+				String con = (String) iter.next();
+				list.append("\n\t\t");
+				list.append(con);
+				if (iter.hasNext()) {
+					list.append(",");					
+				}			
+			}
+    		if (block.endsWith("()")) {
+    			return block.substring(0, block.length() - 2) + "(" + list.toString() + ")";
+    		} else {
+    			return block + "(" + list.toString() + ")";
+    		}
+    	}  
+    	
+        	/** Reparse the results of the expansion */
+    	private void reparseLhs(String text, AndDescr descrs) throws RecognitionException {
+    		CharStream charStream = new ANTLRStringStream( text  + " \n  then"); //need to then so it knows when to end... werd...
+    		RuleParserLexer lexer = new RuleParserLexer( charStream );
+    		TokenStream tokenStream = new CommonTokenStream( lexer );
+    		RuleParser parser = new RuleParser( tokenStream );
+    		parser.setLineOffset( descrs.getLine() );
+    		parser.normal_lhs_block(descrs);
+            
+                if (parser.hasErrors()) {
+    			this.errors.addAll(parser.getErrors());
+    		}
+		if (expanderDebug) {
+			System.out.println("Reparsing LHS: " + text + " --> successful:" + !parser.hasErrors());
+		}    		
+    		
+    	}
+	
+	/** Expand a line on the RHS */
+	private String runThenExpander(String text, int startLine) {
+		//System.err.println( "expand THEN [" + text + "]" );
+		StringTokenizer lines = new StringTokenizer( text, "\n\r" );
+
+		StringBuffer expanded = new StringBuffer();
+		
+		String eol = System.getProperty( "line.separator" );
+				
+		while ( lines.hasMoreTokens() ) {
+			startLine++;
+			String line = lines.nextToken();
+			line = line.trim();
+			if ( line.length() > 0 ) {
+				if ( line.startsWith( ">" ) ) {
+					expanded.append( line.substring( 1 ) );
+					expanded.append( eol );
+				} else {
+					try {
+						expanded.append( expander.expand( "then", line ) );
+						expanded.append( eol );
+					} catch (Exception e) {
+						this.errors.add(new ExpanderException("Unable to expand: " + line + ". Due to " + e.getMessage(), startLine));			
+					}
+				}
+			}
+		}
+		
+		if (expanderDebug) {
+			System.out.println("Expanding RHS: " + text + " ----> " + expanded.toString() + " --> from line starting: " + startLine);
+		}		
+		
+		return expanded.toString();
+	}
+	
+
+	
+	private String getString(Token token) {
+		String orig = token.getText();
+		return orig.substring( 1, orig.length() -1 );
+	}
+	
+	public void reportError(RecognitionException ex) {
+	        // if we've already reported an error and have not matched a token
+                // yet successfully, don't report any errors.
+                if ( errorRecovery ) {
+                        return;
+                }
+                errorRecovery = true;
+
+		ex.line = offset(ex.line); //add the offset if there is one
+		errors.add( ex ); 
+	}
+     	
+     	/** return the raw RecognitionException errors */
+     	public List getErrors() {
+     		return errors;
+     	}
+     	
+     	/** Return a list of pretty strings summarising the errors */
+     	public List getErrorMessages() {
+     		List messages = new ArrayList();
+ 		for ( Iterator errorIter = errors.iterator() ; errorIter.hasNext() ; ) {
+     	     		messages.add( createErrorMessage( (RecognitionException) errorIter.next() ) );
+     	     	}
+     	     	return messages;
+     	}
+     	
+     	/** return true if any parser errors were accumulated */
+     	public boolean hasErrors() {
+  		return ! errors.isEmpty();
+     	}
+     	
+     	/** This will take a RecognitionException, and create a sensible error message out of it */
+     	public String createErrorMessage(RecognitionException e)
+        {
+		StringBuffer message = new StringBuffer();		
+                message.append( source + ":"+e.line+":"+e.charPositionInLine+" ");
+                if ( e instanceof MismatchedTokenException ) {
+                        MismatchedTokenException mte = (MismatchedTokenException)e;
+                        message.append("mismatched token: "+
+                                                           e.token+
+                                                           "; expecting type "+
+                                                           tokenNames[mte.expecting]);
+                }
+                else if ( e instanceof MismatchedTreeNodeException ) {
+                        MismatchedTreeNodeException mtne = (MismatchedTreeNodeException)e;
+                        message.append("mismatched tree node: "+
+                                                           mtne.foundNode+
+                                                           "; expecting type "+
+                                                           tokenNames[mtne.expecting]);
+                }
+                else if ( e instanceof NoViableAltException ) {
+                        NoViableAltException nvae = (NoViableAltException)e;
+			message.append( "Unexpected token '" + e.token.getText() + "'" );
+                        /*
+                        message.append("decision=<<"+nvae.grammarDecisionDescription+">>"+
+                                                           " state "+nvae.stateNumber+
+                                                           " (decision="+nvae.decisionNumber+
+                                                           ") no viable alt; token="+
+                                                           e.token);
+                                                           */
+                }
+                else if ( e instanceof EarlyExitException ) {
+                        EarlyExitException eee = (EarlyExitException)e;
+                        message.append("required (...)+ loop (decision="+
+                                                           eee.decisionNumber+
+                                                           ") did not match anything; token="+
+                                                           e.token);
+                }
+                else if ( e instanceof MismatchedSetException ) {
+                        MismatchedSetException mse = (MismatchedSetException)e;
+                        message.append("mismatched token '"+
+                                                           e.token+
+                                                           "' expecting set "+mse.expecting);
+                }
+                else if ( e instanceof MismatchedNotSetException ) {
+                        MismatchedNotSetException mse = (MismatchedNotSetException)e;
+                        message.append("mismatched token '"+
+                                                           e.token+
+                                                           "' expecting set "+mse.expecting);
+                }
+                else if ( e instanceof FailedPredicateException ) {
+                        FailedPredicateException fpe = (FailedPredicateException)e;
+                        message.append("rule "+fpe.ruleName+" failed predicate: {"+
+                                                           fpe.predicateText+"}?");
+                } else if (e instanceof GeneralParseException) {
+			message.append(" " + e.getMessage());
+		}
+               	return message.toString();
+        }   
+        
+        void checkTrailingSemicolon(String text, int line) {
+        	if (text.trim().endsWith( ";" ) ) {
+        		this.errors.add( new GeneralParseException( "Trailing semi-colon not allowed", offset(line) ) );
+        	}
+        }
+      
+}
+
+ at lexer::header {
+	package org.drools.lang;
+}
+
+opt_eol	:
+		(';'|EOL)*	
+	;
+
+compilation_unit
+	:	opt_eol
+		prolog 
+		(	r=rule 	{this.packageDescr.addRule( r ); } 
+		| 	q=query	{this.packageDescr.addRule( q ); }
+		|	t=template	{this.packageDescr.addFactTemplate ( t ); }
+		|	extra_statement 
+		)*
+	;
+	
+prolog
+	@init {
+		String packageName = "";
+	}
+	:	opt_eol
+		( name=package_statement { packageName = name; } )?
+		{ 
+			this.packageDescr = new PackageDescr( name ); 
+		}
+		(	extra_statement
+		|	expander
+		)*
+		
+		opt_eol
+	;
+	
+package_statement returns [String packageName]
+	@init{
+		packageName = null;
+	}
+	:	
+		'package' opt_eol name=dotted_name ';'? opt_eol
+		{
+			packageName = name;
+		}
+	;
+	
+import_statement
+	:	'import' opt_eol name=import_name ';'? opt_eol
+		{
+			if (packageDescr != null) 
+				packageDescr.addImport( name );
+		}	
+	;
+
+function_import_statement
+	:	'import' 'function' opt_eol name=import_name ';'? opt_eol
+		{
+			if (packageDescr != null) 
+				packageDescr.addFunctionImport( name );
+		}	
+	;
+
+
+import_name returns [String name]
+	@init {
+		name = null;
+	}
+	:	
+		id=ID { name=id.getText(); } ( '.' id=ID { name = name + "." + id.getText(); } )* (star='.*' { name = name + star.getText(); })?
+	;
+expander
+	@init {
+		String config=null;
+	}
+	:	'expander' (name=dotted_name)? ';'? opt_eol
+		{
+			if (expanderResolver == null) 
+				throw new IllegalArgumentException("Unable to use expander. Make sure a expander or dsl config is being passed to the parser. [ExpanderResolver was not set].");
+			if ( expander != null )
+				throw new IllegalArgumentException( "Only one 'expander' statement per file is allowed" );
+			expander = expanderResolver.get( name, config );
+		}
+	;
+	
+global
+	@init {
+	}
+	:
+		'global' type=dotted_name id=ID ';'? opt_eol
+		{
+			packageDescr.addGlobal( id.getText(), type );
+		}
+	;
+	
+function
+	@init {
+		FunctionDescr f = null;
+	}
+	:
+		'function' opt_eol (retType=dotted_name)? opt_eol name=ID opt_eol
+		{
+			//System.err.println( "function :: " + name.getText() );
+			f = new FunctionDescr( name.getText(), retType );
+		} 
+		'(' opt_eol
+			(	(paramType=dotted_name)? opt_eol paramName=argument_name opt_eol
+				{
+					f.addParameter( paramType, paramName );
+				}
+				(	',' opt_eol (paramType=dotted_name)? opt_eol paramName=argument_name opt_eol 
+					{
+						f.addParameter( paramType, paramName );
+					}
+				)*
+			)?
+		')'
+		opt_eol
+		'{'
+			body=curly_chunk
+			{
+				f.setText( body );
+			}
+		'}'
+		{
+			packageDescr.addFunction( f );
+		}
+		opt_eol
+	;
+
+
+query returns [QueryDescr query]
+	@init {
+		query = null;
+	}
+	:
+		opt_eol
+		loc='query' queryName=word opt_eol 
+		{ 
+			query = new QueryDescr( queryName, null ); 
+			query.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+			AndDescr lhs = new AndDescr(); query.setLhs( lhs ); 
+			lhs.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+		}
+		(
+			{ expander != null }? expander_lhs_block[lhs]
+			| normal_lhs_block[lhs]
+		)
+					
+		'end' opt_eol
+	;
+	
+template returns [FactTemplateDescr template]
+	@init {
+		template = null;		
+	}
+	:
+		opt_eol
+		loc='template' templateName=ID EOL
+		{
+			template = new FactTemplateDescr(templateName.getText());
+			template.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );			
+		}
+		(
+			slot=template_slot 
+			{
+				template.addFieldTemplate(slot);
+			}
+		)+
+		'end' EOL		
+	;
+	
+template_slot returns [FieldTemplateDescr field]
+	@init {
+		field = null;
+	}
+	:
+		//name=ID ':' fieldType=dotted_name ( EOL | ';' )
+		 fieldType=dotted_name name=ID ( EOL | ';' )
+		{
+			
+			
+			field = new FieldTemplateDescr(name.getText(), fieldType);
+			field.setLocation( offset(name.getLine()), name.getCharPositionInLine() );
+		}
+	;	
+	
+rule returns [RuleDescr rule]
+	@init {
+		rule = null;
+		String consequence = "";
+	}
+	:
+		opt_eol
+		loc='rule' ruleName=word opt_eol 
+		{ 
+			debug( "start rule: " + ruleName );
+			rule = new RuleDescr( ruleName, null ); 
+			rule.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+		}
+		(	rule_attributes[rule]
+		)?
+		opt_eol
+		((	loc='when' ':'? opt_eol
+			{ 
+				AndDescr lhs = new AndDescr(); rule.setLhs( lhs ); 
+				lhs.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+			}
+			(
+				{ expander != null }? expander_lhs_block[lhs]
+				| normal_lhs_block[lhs]
+			)
+					
+		)?
+		( opt_eol loc='then' ':'?  opt_eol
+			( options{greedy=false;} : any=.
+				{
+					consequence = consequence + " " + any.getText();
+				}
+			)*
+			{
+				if ( expander != null ) {
+					String expanded = runThenExpander( consequence, offset(loc.getLine()) );
+					rule.setConsequence( expanded );
+				} else { 
+					rule.setConsequence( consequence ); 
+				}
+				rule.setConsequenceLocation(offset(loc.getLine()), loc.getCharPositionInLine());
+			})?
+		)?
+		'end' opt_eol
+		{
+			debug( "end rule: " + ruleName );
+		} 
+	;
+	
+extra_statement
+	:
+	(	import_statement
+	|	function_import_statement
+	|	global
+	|	function
+	)
+	;
+
+rule_attributes[RuleDescr rule]
+	: 
+			'attributes'? ':'? opt_eol
+			(	','? a=rule_attribute opt_eol
+				{
+					rule.addAttribute( a );
+				}
+			)*
+	;
+	
+rule_attribute returns [AttributeDescr d]
+	@init {
+		d = null;
+	}
+	:
+			a=salience { d = a; }
+		|	a=no_loop  { d = a; }
+		|	a=agenda_group  { d = a; }		
+		|	a=duration  { d = a; }			
+		|	a=activation_group { d = a; }	
+		|	a=auto_focus { d = a; }	
+		
+	;
+	
+salience returns [AttributeDescr d ]
+	@init {
+		d = null;
+	}
+	:	
+		loc='salience' opt_eol i=INT ';'? opt_eol
+		{
+			d = new AttributeDescr( "salience", i.getText() );
+			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+		}
+	;
+	
+no_loop returns [AttributeDescr d]
+	@init {
+		d = null;
+	}
+	:
+		(
+			loc='no-loop' opt_eol ';'? opt_eol
+			{
+				d = new AttributeDescr( "no-loop", "true" );
+				d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+			}
+		) 
+		|
+		(
+			loc='no-loop' t=BOOL opt_eol ';'? opt_eol
+			{
+				d = new AttributeDescr( "no-loop", t.getText() );
+				d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+			}
+		
+		)
+		
+	;
+	
+auto_focus returns [AttributeDescr d]
+	@init {
+		d = null;
+	}
+	:
+		(
+			loc='auto-focus' opt_eol ';'? opt_eol
+			{
+				d = new AttributeDescr( "auto-focus", "true" );
+				d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+			}
+		) 
+		|
+		(
+			loc='auto-focus' t=BOOL opt_eol ';'? opt_eol
+			{
+				d = new AttributeDescr( "auto-focus", t.getText() );
+				d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+			}
+		
+		)
+		
+	;	
+	
+activation_group returns [AttributeDescr d]
+	@init {
+		d = null;
+	}
+	:
+		loc='activation-group' opt_eol name=STRING ';'? opt_eol
+		{
+			d = new AttributeDescr( "activation-group", getString( name ) );
+			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+		}
+	;
+
+agenda_group returns [AttributeDescr d]
+	@init {
+		d = null;
+	}
+	:
+		loc='agenda-group' opt_eol name=STRING ';'? opt_eol
+		{
+			d = new AttributeDescr( "agenda-group", getString( name ) );
+			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+		}
+	;		
+
+
+duration returns [AttributeDescr d]
+	@init {
+		d = null;
+	}
+	:
+		loc='duration' opt_eol i=INT ';'? opt_eol
+		{
+			d = new AttributeDescr( "duration", i.getText() );
+			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+		}
+	;		
+	
+
+normal_lhs_block[AndDescr descrs]
+	:
+		(	d=lhs opt_eol
+			{ descrs.addDescr( d ); }
+		)* opt_eol
+	;
+
+	
+
+	
+expander_lhs_block[AndDescr descrs]
+	@init {
+		String lhsBlock = null;
+		String eol = System.getProperty( "line.separator" );
+		List constraints = null;
+	}
+	:
+		(options{greedy=false;} : 
+			text=paren_chunk loc=EOL 
+			{
+				//only expand non null
+				if (text != null) {
+					if (text.trim().startsWith("-")) {
+						if (constraints == null) {
+							constraints = new ArrayList();
+						}
+						constraints.add(runWhenExpander( text, offset(loc.getLine())));
+					} else {
+						if (constraints != null) {
+							lhsBlock = applyConstraints(constraints, lhsBlock);
+							constraints = null;
+						}
+					
+					
+						if (lhsBlock == null) {					
+							lhsBlock = runWhenExpander( text, offset(loc.getLine()));
+						} else {
+							lhsBlock = lhsBlock + eol + runWhenExpander( text, offset(loc.getLine()));
+						}
+					}
+					text = null;
+				}
+			}
+			
+		(EOL)* )* 
+		
+		{	
+			//flush out any constraints left handing before the RHS
+			lhsBlock = applyConstraints(constraints, lhsBlock);
+			if (lhsBlock != null) {
+				reparseLhs(lhsBlock, descrs);
+			}
+		}
+
+	;
+	
+	
+	
+lhs returns [PatternDescr d]
+	@init {
+		d=null;
+	}
+	:	l=lhs_or { d = l; } 
+	;
+
+	
+lhs_column returns [PatternDescr d]
+	@init {
+		d=null;
+	}
+	:	f=fact_binding { d = f; }
+	|	f=fact { d = f; }
+	;
+	
+from_statement returns [FromDescr d]
+	@init {
+		d=factory.createFrom();
+	}
+ 	:
+ 		'from' opt_eol ds=from_source
+ 		{
+ 			d.setDataSource(ds);
+ 		
+ 		}
+ 		
+ 		
+ 		
+	;
+	
+from_source returns [DeclarativeInvokerDescr ds]
+	@init {
+		ds = null;
+	}
+	:
+		(var=ID '.' field=ID 
+		
+			{
+			  FieldAccessDescr fa = new FieldAccessDescr(var.getText(), field.getText());	
+			  fa.setLine(var.getLine());
+			  ds = fa;
+			 }
+	
+		) 
+		|
+		(var=ID '.' method=ID opt_eol  '(' opt_eol args=argument_list opt_eol ')' 
+			{
+			MethodAccessDescr mc = new MethodAccessDescr(var.getText(), method.getText());
+			mc.setArguments(args);
+			mc.setLine(var.getLine());
+			ds = mc;
+			}	
+		)
+		|
+		(functionName=ID opt_eol '(' opt_eol args=argument_list opt_eol ')'
+			{
+			FunctionCallDescr fc = new FunctionCallDescr(functionName.getText());
+			fc.setLine(functionName.getLine());
+			fc.setArguments(args);
+			ds = fc;
+			}
+
+		
+		)
+	
+	;	
+	
+argument_list returns [ArrayList args]
+	@init {
+		args = new ArrayList();
+	}
+	:
+		(param=argument_value  {
+			if (param != null) {
+				args.add(param);
+			}
+		}
+		 
+		(
+			opt_eol ',' opt_eol param=argument_value {
+				if (param != null) {
+					args.add(param);
+				}
+			}
+		)*
+		)?
+	;		
+	
+argument_value returns [ArgumentValueDescr value]
+	@init {
+		value = null;
+		String text = null;
+	}
+	:	(	t=STRING { text = getString( t );  value=new ArgumentValueDescr(ArgumentValueDescr.STRING, text);} 
+		|	t=INT    { text = t.getText();  value=new ArgumentValueDescr(ArgumentValueDescr.INTEGRAL, text);}
+		|	t=FLOAT	 { text = t.getText(); value=new ArgumentValueDescr(ArgumentValueDescr.DECIMAL, text); }
+		|	t=BOOL 	 { text = t.getText(); value=new ArgumentValueDescr(ArgumentValueDescr.BOOLEAN, text); }
+		|	t=ID { text = t.getText(); value=new ArgumentValueDescr(ArgumentValueDescr.VARIABLE, text);}	
+		|	t='null' { text = "null"; value=new ArgumentValueDescr(ArgumentValueDescr.NULL, text);}	
+		|	t='null' { text = "null"; value=new ArgumentValueDescr(ArgumentValueDescr.NULL, text);}			
+		|       m=inline_map {  value=new ArgumentValueDescr(ArgumentValueDescr.MAP, m.getKeyValuePairs() ); }		
+		)
+	;			
+
+inline_map returns [ArgumentValueDescr.MapDescr mapDescr]
+    @init {
+        mapDescr = new ArgumentValueDescr.MapDescr();
+    }	
+    :  '{' 
+           ( key=argument_value '=>' value=argument_value {
+                 if ( key != null ) {
+                     mapDescr.add( new ArgumentValueDescr.KeyValuePairDescr( key, value ) );
+                 }
+             }
+           )
+           
+           ( (EOL)? ',' (EOL)? key=argument_value '=>' value=argument_value {
+                 if ( key != null ) {
+                     mapDescr.add( new ArgumentValueDescr.KeyValuePairDescr( key, value ) );
+                 }
+             }
+           )*           
+       '}'
+    ;
+ 	
+fact_binding returns [PatternDescr d]
+	@init {
+		d=null;
+		boolean multi=false;
+	}
+ 	:
+ 		id=ID 
+ 		
+ 		opt_eol ':' opt_eol fe=fact_expression[id.getText()]
+ 		{
+ 			d=fe;
+ 		}
+	;
+ 
+ fact_expression[String id] returns [PatternDescr pd]
+ 	@init {
+ 		pd = null;
+ 		boolean multi = false;
+ 	}
+ 	:	'(' opt_eol fe=fact_expression[id]opt_eol ')' { pd=fe; }
+ 	| 	f=fact opt_eol
+ 		{
+ 			((ColumnDescr)f).setIdentifier( id );
+ 			pd = f;
+ 		}
+ 		(	('or'|'||') opt_eol
+ 			{	if ( ! multi ) {
+ 					PatternDescr first = pd;
+ 					pd = new OrDescr();
+ 					((OrDescr)pd).addDescr( first );
+ 					multi=true;
+ 				}
+ 			}
+ 			f=fact
+ 			{
+ 				((ColumnDescr)f).setIdentifier( id );
+ 				((OrDescr)pd).addDescr( f );
+ 			}
+ 		)*	
+	;
+ 
+fact returns [PatternDescr d] 
+	@init {
+		d=null;
+	}
+ 	:	id=dotted_name 
+ 		{ 
+ 			d = new ColumnDescr( id ); 
+ 		} opt_eol 
+ 		loc='(' {
+ 				d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+ 			}opt_eol (	c=constraints
+ 				{
+		 			for ( Iterator cIter = c.iterator() ; cIter.hasNext() ; ) {
+ 						((ColumnDescr)d).addDescr( (PatternDescr) cIter.next() );
+ 					}
+ 				}
+ 
+ 				)? opt_eol endLoc=')' opt_eol
+ 				{
+ 					d.setEndLocation( offset(endLoc.getLine()), endLoc.getCharPositionInLine() );	
+ 				}
+ 	;
+	
+	
+constraints returns [List constraints]
+	@init {
+		constraints = new ArrayList();
+	}
+	:	opt_eol
+		(constraint[constraints]|predicate[constraints])
+		( opt_eol ',' opt_eol (constraint[constraints]|predicate[constraints]))*
+		opt_eol
+	;
+	
+constraint[List constraints]
+	@init {
+		PatternDescr d = null;
+	}
+	:	opt_eol
+		( fb=ID opt_eol ':' opt_eol )? 
+		f=ID	
+		{
+
+			if ( fb != null ) {
+				//System.err.println( "fb: " + fb.getText() );
+				//System.err.println( " f: " + f.getText() );
+				d = new FieldBindingDescr( f.getText(), fb.getText() );
+				//System.err.println( "fbd: " + d );
+				
+				d.setLocation( offset(f.getLine()), f.getCharPositionInLine() );
+				constraints.add( d );
+			} 
+			FieldConstraintDescr fc = new FieldConstraintDescr(f.getText());
+			fc.setLocation( offset(f.getLine()), f.getCharPositionInLine() );
+									
+			
+		}				
+			opt_eol (	op=operator opt_eol	
+					
+					(	bvc=ID
+						{
+							
+														
+							
+							VariableRestrictionDescr vd = new VariableRestrictionDescr(op, bvc.getText());
+							fc.addRestriction(vd);
+							constraints.add(fc);
+							
+						}
+					|
+						lc=enum_constraint 
+						{ 
+
+							LiteralRestrictionDescr lrd  = new LiteralRestrictionDescr(op, lc, true);
+							fc.addRestriction(lrd);
+							constraints.add(fc);
+							
+						}						
+					|
+						lc=literal_constraint 
+						{ 
+							
+							LiteralRestrictionDescr lrd  = new LiteralRestrictionDescr(op, lc);
+							fc.addRestriction(lrd);
+							constraints.add(fc);
+							
+						}
+					|	rvc=retval_constraint 
+						{ 
+							
+							
+
+							ReturnValueRestrictionDescr rvd = new ReturnValueRestrictionDescr(op, rvc);							
+							fc.addRestriction(rvd);
+							constraints.add(fc);
+							
+						} 
+					)
+					(
+						con=('&'|'|')
+						{
+							if (con.getText().equals("&") ) {								
+								fc.addRestriction(new RestrictionConnectiveDescr(RestrictionConnectiveDescr.AND));	
+							} else {
+								fc.addRestriction(new RestrictionConnectiveDescr(RestrictionConnectiveDescr.OR));	
+							}							
+						}
+
+						op=operator
+						(	bvc=ID
+							{
+								VariableRestrictionDescr vd = new VariableRestrictionDescr(op, bvc.getText());
+								fc.addRestriction(vd);
+							}
+						|
+							lc=enum_constraint 
+							{ 
+								LiteralRestrictionDescr lrd  = new LiteralRestrictionDescr(op, lc, true);
+								fc.addRestriction(lrd);
+								
+							}						
+						|
+							lc=literal_constraint 
+							{ 
+								LiteralRestrictionDescr lrd  = new LiteralRestrictionDescr(op, lc);
+								fc.addRestriction(lrd);
+								
+							}
+						|	rvc=retval_constraint 
+							{ 
+								ReturnValueRestrictionDescr rvd = new ReturnValueRestrictionDescr(op, rvc);							
+								fc.addRestriction(rvd);
+								
+							} 
+						)						
+						
+					)*
+				)?					
+		opt_eol
+	;
+		
+literal_constraint returns [String text]
+	@init {
+		text = null;
+	}
+	:	(	t=STRING { text = getString( t ); } //t.getText(); text=text.substring( 1, text.length() - 1 ); }
+		|	t=INT    { text = t.getText(); }
+		|	t=FLOAT	 { text = t.getText(); }
+		|	t=BOOL 	 { text = t.getText(); }
+		|	t='null' { text = null; }
+		)
+	;
+	
+enum_constraint returns [String text]
+	@init {
+		text = null;
+	}
+	:	(cls=ID '.' en=ID) { text = cls.getText() + "." + en.getText(); }
+	;	
+	
+retval_constraint returns [String text]
+	@init {
+		text = null;
+	}
+	:	
+		'('  c=paren_chunk  ')' { text = c; }
+	;
+
+predicate[List constraints]
+	:
+		decl=ID ':' field=ID '->' '(' text=paren_chunk ')'
+		{
+			PredicateDescr d = new PredicateDescr(field.getText(), decl.getText(), text );
+			constraints.add( d );
+		}
+	;
+	
+paren_chunk returns [String text]
+	@init {
+		text = null;
+	}
+	
+	:
+		 (	options{greedy=false;} : 
+			'(' c=paren_chunk ')' 	
+			{
+				if ( c == null ) {
+					c = "";
+				}
+				if ( text == null ) {
+					text = "( " + c + " )";
+				} else {
+					text = text + " ( " + c + " )";
+				}
+			} 
+		| any=. 
+			{
+				if ( text == null ) {
+					text = any.getText();
+				} else {
+					text = text + " " + any.getText(); 
+				} 
+			}
+		)* 
+	;
+	
+//NOTE: this is needed as there is a bug in antlr if you sometimes use the same sub rule in multiple places
+paren_chunk2 returns [String text]
+	@init {
+		text = null;
+	}
+	
+	:
+		 (	options{greedy=false;} : 
+			'(' c=paren_chunk2 ')' 	
+			{
+				if ( c == null ) {
+					c = "";
+				}
+				if ( text == null ) {
+					text = "( " + c + " )";
+				} else {
+					text = text + " ( " + c + " )";
+				}
+			} 
+		| any=. 
+			{
+				if ( text == null ) {
+					text = any.getText();
+				} else {
+					text = text + " " + any.getText(); 
+				} 
+			}
+		)* 
+	;
+	
+curly_chunk returns [String text]
+	@init {
+		text = null;
+	}
+	
+	:
+		(	options{greedy=false;} : 
+			'{' c=curly_chunk '}' 	
+			{
+				//System.err.println( "chunk [" + c + "]" );
+				if ( c == null ) {
+					c = "";
+				}
+				if ( text == null ) {
+					text = "{ " + c + " }";
+				} else {
+					text = text + " { " + c + " }";
+				}
+			} 
+		| any=. 
+			{
+				//System.err.println( "any [" + any.getText() + "]" );
+				if ( text == null ) {
+					text = any.getText();
+				} else {
+					text = text + " " + any.getText(); 
+				} 
+			}
+		)*
+	;	
+	
+lhs_or returns [PatternDescr d]
+	@init{
+		d = null;
+	}
+	:	
+		{ OrDescr or = null; }
+		left=lhs_and {d = left; }
+		( ('or'|'||') opt_eol
+			right=lhs_and 
+			{
+				if ( or == null ) {
+					or = new OrDescr();
+					or.addDescr( left );
+					d = or;
+				}
+				
+				or.addDescr( right );
+			}
+		)*
+	;
+	
+lhs_and returns [PatternDescr d]
+	@init{
+		d = null;
+	}
+	:
+		{ AndDescr and = null; }
+		left=lhs_unary { d = left; }
+		( ('and'|'&&') opt_eol
+			right=lhs_unary 
+			{
+				if ( and == null ) {
+					and = new AndDescr();
+					and.addDescr( left );
+					d = and;
+				}
+				
+				and.addDescr( right );
+			}
+		)* 
+	;
+	
+lhs_unary returns [PatternDescr d]
+	@init {
+		d = null;
+	}
+	:	(	u=lhs_exist {d = u;}
+		|	u=lhs_not {d = u;}
+		|	u=lhs_eval {d = u;}				
+		|	u=lhs_column {d=u;} (fm=from_statement {fm.setColumn((ColumnDescr) u); d=fm;})?
+		|	'(' opt_eol u=lhs opt_eol ')' {d = u;}
+		) 
+	;
+	
+lhs_exist returns [PatternDescr d]
+	@init {
+		d = null;
+	}
+	:	loc='exists' ('(' column=lhs_column ')' | column=lhs_column)
+		{ 
+			d = new ExistsDescr( (ColumnDescr) column ); 
+			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+		}	
+	;
+	
+lhs_not	returns [NotDescr d]
+	@init {
+		d = null;
+	}
+	:	loc='not' ('(' column=lhs_column  ')' | column=lhs_column)
+		{
+			d = new NotDescr( (ColumnDescr) column ); 
+			d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
+		}
+	;
+
+lhs_eval returns [PatternDescr d]
+	@init {
+		d = null;
+		String text = "";
+	}
+	:	'eval' loc='(' 
+			c=paren_chunk2
+		')' 
+		{ 
+			checkTrailingSemicolon( c, offset(loc.getLine()) );
+			d = new EvalDescr( c ); 
+		}
+	;
+	
+dotted_name returns [String name]
+	@init {
+		name = null;
+	}
+	:	
+		id=ID { name=id.getText(); } ( '.' id=ID { name = name + "." + id.getText(); } )* ( '[' ']' { name = name + "[]";})*
+	;
+	
+argument_name returns [String name]
+	@init {
+		name = null;
+	}
+	:
+		id=ID { name=id.getText(); } ( '[' ']' { name = name + "[]";})*
+	;
+
+	
+word returns [String word]
+	@init{
+		word = null;
+	}
+	:	id=ID      { word=id.getText(); }
+	|	'import'   { word="import"; }
+	|	'use'      { word="use"; }
+	|	'rule'     { word="rule"; }
+	|	'query'    { word="query"; }
+	|	'salience' { word="salience"; }
+ 	|	'no-loop'  { word="no-loop"; }
+	|	'when'     { word="when"; }
+	|	'then'     { word="then"; }
+	|	'end'      { word="end"; }
+	|	str=STRING { word=getString(str);} 
+	;
+
+operator returns [String str] 	
+	@init {
+		str = null;
+	}
+	:
+
+		'==' {str= "==";}
+		|'=' {str="==";}
+		|'>' {str=">";}
+		|'>=' {str=">=";}		
+		|'<' {str="<";}
+		|'<=' {str="<=";}
+		|'!=' {str="!=";}
+		|'contains' {str="contains";}
+		|'matches' {str="matches";}
+		|'excludes' {str="excludes";}
+					
+						
+	;
+
+
+
+MISC 	:
+		'!' | '@' | '$' | '%' | '^' | '&' | '*' | '_' | '-' | '+'  | '?'
+		| '|' | ',' | '{' | '}' | '[' | ']' | '=' | '/' | '(' | ')' | '\'' | '\\'
+		| '||' | '&&' | '<<<' | '++' | '--' | '>>>' | '==' | '+=' | '=+' | '-=' | '=-' |'*=' | '=*' 
+		| '/=' | '=/' | '>>=' 
+		
+	;
+	
+WS      :       (	' '
+                |	'\t'
+                |	'\f'
+                )
+                { channel=99; }
+        ;
+        
+EOL 	:	     
+   		(       ( '\r\n' )=> '\r\n'  // Evil DOS
+                |       '\r'    // Macintosh
+                |       '\n'    // Unix (the right way)
+                )
+        ;  
+        
+INT	
+	:	('-')?('0'..'9')+
+	;
+
+FLOAT
+	:	('-')?('0'..'9')+ '.' ('0'..'9')+
+	;
+	
+STRING
+	:	('"' ( options{greedy=false;} : .)* '"' ) | ('\'' ( options{greedy=false;} : .)* '\'')
+	;
+	
+BOOL
+	:	('true'|'false') 
+	;	
+	
+ID	
+	:	('a'..'z'|'A'..'Z'|'_'|'$' | '\u00c0'..'\u00ff')('a'..'z'|'A'..'Z'|'_'|'0'..'9' | '\u00c0'..'\u00ff')* 
+	;
+	
+		
+
+SH_STYLE_SINGLE_LINE_COMMENT	
+	:	'#' ( options{greedy=false;} : .)* EOL /* ('\r')? '\n'  */
+                { channel=99; }
+	;
+        
+        
+C_STYLE_SINGLE_LINE_COMMENT	
+	:	'//' ( options{greedy=false;} : .)* EOL // ('\r')? '\n' 
+                { channel=99; }
+	;
+
+MULTI_LINE_COMMENT
+	:	'/*' (options{greedy=false;} : .)* '*/'
+                { channel=99; }
+	;

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/RuleParserTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/RuleParserTest.java	2006-08-30 15:59:19 UTC (rev 6027)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/RuleParserTest.java	2006-08-30 16:14:33 UTC (rev 6028)
@@ -980,6 +980,20 @@
 
         assertFalse( this.parser.hasErrors() );
     }
+    
+    public void testFunctionImport() throws Exception {
+        final RuleParser parser = parseResource( "test_FunctionImport.drl" );
+        parser.compilation_unit();
+        assertFalse(parser.hasErrors());
+        
+        PackageDescr pkg = parser.getPackageDescr();
+        assertEquals(2, pkg.getFunctionImports().size());
+        
+        assertEquals("abd.def.x", pkg.getFunctionImports().get( 0 ));
+        assertEquals("qed.wah.*", pkg.getFunctionImports().get( 1 ));
+        
+        
+    }
 
     public void testNotExistWithBrackets() throws Exception {
 




More information about the jboss-svn-commits mailing list