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 2013/04/29 17:16:14 UTC

svn commit: r1477140 - in /uima/sandbox/ruta/trunk: ruta-core/src/main/antlr3/org/apache/uima/ruta/parser/ ruta-ep-ide/src/main/antlr3/org/apache/uima/ruta/ide/core/parser/

Author: pkluegl
Date: Mon Apr 29 15:16:13 2013
New Revision: 1477140

URL: http://svn.apache.org/r1477140
Log:
UIMA-2850
- renaming

Modified:
    uima/sandbox/ruta/trunk/ruta-core/src/main/antlr3/org/apache/uima/ruta/parser/RutaLexer.g
    uima/sandbox/ruta/trunk/ruta-core/src/main/antlr3/org/apache/uima/ruta/parser/RutaParser.g
    uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaLexer.g
    uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaParser.g

Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/antlr3/org/apache/uima/ruta/parser/RutaLexer.g
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/antlr3/org/apache/uima/ruta/parser/RutaLexer.g?rev=1477140&r1=1477139&r2=1477140&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/antlr3/org/apache/uima/ruta/parser/RutaLexer.g (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/antlr3/org/apache/uima/ruta/parser/RutaLexer.g Mon Apr 29 15:16:13 2013
@@ -1,4 +1,4 @@
-lexer grammar TextMarkerLexer;
+lexer grammar RutaLexer;
 options {
 	language = Java;
 }
@@ -30,7 +30,7 @@ tokens {
  * under the License.
 */
 
-	package org.apache.uima.textmarker.parser;
+	package org.apache.uima.ruta.parser;
 }
 
 @lexer::members {

Modified: uima/sandbox/ruta/trunk/ruta-core/src/main/antlr3/org/apache/uima/ruta/parser/RutaParser.g
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/antlr3/org/apache/uima/ruta/parser/RutaParser.g?rev=1477140&r1=1477139&r2=1477140&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/main/antlr3/org/apache/uima/ruta/parser/RutaParser.g (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/main/antlr3/org/apache/uima/ruta/parser/RutaParser.g Mon Apr 29 15:16:13 2013
@@ -1,8 +1,8 @@
-parser grammar TextMarkerParser;
+parser grammar RutaParser;
 
 options {
 	language = Java;
-	tokenVocab = TextMarkerLexer;
+	tokenVocab = RutaLexer;
 }
 
 
@@ -26,7 +26,7 @@ options {
  * under the License.
 */
 
-package org.apache.uima.textmarker.parser;
+package org.apache.uima.ruta.parser;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -49,52 +49,52 @@ import org.antlr.runtime.Token;
 import org.antlr.runtime.TokenStream;
 import org.apache.uima.resource.metadata.TypeSystemDescription;
 
-import org.apache.uima.textmarker.action.AbstractTextMarkerAction;
-import org.apache.uima.textmarker.action.ActionFactory;
-import org.apache.uima.textmarker.condition.AbstractTextMarkerCondition;
-import org.apache.uima.textmarker.condition.ConditionFactory;
-import org.apache.uima.textmarker.TextMarkerAutomataBlock;
-import org.apache.uima.textmarker.TextMarkerBlock;
-import org.apache.uima.textmarker.TextMarkerModule;
-import org.apache.uima.textmarker.TextMarkerScriptBlock;
-import org.apache.uima.textmarker.TextMarkerScriptFactory;
-import org.apache.uima.textmarker.TextMarkerAutomataFactory;
-import org.apache.uima.textmarker.TextMarkerStatement;
-import org.apache.uima.textmarker.expression.ExpressionFactory;
-import org.apache.uima.textmarker.expression.TextMarkerExpression;
-import org.apache.uima.textmarker.expression.bool.BooleanExpression;
-import org.apache.uima.textmarker.expression.list.BooleanListExpression;
-import org.apache.uima.textmarker.expression.list.ListExpression;
-import org.apache.uima.textmarker.expression.list.NumberListExpression;
-import org.apache.uima.textmarker.expression.list.StringListExpression;
-import org.apache.uima.textmarker.expression.list.TypeListExpression;
-import org.apache.uima.textmarker.expression.number.NumberExpression;
-import org.apache.uima.textmarker.expression.resource.WordListExpression;
-import org.apache.uima.textmarker.expression.resource.WordTableExpression;
-import org.apache.uima.textmarker.expression.string.StringExpression;
-import org.apache.uima.textmarker.expression.string.StringFunctionFactory;
-import org.apache.uima.textmarker.expression.type.TypeExpression;
-import org.apache.uima.textmarker.extensions.TextMarkerExternalFactory;
-import org.apache.uima.textmarker.rule.AbstractRuleElement;
-import org.apache.uima.textmarker.rule.ComposedRuleElement;
-import org.apache.uima.textmarker.rule.RegExpRule;
-import org.apache.uima.textmarker.rule.RuleElement;
-import org.apache.uima.textmarker.rule.RuleElementContainer;
-import org.apache.uima.textmarker.rule.RuleElementIsolator;
-import org.apache.uima.textmarker.rule.TextMarkerRule;
-import org.apache.uima.textmarker.rule.TextMarkerRuleElement;
-import org.apache.uima.textmarker.rule.quantifier.RuleElementQuantifier;
+import org.apache.uima.ruta.action.AbstractRutaAction;
+import org.apache.uima.ruta.action.ActionFactory;
+import org.apache.uima.ruta.condition.AbstractRutaCondition;
+import org.apache.uima.ruta.condition.ConditionFactory;
+import org.apache.uima.ruta.RutaAutomataBlock;
+import org.apache.uima.ruta.RutaBlock;
+import org.apache.uima.ruta.RutaModule;
+import org.apache.uima.ruta.RutaScriptBlock;
+import org.apache.uima.ruta.RutaScriptFactory;
+import org.apache.uima.ruta.RutaAutomataFactory;
+import org.apache.uima.ruta.RutaStatement;
+import org.apache.uima.ruta.expression.ExpressionFactory;
+import org.apache.uima.ruta.expression.RutaExpression;
+import org.apache.uima.ruta.expression.bool.BooleanExpression;
+import org.apache.uima.ruta.expression.list.BooleanListExpression;
+import org.apache.uima.ruta.expression.list.ListExpression;
+import org.apache.uima.ruta.expression.list.NumberListExpression;
+import org.apache.uima.ruta.expression.list.StringListExpression;
+import org.apache.uima.ruta.expression.list.TypeListExpression;
+import org.apache.uima.ruta.expression.number.NumberExpression;
+import org.apache.uima.ruta.expression.resource.WordListExpression;
+import org.apache.uima.ruta.expression.resource.WordTableExpression;
+import org.apache.uima.ruta.expression.string.StringExpression;
+import org.apache.uima.ruta.expression.string.StringFunctionFactory;
+import org.apache.uima.ruta.expression.type.TypeExpression;
+import org.apache.uima.ruta.extensions.RutaExternalFactory;
+import org.apache.uima.ruta.rule.AbstractRuleElement;
+import org.apache.uima.ruta.rule.ComposedRuleElement;
+import org.apache.uima.ruta.rule.RegExpRule;
+import org.apache.uima.ruta.rule.RuleElement;
+import org.apache.uima.ruta.rule.RuleElementContainer;
+import org.apache.uima.ruta.rule.RuleElementIsolator;
+import org.apache.uima.ruta.rule.RutaRule;
+import org.apache.uima.ruta.rule.RutaRuleElement;
+import org.apache.uima.ruta.rule.quantifier.RuleElementQuantifier;
 }
 
 @parser::members {
 private List vars = new ArrayList();	
 private int level = 0;
-private TextMarkerScriptFactory factory = new TextMarkerScriptFactory();
-private TextMarkerScriptFactory automataFactory = new TextMarkerAutomataFactory();
-private TextMarkerExternalFactory external;
+private RutaScriptFactory factory = new RutaScriptFactory();
+private RutaScriptFactory automataFactory = new RutaAutomataFactory();
+private RutaExternalFactory external;
 
 
-public void setExternalFactory(TextMarkerExternalFactory factory) {
+public void setExternalFactory(RutaExternalFactory factory) {
 	external = factory;
 }
 
@@ -112,24 +112,24 @@ public void emitErrorMessage(String msg)
 	//		throw new NoViableAltException("already declared \"" + var + "\"", 3, 0, input);
 	//	}
 	//}
-	public void addVariable(TextMarkerBlock parent, String name, String type) {
+	public void addVariable(RutaBlock parent, String name, String type) {
 		parent.getEnvironment().addVariable(name, type);
 	}
 	
-	public boolean ownsVariable(TextMarkerBlock parent, String name) {
+	public boolean ownsVariable(RutaBlock parent, String name) {
 		return parent.getEnvironment().ownsVariable(name);
 	}
-	public boolean isVariable(TextMarkerBlock parent, String name) {
+	public boolean isVariable(RutaBlock parent, String name) {
 		return parent.getEnvironment().isVariable(name);
 	}
 	
-	public void setValue(TextMarkerBlock parent, List<String> names, Object obj) {
+	public void setValue(RutaBlock parent, List<String> names, Object obj) {
 		for(String name : names) {
 			setValue(parent,name,obj);
 		}
 	}
 	
-	public void setValue(TextMarkerBlock parent, String name, Object obj) {
+	public void setValue(RutaBlock parent, String name, Object obj) {
 		if(obj != null) {
 			Object value = parent.getEnvironment().getLiteralValue(name, obj);
 			parent.getEnvironment().setVariableValue(name, value);
@@ -137,21 +137,21 @@ public void emitErrorMessage(String msg)
 		}
 	}
 	
-	public boolean ownsVariableOfType(TextMarkerBlock parent, String name, String type) {
+	public boolean ownsVariableOfType(RutaBlock parent, String name, String type) {
 		return parent.getEnvironment().ownsVariableOfType(name,type);
 	}
 	
-	public boolean isVariableOfType(TextMarkerBlock parent, String name, String type) {
+	public boolean isVariableOfType(RutaBlock parent, String name, String type) {
 		return parent.getEnvironment().isVariableOfType(name,type);
 	}
 	
-	public void addType(TextMarkerBlock parent, String type) {
+	public void addType(RutaBlock parent, String type) {
 	}
 	
-	public void addType(TextMarkerBlock parent, String name, String parentType, List featuresTypes, List featuresNames) {
+	public void addType(RutaBlock parent, String name, String parentType, List featuresTypes, List featuresNames) {
     	}
 	
-	public boolean isType(TextMarkerBlock parent, String type) {
+	public boolean isType(RutaBlock parent, String type) {
 		return parent.getEnvironment().getType(type) != null || type.equals("Document");
 	}
 	
@@ -161,13 +161,13 @@ public void emitErrorMessage(String msg)
 		}
 	}
 	
-	public void addImportTypeSystem(TextMarkerBlock parent, String descriptor) {
+	public void addImportTypeSystem(RutaBlock parent, String descriptor) {
 		//parent.getEnvironment().addTypeSystem(descriptor);
 	}
-	public void addImportScript(TextMarkerBlock parent, String namespace) {
+	public void addImportScript(RutaBlock parent, String namespace) {
 		parent.getScript().addScript(namespace, null);
 	}
-	public void addImportEngine(TextMarkerBlock parent, String namespace) {
+	public void addImportEngine(RutaBlock parent, String namespace) {
 		parent.getScript().addEngine(namespace, null);
 	}
 	
@@ -204,10 +204,10 @@ public void emitErrorMessage(String msg)
 }
 
 
-file_input [String moduleName] returns [TextMarkerModule module]
+file_input [String moduleName] returns [RutaModule module]
 @init{
-TextMarkerScriptBlock rootBlock = null;
-List<TextMarkerStatement> stmts = new ArrayList<TextMarkerStatement>();
+RutaScriptBlock rootBlock = null;
+List<RutaStatement> stmts = new ArrayList<RutaStatement>();
 }
 	:
 	p = packageDeclaration	
@@ -215,7 +215,7 @@ List<TextMarkerStatement> stmts = new Ar
 	rootBlock = factory.createRootScriptBlock(moduleName, p, localTSD);
         rootBlock.getEnvironment().setResourcePaths(resourcePaths);
 	rootBlock.setElements(stmts);
-	module = new TextMarkerModule(rootBlock);
+	module = new RutaModule(rootBlock);
 	rootBlock.setScript(module);
 	}
 	{$blockDeclaration.push(new blockDeclaration_scope());$blockDeclaration::env = rootBlock;}
@@ -230,22 +230,22 @@ packageDeclaration returns [String pack 
 	:	PackageString p = dottedIdentifier SEMI {pack = p;}
 	;
 
-statements returns [List<TextMarkerStatement> stmts = new ArrayList<TextMarkerStatement>()]
+statements returns [List<RutaStatement> stmts = new ArrayList<RutaStatement>()]
 	:
 	(stmt = statement {{if(stmt != null) {stmts.add(stmt);}}})*
 	;
 
-globalStatements returns [List<TextMarkerStatement> stmts = new ArrayList<TextMarkerStatement>()]
+globalStatements returns [List<RutaStatement> stmts = new ArrayList<RutaStatement>()]
 	:
 	(morestmts = globalStatement {if(morestmts != null) {stmts.addAll(morestmts);}})*
 	;
 
-globalStatement returns [List<TextMarkerStatement> stmts = new ArrayList<TextMarkerStatement>()]
+globalStatement returns [List<RutaStatement> stmts = new ArrayList<RutaStatement>()]
 	:
 	stmtImport = importStatement {stmts.add(stmtImport);}
 	;
 	
-statement returns [TextMarkerStatement stmt = null]
+statement returns [RutaStatement stmt = null]
 	:	
 	( stmtDecl = declaration {stmt = stmtDecl;}
 	| stmtVariable = variableDeclaration {stmt = stmtVariable;}
@@ -255,7 +255,7 @@ statement returns [TextMarkerStatement s
 	)
 	;
 
-variableDeclaration returns [TextMarkerStatement stmt = null]
+variableDeclaration returns [RutaStatement stmt = null]
 @init {
 List<String> vars = new ArrayList<String>();
 }
@@ -328,31 +328,31 @@ List<String> vars = new ArrayList<String
 	;
 
 //TODO added rule
-//conditionDeclaration returns [TextMarkerStatement stmt = null]
+//conditionDeclaration returns [RutaStatement stmt = null]
   //  :
 //    type = CONDITION id = Identifier ASSIGN_EQUAL LPAREN cons = conditions RPAREN SEMI
 //    {addVariable($blockDeclaration::env, id.getText(), type.getText());
-//    AbstractTextMarkerCondition condition = ConditionFactory.createConditionAnd(cons,$blockDeclaration::env);
+//    AbstractRutaCondition condition = ConditionFactory.createConditionAnd(cons,$blockDeclaration::env);
 //    setValue($blockDeclaration::env, id.getText(), condition);}
 //    ;
 
 //TODO added rule
-//actionDeclaration returns [TextMarkerStatement stmt = null]
+//actionDeclaration returns [RutaStatement stmt = null]
 //    :
 //    type = ACTION id = Identifier ASSIGN_EQUAL LPAREN a = actions RPAREN SEMI
 //    {addVariable($blockDeclaration::env, id.getText(), type.getText());
-//    AbstractTextMarkerAction action = ActionFactory.createComposedAction(a,$blockDeclaration::env);
+//    AbstractRutaAction action = ActionFactory.createComposedAction(a,$blockDeclaration::env);
 //    setValue($blockDeclaration::env, id.getText(), action);}
 //    ;
 
-importStatement returns [TextMarkerStatement stmt = null]
+importStatement returns [RutaStatement stmt = null]
 	:
 	TypeSystemString ts = dottedIdentifier2{addImportTypeSystem($blockDeclaration::env, ts);} SEMI
 	| ScriptString ns = dottedIdentifier2{addImportScript($blockDeclaration::env, ns);} SEMI
 	| EngineString ns = dottedIdentifier2{addImportEngine($blockDeclaration::env, ns);} SEMI
 	;
 
-declaration returns [TextMarkerStatement stmt = null]
+declaration returns [RutaStatement stmt = null]
 @init {
 List featureTypes = new ArrayList();
 List featureNames = new ArrayList();
@@ -396,16 +396,16 @@ List featureNames = new ArrayList();
 	;
 	
 	
-blockDeclaration returns [TextMarkerBlock block = null]
+blockDeclaration returns [RutaBlock block = null]
 options {
 	backtrack = true;
 }
 
 scope {
-	TextMarkerBlock env;
+	RutaBlock env;
 }
 @init{
-TextMarkerRuleElement re = null;
+RutaRuleElement re = null;
 RuleElementIsolator container = null;
 level++;
 }
@@ -423,9 +423,9 @@ level--;
 	container = new RuleElementIsolator();}
 	re1 = ruleElementWithCA[container]
 	 {re = re1;	 }
-	{TextMarkerRule rule = factory.createRule(re, block);
-	if(block instanceof TextMarkerScriptBlock) {
-	((TextMarkerScriptBlock)block).setRule(rule);
+	{RutaRule rule = factory.createRule(re, block);
+	if(block instanceof RutaScriptBlock) {
+	((RutaScriptBlock)block).setRule(rule);
 	}
 	container.setContainer(rule);
 	}
@@ -435,18 +435,18 @@ level--;
 	}	
 	;
 
-automataDeclaration returns [TextMarkerBlock block = null]
+automataDeclaration returns [RutaBlock block = null]
 options {
 	backtrack = true;
 }
 
 scope {
-	TextMarkerBlock env;
+	RutaBlock env;
 }
 @init{
-TextMarkerRuleElement re = null;
+RutaRuleElement re = null;
 RuleElementIsolator container = null;
-TextMarkerScriptFactory oldFactory = factory;
+RutaScriptFactory oldFactory = factory;
 factory = automataFactory; 
 level++;
 }
@@ -464,9 +464,9 @@ level--;
 	{$blockDeclaration::env = block;
 	container = new RuleElementIsolator();}
 	re1 = ruleElementWithCA[container] {re = re1;}
-	{TextMarkerRule rule = factory.createRule(re, block);
-	if(block instanceof TextMarkerAutomataBlock) {
-	((TextMarkerAutomataBlock)block).setMatchRule(rule);
+	{RutaRule rule = factory.createRule(re, block);
+	if(block instanceof RutaAutomataBlock) {
+	((RutaAutomataBlock)block).setMatchRule(rule);
 	}
 	container.setContainer(rule);
 	}
@@ -478,7 +478,7 @@ level--;
 	;
 
 	
-ruleElementWithCA[RuleElementContainer container] returns [TextMarkerRuleElement re = null] 
+ruleElementWithCA[RuleElementContainer container] returns [RutaRuleElement re = null] 
     :
     
     idRef=typeExpression 
@@ -500,13 +500,13 @@ ruleElementWithCA[RuleElementContainer c
 
 
 	
-simpleStatement returns [TextMarkerStatement stmt = null]
+simpleStatement returns [RutaStatement stmt = null]
 options {
 	backtrack = true;
 }
 @init{
 	//RegExpRule rer = null;
-	Map<TypeExpression, TextMarkerExpression> map = new HashMap<TypeExpression, TextMarkerExpression>();
+	Map<TypeExpression, RutaExpression> map = new HashMap<TypeExpression, RutaExpression>();
 }
 	: 
 
@@ -516,8 +516,8 @@ options {
 	|
 	
 	{stmt = factory.createRule(elements, $blockDeclaration::env);}
-	elements = ruleElements[((TextMarkerRule)stmt).getRoot()] SEMI 
-	{((TextMarkerRule)stmt).setRuleElements(elements);}
+	elements = ruleElements[((RutaRule)stmt).getRoot()] SEMI 
+	{((RutaRule)stmt).setRuleElements(elements);}
 	;
 
 
@@ -588,9 +588,9 @@ ruleElementWildCard [RuleElementContaine
     ;
 
 
-ruleElementDisjunctive [RuleElementContainer container] returns [TextMarkerRuleElement re = null]
+ruleElementDisjunctive [RuleElementContainer container] returns [RutaRuleElement re = null]
 @init{
-	List<TextMarkerExpression> exprs = new ArrayList<TextMarkerExpression>();
+	List<RutaExpression> exprs = new ArrayList<RutaExpression>();
 }
     :
     LPAREN
@@ -658,7 +658,7 @@ scope {
 	;
 
 
-ruleElementType [RuleElementContainer container] returns [TextMarkerRuleElement re = null]
+ruleElementType [RuleElementContainer container] returns [RutaRuleElement re = null]
     :
     
     (typeExpression)=>typeExpr = typeExpression 
@@ -678,7 +678,7 @@ ruleElementType [RuleElementContainer co
 	}
     ;
 
-ruleElementLiteral [RuleElementContainer container] returns [TextMarkerRuleElement re = null]
+ruleElementLiteral [RuleElementContainer container] returns [RutaRuleElement re = null]
     :
     
     (simpleStringExpression)=>stringExpr = simpleStringExpression 
@@ -699,12 +699,12 @@ ruleElementLiteral [RuleElementContainer
 	}
     ;
 	
-conditions returns [List<AbstractTextMarkerCondition> conds = new ArrayList<AbstractTextMarkerCondition>()]
+conditions returns [List<AbstractRutaCondition> conds = new ArrayList<AbstractRutaCondition>()]
     :
     c = condition {conds.add(c);} (COMMA c = condition {conds.add(c);} )*
     ;
     
-actions returns [List<AbstractTextMarkerAction> actions = new ArrayList<AbstractTextMarkerAction>()]
+actions returns [List<AbstractRutaAction> actions = new ArrayList<AbstractRutaAction>()]
     :
     a = action {actions.add(a);} (COMMA a = action {actions.add(a);} )*
     ; 	
@@ -901,21 +901,21 @@ listVariable returns [Token var = null]
 quantifierPart returns [RuleElementQuantifier quantifier = null]
 	:
 	 STAR q = QUESTION? 
-	 {if(q != null) {quantifier = TextMarkerScriptFactory.createStarReluctantQuantifier();} 
-	 	else{quantifier = TextMarkerScriptFactory.createStarGreedyQuantifier();}}
+	 {if(q != null) {quantifier = RutaScriptFactory.createStarReluctantQuantifier();} 
+	 	else{quantifier = RutaScriptFactory.createStarGreedyQuantifier();}}
 	| PLUS q = QUESTION?
-	 {if(q != null) {quantifier = TextMarkerScriptFactory.createPlusReluctantQuantifier();}
-	 else {quantifier = TextMarkerScriptFactory.createPlusGreedyQuantifier();}}
+	 {if(q != null) {quantifier = RutaScriptFactory.createPlusReluctantQuantifier();}
+	 else {quantifier = RutaScriptFactory.createPlusGreedyQuantifier();}}
 	| QUESTION q = QUESTION? 
-	 {if(q != null) {quantifier = TextMarkerScriptFactory.createQuestionReluctantQuantifier();} 
-	 else {quantifier = TextMarkerScriptFactory.createQuestionGreedyQuantifier();}}
+	 {if(q != null) {quantifier = RutaScriptFactory.createQuestionReluctantQuantifier();} 
+	 else {quantifier = RutaScriptFactory.createQuestionGreedyQuantifier();}}
 	| LBRACK min = numberExpression (comma = COMMA (max = numberExpression)?)? RBRACK q = QUESTION?
-	 {if(q != null) {quantifier = TextMarkerScriptFactory.createMinMaxReluctantQuantifier(min,max,comma);} 
-	 else {quantifier = TextMarkerScriptFactory.createMinMaxGreedyQuantifier(min,max,comma);}}	
+	 {if(q != null) {quantifier = RutaScriptFactory.createMinMaxReluctantQuantifier(min,max,comma);} 
+	 else {quantifier = RutaScriptFactory.createMinMaxGreedyQuantifier(min,max,comma);}}	
 	;
 
 
-condition  returns [AbstractTextMarkerCondition result = null]
+condition  returns [AbstractRutaCondition result = null]
 	:
 	(
 	c = conditionAnd
@@ -951,7 +951,7 @@ condition  returns [AbstractTextMarkerCo
 	;
 
 
-//variableCondition returns [AbstractTextMarkerCondition condition = null]
+//variableCondition returns [AbstractRutaCondition condition = null]
 //	:		
 //	
 //	id = Identifier
@@ -960,7 +960,7 @@ condition  returns [AbstractTextMarkerCo
 //	}
 //	;
 
-externalCondition returns [AbstractTextMarkerCondition condition = null]
+externalCondition returns [AbstractRutaCondition condition = null]
 	:		
 	
 	id = Identifier LPAREN args = varArgumentList?	RPAREN
@@ -969,13 +969,13 @@ externalCondition returns [AbstractTextM
 	}
 	;
 	
-conditionAnd returns [AbstractTextMarkerCondition cond = null]
+conditionAnd returns [AbstractRutaCondition cond = null]
     :   
     AND LPAREN conds = conditions RPAREN 
     {cond = ConditionFactory.createConditionAnd(conds, $blockDeclaration::env);}
     ;
     
-conditionContains returns [AbstractTextMarkerCondition cond = null]
+conditionContains returns [AbstractRutaCondition cond = null]
  options {
 	backtrack = true;
 }
@@ -985,13 +985,13 @@ conditionContains returns [AbstractTextM
     {if(type != null) {cond = ConditionFactory.createConditionContains(type, min, max, percent,$blockDeclaration::env);}
     else {cond = ConditionFactory.createConditionContains(list,a, min, max, percent, $blockDeclaration::env);};}
     ;
-conditionContextCount returns [AbstractTextMarkerCondition cond = null]
+conditionContextCount returns [AbstractRutaCondition cond = null]
     :   
     CONTEXTCOUNT LPAREN type = typeExpression (COMMA min = numberExpression COMMA max = numberExpression)? 
     (COMMA var = numberVariable)? RPAREN
     {cond = ConditionFactory.createConditionContextCount(type, min, max, var, $blockDeclaration::env);}
     ;
-conditionCount returns [AbstractTextMarkerCondition cond = null]
+conditionCount returns [AbstractRutaCondition cond = null]
  options {
 	backtrack = true;
 }
@@ -1004,19 +1004,19 @@ conditionCount returns [AbstractTextMark
     (COMMA var = numberVariable)? RPAREN
     {cond = ConditionFactory.createConditionCount(list, min, max, var,$blockDeclaration::env);}   
     ;
-conditionTotalCount returns [AbstractTextMarkerCondition cond = null]
+conditionTotalCount returns [AbstractRutaCondition cond = null]
     :   
     TOTALCOUNT LPAREN type = typeExpression (COMMA min = numberExpression COMMA max = numberExpression)?
     (COMMA var = numberVariable)? RPAREN
     {cond = ConditionFactory.createConditionTotalCount(type, min, max, var, $blockDeclaration::env);}
     ;
-conditionCurrentCount returns [AbstractTextMarkerCondition cond = null]
+conditionCurrentCount returns [AbstractRutaCondition cond = null]
     :   
     CURRENTCOUNT LPAREN type = typeExpression (COMMA min = numberExpression COMMA max = numberExpression)? 
     (COMMA var = numberVariable)? RPAREN
     {cond = ConditionFactory.createConditionCurrentCount(type, min, max, var,$blockDeclaration::env);}
     ;
-conditionInList returns [AbstractTextMarkerCondition cond = null]
+conditionInList returns [AbstractRutaCondition cond = null]
  options {
 	backtrack = true;
 }
@@ -1027,57 +1027,57 @@ conditionInList returns [AbstractTextMar
     ;
 
     
-conditionLast returns [AbstractTextMarkerCondition cond = null]
+conditionLast returns [AbstractRutaCondition cond = null]
     :   
     LAST LPAREN type = typeExpression RPAREN
     {cond = ConditionFactory.createConditionLast(type, $blockDeclaration::env);}    
     ;
     
     
-conditionMofN returns [AbstractTextMarkerCondition cond = null]
+conditionMofN returns [AbstractRutaCondition cond = null]
     :   
     MOFN LPAREN min = numberExpression COMMA max = numberExpression COMMA conds = conditions RPAREN
     {cond = ConditionFactory.createConditionMOfN(conds, min, max, $blockDeclaration::env);} 
     ;
 
-conditionNear returns [AbstractTextMarkerCondition cond = null]
+conditionNear returns [AbstractRutaCondition cond = null]
     :   
     NEAR LPAREN type = typeExpression COMMA min = numberExpression COMMA max = numberExpression (COMMA direction = booleanExpression (COMMA filtered = booleanExpression)?)? RPAREN
     {cond = ConditionFactory.createConditionNear(type, min, max, direction, filtered, $blockDeclaration::env);} 
     ;
-conditionNot returns [AbstractTextMarkerCondition cond = null]
+conditionNot returns [AbstractRutaCondition cond = null]
     :   
     ((MINUS c = condition) |  (NOT LPAREN c = condition RPAREN))
     {cond = ConditionFactory.createConditionNot(c, $blockDeclaration::env);}    
     ;
-conditionOr returns [AbstractTextMarkerCondition cond = null]
+conditionOr returns [AbstractRutaCondition cond = null]
     :   
     OR LPAREN conds = conditions RPAREN
     {cond = ConditionFactory.createConditionOr(conds, $blockDeclaration::env);}
     ;
-conditionPartOf returns [AbstractTextMarkerCondition cond = null]
+conditionPartOf returns [AbstractRutaCondition cond = null]
     :
     PARTOF LPAREN (type1 = typeExpression|type2 = typeListExpression) RPAREN
     {cond = ConditionFactory.createConditionPartOf(type1, type2, $blockDeclaration::env);}
     ;
-conditionPartOfNeq returns [AbstractTextMarkerCondition cond = null]
+conditionPartOfNeq returns [AbstractRutaCondition cond = null]
     :
     PARTOFNEQ LPAREN (type1 = typeExpression|type2 = typeListExpression) RPAREN
     {cond = ConditionFactory.createConditionPartOfNeq(type1, type2, $blockDeclaration::env);}
     ;
 
-conditionPosition returns [AbstractTextMarkerCondition cond = null]
+conditionPosition returns [AbstractRutaCondition cond = null]
     :   
     POSITION LPAREN type = typeExpression COMMA pos = numberExpression (COMMA rel = booleanExpression)? RPAREN
     {cond = ConditionFactory.createConditionPosition(type, pos, rel, $blockDeclaration::env);}
     ;
-conditionRegExp returns [AbstractTextMarkerCondition cond = null]
+conditionRegExp returns [AbstractRutaCondition cond = null]
     :
     REGEXP LPAREN (v = variable COMMA)? pattern = stringExpression (COMMA caseSensitive = booleanExpression)? RPAREN
     {cond = ConditionFactory.createConditionRegExp(v, pattern, caseSensitive, $blockDeclaration::env);}    
     ;
 
-conditionScore returns [AbstractTextMarkerCondition cond = null]
+conditionScore returns [AbstractRutaCondition cond = null]
     :
     SCORE LPAREN min = numberExpression (COMMA max = numberExpression
     (COMMA var = numberVariable)?)?  RPAREN
@@ -1085,67 +1085,67 @@ conditionScore returns [AbstractTextMark
     ;
 
 
-conditionVote returns [AbstractTextMarkerCondition cond = null]
+conditionVote returns [AbstractRutaCondition cond = null]
     :   
     VOTE LPAREN type1 = typeExpression COMMA type2 = typeExpression RPAREN
     {cond = ConditionFactory.createConditionVote(type1, type2, $blockDeclaration::env);}
     ;
     
-conditionIf returns [AbstractTextMarkerCondition cond = null]
+conditionIf returns [AbstractRutaCondition cond = null]
     :   
     IF LPAREN e = booleanExpression RPAREN
     {cond = ConditionFactory.createConditionIf(e, $blockDeclaration::env);}
     ;
 
-conditionFeature returns [AbstractTextMarkerCondition cond = null]
+conditionFeature returns [AbstractRutaCondition cond = null]
     :   
     FEATURE LPAREN se = stringExpression COMMA v = argument RPAREN
     {cond = ConditionFactory.createConditionFeature(se, v, $blockDeclaration::env);}
     ;   
 
-conditionParse returns [AbstractTextMarkerCondition cond = null]
+conditionParse returns [AbstractRutaCondition cond = null]
     :
     PARSE LPAREN {isVariable($blockDeclaration::env,input.LT(1).getText())}? id = Identifier RPAREN
     {cond = ConditionFactory.createConditionParse(id, $blockDeclaration::env);}
     ;
 
-conditionIs returns [AbstractTextMarkerCondition cond = null]
+conditionIs returns [AbstractRutaCondition cond = null]
     :
     IS LPAREN (type1 = typeExpression|type2 = typeListExpression) RPAREN
     {cond = ConditionFactory.createConditionIs(type1, type2, $blockDeclaration::env);}
     ;
 
-conditionBefore returns [AbstractTextMarkerCondition cond = null]
+conditionBefore returns [AbstractRutaCondition cond = null]
     :
     BEFORE LPAREN (type1 = typeExpression|type2 = typeListExpression) RPAREN
     {cond = ConditionFactory.createConditionBefore(type1,type2, $blockDeclaration::env);}
     ;
 
-conditionAfter returns [AbstractTextMarkerCondition cond = null]
+conditionAfter returns [AbstractRutaCondition cond = null]
     :
     AFTER LPAREN (type1 = typeExpression|type2 = typeListExpression) RPAREN
     {cond = ConditionFactory.createConditionAfter(type1,type2,$blockDeclaration::env);}
     ;
 
-conditionStartsWith returns [AbstractTextMarkerCondition cond = null]
+conditionStartsWith returns [AbstractRutaCondition cond = null]
     :
     STARTSWITH LPAREN (type1 = typeExpression|type2 = typeListExpression) RPAREN
     {cond = ConditionFactory.createConditionStartsWith(type1,type2, $blockDeclaration::env);}
     ;
 
-conditionEndsWith returns [AbstractTextMarkerCondition cond = null]
+conditionEndsWith returns [AbstractRutaCondition cond = null]
     :
     ENDSWITH LPAREN (type1 = typeExpression|type2 = typeListExpression) RPAREN
     {cond = ConditionFactory.createConditionEndsWith(type1,type2,$blockDeclaration::env);}
     ;
 
-conditionSize returns [AbstractTextMarkerCondition cond = null]
+conditionSize returns [AbstractRutaCondition cond = null]
     :
     SIZE LPAREN list = listExpression (COMMA min = numberExpression COMMA max = numberExpression)? (COMMA var = numberVariable)? RPAREN
     {cond = ConditionFactory.createConditionSize(list, min, max, var,$blockDeclaration::env);}
     ;
 
-action  returns [AbstractTextMarkerAction result = null]
+action  returns [AbstractRutaAction result = null]
 	:
 	(
 	a = actionColor
@@ -1193,7 +1193,7 @@ action  returns [AbstractTextMarkerActio
 	) {result = a;}
 	;
 
-//variableAction returns [AbstractTextMarkerAction action = null]
+//variableAction returns [AbstractRutaAction action = null]
 //	:		
 //	
 //	id = Identifier
@@ -1203,7 +1203,7 @@ action  returns [AbstractTextMarkerActio
 //	;
 
 
-externalAction returns [AbstractTextMarkerAction action = null]
+externalAction returns [AbstractRutaAction action = null]
 	:		
 	
 	id = Identifier LPAREN args = varArgumentList?	RPAREN
@@ -1214,9 +1214,9 @@ externalAction returns [AbstractTextMark
 
 
 
-actionCreate returns [AbstractTextMarkerAction action = null]
+actionCreate returns [AbstractRutaAction action = null]
 @init {
-	Map<StringExpression, TextMarkerExpression> map = new HashMap<StringExpression, TextMarkerExpression>();
+	Map<StringExpression, RutaExpression> map = new HashMap<StringExpression, RutaExpression>();
     	List<NumberExpression> indexes = new ArrayList<NumberExpression>();
 }
     :
@@ -1231,7 +1231,7 @@ actionCreate returns [AbstractTextMarker
     ;
 
 
-actionMarkTable returns [AbstractTextMarkerAction action = null]
+actionMarkTable returns [AbstractRutaAction action = null]
 @init {
 	Map<StringExpression, NumberExpression> map = new HashMap<StringExpression, NumberExpression>();
 }
@@ -1253,9 +1253,9 @@ actionMarkTable returns [AbstractTextMar
     {action = ActionFactory.createMarkTableAction(structure, index, table, map, ignoreCase, ignoreLength, ignoreChar, maxIgnoreChar,$blockDeclaration::env);}
     ;
  
-actionGather returns [AbstractTextMarkerAction action = null]
+actionGather returns [AbstractRutaAction action = null]
 @init {
-	Map<StringExpression, TextMarkerExpression> map = new HashMap<StringExpression, TextMarkerExpression>();
+	Map<StringExpression, RutaExpression> map = new HashMap<StringExpression, RutaExpression>();
     	List<NumberExpression> indexes = new ArrayList<NumberExpression>();
 }
     :
@@ -1270,9 +1270,9 @@ actionGather returns [AbstractTextMarker
 
   
 
-actionFill returns [AbstractTextMarkerAction action = null]
+actionFill returns [AbstractRutaAction action = null]
 @init {
-Map<StringExpression, TextMarkerExpression> map = new HashMap<StringExpression, TextMarkerExpression>();
+Map<StringExpression, RutaExpression> map = new HashMap<StringExpression, RutaExpression>();
 }
     :
     FILL LPAREN type = typeExpression (COMMA fname = stringExpression ASSIGN_EQUAL 
@@ -1283,7 +1283,7 @@ Map<StringExpression, TextMarkerExpressi
     {action = ActionFactory.createFillAction(type, map, $blockDeclaration::env);}
     ;
     
-actionColor returns [AbstractTextMarkerAction action = null]
+actionColor returns [AbstractRutaAction action = null]
     :   
     COLOR LPAREN type = typeExpression 
     
@@ -1297,19 +1297,19 @@ actionColor returns [AbstractTextMarkerA
     {action = ActionFactory.createColorAction(type, bgcolor, fgcolor, selected, $blockDeclaration::env);}
     ;
 
-actionDel returns [AbstractTextMarkerAction action = null]
+actionDel returns [AbstractRutaAction action = null]
     :   
     DEL
     {action = ActionFactory.createDelAction($blockDeclaration::env);}
     ;
         
-actionLog returns [AbstractTextMarkerAction action = null]
+actionLog returns [AbstractRutaAction action = null]
     :   
     LOG LPAREN lit = stringExpression (COMMA log = LogLevel)? RPAREN
     {action = ActionFactory.createLogAction(lit, log, $blockDeclaration::env);}
     ;
 
-actionMark returns [AbstractTextMarkerAction action = null]
+actionMark returns [AbstractRutaAction action = null]
 @init {
 List<NumberExpression> list = new ArrayList<NumberExpression>();
 }
@@ -1325,7 +1325,7 @@ List<NumberExpression> list = new ArrayL
     {action = ActionFactory.createMarkAction(null, type, list, $blockDeclaration::env);}
     ;
 
-actionShift returns [AbstractTextMarkerAction action = null]
+actionShift returns [AbstractRutaAction action = null]
 @init {
 List<NumberExpression> list = new ArrayList<NumberExpression>();
 }
@@ -1342,7 +1342,7 @@ List<NumberExpression> list = new ArrayL
     ;
 
 
-actionMarkScore returns [AbstractTextMarkerAction action = null]
+actionMarkScore returns [AbstractRutaAction action = null]
 @init {
 List<NumberExpression> list = new ArrayList<NumberExpression>();
 }
@@ -1359,7 +1359,7 @@ List<NumberExpression> list = new ArrayL
     {action = ActionFactory.createMarkAction(score, type, list, $blockDeclaration::env);}
     ;
 
-actionMarkOnce returns [AbstractTextMarkerAction action = null]
+actionMarkOnce returns [AbstractRutaAction action = null]
 @init {
 List<NumberExpression> list = new ArrayList<NumberExpression>();
 }
@@ -1373,7 +1373,7 @@ List<NumberExpression> list = new ArrayL
     {action = ActionFactory.createMarkOnceAction(score, type, list,$blockDeclaration::env);}
     ;
 
-actionMarkFast returns [AbstractTextMarkerAction action = null]
+actionMarkFast returns [AbstractRutaAction action = null]
     :   
     MARKFAST LPAREN type = typeExpression COMMA (list1 = wordListExpression | list2 = stringListExpression) 
     (COMMA ignore = booleanExpression (COMMA ignoreLength = numberExpression (COMMA ignoreWS = booleanExpression)?)?)? RPAREN
@@ -1385,13 +1385,13 @@ actionMarkFast returns [AbstractTextMark
     }
     ;
 
-actionMarkLast returns [AbstractTextMarkerAction action = null]
+actionMarkLast returns [AbstractRutaAction action = null]
     :   
     MARKLAST LPAREN type = typeExpression RPAREN
     {action = ActionFactory.createMarkLastAction(type, $blockDeclaration::env);}
     ;
 
-actionReplace returns [AbstractTextMarkerAction action = null]
+actionReplace returns [AbstractRutaAction action = null]
     :   
     REPLACE LPAREN lit = stringExpression RPAREN
     {action = ActionFactory.createReplaceAction(lit, $blockDeclaration::env);}
@@ -1399,7 +1399,7 @@ actionReplace returns [AbstractTextMarke
     
   
 
-actionRetainType returns [AbstractTextMarkerAction action = null]
+actionRetainType returns [AbstractRutaAction action = null]
 @init {
 List<TypeExpression> list = new ArrayList<TypeExpression>();
 }
@@ -1410,7 +1410,7 @@ List<TypeExpression> list = new ArrayLis
     
  
 
-actionFilterType returns [AbstractTextMarkerAction action = null]
+actionFilterType returns [AbstractRutaAction action = null]
 @init {
 List<TypeExpression> list = new ArrayList<TypeExpression>();
 }
@@ -1419,16 +1419,16 @@ List<TypeExpression> list = new ArrayLis
     {action = ActionFactory.createFilterTypeAction(list,$blockDeclaration::env);}
     ;       
 
-actionCall returns [AbstractTextMarkerAction action = null]
+actionCall returns [AbstractRutaAction action = null]
     :
     CALL LPAREN ns = dottedIdentifier RPAREN
     {action = ActionFactory.createCallAction(ns, $blockDeclaration::env);}
     ;
 
 
-actionConfigure returns [AbstractTextMarkerAction action = null]
+actionConfigure returns [AbstractRutaAction action = null]
 @init {
-	Map<StringExpression, TextMarkerExpression> map = new HashMap<StringExpression, TextMarkerExpression>();
+	Map<StringExpression, RutaExpression> map = new HashMap<StringExpression, RutaExpression>();
 }
 
     :
@@ -1441,13 +1441,13 @@ actionConfigure returns [AbstractTextMar
     ;
 
 
-actionExec returns [AbstractTextMarkerAction action = null]
+actionExec returns [AbstractRutaAction action = null]
     :
     EXEC LPAREN ns = dottedIdentifier (COMMA tl = typeListExpression)? RPAREN
     {action = ActionFactory.createExecAction(ns, tl, $blockDeclaration::env);}
     ;    
     
-actionAssign returns [AbstractTextMarkerAction action = null]
+actionAssign returns [AbstractRutaAction action = null]
     :
     name = ASSIGN LPAREN
     (
@@ -1477,21 +1477,21 @@ actionAssign returns [AbstractTextMarker
     ) RPAREN
     ;
 
-actionSetFeature returns [AbstractTextMarkerAction action = null]
+actionSetFeature returns [AbstractRutaAction action = null]
     :   
     name = SETFEATURE LPAREN f = stringExpression COMMA v = argument RPAREN
     {action = ActionFactory.createSetFeatureAction(f, v, $blockDeclaration::env);}
     ;
 
 
-actionGetFeature returns [AbstractTextMarkerAction action = null]
+actionGetFeature returns [AbstractRutaAction action = null]
     :   
     name = GETFEATURE LPAREN f = stringExpression COMMA v = variable RPAREN
     {action = ActionFactory.createGetFeatureAction(f, v, $blockDeclaration::env);}
     ;
 
 //unknown
-actionDynamicAnchoring returns [AbstractTextMarkerAction action = null]
+actionDynamicAnchoring returns [AbstractRutaAction action = null]
     :
     name = DYNAMICANCHORING LPAREN active = booleanExpression 
     (COMMA penalty = numberExpression 
@@ -1500,7 +1500,7 @@ actionDynamicAnchoring returns [Abstract
     RPAREN
     ;
 
-actionTrim returns [AbstractTextMarkerAction action = null]
+actionTrim returns [AbstractRutaAction action = null]
 @init {
   List<TypeExpression> types = new ArrayList<TypeExpression>();
 }
@@ -1518,7 +1518,7 @@ actionTrim returns [AbstractTextMarkerAc
 
 
 
-actionUnmark returns [AbstractTextMarkerAction action = null]
+actionUnmark returns [AbstractRutaAction action = null]
 @init {
 List<NumberExpression> list = new ArrayList<NumberExpression>();
 }
@@ -1544,20 +1544,20 @@ List<NumberExpression> list = new ArrayL
     ;
 
 
-actionUnmarkAll returns [AbstractTextMarkerAction action = null]
+actionUnmarkAll returns [AbstractRutaAction action = null]
     :
     name = UNMARKALL LPAREN f = typeExpression 
     (COMMA list = typeListExpression)? RPAREN
     {action = ActionFactory.createUnmarkAllAction(f, list, $blockDeclaration::env);}
     ;
 
-actionTransfer returns [AbstractTextMarkerAction action = null]
+actionTransfer returns [AbstractRutaAction action = null]
     :
     name = TRANSFER LPAREN f = typeExpression RPAREN
     {action = ActionFactory.createTransferAction(f, $blockDeclaration::env);}
     ;
 
-actionTrie returns [AbstractTextMarkerAction action = null]
+actionTrie returns [AbstractRutaAction action = null]
 @init {
 Map<StringExpression, TypeExpression> map = new HashMap<StringExpression, TypeExpression>();
 }
@@ -1576,31 +1576,31 @@ Map<StringExpression, TypeExpression> ma
     {action = ActionFactory.createTrieAction(list, map, ignoreCase, ignoreLength, edit, distance, ignoreChar,$blockDeclaration::env);}
     ;
 
-actionAdd returns [AbstractTextMarkerAction action = null]
+actionAdd returns [AbstractRutaAction action = null]
 @init{
-	List<TextMarkerExpression> list = new ArrayList<TextMarkerExpression>();
+	List<RutaExpression> list = new ArrayList<RutaExpression>();
 } 
     :
     name = ADD LPAREN f = listVariable (COMMA a = argument {list.add(a);})+ RPAREN
     {action = ActionFactory.createAddAction(f, list, $blockDeclaration::env);}
     ;
 
-actionRemove returns [AbstractTextMarkerAction action = null]
+actionRemove returns [AbstractRutaAction action = null]
 @init{
-	List<TextMarkerExpression> list = new ArrayList<TextMarkerExpression>();
+	List<RutaExpression> list = new ArrayList<RutaExpression>();
 } 
     :
     name = REMOVE LPAREN f = listVariable (COMMA a = argument {list.add(a);})+ RPAREN
     {action = ActionFactory.createRemoveAction(f, list, $blockDeclaration::env);}
     ;
  
-actionRemoveDuplicate returns [AbstractTextMarkerAction action = null]
+actionRemoveDuplicate returns [AbstractRutaAction action = null]
     :
     name = REMOVEDUPLICATE LPAREN f = listVariable RPAREN
     {action = ActionFactory.createRemoveDuplicateAction(f,$blockDeclaration::env);}
     ; 
     
-actionMerge returns [AbstractTextMarkerAction action = null]
+actionMerge returns [AbstractRutaAction action = null]
 @init{
 	List<ListExpression> list = new ArrayList<ListExpression>();
 } 
@@ -1609,19 +1609,19 @@ actionMerge returns [AbstractTextMarkerA
     {action = ActionFactory.createMergeAction(join, t, list,$blockDeclaration::env);}
     ;
 
-actionGet returns [AbstractTextMarkerAction action = null]
+actionGet returns [AbstractRutaAction action = null]
     :
     name = GET LPAREN f = listExpression COMMA var = variable COMMA op = stringExpression RPAREN
     {action = ActionFactory.createGetAction(f, var, op,$blockDeclaration::env);}
     ;
 
-actionGetList returns [AbstractTextMarkerAction action = null]
+actionGetList returns [AbstractRutaAction action = null]
     :
     name = GETLIST LPAREN var = listVariable COMMA op = stringExpression RPAREN
     {action = ActionFactory.createGetListAction(var, op,$blockDeclaration::env);}
     ;
 
-actionMatchedText returns [AbstractTextMarkerAction action = null]
+actionMatchedText returns [AbstractRutaAction action = null]
 @init {
 List<NumberExpression> list = new ArrayList<NumberExpression>();
 }
@@ -1637,13 +1637,13 @@ List<NumberExpression> list = new ArrayL
     {action = ActionFactory.createMatchedTextAction(var, list, $blockDeclaration::env);}
     ;
 
-actionClear returns [AbstractTextMarkerAction action = null]
+actionClear returns [AbstractRutaAction action = null]
     :
     name = CLEAR LPAREN var = listVariable RPAREN
     {action = ActionFactory.createClearAction(var, $blockDeclaration::env);}
     ;
 
-actionAddRetainType returns [AbstractTextMarkerAction action = null]
+actionAddRetainType returns [AbstractRutaAction action = null]
 @init {
 List<TypeExpression> list = new ArrayList<TypeExpression>();
 }
@@ -1652,7 +1652,7 @@ List<TypeExpression> list = new ArrayLis
     {action = ActionFactory.createAddRetainTypeAction(list,$blockDeclaration::env);}
     ;     
 
-actionRemoveRetainType returns [AbstractTextMarkerAction action = null]
+actionRemoveRetainType returns [AbstractRutaAction action = null]
 @init {
 List<TypeExpression> list = new ArrayList<TypeExpression>();
 }
@@ -1661,7 +1661,7 @@ List<TypeExpression> list = new ArrayLis
     {action = ActionFactory.createRemoveRetainTypeAction(list,$blockDeclaration::env);}
     ;   
 
-actionAddFilterType returns [AbstractTextMarkerAction action = null]
+actionAddFilterType returns [AbstractRutaAction action = null]
 @init {
 List<TypeExpression> list = new ArrayList<TypeExpression>();
 }
@@ -1670,7 +1670,7 @@ List<TypeExpression> list = new ArrayLis
     {action = ActionFactory.createAddFilterTypeAction(list,$blockDeclaration::env);}
     ;   
 
-actionRemoveFilterType returns [AbstractTextMarkerAction action = null]
+actionRemoveFilterType returns [AbstractRutaAction action = null]
 @init {
 List<TypeExpression> list = new ArrayList<TypeExpression>();
 }
@@ -1684,7 +1684,7 @@ varArgumentList returns [List args = new
 	arg = argument {args.add(arg);}(COMMA arg = argument {args.add(arg);})*
 	;
 
-argument returns [TextMarkerExpression expr = null]
+argument returns [RutaExpression expr = null]
 options {
 	backtrack = true;
 }

Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaLexer.g
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaLexer.g?rev=1477140&r1=1477139&r2=1477140&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaLexer.g (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaLexer.g Mon Apr 29 15:16:13 2013
@@ -1,4 +1,4 @@
-lexer grammar TextMarkerLexer;
+lexer grammar RutaLexer;
 options {
 	language = Java;
 }
@@ -30,7 +30,7 @@ tokens {
  * under the License.
 */
 
-package org.apache.uima.textmarker.ide.core.parser;
+package org.apache.uima.ruta.ide.core.parser;
 }
 
 @lexer::members {

Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaParser.g
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaParser.g?rev=1477140&r1=1477139&r2=1477140&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaParser.g (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaParser.g Mon Apr 29 15:16:13 2013
@@ -1,8 +1,8 @@
-parser grammar TextMarkerParser;
+parser grammar RutaParser;
 
 options {
 	language = Java;
-	tokenVocab = TextMarkerLexer;
+	tokenVocab = RutaLexer;
 }
 
 
@@ -26,7 +26,7 @@ options {
  * under the License.
 */
 
-package org.apache.uima.textmarker.ide.core.parser;
+package org.apache.uima.ruta.ide.core.parser;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -56,30 +56,30 @@ import org.eclipse.dltk.ast.expressions.
 import org.eclipse.dltk.ast.references.VariableReference;
 import org.eclipse.dltk.ast.statements.Statement;
 
-import org.apache.uima.textmarker.ide.core.extensions.TextMarkerExternalFactory;
-import org.apache.uima.textmarker.ide.core.builder.DescriptorManager;
-import org.apache.uima.textmarker.ide.parser.ast.ActionFactory;
-import org.apache.uima.textmarker.ide.parser.ast.ComponentDeclaration;
-import org.apache.uima.textmarker.ide.parser.ast.ComponentReference;
-import org.apache.uima.textmarker.ide.parser.ast.ComposedRuleElement;
-import org.apache.uima.textmarker.ide.parser.ast.ConditionFactory;
-import org.apache.uima.textmarker.ide.parser.ast.ExpressionFactory;
-import org.apache.uima.textmarker.ide.parser.ast.ScriptFactory;
-import org.apache.uima.textmarker.ide.parser.ast.StatementFactory;
-import org.apache.uima.textmarker.ide.parser.ast.TMTypeConstants;
-import org.apache.uima.textmarker.ide.parser.ast.TextMarkerBlock;
-import org.apache.uima.textmarker.ide.parser.ast.TextMarkerExpression;
-import org.apache.uima.textmarker.ide.parser.ast.TextMarkerRule;
-import org.apache.uima.textmarker.ide.parser.ast.TextMarkerRuleElement;
-import org.apache.uima.textmarker.ide.parser.ast.TextMarkerScriptBlock;
-import org.apache.uima.textmarker.ide.parser.ast.TextMarkerAction;
-import org.apache.uima.textmarker.ide.parser.ast.TextMarkerCondition;
-import org.apache.uima.textmarker.ide.parser.ast.TextMarkerFeatureDeclaration;
-import org.apache.uima.textmarker.ide.parser.ast.TextMarkerPackageDeclaration;
+import org.apache.uima.ruta.ide.core.extensions.RutaExternalFactory;
+import org.apache.uima.ruta.ide.core.builder.DescriptorManager;
+import org.apache.uima.ruta.ide.parser.ast.ActionFactory;
+import org.apache.uima.ruta.ide.parser.ast.ComponentDeclaration;
+import org.apache.uima.ruta.ide.parser.ast.ComponentReference;
+import org.apache.uima.ruta.ide.parser.ast.ComposedRuleElement;
+import org.apache.uima.ruta.ide.parser.ast.ConditionFactory;
+import org.apache.uima.ruta.ide.parser.ast.ExpressionFactory;
+import org.apache.uima.ruta.ide.parser.ast.ScriptFactory;
+import org.apache.uima.ruta.ide.parser.ast.StatementFactory;
+import org.apache.uima.ruta.ide.parser.ast.TMTypeConstants;
+import org.apache.uima.ruta.ide.parser.ast.RutaBlock;
+import org.apache.uima.ruta.ide.parser.ast.RutaExpression;
+import org.apache.uima.ruta.ide.parser.ast.RutaRule;
+import org.apache.uima.ruta.ide.parser.ast.RutaRuleElement;
+import org.apache.uima.ruta.ide.parser.ast.RutaScriptBlock;
+import org.apache.uima.ruta.ide.parser.ast.RutaAction;
+import org.apache.uima.ruta.ide.parser.ast.RutaCondition;
+import org.apache.uima.ruta.ide.parser.ast.RutaFeatureDeclaration;
+import org.apache.uima.ruta.ide.parser.ast.RutaPackageDeclaration;
 }
 
 @parser::members {
-	public DLTKTextMarkerErrorReporter reporter;
+	public DLTKRutaErrorReporter reporter;
 	public ModuleDeclaration md;
 	private List<String> vars = new ArrayList<String>();	
 	private Map<String, String> varTypeMap = new HashMap<String, String>();
@@ -89,7 +89,7 @@ import org.apache.uima.textmarker.ide.pa
 	public DLTKTokenConverter converter;
 	public DescriptorManager descriptor;
 	private int level = 0;
-	private TextMarkerExternalFactory external = new TextMarkerExternalFactory();
+	private RutaExternalFactory external = new RutaExternalFactory();
 	
 	private String module;
 	private String packageString;
@@ -116,7 +116,7 @@ import org.apache.uima.textmarker.ide.pa
 		}
 	}
 	
-	public void addType(TextMarkerBlock parent, String type, String parentType) {
+	public void addType(RutaBlock parent, String type, String parentType) {
 		vars.add(type);
 		descriptor.addType(parent.getNamespace()+"."+type.trim(), "Type defined in "+packageString+"."+module, parentType);
 	}
@@ -127,7 +127,7 @@ import org.apache.uima.textmarker.ide.pa
 		
 	}
 	
-	public void addType(TextMarkerBlock parent, String name, String parentType, List featuresTypes,
+	public void addType(RutaBlock parent, String name, String parentType, List featuresTypes,
           List<Token> featuresNames) {
 	   	 name = parent.getNamespace() + "." + name.trim();
 	   	 descriptor.addType(name, "Type defined in " + packageString + "." + module, parentType);
@@ -144,15 +144,15 @@ import org.apache.uima.textmarker.ide.pa
 	   	 }
  	 }
 	
-	public void addWordList(TextMarkerBlock parent, String name, String list) {
+	public void addWordList(RutaBlock parent, String name, String list) {
 		lists.put(name, list);
 	}
 	
-	public void addCSVTable(TextMarkerBlock parent, String name, String table) {
+	public void addCSVTable(RutaBlock parent, String name, String table) {
 		tables.put(name, table);
 	}
 	
-	public boolean isType(TextMarkerBlock parent, String type) {
+	public boolean isType(RutaBlock parent, String type) {
 		return vars.contains(type);
 	}
 		
@@ -229,7 +229,7 @@ import org.apache.uima.textmarker.ide.pa
 
 file_input [String module]
 @init {
-TextMarkerScriptBlock rootBlock = null;
+RutaScriptBlock rootBlock = null;
 List<Statement> stmts = new ArrayList<Statement>();
 }
 	:	
@@ -261,7 +261,7 @@ List<Statement> stmts = new ArrayList<St
 	;
 	
 
-packageDeclaration returns [TextMarkerPackageDeclaration pack]
+packageDeclaration returns [RutaPackageDeclaration pack]
 	:	pString = PackageString 
 	{
 	pack = StatementFactory.createPkgDeclaration(p, pString);
@@ -497,7 +497,7 @@ declaration returns [List<Statement> stm
 			fname = Identifier{featureNames.add(fname);})* 
 		RPAREN) SEMI // TODO removed question mark
 		{
-		List<TextMarkerFeatureDeclaration> features = new ArrayList<TextMarkerFeatureDeclaration>();
+		List<RutaFeatureDeclaration> features = new ArrayList<RutaFeatureDeclaration>();
 		int i = 0;
 		for (Object eachTO : featureTypes) {
 		   Token eachName = featureNames.get(i); 
@@ -516,15 +516,15 @@ declaration returns [List<Statement> stm
 
 	
 
-blockDeclaration returns [TextMarkerBlock block = null]
+blockDeclaration returns [RutaBlock block = null]
 options{
 	backtrack = true;
 }
 scope {
-	TextMarkerBlock env;
+	RutaBlock env;
 	}	
 @init{
-TextMarkerRule rule = null;
+RutaRule rule = null;
 level++;
 }
 @after {
@@ -549,7 +549,7 @@ level--;
 	;
 
 	
-ruleElementWithCA returns [TextMarkerRuleElement re = null] 
+ruleElementWithCA returns [RutaRuleElement re = null] 
     :
     idRef=typeExpression quantifier = quantifierPart? {re = scriptFactory.createRuleElement(idRef,quantifier,c,a, end);}
         LCURLY c = conditions? (THEN a = actions)? end = RCURLY
@@ -557,14 +557,14 @@ ruleElementWithCA returns [TextMarkerRul
     ;
 
 	
-ruleElementWithoutCA returns [TextMarkerRuleElement re = null] 
+ruleElementWithoutCA returns [RutaRuleElement re = null] 
     :
     idRef=typeExpression quantifier = quantifierPart? 
              {re = scriptFactory.createRuleElement(idRef,quantifier,null,null, null);}
 
     ;
 		
-simpleStatement returns [TextMarkerRule stmt = null]
+simpleStatement returns [RutaRule stmt = null]
 	: 
 	(regexpRule)=> rer = regexpRule {stmt = rer;}
 	|
@@ -574,7 +574,7 @@ simpleStatement returns [TextMarkerRule 
 		
 	;
 
-regexpRule returns [TextMarkerRule stmt = null]
+regexpRule returns [RutaRule stmt = null]
 @init{
 	List<Expression> exprs = new ArrayList<Expression>();
 }
@@ -607,7 +607,7 @@ ruleElements returns [List<Expression> e
 	re = ruleElement {if(re!=null) elements.add(re);} (re = ruleElement {if(re!=null) elements.add(re);})*
 	;	
 	
-blockRuleElement returns [TextMarkerRuleElement rElement = null] //[List<TextMarkerRuleElement> elements = new ArrayList<TextMarkerRuleElement>()]
+blockRuleElement returns [RutaRuleElement rElement = null] //[List<RutaRuleElement> elements = new ArrayList<RutaRuleElement>()]
 	:
 	re = ruleElementType {rElement = re;}
 	;	
@@ -620,9 +620,9 @@ ruleElement returns [Expression re = nul
 	| re4 = ruleElementWildCard {re = re4;}
 	;
 
-ruleElementWildCard returns [TextMarkerRuleElement re = null] 
+ruleElementWildCard returns [RutaRuleElement re = null] 
 @init{
-List<TextMarkerCondition> dummyConds = new ArrayList<TextMarkerCondition>();
+List<RutaCondition> dummyConds = new ArrayList<RutaCondition>();
 }
   :
     	w = WILDCARD
@@ -666,9 +666,9 @@ ruleElementComposed returns [ComposedRul
 	{re = scriptFactory.createComposedRuleElement(res, q, c, a, disjunctive,$blockDeclaration::env, ft, lt1, lt2);}
 	;
 
-ruleElementType returns [TextMarkerRuleElement re = null] 
+ruleElementType returns [RutaRuleElement re = null] 
 @init{
-List<TextMarkerCondition> dummyConds = new ArrayList<TextMarkerCondition>();
+List<RutaCondition> dummyConds = new ArrayList<RutaCondition>();
 }
   :
     (typeExpression)=>idRef=typeExpression quantifier = quantifierPart? 
@@ -690,7 +690,7 @@ List<TextMarkerCondition> dummyConds = n
         //start, end, "", cp, ap, "", $blockDeclaration::env);}
     ;
 
-ruleElementLiteral returns [TextMarkerRuleElement re = null] 
+ruleElementLiteral returns [RutaRuleElement re = null] 
     :
     (simpleStringExpression)=>idRef=simpleStringExpression quantifier = quantifierPart? 
         (LCURLY 
@@ -704,7 +704,7 @@ ruleElementLiteral returns [TextMarkerRu
         //start, end, "", cp, ap, "", $blockDeclaration::env);}
     ;
     
-conditions returns [List<TextMarkerCondition> conds = new ArrayList<TextMarkerCondition>()]
+conditions returns [List<RutaCondition> conds = new ArrayList<RutaCondition>()]
 @init {
 conds.add(ConditionFactory.createEmptyCondition(input.LT(1)));
 }
@@ -713,7 +713,7 @@ conds.add(ConditionFactory.createEmptyCo
     ;
 
   
-actions returns [List<TextMarkerAction> actions = new ArrayList<TextMarkerAction>()]
+actions returns [List<RutaAction> actions = new ArrayList<RutaAction>()]
     :
     a = action {actions.add(a);} (COMMA a = action {actions.add(a);} )*
     ; 	
@@ -915,7 +915,7 @@ quantifierPart returns [List<Expression>
 	;
 	
 	
-condition returns [TextMarkerCondition result = null]
+condition returns [RutaCondition result = null]
 @init {
 result = ConditionFactory.createEmptyCondition(input.LT(1));
 }
@@ -953,7 +953,7 @@ result = ConditionFactory.createEmptyCon
 	;
 	
 //TODO added rule
-variableCondition returns [TextMarkerCondition condition = null]
+variableCondition returns [RutaCondition condition = null]
 	:		
 	// also create condition for auto-completion
 	//{isVariableOfType(input.LT(1).getText(), "CONDITION")}? 
@@ -964,7 +964,7 @@ variableCondition returns [TextMarkerCon
 	;	
 	
 	
-externalCondition returns [TextMarkerCondition condition = null]
+externalCondition returns [RutaCondition condition = null]
 	:
 	id = Identifier
 	{condition = external.createExternalCondition(id, args);}
@@ -973,14 +973,14 @@ externalCondition returns [TextMarkerCon
 	RPAREN
 	{condition = external.createExternalCondition(id, args);}
 	;
-conditionAnd returns [TextMarkerCondition cond = null]
+conditionAnd returns [RutaCondition cond = null]
     :   
     name = AND LPAREN conds = conditions  
     {cond = ConditionFactory.createCondition(name, conds);}
     RPAREN
     ;
 
-conditionContains returns [TextMarkerCondition cond = null]
+conditionContains returns [RutaCondition cond = null]
  options {
 	backtrack = true;
 }
@@ -992,7 +992,7 @@ conditionContains returns [TextMarkerCon
     RPAREN
     ;
     
-conditionContextCount returns [TextMarkerCondition cond = null]
+conditionContextCount returns [RutaCondition cond = null]
     :   
     name = CONTEXTCOUNT LPAREN typeExpr = typeExpression 
     {cond = ConditionFactory.createCondition(name, typeExpr, min, max, var);}
@@ -1003,7 +1003,7 @@ conditionContextCount returns [TextMarke
     RPAREN
     ;
     
-conditionCount returns [TextMarkerCondition cond = null]
+conditionCount returns [RutaCondition cond = null]
  options {
 	backtrack = true;
 }
@@ -1027,7 +1027,7 @@ conditionCount returns [TextMarkerCondit
     RPAREN 
     ;   
     
-conditionCurrentCount returns [TextMarkerCondition cond = null]
+conditionCurrentCount returns [RutaCondition cond = null]
     :   
     name = CURRENTCOUNT LPAREN type = typeExpression 
     {cond = ConditionFactory.createCondition(name,type, min, max, var);}
@@ -1038,7 +1038,7 @@ conditionCurrentCount returns [TextMarke
     RPAREN
     ;   
     
-conditionTotalCount returns [TextMarkerCondition cond = null]
+conditionTotalCount returns [RutaCondition cond = null]
     :   
     name = TOTALCOUNT LPAREN type = typeExpression 
     {cond = ConditionFactory.createCondition(name,type, min, max, var);}
@@ -1048,7 +1048,7 @@ conditionTotalCount returns [TextMarkerC
     {cond = ConditionFactory.createCondition(name, type, min, max, var);}
     RPAREN
     ;
-conditionInList returns [TextMarkerCondition cond = null]
+conditionInList returns [RutaCondition cond = null]
  options {
 	backtrack = true;
 }
@@ -1060,14 +1060,14 @@ conditionInList returns [TextMarkerCondi
     RPAREN
     ;
             
-conditionLast returns [TextMarkerCondition cond = null]
+conditionLast returns [RutaCondition cond = null]
     :   
     name = LAST LPAREN type = typeExpression 
     {cond = ConditionFactory.createCondition(name, type);}
     RPAREN
     ;
     
-conditionMofN returns [TextMarkerCondition cond = null]
+conditionMofN returns [RutaCondition cond = null]
     :   
     name = MOFN LPAREN min = numberExpression COMMA max = numberExpression COMMA conds = conditions 
     {List exprs = new ArrayList();
@@ -1078,32 +1078,32 @@ conditionMofN returns [TextMarkerConditi
     RPAREN
     ;
 
-conditionNear returns [TextMarkerCondition cond = null]
+conditionNear returns [RutaCondition cond = null]
     :   
     name = NEAR LPAREN type = typeExpression COMMA min = numberExpression COMMA max = numberExpression 
     (COMMA direction = booleanExpression (COMMA filtered = booleanExpression)?)? 
     {cond = ConditionFactory.createCondition(name, type, min, max, direction, filtered);}   
     RPAREN
     ;
-conditionNot returns [TextMarkerCondition cond = null]
+conditionNot returns [RutaCondition cond = null]
     :   
     ((name = MINUS c = condition) |  (name = NOT LPAREN c = condition RPAREN))
     {cond = ConditionFactory.createCondition(name, c);} 
     ;
-conditionOr returns [TextMarkerCondition cond = null]
+conditionOr returns [RutaCondition cond = null]
     :   
     name = OR LPAREN conds = conditions 
     {cond = ConditionFactory.createCondition(name, conds);}
     RPAREN
     ;
-conditionPartOf returns [TextMarkerCondition cond = null]
+conditionPartOf returns [RutaCondition cond = null]
     :
     name = PARTOF LPAREN (type = typeExpression|type = typeListExpression)    
     {cond = ConditionFactory.createCondition(name, type);}
     RPAREN
     ;
     
-conditionPartOfNeq returns [TextMarkerCondition cond = null]
+conditionPartOfNeq returns [RutaCondition cond = null]
     :
     name = PARTOFNEQ LPAREN (type = typeExpression|type = typeListExpression)    
     {cond = ConditionFactory.createCondition(name, type);}
@@ -1111,7 +1111,7 @@ conditionPartOfNeq returns [TextMarkerCo
     ;    
 
 
-conditionPosition returns [TextMarkerCondition cond = null]
+conditionPosition returns [RutaCondition cond = null]
     :   
     name = POSITION LPAREN type = typeExpression 
     {cond = ConditionFactory.createCondition(name, type, pos, rel);}
@@ -1121,14 +1121,14 @@ conditionPosition returns [TextMarkerCon
     {cond = ConditionFactory.createCondition(name, type, pos, rel);}
     RPAREN
     ;
-conditionRegExp returns [TextMarkerCondition cond = null]
+conditionRegExp returns [RutaCondition cond = null]
     :
     name = REGEXP LPAREN (v = variable COMMA)? pattern = stringExpression (COMMA caseSensitive = booleanExpression)? 
     {cond = ConditionFactory.createCondition(name, v, pattern, caseSensitive);}   
     RPAREN 
     ;
     
-conditionScore returns [TextMarkerCondition cond = null]
+conditionScore returns [RutaCondition cond = null]
     :
     name = SCORE LPAREN min = numberExpression (COMMA max = numberExpression  
     (COMMA var = numberVariable)?)? 
@@ -1136,26 +1136,26 @@ conditionScore returns [TextMarkerCondit
     RPAREN
     ;
 
-conditionVote returns [TextMarkerCondition cond = null]
+conditionVote returns [RutaCondition cond = null]
     :   
     name = VOTE LPAREN type1 = typeExpression COMMA type2 = typeExpression 
     {cond = ConditionFactory.createCondition(name, type1, type2);}
     RPAREN
     ;   
-conditionIf returns [TextMarkerCondition cond = null]
+conditionIf returns [RutaCondition cond = null]
     :   
     name = IF LPAREN e = booleanExpression 
     {cond = ConditionFactory.createCondition(name, e);}
     RPAREN
     ;   
     
-conditionFeature returns [TextMarkerCondition cond = null]
+conditionFeature returns [RutaCondition cond = null]
     :   
     name = FEATURE LPAREN se = stringExpression COMMA v = argument 
     {cond = ConditionFactory.createCondition(name, se, v);}
     RPAREN
     ;   
-conditionParse returns [TextMarkerCondition cond = null]
+conditionParse returns [RutaCondition cond = null]
     :
     name = PARSE LPAREN
      var=genericVariableReference 
@@ -1164,42 +1164,42 @@ conditionParse returns [TextMarkerCondit
     ;
 
 
-conditionIs returns [TextMarkerCondition cond = null]
+conditionIs returns [RutaCondition cond = null]
     :
     name = IS LPAREN (type = typeExpression|type = typeListExpression) 
     {cond = ConditionFactory.createCondition(name, type);}
     RPAREN
     ;
 
-conditionBefore returns [TextMarkerCondition cond = null]
+conditionBefore returns [RutaCondition cond = null]
     :
     name = BEFORE LPAREN (type = typeExpression|type = typeListExpression) 
     {cond = ConditionFactory.createCondition(name, type);}
     RPAREN
     ;
 
-conditionAfter returns [TextMarkerCondition cond = null]
+conditionAfter returns [RutaCondition cond = null]
     :
     name = AFTER LPAREN (type = typeExpression|type = typeListExpression) 
     {cond = ConditionFactory.createCondition(name, type);}
     RPAREN
     ;
     
-conditionStartsWith returns [TextMarkerCondition cond = null]
+conditionStartsWith returns [RutaCondition cond = null]
     :
     name = STARTSWITH LPAREN (type = typeExpression|type = typeListExpression) 
     {cond = ConditionFactory.createCondition(name, type);}
     RPAREN
     ;
     
-conditionEndsWith returns [TextMarkerCondition cond = null]
+conditionEndsWith returns [RutaCondition cond = null]
     :
     name = ENDSWITH LPAREN (type = typeExpression|type = typeListExpression) 
     {cond = ConditionFactory.createCondition(name, type);}
     RPAREN
     ;
     
-conditionSize returns [TextMarkerCondition cond = null]
+conditionSize returns [RutaCondition cond = null]
     :
     name = SIZE LPAREN list = listExpression (COMMA min = numberExpression COMMA max = numberExpression)? (COMMA var = numberVariable)? 
     {cond = ConditionFactory.createCondition(name, list, min, max, var);}
@@ -1207,7 +1207,7 @@ conditionSize returns [TextMarkerConditi
     ;
 
 	
-action returns [TextMarkerAction result = null]
+action returns [RutaAction result = null]
 @init {
 result = ActionFactory.createEmptyAction(input.LT(1));
 }
@@ -1259,7 +1259,7 @@ result = ActionFactory.createEmptyAction
 	;
 
 
-variableAction returns [TextMarkerAction action = null]
+variableAction returns [RutaAction action = null]
 	:
 	// also create an dummy action for auto-completion
 	//{isVariableOfType(input.LT(1).getText(), "ACTION")}?
@@ -1269,7 +1269,7 @@ variableAction returns [TextMarkerAction
 	}
 	;
 	
-externalAction returns [TextMarkerAction action = null]
+externalAction returns [RutaAction action = null]
 	:
 	 id = Identifier
 	 LPAREN
@@ -1281,7 +1281,7 @@ externalAction returns [TextMarkerAction
 	;
 
 
-actionCreate returns [TextMarkerAction action = null]
+actionCreate returns [RutaAction action = null]
 @init {
     List left = new ArrayList();
     List right = new ArrayList();
@@ -1302,7 +1302,7 @@ actionCreate returns [TextMarkerAction a
     ;
 
 
-actionMarkTable returns [TextMarkerAction action = null]
+actionMarkTable returns [RutaAction action = null]
 @init {
     List<Expression> left = new ArrayList<Expression>();
     List<Expression> right = new ArrayList<Expression>();
@@ -1333,7 +1333,7 @@ actionMarkTable returns [TextMarkerActio
     RPAREN
     ;
 
-actionGather returns [TextMarkerAction action = null]
+actionGather returns [RutaAction action = null]
 @init {
     List left = new ArrayList();
     List right = new ArrayList();
@@ -1353,7 +1353,7 @@ actionGather returns [TextMarkerAction a
     ;
 
 
-actionFill returns [TextMarkerAction action = null]
+actionFill returns [RutaAction action = null]
 @init {
     List left = new ArrayList();
     List right = new ArrayList();
@@ -1370,7 +1370,7 @@ actionFill returns [TextMarkerAction act
     ;
     
 
-actionColor returns [TextMarkerAction action = null]
+actionColor returns [RutaAction action = null]
     :   
     name = COLOR LPAREN type = typeExpression 
     {action = ActionFactory.createAction(name, type, bgcolor, fgcolor, selected);}
@@ -1386,20 +1386,20 @@ actionColor returns [TextMarkerAction ac
     RPAREN
     ;
 
-actionDel returns [TextMarkerAction action = null]
+actionDel returns [RutaAction action = null]
     :   
     name = DEL
     {action = ActionFactory.createAction(name, new ArrayList());}
     ;
         
-actionLog returns [TextMarkerAction action = null]
+actionLog returns [RutaAction action = null]
     :   
     name = LOG LPAREN lit = stringExpression (COMMA log = LogLevel)? 
     {action = ActionFactory.createLogAction(name, lit, log);} //TODO handle logLevel
     RPAREN 
     ;
 
-actionMark returns [TextMarkerAction action = null]
+actionMark returns [RutaAction action = null]
 @init {
 List<Expression> list = new ArrayList<Expression>();
 }
@@ -1414,7 +1414,7 @@ List<Expression> list = new ArrayList<Ex
      RPAREN
     ;
 
-actionShift returns [TextMarkerAction action = null]
+actionShift returns [RutaAction action = null]
 @init {
 List<Expression> list = new ArrayList<Expression>();
 }
@@ -1429,7 +1429,7 @@ List<Expression> list = new ArrayList<Ex
      RPAREN
     ;
 
-actionMarkScore returns [TextMarkerAction action = null]
+actionMarkScore returns [RutaAction action = null]
 @init {
 List<Expression> list = new ArrayList<Expression>();
 }
@@ -1443,7 +1443,7 @@ List<Expression> list = new ArrayList<Ex
      RPAREN
     ;
 
-actionMarkOnce returns [TextMarkerAction action = null]
+actionMarkOnce returns [RutaAction action = null]
 @init {
 List<Expression> list = new ArrayList<Expression>();
 }
@@ -1457,7 +1457,7 @@ List<Expression> list = new ArrayList<Ex
     RPAREN
     ;
 
-actionMarkFast returns [TextMarkerAction action = null]
+actionMarkFast returns [RutaAction action = null]
 @init {
  Expression list = null;
 }
@@ -1471,7 +1471,7 @@ actionMarkFast returns [TextMarkerAction
     RPAREN
     ;
 
-actionMarkLast returns [TextMarkerAction action = null]
+actionMarkLast returns [RutaAction action = null]
     :   
     name = MARKLAST LPAREN type = typeExpression 
     {action = ActionFactory.createAction(name, type);}
@@ -1479,7 +1479,7 @@ actionMarkLast returns [TextMarkerAction
     ;
 
 
-actionReplace returns [TextMarkerAction action = null]
+actionReplace returns [RutaAction action = null]
     :   
     name = REPLACE LPAREN lit = stringExpression 
     {action = ActionFactory.createAction(name, lit);}
@@ -1487,7 +1487,7 @@ actionReplace returns [TextMarkerAction 
     ;
 
         
-actionRetainType returns [TextMarkerAction action = null]
+actionRetainType returns [RutaAction action = null]
 @init {
 List<Expression> list = new ArrayList<Expression>();
 }
@@ -1501,7 +1501,7 @@ List<Expression> list = new ArrayList<Ex
     ;
     
 
-actionFilterType returns [TextMarkerAction action = null]
+actionFilterType returns [RutaAction action = null]
 @init {
 List<Expression> list = new ArrayList<Expression>();
 }
@@ -1514,7 +1514,7 @@ List<Expression> list = new ArrayList<Ex
     {action = ActionFactory.createAction(name, list);}
     ;       
 
-actionAddFilterType returns [TextMarkerAction action = null]
+actionAddFilterType returns [RutaAction action = null]
 @init {
 List<Expression> list = new ArrayList<Expression>();
 }
@@ -1527,7 +1527,7 @@ List<Expression> list = new ArrayList<Ex
     {action = ActionFactory.createAction(name, list);}
     ;   
 
-actionAddRetainType returns [TextMarkerAction action = null]
+actionAddRetainType returns [RutaAction action = null]
 @init {
 List<Expression> list = new ArrayList<Expression>();
 }
@@ -1541,7 +1541,7 @@ List<Expression> list = new ArrayList<Ex
     ;   
 
 
-actionRemoveFilterType returns [TextMarkerAction action = null]
+actionRemoveFilterType returns [RutaAction action = null]
 @init {
 List<Expression> list = new ArrayList<Expression>();
 }
@@ -1554,7 +1554,7 @@ List<Expression> list = new ArrayList<Ex
     {action = ActionFactory.createAction(name, list);}
     ;   
 
-actionRemoveRetainType returns [TextMarkerAction action = null]
+actionRemoveRetainType returns [RutaAction action = null]
 @init {
 List<Expression> list = new ArrayList<Expression>();
 }
@@ -1567,7 +1567,7 @@ List<Expression> list = new ArrayList<Ex
     {action = ActionFactory.createAction(name, list);}
     ; 
 
-actionCall returns [TextMarkerAction action = null]
+actionCall returns [RutaAction action = null]
 @init {
 String string = "";
 
@@ -1582,7 +1582,7 @@ String string = "";
     ;
 
 
-actionConfigure returns [TextMarkerAction action = null]
+actionConfigure returns [RutaAction action = null]
 @init {
     List left = new ArrayList();
     List right = new ArrayList();
@@ -1602,7 +1602,7 @@ actionConfigure returns [TextMarkerActio
     ;
 
 
-actionExec returns [TextMarkerAction action = null]
+actionExec returns [RutaAction action = null]
 @init {
 String string = "";
 }
@@ -1617,7 +1617,7 @@ String string = "";
     ;
 
         
-actionAssign returns [TextMarkerAction action = null]
+actionAssign returns [RutaAction action = null]
 @init{
     VariableReference ref = null;
 }
@@ -1636,7 +1636,7 @@ actionAssign returns [TextMarkerAction a
     ;
 
 //unknown
-actionSetFeature returns [TextMarkerAction action = null]
+actionSetFeature returns [RutaAction action = null]
     :
     name = SETFEATURE LPAREN f = stringExpression 
      {action = ActionFactory.createAction(name, f, v);}
@@ -1645,7 +1645,7 @@ actionSetFeature returns [TextMarkerActi
     RPAREN
     ;
 
-actionGetFeature returns [TextMarkerAction action = null]
+actionGetFeature returns [RutaAction action = null]
     :
     name = GETFEATURE LPAREN f = stringExpression 
     {action = ActionFactory.createAction(name, f, v);}
@@ -1655,7 +1655,7 @@ actionGetFeature returns [TextMarkerActi
     ;
 
 //unknown
-actionDynamicAnchoring returns [TextMarkerAction action = null]
+actionDynamicAnchoring returns [RutaAction action = null]
     :
     name = DYNAMICANCHORING LPAREN active = booleanExpression 
      {action = ActionFactory.createAction(name, active);}
@@ -1666,7 +1666,7 @@ actionDynamicAnchoring returns [TextMark
     RPAREN
     ;
 
-actionTrim returns [TextMarkerAction action = null]
+actionTrim returns [RutaAction action = null]
 @init {
 List<Expression> list = new ArrayList<Expression>();
 }
@@ -1683,7 +1683,7 @@ List<Expression> list = new ArrayList<Ex
     ;
 
 //unknown
-actionUnmark returns [TextMarkerAction action = null]
+actionUnmark returns [RutaAction action = null]
 @init {
 List<Expression> list = new ArrayList<Expression>();
 }
@@ -1711,7 +1711,7 @@ List<Expression> list = new ArrayList<Ex
 
 
 
-actionUnmarkAll returns [TextMarkerAction action = null]
+actionUnmarkAll returns [RutaAction action = null]
     :
     name = UNMARKALL LPAREN f = typeExpression 
     {action = ActionFactory.createAction(name, f, list);}
@@ -1723,14 +1723,14 @@ actionUnmarkAll returns [TextMarkerActio
 
 //unknown
 
-actionTransfer returns [TextMarkerAction action = null]
+actionTransfer returns [RutaAction action = null]
     :
     name = TRANSFER LPAREN f = typeExpression 
     {action = ActionFactory.createAction(name, f);}
     RPAREN
     ;
     
-actionTrie returns [TextMarkerAction action = null]
+actionTrie returns [RutaAction action = null]
 @init {
 Map<Expression, Expression> map = new HashMap<Expression, Expression>();
 List<Expression> left = new ArrayList<Expression>();
@@ -1764,7 +1764,7 @@ List<Expression> right = new ArrayList<E
     ;   
 
 
-actionAdd returns [TextMarkerAction action = null]
+actionAdd returns [RutaAction action = null]
 @init{
 	List<Expression> list = new ArrayList<Expression>();
 } 
@@ -1776,7 +1776,7 @@ actionAdd returns [TextMarkerAction acti
     RPAREN
     ;
 
-actionRemove returns [TextMarkerAction action = null]
+actionRemove returns [RutaAction action = null]
 @init{
 	List<Expression> list = new ArrayList<Expression>();
 } 
@@ -1789,14 +1789,14 @@ actionRemove returns [TextMarkerAction a
     ;
 
 
-actionRemoveDuplicate returns [TextMarkerAction action = null]
+actionRemoveDuplicate returns [RutaAction action = null]
     :
     name = REMOVEDUPLICATE LPAREN f = listVariable 
     {action = ActionFactory.createAction(name, f);}
     RPAREN
     ;
    
-actionMerge returns [TextMarkerAction action = null]
+actionMerge returns [RutaAction action = null]
 @init{
 	List<Expression> list = new ArrayList<Expression>();
 } 
@@ -1811,7 +1811,7 @@ actionMerge returns [TextMarkerAction ac
     RPAREN
     ;
 
-actionGet returns [TextMarkerAction action = null]
+actionGet returns [RutaAction action = null]
     :
     name = GET LPAREN f = listExpression 
     {action = ActionFactory.createAction(name, f, var, op);}
@@ -1823,7 +1823,7 @@ actionGet returns [TextMarkerAction acti
     ;
 
 
-actionGetList returns [TextMarkerAction action = null]
+actionGetList returns [RutaAction action = null]
     :
     name = GETLIST LPAREN var = listVariable 
     {action = ActionFactory.createAction(name, var, op);}
@@ -1832,7 +1832,7 @@ actionGetList returns [TextMarkerAction 
     RPAREN
     ;
 
-actionMatchedText returns [TextMarkerAction action = null]
+actionMatchedText returns [RutaAction action = null]
 @init {
 List<Expression> list = new ArrayList<Expression>();
 }
@@ -1846,7 +1846,7 @@ List<Expression> list = new ArrayList<Ex
     RPAREN
     ;
     
-actionClear returns [TextMarkerAction action = null]
+actionClear returns [RutaAction action = null]
     :
     name = CLEAR LPAREN var = listVariable 
     {action = ActionFactory.createAction(name, var);}
@@ -1999,10 +1999,10 @@ multiplicativeExpression returns [Expres
 	;
 
 //seems OK
-numberExpressionInPar returns [TextMarkerExpression expr = null]
+numberExpressionInPar returns [RutaExpression expr = null]
 	:
 	lp = LPAREN numE = numberExpression rp = RPAREN 
-	{expr = ExpressionFactory.createNumberExpression((TextMarkerExpression)numE); 
+	{expr = ExpressionFactory.createNumberExpression((RutaExpression)numE); 
 	  expr.setInParantheses(true);
           expr.setStart(((CommonToken) lp).getStartIndex());
           expr.setEnd(((CommonToken) rp).getStopIndex()+1);}