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 2020/03/21 22:27:31 UTC
svn commit: r1875503 - in /uima/ruta/trunk/ruta-core/src:
main/antlr3/org/apache/uima/ruta/parser/ main/java/org/apache/uima/ruta/
test/java/org/apache/uima/ruta/action/
Author: pkluegl
Date: Sat Mar 21 22:27:31 2020
New Revision: 1875503
URL: http://svn.apache.org/viewvc?rev=1875503&view=rev
Log:
UIMA-6192: support assignments of lists, in implicit actions and in ASSIGN
Added:
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/AssignActionTest.java
Modified:
uima/ruta/trunk/ruta-core/src/main/antlr3/org/apache/uima/ruta/parser/RutaParser.g
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/ImplicitActionTest.java
Modified: uima/ruta/trunk/ruta-core/src/main/antlr3/org/apache/uima/ruta/parser/RutaParser.g
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/antlr3/org/apache/uima/ruta/parser/RutaParser.g?rev=1875503&r1=1875502&r2=1875503&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/antlr3/org/apache/uima/ruta/parser/RutaParser.g (original)
+++ uima/ruta/trunk/ruta-core/src/main/antlr3/org/apache/uima/ruta/parser/RutaParser.g Sat Mar 21 22:27:31 2020
@@ -2172,6 +2172,15 @@ actionAssign returns [AbstractRutaAction
{isVariableOfType($blockDeclaration::env, input.LT(1).getText(), "DOUBLE")}?
nv = Identifier COMMA e5 = numberExpression
{action = actionFactory.createAssignAction(nv, e5,$blockDeclaration::env);}
+ |
+ {isVariableOfType($blockDeclaration::env, input.LT(1).getText(), "BOOLEANLIST")||
+ isVariableOfType($blockDeclaration::env, input.LT(1).getText(), "INTLIST")||
+ isVariableOfType($blockDeclaration::env, input.LT(1).getText(), "DOUBLELIST")||
+ isVariableOfType($blockDeclaration::env, input.LT(1).getText(), "FLOATLIST")||
+ isVariableOfType($blockDeclaration::env, input.LT(1).getText(), "STRINGLIST")||
+ isVariableOfType($blockDeclaration::env, input.LT(1).getText(), "TYPELIST")}?
+ nv = Identifier COMMA e7 = listExpression
+ {action = actionFactory.createAssignAction(nv, e7,$blockDeclaration::env);}
) RPAREN
;
Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java?rev=1875503&r1=1875502&r2=1875503&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java Sat Mar 21 22:27:31 2020
@@ -76,6 +76,7 @@ import org.apache.uima.ruta.expression.n
import org.apache.uima.ruta.expression.string.IStringExpression;
import org.apache.uima.ruta.expression.string.IStringListExpression;
import org.apache.uima.ruta.expression.type.ITypeExpression;
+import org.apache.uima.ruta.expression.type.ITypeListExpression;
import org.apache.uima.ruta.rule.AbstractRule;
import org.apache.uima.ruta.rule.AbstractRuleMatch;
import org.apache.uima.ruta.rule.MatchContext;
@@ -1239,8 +1240,24 @@ public class RutaStream extends FSIterat
List<AnnotationFS> v = ((IAnnotationListExpression) expression).getAnnotationList(context,
this);
environment.setVariableValue(var, v);
+ } else if (variableGenericType.equals(Boolean.class)
+ && expression instanceof IBooleanListExpression) {
+ List<Boolean> v = ((IBooleanListExpression) expression).getBooleanList(context, this);
+ environment.setVariableValue(var, v);
+ } else if (Number.class.isAssignableFrom(variableGenericType)
+ && expression instanceof INumberListExpression) {
+ List<Number> v = ((INumberListExpression) expression).getNumberList(context, this);
+ environment.setVariableValue(var, v);
+ } else if (variableGenericType.equals(String.class)
+ && expression instanceof IStringListExpression) {
+ List<String> v = ((IStringListExpression) expression).getStringList(context, this);
+ environment.setVariableValue(var, v);
+ } else if (variableGenericType.equals(Type.class)
+ && expression instanceof ITypeListExpression) {
+ List<Type> v = ((ITypeListExpression) expression).getTypeList(context, this);
+ environment.setVariableValue(var, v);
}
- // TODO assign also other lists
+
}
}
Added: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/AssignActionTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/AssignActionTest.java?rev=1875503&view=auto
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/AssignActionTest.java (added)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/AssignActionTest.java Sat Mar 21 22:27:31 2020
@@ -0,0 +1,88 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.uima.ruta.action;
+
+import org.apache.uima.cas.CAS;
+import org.apache.uima.ruta.engine.Ruta;
+import org.apache.uima.ruta.engine.RutaTestUtils;
+import org.junit.Test;
+
+public class AssignActionTest {
+
+ @Test
+ public void testBooleanListAssignment() throws Exception {
+ String document = "This is a test.";
+
+ String script = "";
+ script += "BOOLEANLIST bl;";
+ script += "ASSIGN(bl, {true});";
+ script += "Document{CONTAINS(bl, true) -> T1};";
+
+ CAS cas = RutaTestUtils.getCAS(document);
+ Ruta.apply(cas, script);
+
+ RutaTestUtils.assertAnnotationsEquals(cas, 1, 1, "This is a test.");
+ }
+
+ @Test
+ public void testIntListAssignment() throws Exception {
+ String document = "This is a test.";
+
+ String script = "";
+ script += "INTLIST il;";
+ script += "ASSIGN(il, {1,2,3});";
+ script += "Document{CONTAINS(il, 2) -> T1};";
+
+ CAS cas = RutaTestUtils.getCAS(document);
+ Ruta.apply(cas, script);
+
+ RutaTestUtils.assertAnnotationsEquals(cas, 1, 1, "This is a test.");
+ }
+
+ @Test
+ public void testStringListAssignment() throws Exception {
+ String document = "This is a test.";
+
+ String script = "";
+ script += "STRINGLIST sl;";
+ script += "ASSIGN(sl, {\"a\",\"b\"});";
+ script += "Document{CONTAINS(sl, \"a\") -> T1};";
+
+ CAS cas = RutaTestUtils.getCAS(document);
+ Ruta.apply(cas, script);
+
+ RutaTestUtils.assertAnnotationsEquals(cas, 1, 1, "This is a test.");
+ }
+
+ @Test
+ public void testTypeListAssignment() throws Exception {
+ String document = "This is a test.";
+
+ String script = "";
+ script += "TYPELIST tl;";
+ script += "ASSIGN(tl, {CW, CAP});";
+ script += "Document{CONTAINS(tl, CW) -> T1};";
+
+ CAS cas = RutaTestUtils.getCAS(document);
+ Ruta.apply(cas, script);
+
+ RutaTestUtils.assertAnnotationsEquals(cas, 1, 1, "This is a test.");
+ }
+}
Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/ImplicitActionTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/ImplicitActionTest.java?rev=1875503&r1=1875502&r2=1875503&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/ImplicitActionTest.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/ImplicitActionTest.java Sat Mar 21 22:27:31 2020
@@ -97,4 +97,63 @@ public class ImplicitActionTest {
cas.release();
}
+ @Test
+ public void testBooleanListAssignment() throws Exception {
+ String document = "This is a test.";
+
+ String script = "";
+ script += "BOOLEANLIST bl;";
+ script += "Document { -> bl = {true}};";
+ script += "Document{CONTAINS(bl, true) -> T1};";
+
+ CAS cas = RutaTestUtils.getCAS(document);
+ Ruta.apply(cas, script);
+
+ RutaTestUtils.assertAnnotationsEquals(cas, 1, 1, "This is a test.");
+ }
+
+ @Test
+ public void testIntListAssignment() throws Exception {
+ String document = "This is a test.";
+
+ String script = "";
+ script += "INTLIST il;";
+ script += "Document { -> il = {1,2,3}};";
+ script += "Document{CONTAINS(il, 2) -> T1};";
+
+ CAS cas = RutaTestUtils.getCAS(document);
+ Ruta.apply(cas, script);
+
+ RutaTestUtils.assertAnnotationsEquals(cas, 1, 1, "This is a test.");
+ }
+
+ @Test
+ public void testStringListAssignment() throws Exception {
+ String document = "This is a test.";
+
+ String script = "";
+ script += "STRINGLIST sl;";
+ script += "Document { -> sl = {\"a\",\"b\"}};";
+ script += "Document{CONTAINS(sl, \"a\") -> T1};";
+
+ CAS cas = RutaTestUtils.getCAS(document);
+ Ruta.apply(cas, script);
+
+ RutaTestUtils.assertAnnotationsEquals(cas, 1, 1, "This is a test.");
+ }
+
+ @Test
+ public void testTypeListAssignment() throws Exception {
+ String document = "This is a test.";
+
+ String script = "";
+ script += "TYPELIST tl;";
+ script += "Document { -> tl = {CW, CAP}};";
+ script += "Document{CONTAINS(tl, CW) -> T1};";
+
+ CAS cas = RutaTestUtils.getCAS(document);
+ Ruta.apply(cas, script);
+
+ RutaTestUtils.assertAnnotationsEquals(cas, 1, 1, "This is a test.");
+ }
}