[jboss-svn-commits] JBL Code SVN: r20069 - labs/jbossrules/branches/mattgeis/drools-compiler/src/main/java/org/drools/lang/dsl.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Mon May 19 20:12:48 EDT 2008


Author: mattgeis
Date: 2008-05-19 20:12:48 -0400 (Mon, 19 May 2008)
New Revision: 20069

Modified:
   labs/jbossrules/branches/mattgeis/drools-compiler/src/main/java/org/drools/lang/dsl/DSLMapLexer.java
   labs/jbossrules/branches/mattgeis/drools-compiler/src/main/java/org/drools/lang/dsl/DSLMapParser.java
   labs/jbossrules/branches/mattgeis/drools-compiler/src/main/java/org/drools/lang/dsl/DSLMapWalker.java
   labs/jbossrules/branches/mattgeis/drools-compiler/src/main/java/org/drools/lang/dsl/DSLTokenizedMappingFile.java
   labs/jbossrules/branches/mattgeis/drools-compiler/src/main/java/org/drools/lang/dsl/DefaultExpanderResolver.java
Log:
Updates to get unit tests working.  Massive calls to System.out in ANTLR generated code will be removed prior to merge.

Modified: labs/jbossrules/branches/mattgeis/drools-compiler/src/main/java/org/drools/lang/dsl/DSLMapLexer.java
===================================================================
--- labs/jbossrules/branches/mattgeis/drools-compiler/src/main/java/org/drools/lang/dsl/DSLMapLexer.java	2008-05-19 20:56:16 UTC (rev 20068)
+++ labs/jbossrules/branches/mattgeis/drools-compiler/src/main/java/org/drools/lang/dsl/DSLMapLexer.java	2008-05-20 00:12:48 UTC (rev 20069)
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 DSLMap.g 2008-05-14 15:02:18
+// $ANTLR 3.0.1 DSLMap.g 2008-05-19 16:06:17
 
 	package org.drools.lang.dsl;
 

Modified: labs/jbossrules/branches/mattgeis/drools-compiler/src/main/java/org/drools/lang/dsl/DSLMapParser.java
===================================================================
--- labs/jbossrules/branches/mattgeis/drools-compiler/src/main/java/org/drools/lang/dsl/DSLMapParser.java	2008-05-19 20:56:16 UTC (rev 20068)
+++ labs/jbossrules/branches/mattgeis/drools-compiler/src/main/java/org/drools/lang/dsl/DSLMapParser.java	2008-05-20 00:12:48 UTC (rev 20069)
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 DSLMap.g 2008-05-14 15:02:18
+// $ANTLR 3.0.1 DSLMap.g 2008-05-19 16:06:17
 
 	package org.drools.lang.dsl;
 
@@ -50,7 +50,7 @@
 
         public DSLMapParser(TokenStream input) {
             super(input);
-            ruleMemo = new HashMap[43+1];
+            ruleMemo = new HashMap[45+1];
          }
         
     protected TreeAdaptor adaptor = new CommonTreeAdaptor();
@@ -133,7 +133,7 @@
             	case 1 :
             	    // DSLMap.g:0:0: statement
             	    {
-            	    pushFollow(FOLLOW_statement_in_mapping_file257);
+            	    pushFollow(FOLLOW_statement_in_mapping_file262);
             	    statement1=statement();
             	    _fsp--;
             	    if (failed) return retval;
@@ -189,10 +189,10 @@
                 adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
             }
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
+        
+        	catch (RecognitionException e) {
+        		throw e;
+        	}
         finally {
         }
         return retval;
@@ -253,7 +253,7 @@
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_entry_in_statement280);
+                    pushFollow(FOLLOW_entry_in_statement285);
                     entry2=entry();
                     _fsp--;
                     if (failed) return retval;
@@ -266,7 +266,7 @@
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_comment_in_statement287);
+                    pushFollow(FOLLOW_comment_in_statement292);
                     comment3=comment();
                     _fsp--;
                     if (failed) return retval;
@@ -280,7 +280,7 @@
                     root_0 = (Object)adaptor.nil();
 
                     EOL4=(Token)input.LT(1);
-                    match(input,EOL,FOLLOW_EOL_in_statement293); if (failed) return retval;
+                    match(input,EOL,FOLLOW_EOL_in_statement298); if (failed) return retval;
 
                     }
                     break;
@@ -293,10 +293,10 @@
                 adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
             }
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
+        
+        	catch (RecognitionException e) {
+        		throw e;
+        	}
         finally {
         }
         return retval;
@@ -326,7 +326,7 @@
             // DSLMap.g:89:11: LINE_COMMENT
             {
             LINE_COMMENT5=(Token)input.LT(1);
-            match(input,LINE_COMMENT,FOLLOW_LINE_COMMENT_in_comment309); if (failed) return retval;
+            match(input,LINE_COMMENT,FOLLOW_LINE_COMMENT_in_comment314); if (failed) return retval;
             if ( backtracking==0 ) stream_LINE_COMMENT.add(LINE_COMMENT5);
 
 
@@ -366,10 +366,10 @@
                 adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
             }
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
+        
+        	catch (RecognitionException e) {
+        		throw e;
+        	}
         finally {
         }
         return retval;
@@ -415,26 +415,26 @@
             // DSLMap.g:94:8: ( scope_section meta_section key_section EQUALS value_section ( EOL | EOF ) -> ^( VT_ENTRY scope_section meta_section key_section value_section ) )
             // DSLMap.g:94:10: scope_section meta_section key_section EQUALS value_section ( EOL | EOF )
             {
-            pushFollow(FOLLOW_scope_section_in_entry334);
+            pushFollow(FOLLOW_scope_section_in_entry339);
             scope_section6=scope_section();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) stream_scope_section.add(scope_section6.getTree());
-            pushFollow(FOLLOW_meta_section_in_entry336);
+            pushFollow(FOLLOW_meta_section_in_entry341);
             meta_section7=meta_section();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) stream_meta_section.add(meta_section7.getTree());
-            pushFollow(FOLLOW_key_section_in_entry338);
+            pushFollow(FOLLOW_key_section_in_entry343);
             key_section8=key_section();
             _fsp--;
             if (failed) return retval;
             if ( backtracking==0 ) stream_key_section.add(key_section8.getTree());
             EQUALS9=(Token)input.LT(1);
-            match(input,EQUALS,FOLLOW_EQUALS_in_entry340); if (failed) return retval;
+            match(input,EQUALS,FOLLOW_EQUALS_in_entry345); if (failed) return retval;
             if ( backtracking==0 ) stream_EQUALS.add(EQUALS9);
 
-            pushFollow(FOLLOW_value_section_in_entry342);
+            pushFollow(FOLLOW_value_section_in_entry347);
             value_section10=value_section();
             _fsp--;
             if (failed) return retval;
