You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by pk...@apache.org on 2012/01/18 13:54:54 UTC

svn commit: r1232868 [4/4] - in /uima/sandbox/trunk/TextMarker: uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/action/ uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/ uimaj-ep-textmarker-ide/src/main/jav...

Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.java?rev=1232868&r1=1232867&r2=1232868&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.java Wed Jan 18 12:54:54 2012
@@ -1,4 +1,4 @@
-// $ANTLR 3.4 D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g 2012-01-12 13:42:49
+// $ANTLR 3.4 D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g 2012-01-18 13:50:26
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -555,7 +555,7 @@ public class TextMarkerParser extends Pa
                 int alt1=2;
                 int LA1_0 = input.LA(1);
 
-                if ( (LA1_0==ACTION||LA1_0==AutomataBlockString||(LA1_0 >= BOOLEANLIST && LA1_0 <= BooleanString)||LA1_0==CONDITION||LA1_0==DECLARE||LA1_0==DOUBLELIST||LA1_0==DoubleString||(LA1_0 >= FLOATLIST && LA1_0 <= FloatString)||LA1_0==INTLIST||(LA1_0 >= Identifier && LA1_0 <= IntString)||LA1_0==LPAREN||LA1_0==STRINGLIST||(LA1_0 >= StringLiteral && LA1_0 <= StringString)||(LA1_0 >= TYPELIST && LA1_0 <= TypeString)||(LA1_0 >= WORDLIST && LA1_0 <= WORDTABLE)) ) {
+                if ( (LA1_0==AutomataBlockString||(LA1_0 >= BOOLEANLIST && LA1_0 <= BooleanString)||LA1_0==DECLARE||LA1_0==DOUBLELIST||LA1_0==DoubleString||(LA1_0 >= FLOATLIST && LA1_0 <= FloatString)||LA1_0==INTLIST||(LA1_0 >= Identifier && LA1_0 <= IntString)||LA1_0==LPAREN||LA1_0==STRINGLIST||(LA1_0 >= StringLiteral && LA1_0 <= StringString)||(LA1_0 >= TYPELIST && LA1_0 <= TypeString)||(LA1_0 >= WORDLIST && LA1_0 <= WORDTABLE)) ) {
                     alt1=1;
                 }
 
@@ -749,10 +749,8 @@ public class TextMarkerParser extends Pa
                 alt3=1;
                 }
                 break;
-            case ACTION:
             case BOOLEANLIST:
             case BooleanString:
-            case CONDITION:
             case DOUBLELIST:
             case DoubleString:
             case FLOATLIST:
@@ -996,7 +994,7 @@ public class TextMarkerParser extends Pa
 
 
     // $ANTLR start "variableDeclaration"
-    // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:324:1: variableDeclaration returns [List<Statement> stmts = new ArrayList<Statement>()] : (type= IntString id= Identifier ( COMMA id= Identifier )* ( ASSIGN_EQUAL init= numberExpression )? SEMI |type= DoubleString id= Identifier ( COMMA id= Identifier )* ( ASSIGN_EQUAL init= numberExpression )? SEMI |type= FloatString id= Identifier ( COMMA id= Identifier )* ( ASSIGN_EQUAL init= numberExpression )? SEMI |type= StringString id= Identifier ( COMMA id= Identifier )* ( ASSIGN_EQUAL init= stringExpression )? SEMI |type= BooleanString id= Identifier ( COMMA id= Identifier )* ( ASSIGN_EQUAL init= booleanExpression )? SEMI |type= TypeString id= Identifier ( COMMA id= Identifier )* ( ASSIGN_EQUAL init= annotationType )? SEMI |type= WORDLIST id= Identifier ( ASSIGN_EQUAL list= wordListExpression )? SEMI |type= WORDTABLE id= Identifier ( ASSIG
 N_EQUAL table= wordTableExpression )? SEMI |type= BOOLEANLIST id= Identifier ( ASSIGN_EQUAL list= booleanListExpression )? SEMI |type= INTLIST id= Identifier ( ASSIGN_EQUAL list= numberListExpression )? SEMI |type= DOUBLELIST id= Identifier ( ASSIGN_EQUAL list= numberListExpression )? SEMI |type= FLOATLIST id= Identifier ( ASSIGN_EQUAL list= numberListExpression )? SEMI |type= STRINGLIST id= Identifier ( ASSIGN_EQUAL list= stringListExpression )? SEMI |type= TYPELIST id= Identifier ( ASSIGN_EQUAL list= typeListExpression )? SEMI |stmt= conditionDeclaration |stmt= actionDeclaration );
+    // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:324:1: variableDeclaration returns [List<Statement> stmts = new ArrayList<Statement>()] : (type= IntString id= Identifier ( COMMA id= Identifier )* ( ASSIGN_EQUAL init= numberExpression )? SEMI |type= DoubleString id= Identifier ( COMMA id= Identifier )* ( ASSIGN_EQUAL init= numberExpression )? SEMI |type= FloatString id= Identifier ( COMMA id= Identifier )* ( ASSIGN_EQUAL init= numberExpression )? SEMI |type= StringString id= Identifier ( COMMA id= Identifier )* ( ASSIGN_EQUAL init= stringExpression )? SEMI |type= BooleanString id= Identifier ( COMMA id= Identifier )* ( ASSIGN_EQUAL init= booleanExpression )? SEMI |type= TypeString id= Identifier ( COMMA id= Identifier )* ( ASSIGN_EQUAL init= annotationType )? SEMI |type= WORDLIST id= Identifier ( ASSIGN_EQUAL list= wordListExpression )? SEMI |type= WORDTABLE id= Identifier ( ASSIG
 N_EQUAL table= wordTableExpression )? SEMI |type= BOOLEANLIST id= Identifier ( ASSIGN_EQUAL list= booleanListExpression )? SEMI |type= INTLIST id= Identifier ( ASSIGN_EQUAL list= numberListExpression )? SEMI |type= DOUBLELIST id= Identifier ( ASSIGN_EQUAL list= numberListExpression )? SEMI |type= FLOATLIST id= Identifier ( ASSIGN_EQUAL list= numberListExpression )? SEMI |type= STRINGLIST id= Identifier ( ASSIGN_EQUAL list= stringListExpression )? SEMI |type= TYPELIST id= Identifier ( ASSIGN_EQUAL list= typeListExpression )? SEMI );
     public final List<Statement> variableDeclaration() throws RecognitionException {
         List<Statement> stmts =  new ArrayList<Statement>();
 
@@ -1009,15 +1007,13 @@ public class TextMarkerParser extends Pa
 
         Expression table =null;
 
-        Statement stmt =null;
-
 
 
         	List decls = new ArrayList();
 
         try {
-            // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:328:2: (type= IntString id= Identifier ( COMMA id= Identifier )* ( ASSIGN_EQUAL init= numberExpression )? SEMI |type= DoubleString id= Identifier ( COMMA id= Identifier )* ( ASSIGN_EQUAL init= numberExpression )? SEMI |type= FloatString id= Identifier ( COMMA id= Identifier )* ( ASSIGN_EQUAL init= numberExpression )? SEMI |type= StringString id= Identifier ( COMMA id= Identifier )* ( ASSIGN_EQUAL init= stringExpression )? SEMI |type= BooleanString id= Identifier ( COMMA id= Identifier )* ( ASSIGN_EQUAL init= booleanExpression )? SEMI |type= TypeString id= Identifier ( COMMA id= Identifier )* ( ASSIGN_EQUAL init= annotationType )? SEMI |type= WORDLIST id= Identifier ( ASSIGN_EQUAL list= wordListExpression )? SEMI |type= WORDTABLE id= Identifier ( ASSIGN_EQUAL table= wordTableExpression )? SEMI |type= BOOLEANLIST id= Identifie
 r ( ASSIGN_EQUAL list= booleanListExpression )? SEMI |type= INTLIST id= Identifier ( ASSIGN_EQUAL list= numberListExpression )? SEMI |type= DOUBLELIST id= Identifier ( ASSIGN_EQUAL list= numberListExpression )? SEMI |type= FLOATLIST id= Identifier ( ASSIGN_EQUAL list= numberListExpression )? SEMI |type= STRINGLIST id= Identifier ( ASSIGN_EQUAL list= stringListExpression )? SEMI |type= TYPELIST id= Identifier ( ASSIGN_EQUAL list= typeListExpression )? SEMI |stmt= conditionDeclaration |stmt= actionDeclaration )
-            int alt25=16;
+            // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:328:2: (type= IntString id= Identifier ( COMMA id= Identifier )* ( ASSIGN_EQUAL init= numberExpression )? SEMI |type= DoubleString id= Identifier ( COMMA id= Identifier )* ( ASSIGN_EQUAL init= numberExpression )? SEMI |type= FloatString id= Identifier ( COMMA id= Identifier )* ( ASSIGN_EQUAL init= numberExpression )? SEMI |type= StringString id= Identifier ( COMMA id= Identifier )* ( ASSIGN_EQUAL init= stringExpression )? SEMI |type= BooleanString id= Identifier ( COMMA id= Identifier )* ( ASSIGN_EQUAL init= booleanExpression )? SEMI |type= TypeString id= Identifier ( COMMA id= Identifier )* ( ASSIGN_EQUAL init= annotationType )? SEMI |type= WORDLIST id= Identifier ( ASSIGN_EQUAL list= wordListExpression )? SEMI |type= WORDTABLE id= Identifier ( ASSIGN_EQUAL table= wordTableExpression )? SEMI |type= BOOLEANLIST id= Identifie
 r ( ASSIGN_EQUAL list= booleanListExpression )? SEMI |type= INTLIST id= Identifier ( ASSIGN_EQUAL list= numberListExpression )? SEMI |type= DOUBLELIST id= Identifier ( ASSIGN_EQUAL list= numberListExpression )? SEMI |type= FLOATLIST id= Identifier ( ASSIGN_EQUAL list= numberListExpression )? SEMI |type= STRINGLIST id= Identifier ( ASSIGN_EQUAL list= stringListExpression )? SEMI |type= TYPELIST id= Identifier ( ASSIGN_EQUAL list= typeListExpression )? SEMI )
