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 2016/01/04 11:33:50 UTC
svn commit: r1722834 [9/9] - in /uima/ruta/trunk: ./
example-projects/ruta-ep-example-extensions/
example-projects/ruta-ep-example-extensions/src/main/java/org/apache/uima/ruta/example/extensions/
ruta-core-ext/src/main/java/org/apache/uima/ruta/block/...
Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/verbalize/ExpressionVerbalizer.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/verbalize/ExpressionVerbalizer.java?rev=1722834&r1=1722833&r2=1722834&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/verbalize/ExpressionVerbalizer.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/verbalize/ExpressionVerbalizer.java Mon Jan 4 10:33:48 2016
@@ -27,28 +27,28 @@ import org.apache.uima.ruta.expression.M
import org.apache.uima.ruta.expression.bool.BooleanFeatureExpression;
import org.apache.uima.ruta.expression.bool.BooleanNumberExpression;
import org.apache.uima.ruta.expression.bool.BooleanTypeExpression;
+import org.apache.uima.ruta.expression.bool.BooleanVariableExpression;
import org.apache.uima.ruta.expression.bool.IBooleanExpression;
-import org.apache.uima.ruta.expression.bool.ReferenceBooleanExpression;
import org.apache.uima.ruta.expression.bool.SimpleBooleanExpression;
import org.apache.uima.ruta.expression.feature.FeatureExpression;
import org.apache.uima.ruta.expression.feature.FeatureMatchExpression;
import org.apache.uima.ruta.expression.feature.GenericFeatureExpression;
import org.apache.uima.ruta.expression.feature.SimpleFeatureExpression;
+import org.apache.uima.ruta.expression.list.BooleanListVariableExpression;
import org.apache.uima.ruta.expression.list.ListExpression;
-import org.apache.uima.ruta.expression.list.ReferenceBooleanListExpression;
-import org.apache.uima.ruta.expression.list.ReferenceNumberListExpression;
-import org.apache.uima.ruta.expression.list.ReferenceStringListExpression;
-import org.apache.uima.ruta.expression.list.ReferenceTypeListExpression;
+import org.apache.uima.ruta.expression.list.NumberListVariableExpression;
import org.apache.uima.ruta.expression.list.SimpleBooleanListExpression;
import org.apache.uima.ruta.expression.list.SimpleNumberListExpression;
import org.apache.uima.ruta.expression.list.SimpleStringListExpression;
import org.apache.uima.ruta.expression.list.SimpleTypeListExpression;
+import org.apache.uima.ruta.expression.list.StringListVariableExpression;
+import org.apache.uima.ruta.expression.list.TypeListVariableExpression;
import org.apache.uima.ruta.expression.list.UntypedListExpression;
import org.apache.uima.ruta.expression.number.ComposedNumberExpression;
import org.apache.uima.ruta.expression.number.INumberExpression;
import org.apache.uima.ruta.expression.number.NegativeNumberExpression;
import org.apache.uima.ruta.expression.number.NumberFeatureExpression;
-import org.apache.uima.ruta.expression.number.ReferenceNumberExpression;
+import org.apache.uima.ruta.expression.number.NumberVariableExpression;
import org.apache.uima.ruta.expression.number.SimpleNumberExpression;
import org.apache.uima.ruta.expression.resource.ReferenceWordListExpression;
import org.apache.uima.ruta.expression.resource.ReferenceWordTableExpression;
@@ -57,12 +57,12 @@ import org.apache.uima.ruta.expression.r
import org.apache.uima.ruta.expression.string.ComposedStringExpression;
import org.apache.uima.ruta.expression.string.IStringExpression;
import org.apache.uima.ruta.expression.string.LiteralStringExpression;
-import org.apache.uima.ruta.expression.string.ReferenceStringExpression;
import org.apache.uima.ruta.expression.string.SimpleStringExpression;
import org.apache.uima.ruta.expression.string.StringFeatureExpression;
-import org.apache.uima.ruta.expression.type.ReferenceTypeExpression;
+import org.apache.uima.ruta.expression.string.StringVariableExpression;
+import org.apache.uima.ruta.expression.type.ITypeExpression;
import org.apache.uima.ruta.expression.type.SimpleTypeExpression;
-import org.apache.uima.ruta.expression.type.TypeExpression;
+import org.apache.uima.ruta.expression.type.TypeVariableExpression;
public class ExpressionVerbalizer {
@@ -76,8 +76,8 @@ public class ExpressionVerbalizer {
public String verbalize(IRutaExpression expression) {
if (expression instanceof GenericFeatureExpression) {
return verbalize(((GenericFeatureExpression) expression).getFeatureExpression());
- } else if (expression instanceof TypeExpression) {
- return verbalize((TypeExpression) expression);
+ } else if (expression instanceof ITypeExpression) {
+ return verbalize((ITypeExpression) expression);
} else if (expression instanceof IBooleanExpression) {
return verbalize((IBooleanExpression) expression);
} else if (expression instanceof INumberExpression) {
@@ -120,26 +120,26 @@ public class ExpressionVerbalizer {
if (expression instanceof SimpleBooleanListExpression) {
SimpleBooleanListExpression e = (SimpleBooleanListExpression) expression;
return "{" + verbalizer.verbalizeExpressionList(e.getList()) + "}";
- } else if (expression instanceof ReferenceBooleanListExpression) {
- ReferenceBooleanListExpression e = (ReferenceBooleanListExpression) expression;
+ } else if (expression instanceof BooleanListVariableExpression) {
+ BooleanListVariableExpression e = (BooleanListVariableExpression) expression;
return e.getVar();
} else if (expression instanceof SimpleNumberListExpression) {
SimpleNumberListExpression e = (SimpleNumberListExpression) expression;
return "{" + verbalizer.verbalizeExpressionList(e.getList()) + "}";
- } else if (expression instanceof ReferenceNumberListExpression) {
- ReferenceNumberListExpression e = (ReferenceNumberListExpression) expression;
+ } else if (expression instanceof NumberListVariableExpression) {
+ NumberListVariableExpression e = (NumberListVariableExpression) expression;
return e.getVar();
} else if (expression instanceof SimpleStringListExpression) {
SimpleStringListExpression e = (SimpleStringListExpression) expression;
return "{" + verbalizer.verbalizeExpressionList(e.getList()) + "}";
- } else if (expression instanceof ReferenceStringListExpression) {
- ReferenceStringListExpression e = (ReferenceStringListExpression) expression;
+ } else if (expression instanceof StringListVariableExpression) {
+ StringListVariableExpression e = (StringListVariableExpression) expression;
return e.getVar();
} else if (expression instanceof SimpleTypeListExpression) {
SimpleTypeListExpression e = (SimpleTypeListExpression) expression;
return "{" + verbalizer.verbalizeExpressionList(e.getList()) + "}";
- } else if (expression instanceof ReferenceTypeListExpression) {
- ReferenceTypeListExpression e = (ReferenceTypeListExpression) expression;
+ } else if (expression instanceof TypeListVariableExpression) {
+ TypeListVariableExpression e = (TypeListVariableExpression) expression;
return e.getVar();
} else if (expression instanceof UntypedListExpression) {
UntypedListExpression e = (UntypedListExpression) expression;
@@ -154,8 +154,8 @@ public class ExpressionVerbalizer {
} else if (expression instanceof NegativeNumberExpression) {
NegativeNumberExpression e = (NegativeNumberExpression) expression;
return "-(" + e.getExpression() + ")";
- } else if (expression instanceof ReferenceNumberExpression) {
- ReferenceNumberExpression e = (ReferenceNumberExpression) expression;
+ } else if (expression instanceof NumberVariableExpression) {
+ NumberVariableExpression e = (NumberVariableExpression) expression;
return e.getVar();
} else if (expression instanceof SimpleNumberExpression) {
SimpleNumberExpression e = (SimpleNumberExpression) expression;
@@ -191,8 +191,8 @@ public class ExpressionVerbalizer {
BooleanTypeExpression e = (BooleanTypeExpression) expression;
return verbalize(e.getFristExpression()) + " " + e.getOperator() + " "
+ verbalize(e.getSecondExpression());
- } else if (expression instanceof ReferenceBooleanExpression) {
- ReferenceBooleanExpression e = (ReferenceBooleanExpression) expression;
+ } else if (expression instanceof BooleanVariableExpression) {
+ BooleanVariableExpression e = (BooleanVariableExpression) expression;
return e.getVar();
} else if (expression instanceof SimpleBooleanExpression) {
SimpleBooleanExpression e = (SimpleBooleanExpression) expression;
@@ -203,13 +203,14 @@ public class ExpressionVerbalizer {
return expression.getClass().getSimpleName();
}
+ @SuppressWarnings("rawtypes")
public String verbalize(IStringExpression expression) {
if (expression == null) {
return "";
} else if (expression instanceof INumberExpression) {
return verbalize((INumberExpression) expression);
- } else if (expression instanceof TypeExpression) {
- return verbalize((TypeExpression) expression);
+ } else if (expression instanceof ITypeExpression) {
+ return verbalize((ITypeExpression) expression);
} else if (expression instanceof IBooleanExpression) {
return verbalize((IBooleanExpression) expression);
} else if (expression instanceof ListExpression) {
@@ -237,8 +238,8 @@ public class ExpressionVerbalizer {
}
}
return sb.toString();
- } else if (expression instanceof ReferenceStringExpression) {
- ReferenceStringExpression e = (ReferenceStringExpression) expression;
+ } else if (expression instanceof StringVariableExpression) {
+ StringVariableExpression e = (StringVariableExpression) expression;
return e.getVar();
} else if (expression instanceof SimpleStringExpression) {
SimpleStringExpression e = (SimpleStringExpression) expression;
@@ -247,7 +248,7 @@ public class ExpressionVerbalizer {
return expression.getClass().getSimpleName();
}
- public String verbalize(TypeExpression expression) {
+ public String verbalize(ITypeExpression expression) {
if (expression == null) {
return null;
}
@@ -262,23 +263,15 @@ public class ExpressionVerbalizer {
type = "Document";
}
return type;
- } else if (expression instanceof ReferenceTypeExpression) {
- ReferenceTypeExpression e = (ReferenceTypeExpression) expression;
+ } else if (expression instanceof TypeVariableExpression) {
+ TypeVariableExpression e = (TypeVariableExpression) expression;
return e.getVar();
}
return expression.getClass().getSimpleName();
}
public String verbalize(MatchReference expression) {
- String tail = "";
- String head = expression.getMatch();
- if (expression.getOp() != null) {
- tail += expression.getOp();
- if (expression.getArg() != null) {
- tail += verbalize(expression.getArg());
- }
- }
- return head + tail;
+ return expression.getMatch();
}
public String verbalize(FeatureExpression expression) {
@@ -287,8 +280,8 @@ public class ExpressionVerbalizer {
SimpleFeatureExpression sfe = (SimpleFeatureExpression) expression;
sb.append(sfe.getMatchReference().getMatch());
} else {
- sb.append(verbalize(expression.getTypeExpr(null)));
- List<String> list = expression.getFeatureStringList(null);
+ sb.append(verbalize(expression.getTypeExpr(null, null)));
+ List<String> list = expression.getFeatureStringList(null, null);
if (list != null) {
for (String string : list) {
sb.append(".");
Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/verbalize/RutaVerbalizer.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/verbalize/RutaVerbalizer.java?rev=1722834&r1=1722833&r2=1722834&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/verbalize/RutaVerbalizer.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/verbalize/RutaVerbalizer.java Mon Jan 4 10:33:48 2016
@@ -74,15 +74,15 @@ public class RutaVerbalizer {
return conditionVerbalizer.verbalize((AbstractRutaCondition) element);
} else if (element instanceof IRutaExpression) {
return expressionVerbalizer.verbalize((RutaExpression) element);
- } else if(element instanceof RutaElement){
+ } else if (element instanceof RutaElement) {
return scriptVerbalizer.verbalize((RutaElement) element);
- } else if(element instanceof RutaBlock){
+ } else if (element instanceof RutaBlock) {
return verbalize((RutaBlock) element, false);
} else {
return element.getClass().getSimpleName();
}
}
-
+
public String verbalizeName(RutaElement element) {
if (externalVerbalizers.keySet().contains(element.getClass())) {
return externalVerbalizers.get(element.getClass()).verbalizeName(element);
@@ -130,5 +130,4 @@ public class RutaVerbalizer {
return scriptVerbalizer.verbalizeComposed(cre);
}
-
}
Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/verbalize/ScriptVerbalizer.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/verbalize/ScriptVerbalizer.java?rev=1722834&r1=1722833&r2=1722834&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/verbalize/ScriptVerbalizer.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/verbalize/ScriptVerbalizer.java Mon Jan 4 10:33:48 2016
@@ -31,11 +31,9 @@ import org.apache.uima.ruta.RutaStatemen
import org.apache.uima.ruta.action.AbstractRutaAction;
import org.apache.uima.ruta.condition.AbstractRutaCondition;
import org.apache.uima.ruta.expression.IRutaExpression;
-import org.apache.uima.ruta.expression.MatchReference;
-import org.apache.uima.ruta.expression.RutaExpression;
import org.apache.uima.ruta.expression.number.INumberExpression;
import org.apache.uima.ruta.expression.string.IStringExpression;
-import org.apache.uima.ruta.expression.type.TypeExpression;
+import org.apache.uima.ruta.expression.type.ITypeExpression;
import org.apache.uima.ruta.rule.AbstractRuleElement;
import org.apache.uima.ruta.rule.ComposedRuleElement;
import org.apache.uima.ruta.rule.ConjunctRulesRuleElement;
@@ -138,19 +136,17 @@ public class ScriptVerbalizer {
RutaMatcher matcher = tmre.getMatcher();
// action-only rule
if (matcher instanceof RutaTypeMatcher) {
- RutaExpression expression = ((RutaTypeMatcher) matcher).getExpression();
- if (expression instanceof MatchReference) {
- MatchReference mr = (MatchReference) expression;
- if (mr.getMatch() == null) {
- Iterator<AbstractRutaAction> ait = actions.iterator();
- while (ait.hasNext()) {
- AbstractRutaAction each = ait.next();
- result.append(verbalizer.verbalize(each));
- if (ait.hasNext()) {
- result.append(",");
- }
+ IRutaExpression expression = ((RutaTypeMatcher) matcher).getExpression();
+ if(expression != null) {
+ result.append(verbalizer.verbalize(expression));
+ } else {
+ Iterator<AbstractRutaAction> ait = actions.iterator();
+ while (ait.hasNext()) {
+ AbstractRutaAction each = ait.next();
+ result.append(verbalizer.verbalize(each));
+ if (ait.hasNext()) {
+ result.append(",");
}
- return result.toString();
}
}
}
@@ -298,10 +294,10 @@ public class ScriptVerbalizer {
sb.append(regexp);
sb.append(THEN);
- Iterator<Entry<TypeExpression, INumberExpression>> iterator = rule.getTypeMap().entrySet()
+ Iterator<Entry<ITypeExpression, INumberExpression>> iterator = rule.getTypeMap().entrySet()
.iterator();
while (iterator.hasNext()) {
- Entry<TypeExpression, INumberExpression> next = iterator.next();
+ Entry<ITypeExpression, INumberExpression> next = iterator.next();
String type = verbalizer.verbalize(next.getKey());
INumberExpression value = next.getValue();
if (value != null) {
@@ -310,7 +306,7 @@ public class ScriptVerbalizer {
} else {
sb.append(type);
}
- Map<TypeExpression, Map<IStringExpression, IRutaExpression>> featureAssignments = rule
+ Map<ITypeExpression, Map<IStringExpression, IRutaExpression>> featureAssignments = rule
.getFeatureAssignments();
if (featureAssignments != null) {
Map<IStringExpression, IRutaExpression> map = featureAssignments.get(next.getKey());
Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/visitor/InferenceCrowd.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/visitor/InferenceCrowd.java?rev=1722834&r1=1722833&r2=1722834&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/visitor/InferenceCrowd.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/visitor/InferenceCrowd.java Mon Jan 4 10:33:48 2016
@@ -61,7 +61,7 @@ public class InferenceCrowd implements R
public void annotationAdded(AnnotationFS annotation,
AbstractRuleMatch<? extends AbstractRule> creator) {
- if(visitors.isEmpty()) {
+ if (visitors.isEmpty()) {
return;
}
for (RutaInferenceVisitor each : visitors) {
Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/HtmlConverterTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/HtmlConverterTest.java?rev=1722834&r1=1722833&r2=1722834&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/HtmlConverterTest.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/HtmlConverterTest.java Mon Jan 4 10:33:48 2016
@@ -125,7 +125,6 @@ public class HtmlConverterTest {
CAS modifiedView = cas.getView(outputViewName);
String text = modifiedView.getDocumentText();
- String inputText = cas.getDocumentText();
String expectedText = "start of body\nnormal normal bold\nend of body 3€ äöü";
AnnotationFS documentAnnotation = modifiedView.getDocumentAnnotation();
assertEquals(String.format("begin of annotation is %d, %d expected.",
@@ -163,7 +162,6 @@ public class HtmlConverterTest {
CAS modifiedView = cas.getView(outputViewName);
String text = modifiedView.getDocumentText();
- String inputText = cas.getDocumentText();
String expectedText = "start of body\nnormal\u00A0normal bold\nend of body 3\u20AC\u00A0äöü";
AnnotationFS documentAnnotation = modifiedView.getDocumentAnnotation();
assertEquals(String.format("begin of annotation is %d, %d expected.",
@@ -472,9 +470,9 @@ public class HtmlConverterTest {
// _____________________________ BB _________________________ BB ___________
//
CAS modifiedView = cas.getView(outputViewName);
- String modifiedText = modifiedView.getDocumentText();
- int modLength = modifiedText.length();
- int modLengthCodepoints = modifiedText.codePointCount(0, modLength);
+// String modifiedText = modifiedView.getDocumentText();
+// int modLength = modifiedText.length();
+// int modLengthCodepoints = modifiedText.codePointCount(0, modLength);
AnnotationIndex<AnnotationFS> ai = modifiedView.getAnnotationIndex(boldType);
FSIterator<AnnotationFS> iterator = ai.iterator();
assertEquals(true, iterator.hasNext());
Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/verbalizer/ActionVerbalizerTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/verbalizer/ActionVerbalizerTest.java?rev=1722834&r1=1722833&r2=1722834&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/verbalizer/ActionVerbalizerTest.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/verbalizer/ActionVerbalizerTest.java Mon Jan 4 10:33:48 2016
@@ -70,7 +70,7 @@ import org.apache.uima.ruta.expression.l
import org.apache.uima.ruta.expression.list.StringListExpression;
import org.apache.uima.ruta.expression.list.TypeListExpression;
import org.apache.uima.ruta.expression.number.INumberExpression;
-import org.apache.uima.ruta.expression.number.ReferenceNumberExpression;
+import org.apache.uima.ruta.expression.number.NumberVariableExpression;
import org.apache.uima.ruta.expression.number.SimpleNumberExpression;
import org.apache.uima.ruta.expression.resource.ReferenceWordListExpression;
import org.apache.uima.ruta.expression.resource.ReferenceWordTableExpression;
@@ -79,9 +79,9 @@ import org.apache.uima.ruta.expression.r
import org.apache.uima.ruta.expression.string.AbstractStringExpression;
import org.apache.uima.ruta.expression.string.IStringExpression;
import org.apache.uima.ruta.expression.string.SimpleStringExpression;
-import org.apache.uima.ruta.expression.type.ReferenceTypeExpression;
+import org.apache.uima.ruta.expression.type.ITypeExpression;
import org.apache.uima.ruta.expression.type.SimpleTypeExpression;
-import org.apache.uima.ruta.expression.type.TypeExpression;
+import org.apache.uima.ruta.expression.type.TypeVariableExpression;
import org.apache.uima.ruta.verbalize.RutaVerbalizer;
import org.junit.Test;
@@ -91,17 +91,17 @@ public class ActionVerbalizerTest {
@Test
public void test() {
RutaVerbalizer v = new RutaVerbalizer();
- List<TypeExpression> typeExprList = new ArrayList<TypeExpression>();
+ List<ITypeExpression> typeExprList = new ArrayList<ITypeExpression>();
List<IStringExpression> stringExprList = new ArrayList<IStringExpression>();
List<IRutaExpression> exprList = new ArrayList<IRutaExpression>();
List<INumberExpression> indexes = new ArrayList<INumberExpression>();
String var = "anyVar";
- TypeExpression typeExpr1 = new SimpleTypeExpression("Type1");
- TypeExpression typeExpr2 = new ReferenceTypeExpression("typeVar");
+ ITypeExpression typeExpr1 = new SimpleTypeExpression("Type1");
+ ITypeExpression typeExpr2 = new TypeVariableExpression("typeVar");
typeExprList.add(typeExpr1);
typeExprList.add(typeExpr2);
INumberExpression numExpr1 = new SimpleNumberExpression(4);
- INumberExpression numExpr2 = new ReferenceNumberExpression("numVar");
+ INumberExpression numExpr2 = new NumberVariableExpression("numVar");
IBooleanExpression boolExpr1 = new SimpleBooleanExpression(true);
AbstractStringExpression stringExpr = new SimpleStringExpression("string");
stringExprList.add(stringExpr);
Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/verbalizer/ConditionVerbalizerTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/verbalizer/ConditionVerbalizerTest.java?rev=1722834&r1=1722833&r2=1722834&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/verbalizer/ConditionVerbalizerTest.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/verbalizer/ConditionVerbalizerTest.java Mon Jan 4 10:33:48 2016
@@ -59,13 +59,13 @@ import org.apache.uima.ruta.expression.l
import org.apache.uima.ruta.expression.list.StringListExpression;
import org.apache.uima.ruta.expression.list.TypeListExpression;
import org.apache.uima.ruta.expression.number.INumberExpression;
-import org.apache.uima.ruta.expression.number.ReferenceNumberExpression;
+import org.apache.uima.ruta.expression.number.NumberVariableExpression;
import org.apache.uima.ruta.expression.number.SimpleNumberExpression;
import org.apache.uima.ruta.expression.string.IStringExpression;
import org.apache.uima.ruta.expression.string.SimpleStringExpression;
-import org.apache.uima.ruta.expression.type.ReferenceTypeExpression;
+import org.apache.uima.ruta.expression.type.ITypeExpression;
import org.apache.uima.ruta.expression.type.SimpleTypeExpression;
-import org.apache.uima.ruta.expression.type.TypeExpression;
+import org.apache.uima.ruta.expression.type.TypeVariableExpression;
import org.apache.uima.ruta.verbalize.RutaVerbalizer;
import org.junit.Test;
@@ -74,16 +74,16 @@ public class ConditionVerbalizerTest {
@Test
public void test() {
RutaVerbalizer v = new RutaVerbalizer();
- List<TypeExpression> typeExprList = new ArrayList<TypeExpression>();
+ List<ITypeExpression> typeExprList = new ArrayList<ITypeExpression>();
List<IStringExpression> stringExprList = new ArrayList<IStringExpression>();
String var = "anyVar";
- IStringExpression varExpr = new ReferenceNumberExpression(var);
- TypeExpression typeExpr1 = new SimpleTypeExpression("Type1");
- TypeExpression typeExpr2 = new ReferenceTypeExpression("typeVar");
+ IStringExpression varExpr = new NumberVariableExpression(var);
+ ITypeExpression typeExpr1 = new SimpleTypeExpression("Type1");
+ ITypeExpression typeExpr2 = new TypeVariableExpression("typeVar");
typeExprList.add(typeExpr1);
typeExprList.add(typeExpr2);
INumberExpression numExpr1 = new SimpleNumberExpression(4);
- INumberExpression numExpr2 = new ReferenceNumberExpression("numVar");
+ INumberExpression numExpr2 = new NumberVariableExpression("numVar");
IBooleanExpression boolExpr1 = new SimpleBooleanExpression(true);
IStringExpression stringExpr = new SimpleStringExpression("string");
stringExprList.add(stringExpr);
Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/verbalizer/ExpressionVerbalizerTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/verbalizer/ExpressionVerbalizerTest.java?rev=1722834&r1=1722833&r2=1722834&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/verbalizer/ExpressionVerbalizerTest.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/verbalizer/ExpressionVerbalizerTest.java Mon Jan 4 10:33:48 2016
@@ -26,86 +26,88 @@ import java.util.List;
import org.apache.uima.ruta.expression.bool.BooleanNumberExpression;
import org.apache.uima.ruta.expression.bool.BooleanTypeExpression;
+import org.apache.uima.ruta.expression.bool.BooleanVariableExpression;
import org.apache.uima.ruta.expression.bool.IBooleanExpression;
-import org.apache.uima.ruta.expression.bool.ReferenceBooleanExpression;
import org.apache.uima.ruta.expression.bool.SimpleBooleanExpression;
import org.apache.uima.ruta.expression.list.BooleanListExpression;
+import org.apache.uima.ruta.expression.list.BooleanListVariableExpression;
import org.apache.uima.ruta.expression.list.NumberListExpression;
-import org.apache.uima.ruta.expression.list.ReferenceBooleanListExpression;
-import org.apache.uima.ruta.expression.list.ReferenceNumberListExpression;
-import org.apache.uima.ruta.expression.list.ReferenceStringListExpression;
-import org.apache.uima.ruta.expression.list.ReferenceTypeListExpression;
+import org.apache.uima.ruta.expression.list.NumberListVariableExpression;
import org.apache.uima.ruta.expression.list.SimpleBooleanListExpression;
import org.apache.uima.ruta.expression.list.SimpleNumberListExpression;
import org.apache.uima.ruta.expression.list.SimpleStringListExpression;
import org.apache.uima.ruta.expression.list.SimpleTypeListExpression;
import org.apache.uima.ruta.expression.list.StringListExpression;
+import org.apache.uima.ruta.expression.list.StringListVariableExpression;
import org.apache.uima.ruta.expression.list.TypeListExpression;
+import org.apache.uima.ruta.expression.list.TypeListVariableExpression;
import org.apache.uima.ruta.expression.number.ComposedNumberExpression;
import org.apache.uima.ruta.expression.number.INumberExpression;
-import org.apache.uima.ruta.expression.number.ReferenceNumberExpression;
+import org.apache.uima.ruta.expression.number.NumberVariableExpression;
import org.apache.uima.ruta.expression.number.SimpleNumberExpression;
import org.apache.uima.ruta.expression.string.AbstractStringExpression;
import org.apache.uima.ruta.expression.string.ComposedStringExpression;
import org.apache.uima.ruta.expression.string.IStringExpression;
-import org.apache.uima.ruta.expression.string.ReferenceStringExpression;
import org.apache.uima.ruta.expression.string.SimpleStringExpression;
-import org.apache.uima.ruta.expression.type.ReferenceTypeExpression;
+import org.apache.uima.ruta.expression.string.StringVariableExpression;
+import org.apache.uima.ruta.expression.type.ITypeExpression;
import org.apache.uima.ruta.expression.type.SimpleTypeExpression;
-import org.apache.uima.ruta.expression.type.TypeExpression;
+import org.apache.uima.ruta.expression.type.TypeVariableExpression;
import org.apache.uima.ruta.verbalize.RutaVerbalizer;
import org.junit.Test;
public class ExpressionVerbalizerTest {
- @SuppressWarnings("unchecked")
@Test
public void test() {
RutaVerbalizer v = new RutaVerbalizer();
-// List<TypeExpression> typeExprList = new ArrayList<TypeExpression>();
-// List<StringExpression> stringExprList = new ArrayList<StringExpression>();
-// List<RutaExpression> exprList = new ArrayList<RutaExpression>();
-// List<INumberExpression> indexes = new ArrayList<INumberExpression>();
-
-//
-//// typeExprList.add(typeExpr1);
-//// typeExprList.add(typeExpr2);
-//
-//
-// StringExpression stringExpr = new SimpleStringExpression("string");
-// stringExprList.add(stringExpr);
-//// exprList.add(typeExpr1);
-// WordTableExpression wordTableExpr = new ReferenceWordTableExpression(var);
-// WordListExpression wordListExpr = new ReferenceWordListExpression(var);
-// TypeListExpression typeListExpr = new SimpleTypeListExpression(typeExprList);
-// StringListExpression stringListExpr = new SimpleStringListExpression(stringExprList);
-// Map<StringExpression, RutaExpression> stringExprMap = new HashMap<StringExpression, RutaExpression>();
-// Map<StringExpression, INumberExpression> stringExprNumExprMap = new HashMap<StringExpression, INumberExpression>();
-// Map<StringExpression, TypeExpression> stringExprTypeExprMap = new HashMap<StringExpression, TypeExpression>();
-// @SuppressWarnings("rawtypes")
-// ListExpression listExpr = new SimpleTypeListExpression(typeExprList);
-// @SuppressWarnings("rawtypes")
-// List<ListExpression> listExprList = new ArrayList<ListExpression>();
-// listExprList.add(listExpr);
-// stringExprMap.put(stringExpr, stringExpr);
-//// stringExprNumExprMap.put(stringExpr, numExpr1);
-//// stringExprTypeExprMap.put(stringExpr, typeExpr1);
-//// indexes.add(numExpr1);
-//// indexes.add(numExpr2);
+ // List<TypeExpression> typeExprList = new ArrayList<TypeExpression>();
+ // List<StringExpression> stringExprList = new ArrayList<StringExpression>();
+ // List<RutaExpression> exprList = new ArrayList<RutaExpression>();
+ // List<INumberExpression> indexes = new ArrayList<INumberExpression>();
+
+ //
+ // // typeExprList.add(typeExpr1);
+ // // typeExprList.add(typeExpr2);
+ //
+ //
+ // StringExpression stringExpr = new SimpleStringExpression("string");
+ // stringExprList.add(stringExpr);
+ // // exprList.add(typeExpr1);
+ // WordTableExpression wordTableExpr = new ReferenceWordTableExpression(var);
+ // WordListExpression wordListExpr = new ReferenceWordListExpression(var);
+ // TypeListExpression typeListExpr = new SimpleTypeListExpression(typeExprList);
+ // StringListExpression stringListExpr = new SimpleStringListExpression(stringExprList);
+ // Map<StringExpression, RutaExpression> stringExprMap = new HashMap<StringExpression,
+ // RutaExpression>();
+ // Map<StringExpression, INumberExpression> stringExprNumExprMap = new HashMap<StringExpression,
+ // INumberExpression>();
+ // Map<StringExpression, TypeExpression> stringExprTypeExprMap = new HashMap<StringExpression,
+ // TypeExpression>();
+ // @SuppressWarnings("rawtypes")
+ // ListExpression listExpr = new SimpleTypeListExpression(typeExprList);
+ // @SuppressWarnings("rawtypes")
+ // List<ListExpression> listExprList = new ArrayList<ListExpression>();
+ // listExprList.add(listExpr);
+ // stringExprMap.put(stringExpr, stringExpr);
+ // // stringExprNumExprMap.put(stringExpr, numExpr1);
+ // // stringExprTypeExprMap.put(stringExpr, typeExpr1);
+ // // indexes.add(numExpr1);
+ // // indexes.add(numExpr2);
String s = null;
- String var = "anyVar";
- TypeExpression typeExpr1 = new SimpleTypeExpression("Type1");
- TypeExpression typeExpr2 = new ReferenceTypeExpression("typeVar");
-
+ String var = "anyVar";
+ ITypeExpression typeExpr1 = new SimpleTypeExpression("Type1");
+ ITypeExpression typeExpr2 = new TypeVariableExpression("typeVar");
+
List<INumberExpression> numExprList1 = new ArrayList<INumberExpression>();
List<INumberExpression> numExprList2 = new ArrayList<INumberExpression>();
List<String> opList1 = new ArrayList<String>();
List<String> opList2 = new ArrayList<String>();
INumberExpression numExpr1 = new SimpleNumberExpression(4);
- INumberExpression numExpr2 = new ReferenceNumberExpression("numVar");
- INumberExpression numExpr3 = new ReferenceNumberExpression("4.9");
- INumberExpression numExpr4 = new ReferenceNumberExpression("-4");
+ INumberExpression numExpr2 = new NumberVariableExpression("numVar");
+ INumberExpression numExpr3 = new NumberVariableExpression("4.9");
+ INumberExpression numExpr4 = new NumberVariableExpression("-4");
numExprList1.add(numExpr1);
numExprList1.add(numExpr2);
opList1.add("+");
@@ -114,7 +116,7 @@ public class ExpressionVerbalizerTest {
numExprList2.add(numExpr3);
numExprList2.add(numExpr5);
INumberExpression numExpr6 = new ComposedNumberExpression(numExprList2, opList2);
-
+
s = v.verbalize(numExpr1);
assertEquals("4", s);
s = v.verbalize(numExpr2);
@@ -127,12 +129,10 @@ public class ExpressionVerbalizerTest {
assertEquals("4 + numVar", s);
s = v.verbalize(numExpr6);
assertEquals("4.9 * 4 + numVar", s);
-
-
-
+
IBooleanExpression boolExpr1 = new SimpleBooleanExpression(true);
IBooleanExpression boolExpr2 = new SimpleBooleanExpression(false);
- IBooleanExpression boolExpr3 = new ReferenceBooleanExpression(var);
+ IBooleanExpression boolExpr3 = new BooleanVariableExpression(var);
IBooleanExpression boolExpr4 = new BooleanNumberExpression(numExpr1, "==", numExpr2);
IBooleanExpression boolExpr5 = new BooleanNumberExpression(numExpr1, "!=", numExpr2);
IBooleanExpression boolExpr6 = new BooleanNumberExpression(numExpr1, "<=", numExpr2);
@@ -141,7 +141,7 @@ public class ExpressionVerbalizerTest {
IBooleanExpression boolExpr9 = new BooleanNumberExpression(numExpr1, ">", numExpr2);
IBooleanExpression boolExpr10 = new BooleanTypeExpression(typeExpr1, "==", typeExpr2);
IBooleanExpression boolExpr11 = new BooleanTypeExpression(typeExpr1, "!=", typeExpr2);
-
+
s = v.verbalize(boolExpr1);
assertEquals("true", s);
s = v.verbalize(boolExpr2);
@@ -167,55 +167,54 @@ public class ExpressionVerbalizerTest {
List<IStringExpression> stringExprList = new ArrayList<IStringExpression>();
AbstractStringExpression stringExpr1 = new SimpleStringExpression("string");
- AbstractStringExpression stringExpr2 = new ReferenceStringExpression(var);
+ AbstractStringExpression stringExpr2 = new StringVariableExpression(var);
stringExprList.add(stringExpr1);
stringExprList.add(stringExpr2);
AbstractStringExpression stringExpr3 = new ComposedStringExpression(stringExprList);
-
+
s = v.verbalize(stringExpr1);
assertEquals("\"string\"", s);
s = v.verbalize(stringExpr2);
assertEquals("anyVar", s);
s = v.verbalize(stringExpr3);
- assertEquals("\"string\" + anyVar" , s);
-
-
+ assertEquals("\"string\" + anyVar", s);
+
StringListExpression sle1 = new SimpleStringListExpression(stringExprList);
- StringListExpression sle2 = new ReferenceStringListExpression(var);
+ StringListExpression sle2 = new StringListVariableExpression(var);
s = v.verbalize(sle1);
assertEquals("{\"string\", anyVar}", s);
s = v.verbalize(sle2);
assertEquals("anyVar", s);
-
+
List<IBooleanExpression> boolExprList = new ArrayList<IBooleanExpression>();
boolExprList.add(boolExpr1);
boolExprList.add(boolExpr3);
BooleanListExpression ble1 = new SimpleBooleanListExpression(boolExprList);
- BooleanListExpression ble2 = new ReferenceBooleanListExpression(var);
+ BooleanListExpression ble2 = new BooleanListVariableExpression(var);
s = v.verbalize(ble1);
assertEquals("{true, anyVar}", s);
s = v.verbalize(ble2);
assertEquals("anyVar", s);
-
+
List<INumberExpression> numExprList = new ArrayList<INumberExpression>();
numExprList.add(numExpr1);
numExprList.add(numExpr3);
NumberListExpression nle1 = new SimpleNumberListExpression(numExprList);
- NumberListExpression nle2 = new ReferenceNumberListExpression(var);
+ NumberListExpression nle2 = new NumberListVariableExpression(var);
s = v.verbalize(nle1);
assertEquals("{4, 4.9}", s);
s = v.verbalize(nle2);
assertEquals("anyVar", s);
-
- List<TypeExpression> typeExprList = new ArrayList<TypeExpression>();
+
+ List<ITypeExpression> typeExprList = new ArrayList<ITypeExpression>();
typeExprList.add(typeExpr1);
typeExprList.add(typeExpr2);
TypeListExpression tle1 = new SimpleTypeListExpression(typeExprList);
- TypeListExpression tle2 = new ReferenceTypeListExpression(var);
+ TypeListExpression tle2 = new TypeListVariableExpression(var);
s = v.verbalize(tle1);
assertEquals("{Type1, typeVar}", s);
s = v.verbalize(tle2);
assertEquals("anyVar", s);
-
+
}
}
Propchange: uima/ruta/trunk/ruta-ep-ide/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 4 10:33:48 2016
@@ -1 +1,2 @@
/uima/ruta/branches/UIMA-3569/ruta-ep-ide:1568267-1569288
+/uima/ruta/branches/UIMA-4408/ruta-ep-ide:1711496-1722822
Modified: uima/ruta/trunk/ruta-ep-ide/src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaLexer.g
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-ide/src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaLexer.g?rev=1722834&r1=1722833&r2=1722834&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-ep-ide/src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaLexer.g (original)
+++ uima/ruta/trunk/ruta-ep-ide/src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaLexer.g Mon Jan 4 10:33:48 2016
@@ -363,6 +363,10 @@ STRINGLIST
: 'STRINGLIST';
TYPELIST: 'TYPELIST';
+ANNOTATION
+ : 'ANNOTATION';
+ANNOTATIONLIST
+ : 'ANNOTATIONLIST';
EXP : 'EXP';
@@ -376,6 +380,10 @@ TRUE : 'true';
FALSE : 'false';
NULL : 'null';
+
+ADDRESS_PREFIX
+ : '$';
+
STARTANCHOR
: '@';
Modified: uima/ruta/trunk/ruta-ep-ide/src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaLexer.tokens
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-ide/src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaLexer.tokens?rev=1722834&r1=1722833&r2=1722834&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-ep-ide/src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaLexer.tokens (original)
+++ uima/ruta/trunk/ruta-ep-ide/src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaLexer.tokens Mon Jan 4 10:33:48 2016
@@ -1,163 +1,169 @@
-STAR=149
-FloatTypeSuffix=125
-OctalLiteral=123
-LOG=37
-CONTAINS=8
-REMOVE=72
-GREATEREQUAL=162
-MARKFAST=41
-CONDITION=102
-MATCHEDTEXT=78
-COUNT=14
-LOGN=111
-DYNAMICANCHORING=58
-NOT=70
-Identifier=135
-ACTION=103
-NOTEQUAL=159
-CLEAR=80
-VBAR=151
-DOUBLELIST=106
-ENDSWITH=65
-RPAREN=137
-CREATE=31
-GREATER=154
-SIN=112
-EXP=110
-CURRENTCOUNT=16
-COS=113
-TAN=114
-TYPELIST=109
-FloatString=94
-LESS=153
-REGEXP=25
-GET=75
-PARTOF=22
-UNMARK=54
-LAST=18
-COMMENT=165
-REMOVEDUPLICATE=73
-UNMARKALL=55
-RBRACK=139
-NEAR=20
-GREEDYANCHORING=59
-LINE_COMMENT=166
-IntegerTypeSuffix=120
-MARKSCORE=39
-REMOVESTRING=79
-TRANSFER=56
-LCURLY=140
-TRIE=7
-FILTERTYPE=47
-MARKFIRST=44
-STRINGLIST=108
-MARKONCE=40
-ScriptString=86
-EngineString=87
-WS=164
-WORDTABLE=11
-WORDLIST=10
-AutomataBlockString=90
-FromString=99
-FloatingPointLiteral=126
-STARTANCHOR=118
-INTLIST=105
-OR=21
-TRIM=60
-JavaIDDigit=134
-FLOATLIST=107
-CALL=48
-Annotation=5
-FALSE=117
-LESSEQUAL=161
-RessourceLiteral=130
-VOTE=27
-Letter=133
-EscapeSequence=127
-SIZE=77
-REMOVEFILTERTYPE=69
-LBRACK=138
-CharacterLiteral=128
-DEL=36
-ATTRIBUTE=34
-TypeString=91
-SHIFT=57
-Exponent=124
-THEN2=82
-ASSIGN_EQUAL=155
-RETAINTYPE=46
-TypeSystemString=97
+ACTION=4
+ADD=5
+ADDFILTERTYPE=6
+ADDRESS_PREFIX=7
+ADDRETAINTYPE=8
+AFTER=9
+ALT_NOTEQUAL=10
+AMPER=11
AND=12
-IntString=92
-ADDFILTERTYPE=68
-BlockString=89
-HexDigit=119
-COLOR=35
-LPAREN=136
-POSITION=24
-IF=28
-LogLevel=83
-CONFIGURE=50
-SLASH=150
-THEN=81
-FILL=33
-COMMA=145
-IS=63
-AMPER=152
-REPLACE=45
-GETLIST=76
-WILDCARD=163
-AsString=100
-EQUAL=158
-GATHER=32
-INLIST=17
-PLUS=147
-BooleanString=96
-GETFEATURE=53
-DOT=143
-ListIdentifier=6
-PARTOFNEQ=23
-BOOLEANLIST=104
-ADD=71
-MARKTABLE=42
-HexLiteral=121
-XOR=115
-PERCENT=156
-MARK=38
-PARSE=30
-PackageString=85
-OldColor=84
-MARKLAST=43
-MERGE=74
-CONTEXTCOUNT=13
-BEFORE=61
-EXEC=49
-ImportString=98
-MINUS=148
-AFTER=62
-DecimalLiteral=122
-SEMI=146
-TRUE=116
-FEATURE=29
-SymbolString=101
-COLON=144
-StringLiteral=129
-StringString=95
-SCORE=26
-QUESTION=157
-ADDRETAINTYPE=66
-UnicodeEscape=131
-RCURLY=141
-STARTSWITH=64
-ASSIGN=51
-REMOVERETAINTYPE=67
-TOTALCOUNT=15
-DECLARE=9
-UimafitString=88
-DocComment=4
-MOFN=19
-OctalEscape=132
-SETFEATURE=52
-DoubleString=93
-CIRCUMFLEX=142
-ALT_NOTEQUAL=160
+ANNOTATION=13
+ANNOTATIONLIST=14
+ASSIGN=15
+ASSIGN_EQUAL=16
+ATTRIBUTE=17
+Annotation=18
+AsString=19
+BEFORE=20
+BOOLEANLIST=21
+BlockString=22
+BooleanString=23
+CALL=24
+CIRCUMFLEX=25
+CLEAR=26
+COLON=27
+COLOR=28
+COMMA=29
+COMMENT=30
+CONDITION=31
+CONFIGURE=32
+CONTAINS=33
+CONTEXTCOUNT=34
+COS=35
+COUNT=36
+CREATE=37
+CURRENTCOUNT=38
+CharacterLiteral=39
+DECLARE=40
+DEL=41
+DOT=42
+DOUBLELIST=43
+DYNAMICANCHORING=44
+DecimalLiteral=45
+DocComment=46
+DoubleString=47
+ENDSWITH=48
+EQUAL=49
+EXEC=50
+EXP=51
+EngineString=52
+EscapeSequence=53
+Exponent=54
+FALSE=55
+FEATURE=56
+FILL=57
+FILTERTYPE=58
+FLOATLIST=59
+FloatString=60
+FloatTypeSuffix=61
+FloatingPointLiteral=62
+FromString=63
+GATHER=64
+GET=65
+GETFEATURE=66
+GETLIST=67
+GREATER=68
+GREATEREQUAL=69
+GREEDYANCHORING=70
+HexDigit=71
+HexLiteral=72
+IF=73
+INLIST=74
+INTLIST=75
+IS=76
+Identifier=77
+ImportString=78
+IntString=79
+IntegerTypeSuffix=80
+JavaIDDigit=81
+LAST=82
+LBRACK=83
+LCURLY=84
+LESS=85
+LESSEQUAL=86
+LINE_COMMENT=87
+LOG=88
+LOGN=89
+LPAREN=90
+Letter=91
+ListIdentifier=92
+LogLevel=93
+MARK=94
+MARKFAST=95
+MARKFIRST=96
+MARKLAST=97
+MARKONCE=98
+MARKSCORE=99
+MARKTABLE=100
+MATCHEDTEXT=101
+MERGE=102
+MINUS=103
+MOFN=104
+NEAR=105
+NOT=106
+NOTEQUAL=107
+NULL=108
+OR=109
+OctalEscape=110
+OctalLiteral=111
+OldColor=112
+PARSE=113
+PARTOF=114
+PARTOFNEQ=115
+PERCENT=116
+PLUS=117
+POSITION=118
+POW=119
+PackageString=120
+QUESTION=121
+RBRACK=122
+RCURLY=123
+REGEXP=124
+REMOVE=125
+REMOVEDUPLICATE=126
+REMOVEFILTERTYPE=127
+REMOVERETAINTYPE=128
+REMOVESTRING=129
+REPLACE=130
+RESOURCE=131
+RETAINTYPE=132
+RPAREN=133
+RessourceLiteral=134
+SCORE=135
+SEMI=136
+SETFEATURE=137
+SHIFT=138
+SIN=139
+SIZE=140
+SLASH=141
+SPLIT=142
+STAR=143
+STARTANCHOR=144
+STARTSWITH=145
+STRINGLIST=146
+ScriptString=147
+StringLiteral=148
+StringString=149
+SymbolString=150
+TAN=151
+THEN=152
+THEN2=153
+TOTALCOUNT=154
+TRANSFER=155
+TRIE=156
+TRIM=157
+TRUE=158
+TYPELIST=159
+TypeString=160
+TypeSystemString=161
+UNMARK=162
+UNMARKALL=163
+UimafitString=164
+UnicodeEscape=165
+VBAR=166
+VOTE=167
+WILDCARD=168
+WORDLIST=169
+WORDTABLE=170
+WS=171
+XOR=172
Modified: uima/ruta/trunk/ruta-ep-ide/src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaParser.tokens
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-ide/src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaParser.tokens?rev=1722834&r1=1722833&r2=1722834&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-ep-ide/src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaParser.tokens (original)
+++ uima/ruta/trunk/ruta-ep-ide/src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaParser.tokens Mon Jan 4 10:33:48 2016
@@ -1,163 +1,169 @@
-STAR=149
-FloatTypeSuffix=125
-OctalLiteral=123
-LOG=37
-CONTAINS=8
-REMOVE=72
-GREATEREQUAL=162
-MARKFAST=41
-CONDITION=102
-MATCHEDTEXT=78
-COUNT=14
-LOGN=111
-DYNAMICANCHORING=58
-NOT=70
-Identifier=135
-ACTION=103
-CLEAR=80
-NOTEQUAL=159
-ENDSWITH=65
-DOUBLELIST=106
-VBAR=151
-RPAREN=137
-CREATE=31
-GREATER=154
-SIN=112
-EXP=110
-CURRENTCOUNT=16
-COS=113
-TAN=114
-TYPELIST=109
-FloatString=94
-LESS=153
-REGEXP=25
-GET=75
-UNMARK=54
-PARTOF=22
-LAST=18
-COMMENT=165
-REMOVEDUPLICATE=73
-UNMARKALL=55
-RBRACK=139
-NEAR=20
-GREEDYANCHORING=59
-LINE_COMMENT=166
-IntegerTypeSuffix=120
-MARKSCORE=39
-REMOVESTRING=79
-TRANSFER=56
-LCURLY=140
-TRIE=7
-FILTERTYPE=47
-MARKFIRST=44
-STRINGLIST=108
-MARKONCE=40
-ScriptString=86
-EngineString=87
-WS=164
-WORDTABLE=11
-WORDLIST=10
-AutomataBlockString=90
-FromString=99
-FloatingPointLiteral=126
-STARTANCHOR=118
-INTLIST=105
-OR=21
-TRIM=60
-JavaIDDigit=134
-FLOATLIST=107
-CALL=48
-Annotation=5
-FALSE=117
-LESSEQUAL=161
-RessourceLiteral=130
-VOTE=27
-Letter=133
-EscapeSequence=127
-SIZE=77
-REMOVEFILTERTYPE=69
-LBRACK=138
-CharacterLiteral=128
-DEL=36
-ATTRIBUTE=34
-TypeString=91
-SHIFT=57
-Exponent=124
-THEN2=82
-ASSIGN_EQUAL=155
-RETAINTYPE=46
+ACTION=4
+ADD=5
+ADDFILTERTYPE=6
+ADDRESS_PREFIX=7
+ADDRETAINTYPE=8
+AFTER=9
+ALT_NOTEQUAL=10
+AMPER=11
AND=12
-TypeSystemString=97
-BlockString=89
-ADDFILTERTYPE=68
-IntString=92
-HexDigit=119
-COLOR=35
-POSITION=24
-LPAREN=136
-IF=28
-LogLevel=83
-CONFIGURE=50
-SLASH=150
-THEN=81
-FILL=33
-COMMA=145
-IS=63
-GETLIST=76
-REPLACE=45
-AMPER=152
-AsString=100
-WILDCARD=163
-EQUAL=158
-GATHER=32
-INLIST=17
-PLUS=147
-BooleanString=96
-GETFEATURE=53
-DOT=143
-ListIdentifier=6
-PARTOFNEQ=23
-ADD=71
-BOOLEANLIST=104
-MARKTABLE=42
-HexLiteral=121
-XOR=115
-MARK=38
-PERCENT=156
-PackageString=85
-PARSE=30
-OldColor=84
-MERGE=74
-MARKLAST=43
-CONTEXTCOUNT=13
-BEFORE=61
-EXEC=49
-ImportString=98
-AFTER=62
-MINUS=148
-DecimalLiteral=122
-TRUE=116
-SEMI=146
-FEATURE=29
-SymbolString=101
-StringString=95
-StringLiteral=129
-COLON=144
-SCORE=26
-QUESTION=157
-ADDRETAINTYPE=66
-UnicodeEscape=131
-STARTSWITH=64
-RCURLY=141
-ASSIGN=51
-REMOVERETAINTYPE=67
-TOTALCOUNT=15
-UimafitString=88
-DECLARE=9
-DocComment=4
-MOFN=19
-SETFEATURE=52
-OctalEscape=132
-DoubleString=93
-CIRCUMFLEX=142
-ALT_NOTEQUAL=160
+ANNOTATION=13
+ANNOTATIONLIST=14
+ASSIGN=15
+ASSIGN_EQUAL=16
+ATTRIBUTE=17
+Annotation=18
+AsString=19
+BEFORE=20
+BOOLEANLIST=21
+BlockString=22
+BooleanString=23
+CALL=24
+CIRCUMFLEX=25
+CLEAR=26
+COLON=27
+COLOR=28
+COMMA=29
+COMMENT=30
+CONDITION=31
+CONFIGURE=32
+CONTAINS=33
+CONTEXTCOUNT=34
+COS=35
+COUNT=36
+CREATE=37
+CURRENTCOUNT=38
+CharacterLiteral=39
+DECLARE=40
+DEL=41
+DOT=42
+DOUBLELIST=43
+DYNAMICANCHORING=44
+DecimalLiteral=45
+DocComment=46
+DoubleString=47
+ENDSWITH=48
+EQUAL=49
+EXEC=50
+EXP=51
+EngineString=52
+EscapeSequence=53
+Exponent=54
+FALSE=55
+FEATURE=56
+FILL=57
+FILTERTYPE=58
+FLOATLIST=59
+FloatString=60
+FloatTypeSuffix=61
+FloatingPointLiteral=62
+FromString=63
+GATHER=64
+GET=65
+GETFEATURE=66
+GETLIST=67
+GREATER=68
+GREATEREQUAL=69
+GREEDYANCHORING=70
+HexDigit=71
+HexLiteral=72
+IF=73
+INLIST=74
+INTLIST=75
+IS=76
+Identifier=77
+ImportString=78
+IntString=79
+IntegerTypeSuffix=80
+JavaIDDigit=81
+LAST=82
+LBRACK=83
+LCURLY=84
+LESS=85
+LESSEQUAL=86
+LINE_COMMENT=87
+LOG=88
+LOGN=89
+LPAREN=90
+Letter=91
+ListIdentifier=92
+LogLevel=93
+MARK=94
+MARKFAST=95
+MARKFIRST=96
+MARKLAST=97
+MARKONCE=98
+MARKSCORE=99
+MARKTABLE=100
+MATCHEDTEXT=101
+MERGE=102
+MINUS=103
+MOFN=104
+NEAR=105
+NOT=106
+NOTEQUAL=107
+NULL=108
+OR=109
+OctalEscape=110
+OctalLiteral=111
+OldColor=112
+PARSE=113
+PARTOF=114
+PARTOFNEQ=115
+PERCENT=116
+PLUS=117
+POSITION=118
+POW=119
+PackageString=120
+QUESTION=121
+RBRACK=122
+RCURLY=123
+REGEXP=124
+REMOVE=125
+REMOVEDUPLICATE=126
+REMOVEFILTERTYPE=127
+REMOVERETAINTYPE=128
+REMOVESTRING=129
+REPLACE=130
+RESOURCE=131
+RETAINTYPE=132
+RPAREN=133
+RessourceLiteral=134
+SCORE=135
+SEMI=136
+SETFEATURE=137
+SHIFT=138
+SIN=139
+SIZE=140
+SLASH=141
+SPLIT=142
+STAR=143
+STARTANCHOR=144
+STARTSWITH=145
+STRINGLIST=146
+ScriptString=147
+StringLiteral=148
+StringString=149
+SymbolString=150
+TAN=151
+THEN=152
+THEN2=153
+TOTALCOUNT=154
+TRANSFER=155
+TRIE=156
+TRIM=157
+TRUE=158
+TYPELIST=159
+TypeString=160
+TypeSystemString=161
+UNMARK=162
+UNMARKALL=163
+UimafitString=164
+UnicodeEscape=165
+VBAR=166
+VOTE=167
+WILDCARD=168
+WORDLIST=169
+WORDTABLE=170
+WS=171
+XOR=172