@@ -461,7 +461,7 @@
                     // DSLMap.g:94:71: EOL
                     {
                     EOL11=(Token)input.LT(1);
-                    match(input,EOL,FOLLOW_EOL_in_entry345); if (failed) return retval;
+                    match(input,EOL,FOLLOW_EOL_in_entry350); if (failed) return retval;
                     if ( backtracking==0 ) stream_EOL.add(EOL11);
 
 
@@ -471,7 +471,7 @@
                     // DSLMap.g:94:75: EOF
                     {
                     EOF12=(Token)input.LT(1);
-                    match(input,EOF,FOLLOW_EOF_in_entry347); if (failed) return retval;
+                    match(input,EOF,FOLLOW_EOF_in_entry352); if (failed) return retval;
                     if ( backtracking==0 ) stream_EOF.add(EOF12);
 
 
@@ -520,10 +520,10 @@
                 adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
             }
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
+        
+        	catch (RecognitionException e) {
+        		throw e;
+        	}
         finally {
         }
         return retval;
@@ -567,7 +567,7 @@
             // DSLMap.g:101:4: LEFT_SQUARE (value1= condition_key | value2= consequence_key | value3= keyword_key | value4= any_key ) RIGHT_SQUARE
             {
             LEFT_SQUARE13=(Token)input.LT(1);
-            match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_scope_section377); if (failed) return retval;
+            match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_scope_section382); if (failed) return retval;
             if ( backtracking==0 ) stream_LEFT_SQUARE.add(LEFT_SQUARE13);
 
             // DSLMap.g:102:3: (value1= condition_key | value2= consequence_key | value3= keyword_key | value4= any_key )
@@ -608,7 +608,7 @@
                 case 1 :
                     // DSLMap.g:102:4: value1= condition_key
                     {
-                    pushFollow(FOLLOW_condition_key_in_scope_section385);
+                    pushFollow(FOLLOW_condition_key_in_scope_section390);
                     value1=condition_key();
                     _fsp--;
                     if (failed) return retval;
@@ -619,7 +619,7 @@
                 case 2 :
                     // DSLMap.g:103:5: value2= consequence_key
                     {
-                    pushFollow(FOLLOW_consequence_key_in_scope_section394);
+                    pushFollow(FOLLOW_consequence_key_in_scope_section399);
                     value2=consequence_key();
                     _fsp--;
                     if (failed) return retval;
@@ -630,7 +630,7 @@
                 case 3 :
                     // DSLMap.g:104:5: value3= keyword_key
                     {
-                    pushFollow(FOLLOW_keyword_key_in_scope_section402);
+                    pushFollow(FOLLOW_keyword_key_in_scope_section407);
                     value3=keyword_key();
                     _fsp--;
                     if (failed) return retval;
@@ -641,7 +641,7 @@
                 case 4 :
                     // DSLMap.g:105:5: value4= any_key
                     {
-                    pushFollow(FOLLOW_any_key_in_scope_section410);
+                    pushFollow(FOLLOW_any_key_in_scope_section415);
                     value4=any_key();
                     _fsp--;
                     if (failed) return retval;
@@ -653,7 +653,7 @@
             }
 
             RIGHT_SQUARE14=(Token)input.LT(1);
-            match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_scope_section418); if (failed) return retval;
+            match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_scope_section423); if (failed) return retval;
             if ( backtracking==0 ) stream_RIGHT_SQUARE.add(RIGHT_SQUARE14);
 
 
@@ -720,10 +720,10 @@
                 adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
             }
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
+        
+        	catch (RecognitionException e) {
+        		throw e;
+        	}
         finally {
         }
         return retval;
@@ -759,7 +759,7 @@
             // DSLMap.g:114:4: LEFT_SQUARE ( LITERAL )? RIGHT_SQUARE
             {
             LEFT_SQUARE15=(Token)input.LT(1);
-            match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_meta_section456); if (failed) return retval;
+            match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_meta_section461); if (failed) return retval;
             if ( backtracking==0 ) stream_LEFT_SQUARE.add(LEFT_SQUARE15);
 
             // DSLMap.g:114:16: ( LITERAL )?
@@ -774,7 +774,7 @@
                     // DSLMap.g:0:0: LITERAL
                     {
                     LITERAL16=(Token)input.LT(1);
-                    match(input,LITERAL,FOLLOW_LITERAL_in_meta_section458); if (failed) return retval;
+                    match(input,LITERAL,FOLLOW_LITERAL_in_meta_section463); if (failed) return retval;
                     if ( backtracking==0 ) stream_LITERAL.add(LITERAL16);
 
 
@@ -784,7 +784,7 @@
             }
 
             RIGHT_SQUARE17=(Token)input.LT(1);
-            match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_meta_section461); if (failed) return retval;
+            match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_meta_section466); if (failed) return retval;
             if ( backtracking==0 ) stream_RIGHT_SQUARE.add(RIGHT_SQUARE17);
 
 
@@ -829,10 +829,10 @@
                 adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
             }
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
+        
+        	catch (RecognitionException e) {
+        		throw e;
+        	}
         finally {
         }
         return retval;
@@ -867,7 +867,7 @@
                 int alt6=2;
                 int LA6_0 = input.LA(1);
 