+            int alt25=14;
             switch ( input.LA(1) ) {
             case IntString:
                 {
@@ -1089,16 +1085,6 @@ public class TextMarkerParser extends Pa
                 alt25=14;
                 }
                 break;
-            case CONDITION:
-                {
-                alt25=15;
-                }
-                break;
-            case ACTION:
-                {
-                alt25=16;
-                }
-                break;
             default:
                 if (state.backtracking>0) {state.failed=true; return stmts;}
                 NoViableAltException nvae =
@@ -1877,32 +1863,6 @@ public class TextMarkerParser extends Pa
 
                     }
                     break;
-                case 15 :
-                    // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:427:2: stmt= conditionDeclaration
-                    {
-                    pushFollow(FOLLOW_conditionDeclaration_in_variableDeclaration1200);
-                    stmt=conditionDeclaration();
-
-                    state._fsp--;
-                    if (state.failed) return stmts;
-
-                    if ( state.backtracking==0 ) {stmts.add(stmt);}
-
-                    }
-                    break;
-                case 16 :
-                    // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:429:2: stmt= actionDeclaration
-                    {
-                    pushFollow(FOLLOW_actionDeclaration_in_variableDeclaration1212);
-                    stmt=actionDeclaration();
-
-                    state._fsp--;
-                    if (state.failed) return stmts;
-
-                    if ( state.backtracking==0 ) {stmts.add(stmt);}
-
-                    }
-                    break;
 
             }
         }
@@ -1928,130 +1888,6 @@ public class TextMarkerParser extends Pa
 
 
 