-                if ( ((LA6_0>=LITERAL && LA6_0<=LEFT_CURLY)) ) {
+                if ( ((LA6_0>=LEFT_SQUARE && LA6_0<=LEFT_CURLY)) ) {
                     alt6=1;
                 }
 
@@ -876,7 +876,7 @@
             	case 1 :
             	    // DSLMap.g:0:0: key_sentence
             	    {
-            	    pushFollow(FOLLOW_key_sentence_in_key_section483);
+            	    pushFollow(FOLLOW_key_sentence_in_key_section488);
             	    key_sentence18=key_sentence();
             	    _fsp--;
             	    if (failed) return retval;
@@ -939,10 +939,10 @@
                 adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
             }
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
+        
+        	catch (RecognitionException e) {
+        		throw e;
+        	}
         finally {
         }
         return retval;
@@ -979,7 +979,7 @@
             if ( (LA7_0==LEFT_CURLY) ) {
                 alt7=1;
             }
-            else if ( ((LA7_0>=LITERAL && LA7_0<=COLON)) ) {
+            else if ( ((LA7_0>=LEFT_SQUARE && LA7_0<=COLON)) ) {
                 alt7=2;
             }
             else {
@@ -995,7 +995,7 @@
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_variable_definition_in_key_sentence514);
+                    pushFollow(FOLLOW_variable_definition_in_key_sentence519);
                     variable_definition19=variable_definition();
                     _fsp--;
                     if (failed) return retval;
@@ -1006,7 +1006,7 @@
                 case 2 :
                     // DSLMap.g:128:4: cb= key_chunk
                     {
-                    pushFollow(FOLLOW_key_chunk_in_key_sentence521);
+                    pushFollow(FOLLOW_key_chunk_in_key_sentence526);
                     cb=key_chunk();
                     _fsp--;
                     if (failed) return retval;
@@ -1045,10 +1045,10 @@
                 adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
             }
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
+        
+        	catch (RecognitionException e) {
+        		throw e;
+        	}
         finally {
         }
         return retval;
@@ -1085,7 +1085,7 @@
                 int alt8=2;
                 int LA8_0 = input.LA(1);
 
-                if ( ((LA8_0>=LITERAL && LA8_0<=COLON)) ) {
+                if ( ((LA8_0>=LEFT_SQUARE && LA8_0<=COLON)) ) {
                     int LA8_2 = input.LA(2);
 
                     if ( (synpred11()) ) {
@@ -1100,7 +1100,7 @@
             	case 1 :
             	    // DSLMap.g:0:0: literal
             	    {
-            	    pushFollow(FOLLOW_literal_in_key_chunk542);
+            	    pushFollow(FOLLOW_literal_in_key_chunk547);
             	    literal20=literal();
             	    _fsp--;
             	    if (failed) return retval;
@@ -1129,10 +1129,10 @@
                 adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
             }
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
+        
+        	catch (RecognitionException e) {
+        		throw e;
+        	}
         finally {
         }
         return retval;
@@ -1167,7 +1167,7 @@
                 int alt9=2;
                 int LA9_0 = input.LA(1);
 
-                if ( (LA9_0==EQUALS||(LA9_0>=LITERAL && LA9_0<=LEFT_CURLY)) ) {
+                if ( ((LA9_0>=EQUALS && LA9_0<=LEFT_CURLY)) ) {
                     alt9=1;
                 }
 
@@ -1176,7 +1176,7 @@
             	case 1 :
             	    // DSLMap.g:0:0: value_sentence
             	    {
-            	    pushFollow(FOLLOW_value_sentence_in_value_section557);
+            	    pushFollow(FOLLOW_value_sentence_in_value_section562);
             	    value_sentence21=value_sentence();
             	    _fsp--;
             	    if (failed) return retval;
@@ -1239,10 +1239,10 @@
                 adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
             }
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
+        
+        	catch (RecognitionException e) {
+        		throw e;
+        	}
         finally {
         }
         return retval;
@@ -1279,7 +1279,7 @@
             if ( (LA10_0==LEFT_CURLY) ) {
                 alt10=1;
             }
-            else if ( (LA10_0==EQUALS||(LA10_0>=LITERAL && LA10_0<=COLON)) ) {
+            else if ( ((LA10_0>=EQUALS && LA10_0<=COLON)) ) {
                 alt10=2;
             }
             else {
@@ -1295,7 +1295,7 @@
                     {
                     root_0 = (Object)adaptor.nil();
 
-                    pushFollow(FOLLOW_variable_reference_in_value_sentence588);
+                    pushFollow(FOLLOW_variable_reference_in_value_sentence593);
                     variable_reference22=variable_reference();
                     _fsp--;
                     if (failed) return retval;
@@ -1306,7 +1306,7 @@
                 case 2 :
                     // DSLMap.g:146:4: vc= value_chunk
                     {
-                    pushFollow(FOLLOW_value_chunk_in_value_sentence595);
+                    pushFollow(FOLLOW_value_chunk_in_value_sentence600);
                     vc=value_chunk();
                     _fsp--;
                     if (failed) return retval;
@@ -1345,10 +1345,10 @@
                 adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
             }
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
+        
+        	catch (RecognitionException e) {
+        		throw e;
+        	}
         finally {
         }
         return retval;
@@ -1387,7 +1387,7 @@
                 int alt11=3;
                 int LA11_0 = input.LA(1);
 
-                if ( ((LA11_0>=LITERAL && LA11_0<=COLON)) ) {
+                if ( ((LA11_0>=LEFT_SQUARE && LA11_0<=COLON)) ) {
                     int LA11_2 = input.LA(2);
 
                     if ( (synpred14()) ) {
@@ -1411,7 +1411,7 @@
             	case 1 :
             	    // DSLMap.g:151:5: literal
             	    {
-            	    pushFollow(FOLLOW_literal_in_value_chunk617);
+            	    pushFollow(FOLLOW_literal_in_value_chunk622);
             	    literal23=literal();
             	    _fsp--;
             	    if (failed) return retval;
@@ -1423,7 +1423,7 @@
             	    // DSLMap.g:151:13: EQUALS
             	    {
             	    EQUALS24=(Token)input.LT(1);
-            	    match(input,EQUALS,FOLLOW_EQUALS_in_value_chunk619); if (failed) return retval;
+            	    match(input,EQUALS,FOLLOW_EQUALS_in_value_chunk624); if (failed) return retval;
             	    if ( backtracking==0 ) {
             	    EQUALS24_tree = (Object)adaptor.create(EQUALS24);
             	    adaptor.addChild(root_0, EQUALS24_tree);
@@ -1452,10 +1452,10 @@
                 adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
             }
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
+        
+        	catch (RecognitionException e) {
+        		throw e;
+        	}
         finally {
         }
         return retval;
@@ -1468,7 +1468,7 @@
     };
 
     // $ANTLR start literal
-    // DSLMap.g:154:1: literal : ( LITERAL | COLON ) ;
+    // DSLMap.g:154:1: literal : ( LITERAL | COLON | LEFT_SQUARE | RIGHT_SQUARE ) ;
     public final literal_return literal() throws RecognitionException {
         literal_return retval = new literal_return();
         retval.start = input.LT(1);
@@ -1480,13 +1480,13 @@
         Object set25_tree=null;
 
         try {
-            // DSLMap.g:156:2: ( ( LITERAL | COLON ) )
-            // DSLMap.g:156:4: ( LITERAL | COLON )
+            // DSLMap.g:156:2: ( ( LITERAL | COLON | LEFT_SQUARE | RIGHT_SQUARE ) )
+            // DSLMap.g:156:4: ( LITERAL | COLON | LEFT_SQUARE | RIGHT_SQUARE )
             {
             root_0 = (Object)adaptor.nil();
 
             set25=(Token)input.LT(1);
-            if ( (input.LA(1)>=LITERAL && input.LA(1)<=COLON) ) {
+            if ( (input.LA(1)>=LEFT_SQUARE && input.LA(1)<=COLON) ) {
                 input.consume();
                 if ( backtracking==0 ) adaptor.addChild(root_0, adaptor.create(set25));
                 errorRecovery=false;failed=false;
@@ -1495,7 +1495,7 @@
                 if (backtracking>0) {failed=true; return retval;}
                 MismatchedSetException mse =
                     new MismatchedSetException(null,input);
-                recoverFromMismatchedSet(input,mse,FOLLOW_set_in_literal637);    throw mse;
+                recoverFromMismatchedSet(input,mse,FOLLOW_set_in_literal642);    throw mse;
             }
 
 
@@ -1508,10 +1508,10 @@
                 adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
             }
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
+        
+        	catch (RecognitionException e) {
+        		throw e;
+        	}
         finally {
         }
         return retval;
@@ -1556,14 +1556,14 @@
             // DSLMap.g:165:4: lc= LEFT_CURLY name= LITERAL ( COLON pat= pattern )? RIGHT_CURLY
             {
             lc=(Token)input.LT(1);
-            match(input,LEFT_CURLY,FOLLOW_LEFT_CURLY_in_variable_definition665); if (failed) return retval;
+            match(input,LEFT_CURLY,FOLLOW_LEFT_CURLY_in_variable_definition678); if (failed) return retval;
             if ( backtracking==0 ) stream_LEFT_CURLY.add(lc);
 
             if ( backtracking==0 ) {
                if( ((CommonToken)input.LT(-2)).getStopIndex() < ((CommonToken)lc).getStartIndex() -1 ) hasSpace = true; 
             }
             name=(Token)input.LT(1);
-            match(input,LITERAL,FOLLOW_LITERAL_in_variable_definition673); if (failed) return retval;
+            match(input,LITERAL,FOLLOW_LITERAL_in_variable_definition686); if (failed) return retval;
             if ( backtracking==0 ) stream_LITERAL.add(name);
 
             // DSLMap.g:166:15: ( COLON pat= pattern )?
@@ -1578,10 +1578,10 @@
                     // DSLMap.g:166:17: COLON pat= pattern
                     {
                     COLON26=(Token)input.LT(1);
-                    match(input,COLON,FOLLOW_COLON_in_variable_definition677); if (failed) return retval;
+                    match(input,COLON,FOLLOW_COLON_in_variable_definition690); if (failed) return retval;
                     if ( backtracking==0 ) stream_COLON.add(COLON26);
 
-                    pushFollow(FOLLOW_pattern_in_variable_definition681);
+                    pushFollow(FOLLOW_pattern_in_variable_definition694);
                     pat=pattern();
                     _fsp--;
                     if (failed) return retval;
@@ -1596,7 +1596,7 @@
             }
 
             RIGHT_CURLY27=(Token)input.LT(1);
-            match(input,RIGHT_CURLY,FOLLOW_RIGHT_CURLY_in_variable_definition688); if (failed) return retval;
+            match(input,RIGHT_CURLY,FOLLOW_RIGHT_CURLY_in_variable_definition701); if (failed) return retval;
             if ( backtracking==0 ) stream_RIGHT_CURLY.add(RIGHT_CURLY27);
 
 
@@ -1680,10 +1680,10 @@
                 adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
             }
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
+        
+        	catch (RecognitionException e) {
+        		throw e;
+        	}
         finally {
         }
         return retval;
@@ -1727,11 +1727,11 @@
             // DSLMap.g:177:4: LEFT_CURLY name= LITERAL ( COLON pat= pattern )? RIGHT_CURLY
             {
             LEFT_CURLY28=(Token)input.LT(1);
-            match(input,LEFT_CURLY,FOLLOW_LEFT_CURLY_in_variable_definition2770); if (failed) return retval;
+            match(input,LEFT_CURLY,FOLLOW_LEFT_CURLY_in_variable_definition2783); if (failed) return retval;
             if ( backtracking==0 ) stream_LEFT_CURLY.add(LEFT_CURLY28);
 
             name=(Token)input.LT(1);
-            match(input,LITERAL,FOLLOW_LITERAL_in_variable_definition2774); if (failed) return retval;
+            match(input,LITERAL,FOLLOW_LITERAL_in_variable_definition2787); if (failed) return retval;
             if ( backtracking==0 ) stream_LITERAL.add(name);
 
             // DSLMap.g:177:28: ( COLON pat= pattern )?
@@ -1746,10 +1746,10 @@
                     // DSLMap.g:177:30: COLON pat= pattern
                     {
                     COLON29=(Token)input.LT(1);
-                    match(input,COLON,FOLLOW_COLON_in_variable_definition2778); if (failed) return retval;
+                    match(input,COLON,FOLLOW_COLON_in_variable_definition2791); if (failed) return retval;
                     if ( backtracking==0 ) stream_COLON.add(COLON29);
 
-                    pushFollow(FOLLOW_pattern_in_variable_definition2782);
+                    pushFollow(FOLLOW_pattern_in_variable_definition2795);
                     pat=pattern();
                     _fsp--;
                     if (failed) return retval;
@@ -1764,7 +1764,7 @@
             }
 
             RIGHT_CURLY30=(Token)input.LT(1);
-            match(input,RIGHT_CURLY,FOLLOW_RIGHT_CURLY_in_variable_definition2789); if (failed) return retval;
+            match(input,RIGHT_CURLY,FOLLOW_RIGHT_CURLY_in_variable_definition2802); if (failed) return retval;
             if ( backtracking==0 ) stream_RIGHT_CURLY.add(RIGHT_CURLY30);
 
 
@@ -1819,10 +1819,10 @@
                 adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
             }
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
+        
+        	catch (RecognitionException e) {
+        		throw e;
+        	}
         finally {
         }
         return retval;
@@ -1870,20 +1870,40 @@
             do {
                 int alt14=4;
                 switch ( input.LA(1) ) {
-                case LITERAL:
-                case COLON:
+                case RIGHT_SQUARE:
                     {
-                    alt14=1;
+                    int LA14_2 = input.LA(2);
+
+                    if ( (synpred21()) ) {
+                        alt14=1;
                     }
+
+
+                    }
                     break;
+                case LEFT_SQUARE:
+                    {
+                    int LA14_3 = input.LA(2);
+
+                    if ( (synpred21()) ) {
+                        alt14=1;
+                    }
+                    else if ( (synpred23()) ) {
+                        alt14=3;
+                    }
+
+
+                    }
+                    break;
                 case LEFT_CURLY:
                     {
                     alt14=2;
                     }
                     break;
-                case LEFT_SQUARE:
+                case LITERAL:
+                case COLON:
                     {
-                    alt14=3;
+                    alt14=1;
                     }
                     break;
 
@@ -1893,7 +1913,7 @@
             	case 1 :
             	    // DSLMap.g:184:13: literal
             	    {
-            	    pushFollow(FOLLOW_literal_in_pattern840);
+            	    pushFollow(FOLLOW_literal_in_pattern853);
             	    literal31=literal();
             	    _fsp--;
             	    if (failed) return retval;
@@ -1905,18 +1925,18 @@
             	    // DSLMap.g:185:13: LEFT_CURLY literal RIGHT_CURLY
             	    {
             	    LEFT_CURLY32=(Token)input.LT(1);
-            	    match(input,LEFT_CURLY,FOLLOW_LEFT_CURLY_in_pattern854); if (failed) return retval;
+            	    match(input,LEFT_CURLY,FOLLOW_LEFT_CURLY_in_pattern867); if (failed) return retval;
             	    if ( backtracking==0 ) {
             	    LEFT_CURLY32_tree = (Object)adaptor.create(LEFT_CURLY32);
             	    adaptor.addChild(root_0, LEFT_CURLY32_tree);
             	    }
-            	    pushFollow(FOLLOW_literal_in_pattern856);
+            	    pushFollow(FOLLOW_literal_in_pattern869);
             	    literal33=literal();
             	    _fsp--;
             	    if (failed) return retval;
             	    if ( backtracking==0 ) adaptor.addChild(root_0, literal33.getTree());
             	    RIGHT_CURLY34=(Token)input.LT(1);
-            	    match(input,RIGHT_CURLY,FOLLOW_RIGHT_CURLY_in_pattern858); if (failed) return retval;
+            	    match(input,RIGHT_CURLY,FOLLOW_RIGHT_CURLY_in_pattern871); if (failed) return retval;
             	    if ( backtracking==0 ) {
             	    RIGHT_CURLY34_tree = (Object)adaptor.create(RIGHT_CURLY34);
             	    adaptor.addChild(root_0, RIGHT_CURLY34_tree);
@@ -1928,18 +1948,18 @@
             	    // DSLMap.g:186:13: LEFT_SQUARE pattern RIGHT_SQUARE
             	    {
             	    LEFT_SQUARE35=(Token)input.LT(1);
-            	    match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_pattern872); if (failed) return retval;
+            	    match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_pattern885); if (failed) return retval;
             	    if ( backtracking==0 ) {
             	    LEFT_SQUARE35_tree = (Object)adaptor.create(LEFT_SQUARE35);
             	    adaptor.addChild(root_0, LEFT_SQUARE35_tree);
             	    }
-            	    pushFollow(FOLLOW_pattern_in_pattern874);
+            	    pushFollow(FOLLOW_pattern_in_pattern887);
             	    pattern36=pattern();
             	    _fsp--;
             	    if (failed) return retval;
             	    if ( backtracking==0 ) adaptor.addChild(root_0, pattern36.getTree());
             	    RIGHT_SQUARE37=(Token)input.LT(1);
-            	    match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_pattern876); if (failed) return retval;
+            	    match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_pattern889); if (failed) return retval;
             	    if ( backtracking==0 ) {
             	    RIGHT_SQUARE37_tree = (Object)adaptor.create(RIGHT_SQUARE37);
             	    adaptor.addChild(root_0, RIGHT_SQUARE37_tree);
@@ -1968,10 +1988,10 @@
                 adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
             }
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
+        
+        	catch (RecognitionException e) {
+        		throw e;
+        	}
         finally {
         }
         return retval;
@@ -2010,18 +2030,18 @@
             // DSLMap.g:195:4: lc= LEFT_CURLY name= LITERAL RIGHT_CURLY
             {
             lc=(Token)input.LT(1);
-            match(input,LEFT_CURLY,FOLLOW_LEFT_CURLY_in_variable_reference911); if (failed) return retval;
+            match(input,LEFT_CURLY,FOLLOW_LEFT_CURLY_in_variable_reference924); if (failed) return retval;
             if ( backtracking==0 ) stream_LEFT_CURLY.add(lc);
 
             if ( backtracking==0 ) {
                if( ((CommonToken)input.LT(-2)).getStopIndex() < ((CommonToken)lc).getStartIndex() -1 ) hasSpace = true; 
             }
             name=(Token)input.LT(1);
-            match(input,LITERAL,FOLLOW_LITERAL_in_variable_reference919); if (failed) return retval;
+            match(input,LITERAL,FOLLOW_LITERAL_in_variable_reference932); if (failed) return retval;
             if ( backtracking==0 ) stream_LITERAL.add(name);
 
             RIGHT_CURLY38=(Token)input.LT(1);
-            match(input,RIGHT_CURLY,FOLLOW_RIGHT_CURLY_in_variable_reference921); if (failed) return retval;
+            match(input,RIGHT_CURLY,FOLLOW_RIGHT_CURLY_in_variable_reference934); if (failed) return retval;
             if ( backtracking==0 ) stream_RIGHT_CURLY.add(RIGHT_CURLY38);
 
 
@@ -2076,10 +2096,10 @@
                 adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
             }
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
+        
+        	catch (RecognitionException e) {
+        		throw e;
+        	}
         finally {
         }
         return retval;
@@ -2115,15 +2135,15 @@
             // DSLMap.g:203:4: LEFT_CURLY name= LITERAL RIGHT_CURLY
             {
             LEFT_CURLY39=(Token)input.LT(1);
-            match(input,LEFT_CURLY,FOLLOW_LEFT_CURLY_in_variable_reference2962); if (failed) return retval;
+            match(input,LEFT_CURLY,FOLLOW_LEFT_CURLY_in_variable_reference2975); if (failed) return retval;
             if ( backtracking==0 ) stream_LEFT_CURLY.add(LEFT_CURLY39);
 
             name=(Token)input.LT(1);
-            match(input,LITERAL,FOLLOW_LITERAL_in_variable_reference2966); if (failed) return retval;
+            match(input,LITERAL,FOLLOW_LITERAL_in_variable_reference2979); if (failed) return retval;
             if ( backtracking==0 ) stream_LITERAL.add(name);
 
             RIGHT_CURLY40=(Token)input.LT(1);
-            match(input,RIGHT_CURLY,FOLLOW_RIGHT_CURLY_in_variable_reference2968); if (failed) return retval;
+            match(input,RIGHT_CURLY,FOLLOW_RIGHT_CURLY_in_variable_reference2981); if (failed) return retval;
             if ( backtracking==0 ) stream_RIGHT_CURLY.add(RIGHT_CURLY40);
 
 
@@ -2164,10 +2184,10 @@
                 adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
             }
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
+        
+        	catch (RecognitionException e) {
+        		throw e;
+        	}
         finally {
         }
         return retval;
@@ -2201,7 +2221,7 @@
                 throw new FailedPredicateException(input, "condition_key", "validateIdentifierKey(\"condition\")||validateIdentifierKey(\"when\")");
             }
             value=(Token)input.LT(1);
-            match(input,LITERAL,FOLLOW_LITERAL_in_condition_key997); if (failed) return retval;
+            match(input,LITERAL,FOLLOW_LITERAL_in_condition_key1010); if (failed) return retval;
             if ( backtracking==0 ) stream_LITERAL.add(value);
 
 
@@ -2233,10 +2253,10 @@
                 adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
             }
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
+        
+        	catch (RecognitionException e) {
+        		throw e;
+        	}
         finally {
         }
         return retval;
@@ -2270,7 +2290,7 @@
                 throw new FailedPredicateException(input, "consequence_key", "validateIdentifierKey(\"consequence\")||validateIdentifierKey(\"then\")");
             }
             value=(Token)input.LT(1);
-            match(input,LITERAL,FOLLOW_LITERAL_in_consequence_key1020); if (failed) return retval;
+            match(input,LITERAL,FOLLOW_LITERAL_in_consequence_key1033); if (failed) return retval;
             if ( backtracking==0 ) stream_LITERAL.add(value);
 
 
@@ -2302,10 +2322,10 @@
                 adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
             }
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
+        
+        	catch (RecognitionException e) {
+        		throw e;
+        	}
         finally {
         }
         return retval;
@@ -2339,7 +2359,7 @@
                 throw new FailedPredicateException(input, "keyword_key", "validateIdentifierKey(\"keyword\")");
             }
             value=(Token)input.LT(1);
-            match(input,LITERAL,FOLLOW_LITERAL_in_keyword_key1043); if (failed) return retval;
+            match(input,LITERAL,FOLLOW_LITERAL_in_keyword_key1056); if (failed) return retval;
             if ( backtracking==0 ) stream_LITERAL.add(value);
 
 
@@ -2371,10 +2391,10 @@
                 adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
             }
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
+        
+        	catch (RecognitionException e) {
+        		throw e;
+        	}
         finally {
         }
         return retval;
@@ -2408,7 +2428,7 @@
                 throw new FailedPredicateException(input, "any_key", "validateIdentifierKey(\"*\")");
             }
             value=(Token)input.LT(1);
-            match(input,LITERAL,FOLLOW_LITERAL_in_any_key1066); if (failed) return retval;
+            match(input,LITERAL,FOLLOW_LITERAL_in_any_key1079); if (failed) return retval;
             if ( backtracking==0 ) stream_LITERAL.add(value);
 
 
@@ -2440,10 +2460,10 @@
                 adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop);
             }
         }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
+        
+        	catch (RecognitionException e) {
+        		throw e;
+        	}
         finally {
         }
         return retval;
@@ -2455,7 +2475,7 @@
         // DSLMap.g:102:4: ( condition_key )
         // DSLMap.g:102:4: condition_key
         {
-        pushFollow(FOLLOW_condition_key_in_synpred5385);
+        pushFollow(FOLLOW_condition_key_in_synpred5390);
         condition_key();
         _fsp--;
         if (failed) return ;
@@ -2469,7 +2489,7 @@
         // DSLMap.g:103:5: ( consequence_key )
         // DSLMap.g:103:5: consequence_key
         {
-        pushFollow(FOLLOW_consequence_key_in_synpred6394);
+        pushFollow(FOLLOW_consequence_key_in_synpred6399);
         consequence_key();
         _fsp--;
         if (failed) return ;
@@ -2483,7 +2503,7 @@
         // DSLMap.g:104:5: ( keyword_key )
         // DSLMap.g:104:5: keyword_key
         {
-        pushFollow(FOLLOW_keyword_key_in_synpred7402);
+        pushFollow(FOLLOW_keyword_key_in_synpred7407);
         keyword_key();
         _fsp--;
         if (failed) return ;
@@ -2497,7 +2517,7 @@
         // DSLMap.g:133:4: ( literal )
         // DSLMap.g:133:4: literal
         {
-        pushFollow(FOLLOW_literal_in_synpred11542);
+        pushFollow(FOLLOW_literal_in_synpred11547);
         literal();
         _fsp--;
         if (failed) return ;
@@ -2511,7 +2531,7 @@
         // DSLMap.g:151:5: ( literal )
         // DSLMap.g:151:5: literal
         {
-        pushFollow(FOLLOW_literal_in_synpred14617);
+        pushFollow(FOLLOW_literal_in_synpred14622);
         literal();
         _fsp--;
         if (failed) return ;
@@ -2525,12 +2545,56 @@
         // DSLMap.g:151:13: ( EQUALS )
         // DSLMap.g:151:13: EQUALS
         {
-        match(input,EQUALS,FOLLOW_EQUALS_in_synpred15619); if (failed) return ;
+        match(input,EQUALS,FOLLOW_EQUALS_in_synpred15624); if (failed) return ;
 
         }
     }
     // $ANTLR end synpred15
 
+    // $ANTLR start synpred21
+    public final void synpred21_fragment() throws RecognitionException {   
+        // DSLMap.g:184:13: ( literal )
+        // DSLMap.g:184:13: literal
+        {
+        pushFollow(FOLLOW_literal_in_synpred21853);
+        literal();
+        _fsp--;
+        if (failed) return ;
+
+        }
+    }
+    // $ANTLR end synpred21
+
+    // $ANTLR start synpred23
+    public final void synpred23_fragment() throws RecognitionException {   
+        // DSLMap.g:186:13: ( LEFT_SQUARE pattern RIGHT_SQUARE )
+        // DSLMap.g:186:13: LEFT_SQUARE pattern RIGHT_SQUARE
+        {
+        match(input,LEFT_SQUARE,FOLLOW_LEFT_SQUARE_in_synpred23885); if (failed) return ;
+        pushFollow(FOLLOW_pattern_in_synpred23887);
+        pattern();
+        _fsp--;
+        if (failed) return ;
+        match(input,RIGHT_SQUARE,FOLLOW_RIGHT_SQUARE_in_synpred23889); if (failed) return ;
+
+        }
+    }
+    // $ANTLR end synpred23
+
+    public final boolean synpred23() {
+        backtracking++;
+        int start = input.mark();
+        try {
+            synpred23_fragment(); // can never throw exception
+        } catch (RecognitionException re) {
+            System.err.println("impossible: "+re);
+        }
+        boolean success = !failed;
+        input.rewind(start);
+        backtracking--;
+        failed=false;
+        return success;
+    }
     public final boolean synpred7() {
         backtracking++;
         int start = input.mark();
@@ -2615,73 +2679,91 @@
         failed=false;
         return success;
     }
+    public final boolean synpred21() {
+        backtracking++;
+        int start = input.mark();
+        try {
+            synpred21_fragment(); // can never throw exception
+        } catch (RecognitionException re) {
+            System.err.println("impossible: "+re);
+        }
+        boolean success = !failed;
+        input.rewind(start);
+        backtracking--;
+        failed=false;
+        return success;
+    }
 
 
  
 
-    public static final BitSet FOLLOW_statement_in_mapping_file257 = new BitSet(new long[]{0x0000000000B00002L});
-    public static final BitSet FOLLOW_entry_in_statement280 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_comment_in_statement287 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_EOL_in_statement293 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LINE_COMMENT_in_comment309 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_scope_section_in_entry334 = new BitSet(new long[]{0x0000000000800000L});
-    public static final BitSet FOLLOW_meta_section_in_entry336 = new BitSet(new long[]{0x000000000E000000L});
-    public static final BitSet FOLLOW_key_section_in_entry338 = new BitSet(new long[]{0x0000000000400000L});
-    public static final BitSet FOLLOW_EQUALS_in_entry340 = new BitSet(new long[]{0x000000000E400000L});
-    public static final BitSet FOLLOW_value_section_in_entry342 = new BitSet(new long[]{0x0000000000100000L});
-    public static final BitSet FOLLOW_EOL_in_entry345 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_EOF_in_entry347 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_SQUARE_in_scope_section377 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_condition_key_in_scope_section385 = new BitSet(new long[]{0x0000000001000000L});
-    public static final BitSet FOLLOW_consequence_key_in_scope_section394 = new BitSet(new long[]{0x0000000001000000L});
-    public static final BitSet FOLLOW_keyword_key_in_scope_section402 = new BitSet(new long[]{0x0000000001000000L});
-    public static final BitSet FOLLOW_any_key_in_scope_section410 = new BitSet(new long[]{0x0000000001000000L});
-    public static final BitSet FOLLOW_RIGHT_SQUARE_in_scope_section418 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_SQUARE_in_meta_section456 = new BitSet(new long[]{0x0000000003000000L});
-    public static final BitSet FOLLOW_LITERAL_in_meta_section458 = new BitSet(new long[]{0x0000000001000000L});
-    public static final BitSet FOLLOW_RIGHT_SQUARE_in_meta_section461 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_key_sentence_in_key_section483 = new BitSet(new long[]{0x000000000E000002L});
-    public static final BitSet FOLLOW_variable_definition_in_key_sentence514 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_key_chunk_in_key_sentence521 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_literal_in_key_chunk542 = new BitSet(new long[]{0x0000000006000002L});
-    public static final BitSet FOLLOW_value_sentence_in_value_section557 = new BitSet(new long[]{0x000000000E400002L});
-    public static final BitSet FOLLOW_variable_reference_in_value_sentence588 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_value_chunk_in_value_sentence595 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_literal_in_value_chunk617 = new BitSet(new long[]{0x0000000006400002L});
-    public static final BitSet FOLLOW_EQUALS_in_value_chunk619 = new BitSet(new long[]{0x0000000006400002L});
-    public static final BitSet FOLLOW_set_in_literal637 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_CURLY_in_variable_definition665 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_LITERAL_in_variable_definition673 = new BitSet(new long[]{0x0000000014000000L});
-    public static final BitSet FOLLOW_COLON_in_variable_definition677 = new BitSet(new long[]{0x000000000E800000L});
-    public static final BitSet FOLLOW_pattern_in_variable_definition681 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_RIGHT_CURLY_in_variable_definition688 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_CURLY_in_variable_definition2770 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_LITERAL_in_variable_definition2774 = new BitSet(new long[]{0x0000000014000000L});
-    public static final BitSet FOLLOW_COLON_in_variable_definition2778 = new BitSet(new long[]{0x000000000E800000L});
-    public static final BitSet FOLLOW_pattern_in_variable_definition2782 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_RIGHT_CURLY_in_variable_definition2789 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_literal_in_pattern840 = new BitSet(new long[]{0x000000000E800002L});
-    public static final BitSet FOLLOW_LEFT_CURLY_in_pattern854 = new BitSet(new long[]{0x0000000006000000L});
-    public static final BitSet FOLLOW_literal_in_pattern856 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_RIGHT_CURLY_in_pattern858 = new BitSet(new long[]{0x000000000E800002L});
-    public static final BitSet FOLLOW_LEFT_SQUARE_in_pattern872 = new BitSet(new long[]{0x000000000E800000L});
-    public static final BitSet FOLLOW_pattern_in_pattern874 = new BitSet(new long[]{0x0000000001000000L});
-    public static final BitSet FOLLOW_RIGHT_SQUARE_in_pattern876 = new BitSet(new long[]{0x000000000E800002L});
-    public static final BitSet FOLLOW_LEFT_CURLY_in_variable_reference911 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_LITERAL_in_variable_reference919 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_RIGHT_CURLY_in_variable_reference921 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LEFT_CURLY_in_variable_reference2962 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_LITERAL_in_variable_reference2966 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_RIGHT_CURLY_in_variable_reference2968 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LITERAL_in_condition_key997 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LITERAL_in_consequence_key1020 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LITERAL_in_keyword_key1043 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_LITERAL_in_any_key1066 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_condition_key_in_synpred5385 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_consequence_key_in_synpred6394 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_keyword_key_in_synpred7402 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_literal_in_synpred11542 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_literal_in_synpred14617 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_EQUALS_in_synpred15619 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_statement_in_mapping_file262 = new BitSet(new long[]{0x0000000000B00002L});
+    public static final BitSet FOLLOW_entry_in_statement285 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_comment_in_statement292 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_EOL_in_statement298 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LINE_COMMENT_in_comment314 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_scope_section_in_entry339 = new BitSet(new long[]{0x0000000000800000L});
+    public static final BitSet FOLLOW_meta_section_in_entry341 = new BitSet(new long[]{0x000000000F800000L});
+    public static final BitSet FOLLOW_key_section_in_entry343 = new BitSet(new long[]{0x0000000000400000L});
+    public static final BitSet FOLLOW_EQUALS_in_entry345 = new BitSet(new long[]{0x000000000FC00000L});
+    public static final BitSet FOLLOW_value_section_in_entry347 = new BitSet(new long[]{0x0000000000100000L});
+    public static final BitSet FOLLOW_EOL_in_entry350 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_EOF_in_entry352 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_SQUARE_in_scope_section382 = new BitSet(new long[]{0x0000000002000000L});
+    public static final BitSet FOLLOW_condition_key_in_scope_section390 = new BitSet(new long[]{0x0000000001000000L});
+    public static final BitSet FOLLOW_consequence_key_in_scope_section399 = new BitSet(new long[]{0x0000000001000000L});
+    public static final BitSet FOLLOW_keyword_key_in_scope_section407 = new BitSet(new long[]{0x0000000001000000L});
+    public static final BitSet FOLLOW_any_key_in_scope_section415 = new BitSet(new long[]{0x0000000001000000L});
+    public static final BitSet FOLLOW_RIGHT_SQUARE_in_scope_section423 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_SQUARE_in_meta_section461 = new BitSet(new long[]{0x0000000003000000L});
+    public static final BitSet FOLLOW_LITERAL_in_meta_section463 = new BitSet(new long[]{0x0000000001000000L});
+    public static final BitSet FOLLOW_RIGHT_SQUARE_in_meta_section466 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_key_sentence_in_key_section488 = new BitSet(new long[]{0x000000000F800002L});
+    public static final BitSet FOLLOW_variable_definition_in_key_sentence519 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_key_chunk_in_key_sentence526 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_literal_in_key_chunk547 = new BitSet(new long[]{0x0000000007800002L});
+    public static final BitSet FOLLOW_value_sentence_in_value_section562 = new BitSet(new long[]{0x000000000FC00002L});
+    public static final BitSet FOLLOW_variable_reference_in_value_sentence593 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_value_chunk_in_value_sentence600 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_literal_in_value_chunk622 = new BitSet(new long[]{0x0000000007C00002L});
+    public static final BitSet FOLLOW_EQUALS_in_value_chunk624 = new BitSet(new long[]{0x0000000007C00002L});
+    public static final BitSet FOLLOW_set_in_literal642 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_CURLY_in_variable_definition678 = new BitSet(new long[]{0x0000000002000000L});
+    public static final BitSet FOLLOW_LITERAL_in_variable_definition686 = new BitSet(new long[]{0x0000000014000000L});
+    public static final BitSet FOLLOW_COLON_in_variable_definition690 = new BitSet(new long[]{0x000000000F800000L});
+    public static final BitSet FOLLOW_pattern_in_variable_definition694 = new BitSet(new long[]{0x0000000010000000L});
+    public static final BitSet FOLLOW_RIGHT_CURLY_in_variable_definition701 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_CURLY_in_variable_definition2783 = new BitSet(new long[]{0x0000000002000000L});
+    public static final BitSet FOLLOW_LITERAL_in_variable_definition2787 = new BitSet(new long[]{0x0000000014000000L});
+    public static final BitSet FOLLOW_COLON_in_variable_definition2791 = new BitSet(new long[]{0x000000000F800000L});
+    public static final BitSet FOLLOW_pattern_in_variable_definition2795 = new BitSet(new long[]{0x0000000010000000L});
+    public static final BitSet FOLLOW_RIGHT_CURLY_in_variable_definition2802 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_literal_in_pattern853 = new BitSet(new long[]{0x000000000F800002L});
+    public static final BitSet FOLLOW_LEFT_CURLY_in_pattern867 = new BitSet(new long[]{0x0000000007800000L});
+    public static final BitSet FOLLOW_literal_in_pattern869 = new BitSet(new long[]{0x0000000010000000L});
+    public static final BitSet FOLLOW_RIGHT_CURLY_in_pattern871 = new BitSet(new long[]{0x000000000F800002L});
+    public static final BitSet FOLLOW_LEFT_SQUARE_in_pattern885 = new BitSet(new long[]{0x000000000F800000L});
+    public static final BitSet FOLLOW_pattern_in_pattern887 = new BitSet(new long[]{0x0000000001000000L});
+    public static final BitSet FOLLOW_RIGHT_SQUARE_in_pattern889 = new BitSet(new long[]{0x000000000F800002L});
+    public static final BitSet FOLLOW_LEFT_CURLY_in_variable_reference924 = new BitSet(new long[]{0x0000000002000000L});
+    public static final BitSet FOLLOW_LITERAL_in_variable_reference932 = new BitSet(new long[]{0x0000000010000000L});
+    public static final BitSet FOLLOW_RIGHT_CURLY_in_variable_reference934 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_CURLY_in_variable_reference2975 = new BitSet(new long[]{0x0000000002000000L});
+    public static final BitSet FOLLOW_LITERAL_in_variable_reference2979 = new BitSet(new long[]{0x0000000010000000L});
+    public static final BitSet FOLLOW_RIGHT_CURLY_in_variable_reference2981 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LITERAL_in_condition_key1010 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LITERAL_in_consequence_key1033 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LITERAL_in_keyword_key1056 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LITERAL_in_any_key1079 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_condition_key_in_synpred5390 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_consequence_key_in_synpred6399 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_keyword_key_in_synpred7407 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_literal_in_synpred11547 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_literal_in_synpred14622 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_EQUALS_in_synpred15624 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_literal_in_synpred21853 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_LEFT_SQUARE_in_synpred23885 = new BitSet(new long[]{0x000000000F800000L});
+    public static final BitSet FOLLOW_pattern_in_synpred23887 = new BitSet(new long[]{0x0000000001000000L});
+    public static final BitSet FOLLOW_RIGHT_SQUARE_in_synpred23889 = new BitSet(new long[]{0x0000000000000002L});
 
 }
\ No newline at end of file

Modified: labs/jbossrules/branches/mattgeis/drools-compiler/src/main/java/org/drools/lang/dsl/DSLMapWalker.java
===================================================================
--- labs/jbossrules/branches/mattgeis/drools-compiler/src/main/java/org/drools/lang/dsl/DSLMapWalker.java	2008-05-19 20:56:16 UTC (rev 20068)
+++ labs/jbossrules/branches/mattgeis/drools-compiler/src/main/java/org/drools/lang/dsl/DSLMapWalker.java	2008-05-20 00:12:48 UTC (rev 20069)
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 DSLMapWalker.g 2008-05-14 15:02:19
+// $ANTLR 3.0.1 DSLMapWalker.g 2008-05-19 16:06:18
 
 	package org.drools.lang.dsl;
 	

Modified: labs/jbossrules/branches/mattgeis/drools-compiler/src/main/java/org/drools/lang/dsl/DSLTokenizedMappingFile.java
===================================================================
--- labs/jbossrules/branches/mattgeis/drools-compiler/src/main/java/org/drools/lang/dsl/DSLTokenizedMappingFile.java	2008-05-19 20:56:16 UTC (rev 20068)
+++ labs/jbossrules/branches/mattgeis/drools-compiler/src/main/java/org/drools/lang/dsl/DSLTokenizedMappingFile.java	2008-05-20 00:12:48 UTC (rev 20069)
@@ -13,6 +13,10 @@
 import org.antlr.runtime.tree.CommonTreeNodeStream;
 
 public class DSLTokenizedMappingFile extends DSLMappingFile {
+	public DSLTokenizedMappingFile() {
+        super();
+    }
+	
 	public boolean parseAndLoad(final Reader dsl) throws IOException {
         String line = null;
         int linecounter = 0;

Modified: labs/jbossrules/branches/mattgeis/drools-compiler/src/main/java/org/drools/lang/dsl/DefaultExpanderResolver.java
===================================================================
--- labs/jbossrules/branches/mattgeis/drools-compiler/src/main/java/org/drools/lang/dsl/DefaultExpanderResolver.java	2008-05-19 20:56:16 UTC (rev 20068)
+++ labs/jbossrules/branches/mattgeis/drools-compiler/src/main/java/org/drools/lang/dsl/DefaultExpanderResolver.java	2008-05-20 00:12:48 UTC (rev 20069)
@@ -56,7 +56,7 @@
      * This is the constructor most people should use.
      */
     public DefaultExpanderResolver(final Reader reader) throws IOException {
-        final DSLMappingFile file = new DSLMappingFile();
+        final DSLTokenizedMappingFile file = new DSLTokenizedMappingFile();
         if ( file.parseAndLoad( reader ) ) {
             final Expander expander = new DefaultExpander();
             expander.addDSLMapping( file.getMapping() );




More information about the jboss-svn-commits mailing list