-    // $ANTLR start "conditionDeclaration"
-    // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:432:1: conditionDeclaration returns [Statement stmt = null] : declareToken= CONDITION id= Identifier ASSIGN_EQUAL LPAREN cons= conditions RPAREN SEMI ;
-    public final Statement conditionDeclaration() throws RecognitionException {
-        Statement stmt =  null;
-
-
-        Token declareToken=null;
-        Token id=null;
-        List<TextMarkerCondition> cons =null;
-
-
-        try {
-            // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:433:5: (declareToken= CONDITION id= Identifier ASSIGN_EQUAL LPAREN cons= conditions RPAREN SEMI )
-            // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:434:5: declareToken= CONDITION id= Identifier ASSIGN_EQUAL LPAREN cons= conditions RPAREN SEMI
-            {
-            declareToken=(Token)match(input,CONDITION,FOLLOW_CONDITION_in_conditionDeclaration1240); if (state.failed) return stmt;
-
-            id=(Token)match(input,Identifier,FOLLOW_Identifier_in_conditionDeclaration1246); if (state.failed) return stmt;
-
-            if ( state.backtracking==0 ) {addVariable(id.getText(), declareToken.getText());}
-
-            match(input,ASSIGN_EQUAL,FOLLOW_ASSIGN_EQUAL_in_conditionDeclaration1254); if (state.failed) return stmt;
-
-            match(input,LPAREN,FOLLOW_LPAREN_in_conditionDeclaration1261); if (state.failed) return stmt;
-
-            pushFollow(FOLLOW_conditions_in_conditionDeclaration1267);
-            cons=conditions();
-
-            state._fsp--;
-            if (state.failed) return stmt;
-
-            match(input,RPAREN,FOLLOW_RPAREN_in_conditionDeclaration1269); if (state.failed) return stmt;
-
-            match(input,SEMI,FOLLOW_SEMI_in_conditionDeclaration1271); if (state.failed) return stmt;
-
-            if ( state.backtracking==0 ) {stmt = StatementFactory.createComposedVariableConditionDeclaration(id, cons);}
-
-            }
-
-        }
-
-        	catch (RecognitionException exception1) {
-        		if( reporter != null ) {
-        			reporter.reportError(exception1);
-        		}
-        		recover(input,exception1);
-        	}
-        	catch (Throwable exception2) {
-        		if( reporter != null ) {
-        			reporter.reportThrowable(exception2);
-        		}
-        	}
-
-        finally {
-        	// do for sure before leaving
-        }
-        return stmt;
-    }
-    // $ANTLR end "conditionDeclaration"
-
-
-
-    // $ANTLR start "actionDeclaration"
-    // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:441:1: actionDeclaration returns [Statement stmt = null] : declareToken= ACTION id= Identifier ASSIGN_EQUAL LPAREN a= actions RPAREN SEMI ;
-    public final Statement actionDeclaration() throws RecognitionException {
-        Statement stmt =  null;
-
-
-        Token declareToken=null;
-        Token id=null;
-        List<TextMarkerAction> a =null;
-
-
-        try {
-            // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:442:5: (declareToken= ACTION id= Identifier ASSIGN_EQUAL LPAREN a= actions RPAREN SEMI )
-            // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:443:5: declareToken= ACTION id= Identifier ASSIGN_EQUAL LPAREN a= actions RPAREN SEMI
-            {
-            declareToken=(Token)match(input,ACTION,FOLLOW_ACTION_in_actionDeclaration1307); if (state.failed) return stmt;
-
-            id=(Token)match(input,Identifier,FOLLOW_Identifier_in_actionDeclaration1313); if (state.failed) return stmt;
-
-            if ( state.backtracking==0 ) {addVariable(id.getText(), declareToken.getText());}
-
-            match(input,ASSIGN_EQUAL,FOLLOW_ASSIGN_EQUAL_in_actionDeclaration1321); if (state.failed) return stmt;
-
-            match(input,LPAREN,FOLLOW_LPAREN_in_actionDeclaration1327); if (state.failed) return stmt;
-
-            pushFollow(FOLLOW_actions_in_actionDeclaration1333);
-            a=actions();
-
-            state._fsp--;
-            if (state.failed) return stmt;
-
-            match(input,RPAREN,FOLLOW_RPAREN_in_actionDeclaration1335); if (state.failed) return stmt;
-
-            match(input,SEMI,FOLLOW_SEMI_in_actionDeclaration1337); if (state.failed) return stmt;
-
-            if ( state.backtracking==0 ) {stmt = StatementFactory.createComposedVariableActionDeclaration(id, a);}
-
-            }
-
-        }
-
-        	catch (RecognitionException exception1) {
-        		if( reporter != null ) {
-        			reporter.reportError(exception1);
-        		}
-        		recover(input,exception1);
-        	}
-        	catch (Throwable exception2) {
-        		if( reporter != null ) {
-        			reporter.reportThrowable(exception2);
-        		}
-        	}
-
-        finally {
-        	// do for sure before leaving
-        }
-        return stmt;
-    }
-    // $ANTLR end "actionDeclaration"
-
-
-
     // $ANTLR start "declaration"
     // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:449:1: declaration returns [List<Statement> stmts = new ArrayList<Statement>()] : (declareToken= DECLARE (lazyParent= annotationType )? id= Identifier ( COMMA id= Identifier )* end= SEMI |declareToken= DECLARE type= annotationType id= Identifier ( LPAREN (obj1= annotationType |obj2= StringString |obj3= DoubleString |obj6= FloatString |obj4= IntString |obj5= BooleanString ) fname= Identifier ( COMMA (obj1= annotationType |obj2= StringString |obj3= DoubleString |obj6= FloatString |obj4= IntString |obj5= BooleanString ) fname= Identifier )* RPAREN ) SEMI ) ;
     public final List<Statement> declaration() throws RecognitionException {
@@ -2091,7 +1927,7 @@ public class TextMarkerParser extends Pa
                 case 1 :
                     // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:458:3: declareToken= DECLARE (lazyParent= annotationType )? id= Identifier ( COMMA id= Identifier )* end= SEMI
                     {
-                    declareToken=(Token)match(input,DECLARE,FOLLOW_DECLARE_in_declaration1372); if (state.failed) return stmts;
+                    declareToken=(Token)match(input,DECLARE,FOLLOW_DECLARE_in_declaration1241); if (state.failed) return stmts;
 
                     // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:458:35: (lazyParent= annotationType )?
                     int alt26=2;
@@ -2111,7 +1947,7 @@ public class TextMarkerParser extends Pa
                         case 1 :
                             // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:458:35: lazyParent= annotationType
                             {
-                            pushFollow(FOLLOW_annotationType_in_declaration1378);
+                            pushFollow(FOLLOW_annotationType_in_declaration1247);
                             lazyParent=annotationType();
 
                             state._fsp--;
@@ -2123,7 +1959,7 @@ public class TextMarkerParser extends Pa
                     }
 
 
-                    id=(Token)match(input,Identifier,FOLLOW_Identifier_in_declaration1388); if (state.failed) return stmts;
+                    id=(Token)match(input,Identifier,FOLLOW_Identifier_in_declaration1257); if (state.failed) return stmts;
 
                     if ( state.backtracking==0 ) {addVariable(id.getText(), declareToken.getText());}
 
@@ -2145,9 +1981,9 @@ public class TextMarkerParser extends Pa
                     	case 1 :
                     	    // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:462:4: COMMA id= Identifier
                     	    {
-                    	    match(input,COMMA,FOLLOW_COMMA_in_declaration1400); if (state.failed) return stmts;
+                    	    match(input,COMMA,FOLLOW_COMMA_in_declaration1269); if (state.failed) return stmts;
 
-                    	    id=(Token)match(input,Identifier,FOLLOW_Identifier_in_declaration1410); if (state.failed) return stmts;
+                    	    id=(Token)match(input,Identifier,FOLLOW_Identifier_in_declaration1279); if (state.failed) return stmts;
 
                     	    if ( state.backtracking==0 ) {addVariable(id.getText(), declareToken.getText());}
 
@@ -2163,7 +1999,7 @@ public class TextMarkerParser extends Pa
                     } while (true);
 
 
-                    end=(Token)match(input,SEMI,FOLLOW_SEMI_in_declaration1429); if (state.failed) return stmts;
+                    end=(Token)match(input,SEMI,FOLLOW_SEMI_in_declaration1298); if (state.failed) return stmts;
 
                     if ( state.backtracking==0 ) {
                     		 stmt = StatementFactory.createDeclareDeclarationsStatement(declareToken, declarations, lazyParent);
@@ -2175,22 +2011,22 @@ public class TextMarkerParser extends Pa
                 case 2 :
                     // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:472:2: declareToken= DECLARE type= annotationType id= Identifier ( LPAREN (obj1= annotationType |obj2= StringString |obj3= DoubleString |obj6= FloatString |obj4= IntString |obj5= BooleanString ) fname= Identifier ( COMMA (obj1= annotationType |obj2= StringString |obj3= DoubleString |obj6= FloatString |obj4= IntString |obj5= BooleanString ) fname= Identifier )* RPAREN ) SEMI
                     {
-                    declareToken=(Token)match(input,DECLARE,FOLLOW_DECLARE_in_declaration1442); if (state.failed) return stmts;
+                    declareToken=(Token)match(input,DECLARE,FOLLOW_DECLARE_in_declaration1311); if (state.failed) return stmts;
 
-                    pushFollow(FOLLOW_annotationType_in_declaration1446);
+                    pushFollow(FOLLOW_annotationType_in_declaration1315);
                     type=annotationType();
 
                     state._fsp--;
                     if (state.failed) return stmts;
 
-                    id=(Token)match(input,Identifier,FOLLOW_Identifier_in_declaration1453); if (state.failed) return stmts;
+                    id=(Token)match(input,Identifier,FOLLOW_Identifier_in_declaration1322); if (state.failed) return stmts;
 
                     if ( state.backtracking==0 ) {addVariable(id.getText(), declareToken.getText());}
 
                     // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:474:3: ( LPAREN (obj1= annotationType |obj2= StringString |obj3= DoubleString |obj6= FloatString |obj4= IntString |obj5= BooleanString ) fname= Identifier ( COMMA (obj1= annotationType |obj2= StringString |obj3= DoubleString |obj6= FloatString |obj4= IntString |obj5= BooleanString ) fname= Identifier )* RPAREN )
                     // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:474:4: LPAREN (obj1= annotationType |obj2= StringString |obj3= DoubleString |obj6= FloatString |obj4= IntString |obj5= BooleanString ) fname= Identifier ( COMMA (obj1= annotationType |obj2= StringString |obj3= DoubleString |obj6= FloatString |obj4= IntString |obj5= BooleanString ) fname= Identifier )* RPAREN
                     {
-                    match(input,LPAREN,FOLLOW_LPAREN_in_declaration1460); if (state.failed) return stmts;
+                    match(input,LPAREN,FOLLOW_LPAREN_in_declaration1329); if (state.failed) return stmts;
 
                     // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:475:4: (obj1= annotationType |obj2= StringString |obj3= DoubleString |obj6= FloatString |obj4= IntString |obj5= BooleanString )
                     int alt28=6;
@@ -2239,7 +2075,7 @@ public class TextMarkerParser extends Pa
                         case 1 :
                             // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:476:4: obj1= annotationType
                             {
-                            pushFollow(FOLLOW_annotationType_in_declaration1475);
+                            pushFollow(FOLLOW_annotationType_in_declaration1344);
                             obj1=annotationType();
 
                             state._fsp--;
@@ -2252,7 +2088,7 @@ public class TextMarkerParser extends Pa
                         case 2 :
                             // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:477:6: obj2= StringString
                             {
-                            obj2=(Token)match(input,StringString,FOLLOW_StringString_in_declaration1488); if (state.failed) return stmts;
+                            obj2=(Token)match(input,StringString,FOLLOW_StringString_in_declaration1357); if (state.failed) return stmts;
 
                             if ( state.backtracking==0 ) {featureTypes.add(obj2);}
 
@@ -2261,7 +2097,7 @@ public class TextMarkerParser extends Pa
                         case 3 :
                             // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:478:6: obj3= DoubleString
                             {
-                            obj3=(Token)match(input,DoubleString,FOLLOW_DoubleString_in_declaration1501); if (state.failed) return stmts;
+                            obj3=(Token)match(input,DoubleString,FOLLOW_DoubleString_in_declaration1370); if (state.failed) return stmts;
 
                             if ( state.backtracking==0 ) {featureTypes.add(obj3);}
 
@@ -2270,7 +2106,7 @@ public class TextMarkerParser extends Pa
                         case 4 :
                             // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:479:6: obj6= FloatString
                             {
-                            obj6=(Token)match(input,FloatString,FOLLOW_FloatString_in_declaration1513); if (state.failed) return stmts;
+                            obj6=(Token)match(input,FloatString,FOLLOW_FloatString_in_declaration1382); if (state.failed) return stmts;
 
                             if ( state.backtracking==0 ) {featureTypes.add(obj6);}
 
@@ -2279,7 +2115,7 @@ public class TextMarkerParser extends Pa
                         case 5 :
                             // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:480:6: obj4= IntString
                             {
-                            obj4=(Token)match(input,IntString,FOLLOW_IntString_in_declaration1527); if (state.failed) return stmts;
+                            obj4=(Token)match(input,IntString,FOLLOW_IntString_in_declaration1396); if (state.failed) return stmts;
 
                             if ( state.backtracking==0 ) {featureTypes.add(obj4);}
 
@@ -2288,7 +2124,7 @@ public class TextMarkerParser extends Pa
                         case 6 :
                             // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:481:6: obj5= BooleanString
                             {
-                            obj5=(Token)match(input,BooleanString,FOLLOW_BooleanString_in_declaration1539); if (state.failed) return stmts;
+                            obj5=(Token)match(input,BooleanString,FOLLOW_BooleanString_in_declaration1408); if (state.failed) return stmts;
 
                             if ( state.backtracking==0 ) {featureTypes.add(obj5);}
 
@@ -2298,7 +2134,7 @@ public class TextMarkerParser extends Pa
                     }
 
 
-                    fname=(Token)match(input,Identifier,FOLLOW_Identifier_in_declaration1559); if (state.failed) return stmts;
+                    fname=(Token)match(input,Identifier,FOLLOW_Identifier_in_declaration1428); if (state.failed) return stmts;
 
                     if ( state.backtracking==0 ) {featureNames.add(fname);}
 
@@ -2317,7 +2153,7 @@ public class TextMarkerParser extends Pa
                     	case 1 :
                     	    // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:486:4: COMMA (obj1= annotationType |obj2= StringString |obj3= DoubleString |obj6= FloatString |obj4= IntString |obj5= BooleanString ) fname= Identifier
                     	    {
-                    	    match(input,COMMA,FOLLOW_COMMA_in_declaration1571); if (state.failed) return stmts;
+                    	    match(input,COMMA,FOLLOW_COMMA_in_declaration1440); if (state.failed) return stmts;
 
                     	    // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:487:4: (obj1= annotationType |obj2= StringString |obj3= DoubleString |obj6= FloatString |obj4= IntString |obj5= BooleanString )
                     	    int alt29=6;
@@ -2366,7 +2202,7 @@ public class TextMarkerParser extends Pa
                     	        case 1 :
                     	            // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:488:4: obj1= annotationType
                     	            {
-                    	            pushFollow(FOLLOW_annotationType_in_declaration1586);
+                    	            pushFollow(FOLLOW_annotationType_in_declaration1455);
                     	            obj1=annotationType();
 
                     	            state._fsp--;
@@ -2379,7 +2215,7 @@ public class TextMarkerParser extends Pa
                     	        case 2 :
                     	            // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:489:6: obj2= StringString
                     	            {
-                    	            obj2=(Token)match(input,StringString,FOLLOW_StringString_in_declaration1599); if (state.failed) return stmts;
+                    	            obj2=(Token)match(input,StringString,FOLLOW_StringString_in_declaration1468); if (state.failed) return stmts;
 
                     	            if ( state.backtracking==0 ) {featureTypes.add(obj2);}
 
@@ -2388,7 +2224,7 @@ public class TextMarkerParser extends Pa
                     	        case 3 :
                     	            // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:490:6: obj3= DoubleString
                     	            {
-                    	            obj3=(Token)match(input,DoubleString,FOLLOW_DoubleString_in_declaration1612); if (state.failed) return stmts;
+                    	            obj3=(Token)match(input,DoubleString,FOLLOW_DoubleString_in_declaration1481); if (state.failed) return stmts;
 
                     	            if ( state.backtracking==0 ) {featureTypes.add(obj3);}
 
@@ -2397,7 +2233,7 @@ public class TextMarkerParser extends Pa
                     	        case 4 :
                     	            // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:491:6: obj6= FloatString
                     	            {
-                    	            obj6=(Token)match(input,FloatString,FOLLOW_FloatString_in_declaration1624); if (state.failed) return stmts;
+                    	            obj6=(Token)match(input,FloatString,FOLLOW_FloatString_in_declaration1493); if (state.failed) return stmts;
 
                     	            if ( state.backtracking==0 ) {featureTypes.add(obj6);}
 
@@ -2406,7 +2242,7 @@ public class TextMarkerParser extends Pa
                     	        case 5 :
                     	            // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:492:6: obj4= IntString
                     	            {
-                    	            obj4=(Token)match(input,IntString,FOLLOW_IntString_in_declaration1638); if (state.failed) return stmts;
+                    	            obj4=(Token)match(input,IntString,FOLLOW_IntString_in_declaration1507); if (state.failed) return stmts;
 
                     	            if ( state.backtracking==0 ) {featureTypes.add(obj4);}
 
@@ -2415,7 +2251,7 @@ public class TextMarkerParser extends Pa
                     	        case 6 :
                     	            // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:493:6: obj5= BooleanString
                     	            {
-                    	            obj5=(Token)match(input,BooleanString,FOLLOW_BooleanString_in_declaration1650); if (state.failed) return stmts;
+                    	            obj5=(Token)match(input,BooleanString,FOLLOW_BooleanString_in_declaration1519); if (state.failed) return stmts;
 
                     	            if ( state.backtracking==0 ) {featureTypes.add(obj5);}
 
@@ -2425,7 +2261,7 @@ public class TextMarkerParser extends Pa
                     	    }
 
 
-                    	    fname=(Token)match(input,Identifier,FOLLOW_Identifier_in_declaration1669); if (state.failed) return stmts;
+                    	    fname=(Token)match(input,Identifier,FOLLOW_Identifier_in_declaration1538); if (state.failed) return stmts;
 
                     	    if ( state.backtracking==0 ) {featureNames.add(fname);}
 
@@ -2438,12 +2274,12 @@ public class TextMarkerParser extends Pa
                     } while (true);
 
 
-                    match(input,RPAREN,FOLLOW_RPAREN_in_declaration1677); if (state.failed) return stmts;
+                    match(input,RPAREN,FOLLOW_RPAREN_in_declaration1546); if (state.failed) return stmts;
 
                     }
 
 
-                    match(input,SEMI,FOLLOW_SEMI_in_declaration1680); if (state.failed) return stmts;
+                    match(input,SEMI,FOLLOW_SEMI_in_declaration1549); if (state.failed) return stmts;
 
                     if ( state.backtracking==0 ) {
                     		List<TextMarkerFeatureDeclaration> features = new ArrayList<TextMarkerFeatureDeclaration>();
@@ -2541,14 +2377,14 @@ public class TextMarkerParser extends Pa
                 case 1 :
                     // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:534:3: declareToken= BlockString
                     {
-                    declareToken=(Token)match(input,BlockString,FOLLOW_BlockString_in_blockDeclaration1741); if (state.failed) return block;
+                    declareToken=(Token)match(input,BlockString,FOLLOW_BlockString_in_blockDeclaration1610); if (state.failed) return block;
 
                     }
                     break;
                 case 2 :
                     // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:534:32: declareToken= AutomataBlockString
                     {
-                    declareToken=(Token)match(input,AutomataBlockString,FOLLOW_AutomataBlockString_in_blockDeclaration1749); if (state.failed) return block;
+                    declareToken=(Token)match(input,AutomataBlockString,FOLLOW_AutomataBlockString_in_blockDeclaration1618); if (state.failed) return block;
 
                     }
                     break;
@@ -2556,9 +2392,9 @@ public class TextMarkerParser extends Pa
             }
 
 
-            match(input,LPAREN,FOLLOW_LPAREN_in_blockDeclaration1753); if (state.failed) return block;
+            match(input,LPAREN,FOLLOW_LPAREN_in_blockDeclaration1622); if (state.failed) return block;
 
-            id=(Token)match(input,Identifier,FOLLOW_Identifier_in_blockDeclaration1760); if (state.failed) return block;
+            id=(Token)match(input,Identifier,FOLLOW_Identifier_in_blockDeclaration1629); if (state.failed) return block;
 
             if ( state.backtracking==0 ) {addVariable(id.getText(), declareToken.getText());}
 
@@ -2567,9 +2403,9 @@ public class TextMarkerParser extends Pa
             		((blockDeclaration_scope)blockDeclaration_stack.peek()).env = block;
             	}
 
-            match(input,RPAREN,FOLLOW_RPAREN_in_blockDeclaration1768); if (state.failed) return block;
+            match(input,RPAREN,FOLLOW_RPAREN_in_blockDeclaration1637); if (state.failed) return block;
 
-            pushFollow(FOLLOW_ruleElementWithCA_in_blockDeclaration1775);
+            pushFollow(FOLLOW_ruleElementWithCA_in_blockDeclaration1644);
             re1=ruleElementWithCA();
 
             state._fsp--;
@@ -2579,15 +2415,15 @@ public class TextMarkerParser extends Pa
 
             if ( state.backtracking==0 ) {ScriptFactory.finalizeScriptBlock(block, rc, re, body);}
 
-            match(input,LCURLY,FOLLOW_LCURLY_in_blockDeclaration1783); if (state.failed) return block;
+            match(input,LCURLY,FOLLOW_LCURLY_in_blockDeclaration1652); if (state.failed) return block;
 
-            pushFollow(FOLLOW_statements_in_blockDeclaration1789);
+            pushFollow(FOLLOW_statements_in_blockDeclaration1658);
             body=statements();
 
             state._fsp--;
             if (state.failed) return block;
 
-            rc=(Token)match(input,RCURLY,FOLLOW_RCURLY_in_blockDeclaration1795); if (state.failed) return block;
+            rc=(Token)match(input,RCURLY,FOLLOW_RCURLY_in_blockDeclaration1664); if (state.failed) return block;
 
             if ( state.backtracking==0 ) {ScriptFactory.finalizeScriptBlock(block, rc, re, body);}
 
@@ -2640,7 +2476,7 @@ public class TextMarkerParser extends Pa
             // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:550:5: (idRef= typeExpression (quantifier= quantifierPart )? LCURLY (c= conditions )? ( THEN a= actions )? end= RCURLY )
             // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:551:5: idRef= typeExpression (quantifier= quantifierPart )? LCURLY (c= conditions )? ( THEN a= actions )? end= RCURLY
             {
-            pushFollow(FOLLOW_typeExpression_in_ruleElementWithCA1825);
+            pushFollow(FOLLOW_typeExpression_in_ruleElementWithCA1694);
             idRef=typeExpression();
 
             state._fsp--;
@@ -2657,7 +2493,7 @@ public class TextMarkerParser extends Pa
                 case 1 :
                     // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:551:37: quantifier= quantifierPart
                     {
-                    pushFollow(FOLLOW_quantifierPart_in_ruleElementWithCA1831);
+                    pushFollow(FOLLOW_quantifierPart_in_ruleElementWithCA1700);
                     quantifier=quantifierPart();
 
                     state._fsp--;
@@ -2671,7 +2507,7 @@ public class TextMarkerParser extends Pa
 
             if ( state.backtracking==0 ) {re = ScriptFactory.createRuleElement(idRef,quantifier,c,a, end);}
 
-            match(input,LCURLY,FOLLOW_LCURLY_in_ruleElementWithCA1844); if (state.failed) return re;
+            match(input,LCURLY,FOLLOW_LCURLY_in_ruleElementWithCA1713); if (state.failed) return re;
 
             // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:552:18: (c= conditions )?
             int alt34=2;
@@ -2684,7 +2520,7 @@ public class TextMarkerParser extends Pa
                 case 1 :
                     // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:552:18: c= conditions
                     {
-                    pushFollow(FOLLOW_conditions_in_ruleElementWithCA1850);
+                    pushFollow(FOLLOW_conditions_in_ruleElementWithCA1719);
                     c=conditions();
 
                     state._fsp--;
@@ -2707,9 +2543,9 @@ public class TextMarkerParser extends Pa
                 case 1 :
                     // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:552:33: THEN a= actions
                     {
-                    match(input,THEN,FOLLOW_THEN_in_ruleElementWithCA1854); if (state.failed) return re;
+                    match(input,THEN,FOLLOW_THEN_in_ruleElementWithCA1723); if (state.failed) return re;
 
-                    pushFollow(FOLLOW_actions_in_ruleElementWithCA1860);
+                    pushFollow(FOLLOW_actions_in_ruleElementWithCA1729);
                     a=actions();
 
                     state._fsp--;
@@ -2721,7 +2557,7 @@ public class TextMarkerParser extends Pa
             }
 
 
-            end=(Token)match(input,RCURLY,FOLLOW_RCURLY_in_ruleElementWithCA1868); if (state.failed) return re;
+            end=(Token)match(input,RCURLY,FOLLOW_RCURLY_in_ruleElementWithCA1737); if (state.failed) return re;
 
             if ( state.backtracking==0 ) {re = ScriptFactory.createRuleElement(idRef,quantifier,c,a, end);}
 
@@ -2765,7 +2601,7 @@ public class TextMarkerParser extends Pa
             // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:558:5: (idRef= typeExpression (quantifier= quantifierPart )? )
             // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:559:5: idRef= typeExpression (quantifier= quantifierPart )?
             {
-            pushFollow(FOLLOW_typeExpression_in_ruleElementWithoutCA1908);
+            pushFollow(FOLLOW_typeExpression_in_ruleElementWithoutCA1777);
             idRef=typeExpression();
 
             state._fsp--;
@@ -2782,7 +2618,7 @@ public class TextMarkerParser extends Pa
                 case 1 :
                     // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:559:37: quantifier= quantifierPart
                     {
-                    pushFollow(FOLLOW_quantifierPart_in_ruleElementWithoutCA1914);
+                    pushFollow(FOLLOW_quantifierPart_in_ruleElementWithoutCA1783);
                     quantifier=quantifierPart();
 
                     state._fsp--;
@@ -2834,7 +2670,7 @@ public class TextMarkerParser extends Pa
             // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:565:2: (elements= ruleElements SEMI )
             // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:566:2: elements= ruleElements SEMI
             {
-            pushFollow(FOLLOW_ruleElements_in_simpleStatement1956);
+            pushFollow(FOLLOW_ruleElements_in_simpleStatement1825);
             elements=ruleElements();
 
             state._fsp--;
@@ -2842,7 +2678,7 @@ public class TextMarkerParser extends Pa
 
             if ( state.backtracking==0 ) {stmt = ScriptFactory.createRule(elements);}
 
-            match(input,SEMI,FOLLOW_SEMI_in_simpleStatement1965); if (state.failed) return stmt;
+            match(input,SEMI,FOLLOW_SEMI_in_simpleStatement1834); if (state.failed) return stmt;
 
             }
 
@@ -2882,7 +2718,7 @@ public class TextMarkerParser extends Pa
             // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:572:2: (re= ruleElement (re= ruleElement )* )
             // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:573:2: re= ruleElement (re= ruleElement )*
             {
-            pushFollow(FOLLOW_ruleElement_in_ruleElements1986);
+            pushFollow(FOLLOW_ruleElement_in_ruleElements1855);
             re=ruleElement();
 
             state._fsp--;
@@ -2905,7 +2741,7 @@ public class TextMarkerParser extends Pa
             	case 1 :
             	    // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:573:53: re= ruleElement
             	    {
-            	    pushFollow(FOLLOW_ruleElement_in_ruleElements1995);
+            	    pushFollow(FOLLOW_ruleElement_in_ruleElements1864);
             	    re=ruleElement();
 
             	    state._fsp--;
@@ -2960,7 +2796,7 @@ public class TextMarkerParser extends Pa
             // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:577:2: (re= ruleElementType )
             // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:578:2: re= ruleElementType
             {
-            pushFollow(FOLLOW_ruleElementType_in_blockRuleElement2022);
+            pushFollow(FOLLOW_ruleElementType_in_blockRuleElement1891);
             re=ruleElementType();
 
             state._fsp--;
@@ -3058,7 +2894,7 @@ public class TextMarkerParser extends Pa
                 case 1 :
                     // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:583:2: re1= ruleElementType
                     {
-                    pushFollow(FOLLOW_ruleElementType_in_ruleElement2046);
+                    pushFollow(FOLLOW_ruleElementType_in_ruleElement1915);
                     re1=ruleElementType();
 
                     state._fsp--;
@@ -3071,7 +2907,7 @@ public class TextMarkerParser extends Pa
                 case 2 :
                     // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:584:4: re2= ruleElementLiteral
                     {
-                    pushFollow(FOLLOW_ruleElementLiteral_in_ruleElement2057);
+                    pushFollow(FOLLOW_ruleElementLiteral_in_ruleElement1926);
                     re2=ruleElementLiteral();
 
                     state._fsp--;
@@ -3084,7 +2920,7 @@ public class TextMarkerParser extends Pa
                 case 3 :
                     // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:585:4: re3= ruleElementComposed
                     {
-                    pushFollow(FOLLOW_ruleElementComposed_in_ruleElement2068);
+                    pushFollow(FOLLOW_ruleElementComposed_in_ruleElement1937);
                     re3=ruleElementComposed();
 
                     state._fsp--;
@@ -3147,7 +2983,7 @@ public class TextMarkerParser extends Pa
             // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:592:2: ( LPAREN ( ( ruleElementType VBAR )=>re1= ruleElementType VBAR re2= ruleElementType ( VBAR re3= ruleElementType )* | ( ruleElements )=>res= ruleElements ) RPAREN (q= quantifierPart )? ( LCURLY (c= conditions )? ( THEN a= actions )? RCURLY )? )
             // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:593:2: LPAREN ( ( ruleElementType VBAR )=>re1= ruleElementType VBAR re2= ruleElementType ( VBAR re3= ruleElementType )* | ( ruleElements )=>res= ruleElements ) RPAREN (q= quantifierPart )? ( LCURLY (c= conditions )? ( THEN a= actions )? RCURLY )?
             {
-            match(input,LPAREN,FOLLOW_LPAREN_in_ruleElementComposed2092); if (state.failed) return re;
+            match(input,LPAREN,FOLLOW_LPAREN_in_ruleElementComposed1961); if (state.failed) return re;
 
             // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:595:2: ( ( ruleElementType VBAR )=>re1= ruleElementType VBAR re2= ruleElementType ( VBAR re3= ruleElementType )* | ( ruleElements )=>res= ruleElements )
             int alt40=2;
@@ -3207,7 +3043,7 @@ public class TextMarkerParser extends Pa
                 case 1 :
                     // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:595:3: ( ruleElementType VBAR )=>re1= ruleElementType VBAR re2= ruleElementType ( VBAR re3= ruleElementType )*
                     {
-                    pushFollow(FOLLOW_ruleElementType_in_ruleElementComposed2110);
+                    pushFollow(FOLLOW_ruleElementType_in_ruleElementComposed1979);
                     re1=ruleElementType();
 
                     state._fsp--;
@@ -3215,9 +3051,9 @@ public class TextMarkerParser extends Pa
 
                     if ( state.backtracking==0 ) {disjunctive = true; res = new ArrayList<Expression>(); res.add(re1);}
 
-                    match(input,VBAR,FOLLOW_VBAR_in_ruleElementComposed2116); if (state.failed) return re;
+                    match(input,VBAR,FOLLOW_VBAR_in_ruleElementComposed1985); if (state.failed) return re;
 
-                    pushFollow(FOLLOW_ruleElementType_in_ruleElementComposed2122);
+                    pushFollow(FOLLOW_ruleElementType_in_ruleElementComposed1991);
                     re2=ruleElementType();
 
                     state._fsp--;
@@ -3240,9 +3076,9 @@ public class TextMarkerParser extends Pa
                     	case 1 :
                     	    // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:597:3: VBAR re3= ruleElementType
                     	    {
-                    	    match(input,VBAR,FOLLOW_VBAR_in_ruleElementComposed2128); if (state.failed) return re;
+                    	    match(input,VBAR,FOLLOW_VBAR_in_ruleElementComposed1997); if (state.failed) return re;
 
-                    	    pushFollow(FOLLOW_ruleElementType_in_ruleElementComposed2134);
+                    	    pushFollow(FOLLOW_ruleElementType_in_ruleElementComposed2003);
                     	    re3=ruleElementType();
 
                     	    state._fsp--;
@@ -3264,7 +3100,7 @@ public class TextMarkerParser extends Pa
                 case 2 :
                     // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:598:4: ( ruleElements )=>res= ruleElements
                     {
-                    pushFollow(FOLLOW_ruleElements_in_ruleElementComposed2151);
+                    pushFollow(FOLLOW_ruleElements_in_ruleElementComposed2020);
                     res=ruleElements();
 
                     state._fsp--;
@@ -3276,7 +3112,7 @@ public class TextMarkerParser extends Pa
             }
 
 
-            match(input,RPAREN,FOLLOW_RPAREN_in_ruleElementComposed2157); if (state.failed) return re;
+            match(input,RPAREN,FOLLOW_RPAREN_in_ruleElementComposed2026); if (state.failed) return re;
 
             // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:600:11: (q= quantifierPart )?
             int alt41=2;
@@ -3289,7 +3125,7 @@ public class TextMarkerParser extends Pa
                 case 1 :
                     // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:600:11: q= quantifierPart
                     {
-                    pushFollow(FOLLOW_quantifierPart_in_ruleElementComposed2163);
+                    pushFollow(FOLLOW_quantifierPart_in_ruleElementComposed2032);
                     q=quantifierPart();
 
                     state._fsp--;
@@ -3312,7 +3148,7 @@ public class TextMarkerParser extends Pa
                 case 1 :
                     // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:600:30: LCURLY (c= conditions )? ( THEN a= actions )? RCURLY
                     {
-                    match(input,LCURLY,FOLLOW_LCURLY_in_ruleElementComposed2167); if (state.failed) return re;
+                    match(input,LCURLY,FOLLOW_LCURLY_in_ruleElementComposed2036); if (state.failed) return re;
 
                     // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:600:39: (c= conditions )?
                     int alt42=2;
@@ -3325,7 +3161,7 @@ public class TextMarkerParser extends Pa
                         case 1 :
                             // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:600:39: c= conditions
                             {
-                            pushFollow(FOLLOW_conditions_in_ruleElementComposed2173);
+                            pushFollow(FOLLOW_conditions_in_ruleElementComposed2042);
                             c=conditions();
 
                             state._fsp--;
@@ -3348,9 +3184,9 @@ public class TextMarkerParser extends Pa
                         case 1 :
                             // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:600:54: THEN a= actions
                             {
-                            match(input,THEN,FOLLOW_THEN_in_ruleElementComposed2177); if (state.failed) return re;
+                            match(input,THEN,FOLLOW_THEN_in_ruleElementComposed2046); if (state.failed) return re;
 
-                            pushFollow(FOLLOW_actions_in_ruleElementComposed2183);
+                            pushFollow(FOLLOW_actions_in_ruleElementComposed2052);
                             a=actions();
 
                             state._fsp--;
@@ -3362,7 +3198,7 @@ public class TextMarkerParser extends Pa
                     }
 
 
-                    match(input,RCURLY,FOLLOW_RCURLY_in_ruleElementComposed2187); if (state.failed) return re;
+                    match(input,RCURLY,FOLLOW_RCURLY_in_ruleElementComposed2056); if (state.failed) return re;
 
                     }
                     break;
@@ -3417,7 +3253,7 @@ public class TextMarkerParser extends Pa
             // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:605:5: ( ( typeExpression )=>idRef= typeExpression (quantifier= quantifierPart )? ( LCURLY (c= conditions )? ( THEN a= actions )? end= RCURLY )? )
             // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:606:5: ( typeExpression )=>idRef= typeExpression (quantifier= quantifierPart )? ( LCURLY (c= conditions )? ( THEN a= actions )? end= RCURLY )?
             {
-            pushFollow(FOLLOW_typeExpression_in_ruleElementType2221);
+            pushFollow(FOLLOW_typeExpression_in_ruleElementType2090);
             idRef=typeExpression();
 
             state._fsp--;
@@ -3434,7 +3270,7 @@ public class TextMarkerParser extends Pa
                 case 1 :
                     // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:606:55: quantifier= quantifierPart
                     {
-                    pushFollow(FOLLOW_quantifierPart_in_ruleElementType2227);
+                    pushFollow(FOLLOW_quantifierPart_in_ruleElementType2096);
                     quantifier=quantifierPart();
 
                     state._fsp--;
@@ -3457,7 +3293,7 @@ public class TextMarkerParser extends Pa
                 case 1 :
                     // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:607:10: LCURLY (c= conditions )? ( THEN a= actions )? end= RCURLY
                     {
-                    match(input,LCURLY,FOLLOW_LCURLY_in_ruleElementType2240); if (state.failed) return re;
+                    match(input,LCURLY,FOLLOW_LCURLY_in_ruleElementType2109); if (state.failed) return re;
 
                     // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:607:19: (c= conditions )?
                     int alt46=2;
@@ -3470,7 +3306,7 @@ public class TextMarkerParser extends Pa
                         case 1 :
                             // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:607:19: c= conditions
                             {
-                            pushFollow(FOLLOW_conditions_in_ruleElementType2246);
+                            pushFollow(FOLLOW_conditions_in_ruleElementType2115);
                             c=conditions();
 
                             state._fsp--;
@@ -3493,9 +3329,9 @@ public class TextMarkerParser extends Pa
                         case 1 :
                             // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:607:34: THEN a= actions
                             {
-                            match(input,THEN,FOLLOW_THEN_in_ruleElementType2250); if (state.failed) return re;
+                            match(input,THEN,FOLLOW_THEN_in_ruleElementType2119); if (state.failed) return re;
 
-                            pushFollow(FOLLOW_actions_in_ruleElementType2256);
+                            pushFollow(FOLLOW_actions_in_ruleElementType2125);
                             a=actions();
 
                             state._fsp--;
@@ -3507,7 +3343,7 @@ public class TextMarkerParser extends Pa
                     }
 
 
-                    end=(Token)match(input,RCURLY,FOLLOW_RCURLY_in_ruleElementType2264); if (state.failed) return re;
+                    end=(Token)match(input,RCURLY,FOLLOW_RCURLY_in_ruleElementType2133); if (state.failed) return re;
 
                     }
                     break;
@@ -3564,7 +3400,7 @@ public class TextMarkerParser extends Pa
             // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:615:5: ( ( simpleStringExpression )=>idRef= simpleStringExpression (quantifier= quantifierPart )? ( LCURLY (c= conditions )? ( THEN a= actions )? end= RCURLY )? )
             // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:616:5: ( simpleStringExpression )=>idRef= simpleStringExpression (quantifier= quantifierPart )? ( LCURLY (c= conditions )? ( THEN a= actions )? end= RCURLY )?
             {
-            pushFollow(FOLLOW_simpleStringExpression_in_ruleElementLiteral2317);
+            pushFollow(FOLLOW_simpleStringExpression_in_ruleElementLiteral2186);
             idRef=simpleStringExpression();
 
             state._fsp--;
@@ -3581,7 +3417,7 @@ public class TextMarkerParser extends Pa
                 case 1 :
                     // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:616:71: quantifier= quantifierPart
                     {
-                    pushFollow(FOLLOW_quantifierPart_in_ruleElementLiteral2323);
+                    pushFollow(FOLLOW_quantifierPart_in_ruleElementLiteral2192);
                     quantifier=quantifierPart();
 
                     state._fsp--;
@@ -3604,7 +3440,7 @@ public class TextMarkerParser extends Pa
                 case 1 :
                     // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:617:10: LCURLY (c= conditions )? ( THEN a= actions )? end= RCURLY
                     {
-                    match(input,LCURLY,FOLLOW_LCURLY_in_ruleElementLiteral2336); if (state.failed) return re;
+                    match(input,LCURLY,FOLLOW_LCURLY_in_ruleElementLiteral2205); if (state.failed) return re;
 
                     // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:617:19: (c= conditions )?
                     int alt50=2;
@@ -3617,7 +3453,7 @@ public class TextMarkerParser extends Pa
                         case 1 :
                             // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:617:19: c= conditions
                             {
-                            pushFollow(FOLLOW_conditions_in_ruleElementLiteral2342);
+                            pushFollow(FOLLOW_conditions_in_ruleElementLiteral2211);
                             c=conditions();
 
                             state._fsp--;
@@ -3640,9 +3476,9 @@ public class TextMarkerParser extends Pa
                         case 1 :
                             // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:617:34: THEN a= actions
                             {
-                            match(input,THEN,FOLLOW_THEN_in_ruleElementLiteral2346); if (state.failed) return re;
+                            match(input,THEN,FOLLOW_THEN_in_ruleElementLiteral2215); if (state.failed) return re;
 
-                            pushFollow(FOLLOW_actions_in_ruleElementLiteral2352);
+                            pushFollow(FOLLOW_actions_in_ruleElementLiteral2221);
                             a=actions();
 
                             state._fsp--;
@@ -3654,7 +3490,7 @@ public class TextMarkerParser extends Pa
                     }
 
 
-                    end=(Token)match(input,RCURLY,FOLLOW_RCURLY_in_ruleElementLiteral2360); if (state.failed) return re;
+                    end=(Token)match(input,RCURLY,FOLLOW_RCURLY_in_ruleElementLiteral2229); if (state.failed) return re;
 
                     }
                     break;
@@ -3704,7 +3540,7 @@ public class TextMarkerParser extends Pa
             // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:625:5: (c= condition ( COMMA c= condition )* )
             // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:626:5: c= condition ( COMMA c= condition )*
             {
-            pushFollow(FOLLOW_condition_in_conditions2414);
+            pushFollow(FOLLOW_condition_in_conditions2283);
             c=condition();
 
             state._fsp--;
@@ -3727,9 +3563,9 @@ public class TextMarkerParser extends Pa
             	case 1 :
             	    // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:626:36: COMMA c= condition
             	    {
-            	    match(input,COMMA,FOLLOW_COMMA_in_conditions2419); if (state.failed) return conds;
+            	    match(input,COMMA,FOLLOW_COMMA_in_conditions2288); if (state.failed) return conds;
 
-            	    pushFollow(FOLLOW_condition_in_conditions2425);
+            	    pushFollow(FOLLOW_condition_in_conditions2294);
             	    c=condition();
 
             	    state._fsp--;
@@ -3784,7 +3620,7 @@ public class TextMarkerParser extends Pa
             // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:631:5: (a= action ( COMMA a= action )* )
             // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:632:5: a= action ( COMMA a= action )*
             {
-            pushFollow(FOLLOW_action_in_actions2462);
+            pushFollow(FOLLOW_action_in_actions2331);
             a=action();
 
             state._fsp--;
@@ -3807,9 +3643,9 @@ public class TextMarkerParser extends Pa
             	case 1 :
             	    // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:632:35: COMMA a= action
             	    {
-            	    match(input,COMMA,FOLLOW_COMMA_in_actions2467); if (state.failed) return actions;
+            	    match(input,COMMA,FOLLOW_COMMA_in_actions2336); if (state.failed) return actions;
 
-            	    pushFollow(FOLLOW_action_in_actions2473);
+            	    pushFollow(FOLLOW_action_in_actions2342);
             	    a=action();
 
             	    state._fsp--;
@@ -3937,7 +3773,7 @@ public class TextMarkerParser extends Pa
                 case 1 :
                     // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:638:2: ( booleanListExpression )=>e= booleanListExpression
                     {
-                    pushFollow(FOLLOW_booleanListExpression_in_listExpression2511);
+                    pushFollow(FOLLOW_booleanListExpression_in_listExpression2380);
                     e=booleanListExpression();
 
                     state._fsp--;
@@ -3950,7 +3786,7 @@ public class TextMarkerParser extends Pa
                 case 2 :
                     // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:639:4: ( intListExpression )=>e= intListExpression
                     {
-                    pushFollow(FOLLOW_intListExpression_in_listExpression2527);
+                    pushFollow(FOLLOW_intListExpression_in_listExpression2396);
                     e=intListExpression();
 
                     state._fsp--;
@@ -3963,7 +3799,7 @@ public class TextMarkerParser extends Pa
                 case 3 :
                     // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:640:4: ( doubleListExpression )=>e= doubleListExpression
                     {
-                    pushFollow(FOLLOW_doubleListExpression_in_listExpression2543);
+                    pushFollow(FOLLOW_doubleListExpression_in_listExpression2412);
                     e=doubleListExpression();
 
                     state._fsp--;
@@ -3976,7 +3812,7 @@ public class TextMarkerParser extends Pa
                 case 4 :
                     // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:641:4: ( floatListExpression )=>e= floatListExpression
                     {
-                    pushFollow(FOLLOW_floatListExpression_in_listExpression2559);
+                    pushFollow(FOLLOW_floatListExpression_in_listExpression2428);
                     e=floatListExpression();
 
                     state._fsp--;
@@ -3989,7 +3825,7 @@ public class TextMarkerParser extends Pa
                 case 5 :
                     // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:642:4: ( stringListExpression )=>e= stringListExpression
                     {
-                    pushFollow(FOLLOW_stringListExpression_in_listExpression2575);
+                    pushFollow(FOLLOW_stringListExpression_in_listExpression2444);
                     e=stringListExpression();
 
                     state._fsp--;
@@ -4002,7 +3838,7 @@ public class TextMarkerParser extends Pa
                 case 6 :
                     // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:643:4: ( typeListExpression )=>e= typeListExpression
                     {
-                    pushFollow(FOLLOW_typeListExpression_in_listExpression2591);
+                    pushFollow(FOLLOW_typeListExpression_in_listExpression2460);
                     e=typeListExpression();
 
                     state._fsp--;
@@ -4050,7 +3886,7 @@ public class TextMarkerParser extends Pa
             // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:648:2: (e= simpleBooleanListExpression )
             // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:649:2: e= simpleBooleanListExpression
             {
-            pushFollow(FOLLOW_simpleBooleanListExpression_in_booleanListExpression2615);
+            pushFollow(FOLLOW_simpleBooleanListExpression_in_booleanListExpression2484);
             e=simpleBooleanListExpression();
 
             state._fsp--;
@@ -4119,7 +3955,7 @@ public class TextMarkerParser extends Pa
                 case 1 :
                     // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:656:2: LCURLY (e= simpleBooleanExpression ( COMMA e= simpleBooleanExpression )* )? RCURLY
                     {
-                    match(input,LCURLY,FOLLOW_LCURLY_in_simpleBooleanListExpression2636); if (state.failed) return expr;
+                    match(input,LCURLY,FOLLOW_LCURLY_in_simpleBooleanListExpression2505); if (state.failed) return expr;
 
                     // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:656:9: (e= simpleBooleanExpression ( COMMA e= simpleBooleanExpression )* )?
                     int alt57=2;
@@ -4132,7 +3968,7 @@ public class TextMarkerParser extends Pa
                         case 1 :
                             // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:656:10: e= simpleBooleanExpression ( COMMA e= simpleBooleanExpression )*
                             {
-                            pushFollow(FOLLOW_simpleBooleanExpression_in_simpleBooleanListExpression2643);
+                            pushFollow(FOLLOW_simpleBooleanExpression_in_simpleBooleanListExpression2512);
                             e=simpleBooleanExpression();
 
                             state._fsp--;
@@ -4155,9 +3991,9 @@ public class TextMarkerParser extends Pa
                             	case 1 :
                             	    // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:656:54: COMMA e= simpleBooleanExpression
                             	    {
-                            	    match(input,COMMA,FOLLOW_COMMA_in_simpleBooleanListExpression2648); if (state.failed) return expr;
+                            	    match(input,COMMA,FOLLOW_COMMA_in_simpleBooleanListExpression2517); if (state.failed) return expr;
 
-                            	    pushFollow(FOLLOW_simpleBooleanExpression_in_simpleBooleanListExpression2654);
+                            	    pushFollow(FOLLOW_simpleBooleanExpression_in_simpleBooleanListExpression2523);
                             	    e=simpleBooleanExpression();
 
                             	    state._fsp--;
@@ -4180,7 +4016,7 @@ public class TextMarkerParser extends Pa
                     }
 
 
-                    match(input,RCURLY,FOLLOW_RCURLY_in_simpleBooleanListExpression2663); if (state.failed) return expr;
+                    match(input,RCURLY,FOLLOW_RCURLY_in_simpleBooleanListExpression2532); if (state.failed) return expr;
 
                     if ( state.backtracking==0 ) {expr = ExpressionFactory.createListExpression(list, TMTypeConstants.TM_TYPE_BL);}
 
@@ -4194,7 +4030,7 @@ public class TextMarkerParser extends Pa
                         throw new FailedPredicateException(input, "simpleBooleanListExpression", "isVariableOfType(input.LT(1).getText(), \"BOOLEANLIST\")");
                     }
 
-                    var=(Token)match(input,Identifier,FOLLOW_Identifier_in_simpleBooleanListExpression2680); if (state.failed) return expr;
+                    var=(Token)match(input,Identifier,FOLLOW_Identifier_in_simpleBooleanListExpression2549); if (state.failed) return expr;
 
                     if ( state.backtracking==0 ) {expr = ExpressionFactory.createListExpression(var, TMTypeConstants.TM_TYPE_BL);}
 
@@ -4238,7 +4074,7 @@ public class TextMarkerParser extends Pa
             // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:666:2: (e= simpleIntListExpression )
             // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:667:2: e= simpleIntListExpression
             {
-            pushFollow(FOLLOW_simpleIntListExpression_in_intListExpression2705);
+            pushFollow(FOLLOW_simpleIntListExpression_in_intListExpression2574);
             e=simpleIntListExpression();
 
             state._fsp--;
@@ -4307,7 +4143,7 @@ public class TextMarkerParser extends Pa
                 case 1 :
                     // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:674:2: LCURLY (e= simpleNumberExpression ( COMMA e= simpleNumberExpression )* )? RCURLY
                     {
-                    match(input,LCURLY,FOLLOW_LCURLY_in_simpleIntListExpression2726); if (state.failed) return expr;
+                    match(input,LCURLY,FOLLOW_LCURLY_in_simpleIntListExpression2595); if (state.failed) return expr;
 
                     // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:674:9: (e= simpleNumberExpression ( COMMA e= simpleNumberExpression )* )?
                     int alt60=2;
@@ -4320,7 +4156,7 @@ public class TextMarkerParser extends Pa
                         case 1 :
                             // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:674:10: e= simpleNumberExpression ( COMMA e= simpleNumberExpression )*
                             {
-                            pushFollow(FOLLOW_simpleNumberExpression_in_simpleIntListExpression2733);
+                            pushFollow(FOLLOW_simpleNumberExpression_in_simpleIntListExpression2602);
                             e=simpleNumberExpression();
 
                             state._fsp--;
@@ -4343,9 +4179,9 @@ public class TextMarkerParser extends Pa
                             	case 1 :
                             	    // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:674:53: COMMA e= simpleNumberExpression
                             	    {
-                            	    match(input,COMMA,FOLLOW_COMMA_in_simpleIntListExpression2738); if (state.failed) return expr;
+                            	    match(input,COMMA,FOLLOW_COMMA_in_simpleIntListExpression2607); if (state.failed) return expr;
 
-                            	    pushFollow(FOLLOW_simpleNumberExpression_in_simpleIntListExpression2744);
+                            	    pushFollow(FOLLOW_simpleNumberExpression_in_simpleIntListExpression2613);
                             	    e=simpleNumberExpression();
 
                             	    state._fsp--;
@@ -4368,7 +4204,7 @@ public class TextMarkerParser extends Pa
                     }
 
 
-                    match(input,RCURLY,FOLLOW_RCURLY_in_simpleIntListExpression2753); if (state.failed) return expr;
+                    match(input,RCURLY,FOLLOW_RCURLY_in_simpleIntListExpression2622); if (state.failed) return expr;
 
                     if ( state.backtracking==0 ) {expr = ExpressionFactory.createListExpression(list, TMTypeConstants.TM_TYPE_NL);}
 
@@ -4382,7 +4218,7 @@ public class TextMarkerParser extends Pa
                         throw new FailedPredicateException(input, "simpleIntListExpression", "isVariableOfType(input.LT(1).getText(), \"INTLIST\")");
                     }
 
-                    var=(Token)match(input,Identifier,FOLLOW_Identifier_in_simpleIntListExpression2770); if (state.failed) return expr;
+                    var=(Token)match(input,Identifier,FOLLOW_Identifier_in_simpleIntListExpression2639); if (state.failed) return expr;
 
                     if ( state.backtracking==0 ) {expr = ExpressionFactory.createListExpression(var, TMTypeConstants.TM_TYPE_NL);}
 
@@ -4483,7 +4319,7 @@ public class TextMarkerParser extends Pa
                 case 1 :
                     // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:685:2: (e1= doubleListExpression )=>e1= doubleListExpression
                     {
-                    pushFollow(FOLLOW_doubleListExpression_in_numberListExpression2804);
+                    pushFollow(FOLLOW_doubleListExpression_in_numberListExpression2673);
                     e1=doubleListExpression();
 
                     state._fsp--;
@@ -4496,7 +4332,7 @@ public class TextMarkerParser extends Pa
                 case 2 :
                     // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:687:2: (e1= floatListExpression )=>e1= floatListExpression
                     {
-                    pushFollow(FOLLOW_floatListExpression_in_numberListExpression2825);
+                    pushFollow(FOLLOW_floatListExpression_in_numberListExpression2694);
                     e1=floatListExpression();
 
                     state._fsp--;
@@ -4509,7 +4345,7 @@ public class TextMarkerParser extends Pa
                 case 3 :
                     // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:689:2: e2= intListExpression
                     {
-                    pushFollow(FOLLOW_intListExpression_in_numberListExpression2837);
+                    pushFollow(FOLLOW_intListExpression_in_numberListExpression2706);
                     e2=intListExpression();
 
                     state._fsp--;
@@ -4557,7 +4393,7 @@ public class TextMarkerParser extends Pa
             // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:693:2: (e= simpleDoubleListExpression )
             // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:694:2: e= simpleDoubleListExpression
             {
-            pushFollow(FOLLOW_simpleDoubleListExpression_in_doubleListExpression2860);
+            pushFollow(FOLLOW_simpleDoubleListExpression_in_doubleListExpression2729);
             e=simpleDoubleListExpression();
 
             state._fsp--;
@@ -4626,7 +4462,7 @@ public class TextMarkerParser extends Pa
                 case 1 :
                     // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:701:2: LCURLY (e= simpleNumberExpression ( COMMA e= simpleNumberExpression )* )? RCURLY
                     {
-                    match(input,LCURLY,FOLLOW_LCURLY_in_simpleDoubleListExpression2881); if (state.failed) return expr;
+                    match(input,LCURLY,FOLLOW_LCURLY_in_simpleDoubleListExpression2750); if (state.failed) return expr;
 
                     // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:701:9: (e= simpleNumberExpression ( COMMA e= simpleNumberExpression )* )?
                     int alt64=2;
@@ -4639,7 +4475,7 @@ public class TextMarkerParser extends Pa
                         case 1 :
                             // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:701:10: e= simpleNumberExpression ( COMMA e= simpleNumberExpression )*
                             {
-                            pushFollow(FOLLOW_simpleNumberExpression_in_simpleDoubleListExpression2888);
+                            pushFollow(FOLLOW_simpleNumberExpression_in_simpleDoubleListExpression2757);
                             e=simpleNumberExpression();
 
                             state._fsp--;
@@ -4662,9 +4498,9 @@ public class TextMarkerParser extends Pa
                             	case 1 :
                             	    // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:701:53: COMMA e= simpleNumberExpression
                             	    {
-                            	    match(input,COMMA,FOLLOW_COMMA_in_simpleDoubleListExpression2893); if (state.failed) return expr;
+                            	    match(input,COMMA,FOLLOW_COMMA_in_simpleDoubleListExpression2762); if (state.failed) return expr;
 
-                            	    pushFollow(FOLLOW_simpleNumberExpression_in_simpleDoubleListExpression2899);
+                            	    pushFollow(FOLLOW_simpleNumberExpression_in_simpleDoubleListExpression2768);
                             	    e=simpleNumberExpression();
 
                             	    state._fsp--;
@@ -4687,7 +4523,7 @@ public class TextMarkerParser extends Pa
                     }
 
 
-                    match(input,RCURLY,FOLLOW_RCURLY_in_simpleDoubleListExpression2908); if (state.failed) return expr;
+                    match(input,RCURLY,FOLLOW_RCURLY_in_simpleDoubleListExpression2777); if (state.failed) return expr;
 
                     if ( state.backtracking==0 ) {expr = ExpressionFactory.createListExpression(list, TMTypeConstants.TM_TYPE_NL);}
 
@@ -4701,7 +4537,7 @@ public class TextMarkerParser extends Pa
                         throw new FailedPredicateException(input, "simpleDoubleListExpression", "isVariableOfType(input.LT(1).getText(), \"DOUBLELIST\")");
                     }
 
-                    var=(Token)match(input,Identifier,FOLLOW_Identifier_in_simpleDoubleListExpression2925); if (state.failed) return expr;
+                    var=(Token)match(input,Identifier,FOLLOW_Identifier_in_simpleDoubleListExpression2794); if (state.failed) return expr;
 
                     if ( state.backtracking==0 ) {expr = ExpressionFactory.createListExpression(var, TMTypeConstants.TM_TYPE_NL);}
 
@@ -4745,7 +4581,7 @@ public class TextMarkerParser extends Pa
             // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:710:2: (e= simpleFloatListExpression )
             // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:711:2: e= simpleFloatListExpression
             {
-            pushFollow(FOLLOW_simpleFloatListExpression_in_floatListExpression2949);
+            pushFollow(FOLLOW_simpleFloatListExpression_in_floatListExpression2818);
             e=simpleFloatListExpression();
 
             state._fsp--;
@@ -4814,7 +4650,7 @@ public class TextMarkerParser extends Pa
                 case 1 :
                     // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:718:2: LCURLY (e= simpleNumberExpression ( COMMA e= simpleNumberExpression )* )? RCURLY
                     {
-                    match(input,LCURLY,FOLLOW_LCURLY_in_simpleFloatListExpression2970); if (state.failed) return expr;
+                    match(input,LCURLY,FOLLOW_LCURLY_in_simpleFloatListExpression2839); if (state.failed) return expr;
 
                     // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:718:9: (e= simpleNumberExpression ( COMMA e= simpleNumberExpression )* )?
                     int alt67=2;
@@ -4827,7 +4663,7 @@ public class TextMarkerParser extends Pa
                         case 1 :
                             // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:718:10: e= simpleNumberExpression ( COMMA e= simpleNumberExpression )*
                             {
-                            pushFollow(FOLLOW_simpleNumberExpression_in_simpleFloatListExpression2977);
+                            pushFollow(FOLLOW_simpleNumberExpression_in_simpleFloatListExpression2846);
                             e=simpleNumberExpression();
 
                             state._fsp--;
@@ -4850,9 +4686,9 @@ public class TextMarkerParser extends Pa
                             	case 1 :
                             	    // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:718:53: COMMA e= simpleNumberExpression
                             	    {
-                            	    match(input,COMMA,FOLLOW_COMMA_in_simpleFloatListExpression2982); if (state.failed) return expr;
+                            	    match(input,COMMA,FOLLOW_COMMA_in_simpleFloatListExpression2851); if (state.failed) return expr;
 
-                            	    pushFollow(FOLLOW_simpleNumberExpression_in_simpleFloatListExpression2988);
+                            	    pushFollow(FOLLOW_simpleNumberExpression_in_simpleFloatListExpression2857);
                             	    e=simpleNumberExpression();
 
                             	    state._fsp--;
@@ -4875,7 +4711,7 @@ public class TextMarkerParser extends Pa
                     }
 
 
-                    match(input,RCURLY,FOLLOW_RCURLY_in_simpleFloatListExpression2997); if (state.failed) return expr;
+                    match(input,RCURLY,FOLLOW_RCURLY_in_simpleFloatListExpression2866); if (state.failed) return expr;
 
                     if ( state.backtracking==0 ) {expr = ExpressionFactory.createListExpression(list, TMTypeConstants.TM_TYPE_NL);}
 
@@ -4889,7 +4725,7 @@ public class TextMarkerParser extends Pa
                         throw new FailedPredicateException(input, "simpleFloatListExpression", "isVariableOfType(input.LT(1).getText(), \"FLOATLIST\")");
                     }
 
-                    var=(Token)match(input,Identifier,FOLLOW_Identifier_in_simpleFloatListExpression3014); if (state.failed) return expr;
+                    var=(Token)match(input,Identifier,FOLLOW_Identifier_in_simpleFloatListExpression2883); if (state.failed) return expr;
 
                     if ( state.backtracking==0 ) {expr = ExpressionFactory.createListExpression(var, TMTypeConstants.TM_TYPE_NL);}
 
@@ -4933,7 +4769,7 @@ public class TextMarkerParser extends Pa
             // D:\\work\\workspace-uima3\\uimaj-ep-textmarker-ide\\src\\main\\java\\org\\apache\\uima\\textmarker\\ide\\core\\parser\\TextMarkerParser.g:728:2: (e= simpleStringListExpression )

[... 10135 lines stripped ...]