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 2015/04/29 11:56:59 UTC
svn commit: r1676707 - in /uima/ruta/trunk/ruta-core/src:
main/java/org/apache/uima/ruta/engine/ test/java/org/apache/uima/ruta/
test/java/org/apache/uima/ruta/action/
test/java/org/apache/uima/ruta/engine/ test/resources/org/apache/uima/ruta/
test/res...
Author: pkluegl
Date: Wed Apr 29 09:56:57 2015
New Revision: 1676707
URL: http://svn.apache.org/r1676707
Log:
UIMA-4369
- applied patch
Modified:
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaEngine.java
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/LoadResourceFromClassPathTest.java
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/LoadScriptFromClassPathTest.java
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/NBSPWSTest.java
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/NullExpressionTest.java
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/Quantifier6Test.java
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/RemoveDocumentAnnotationTest.java
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/WSDictionaryTest.java
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/WildCard2Test.java
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MarkFirstActionTest.java
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/ViewWriterTest.java
uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/FilteringTest.ruta
uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/Main.ruta
uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/OutOfWindowTest.ruta
uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/Quantifier2Test.ruta
uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/RuleInference2Test.ruta
uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/RuleInference3Test.ruta
uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/WildCard1Test.ruta
uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/AddFilterTypeTest.ruta
uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/AddRetainTypeTest.ruta
uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/ClearTest.ruta
uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/FillTest.ruta
uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/FilterTypeTest.ruta
uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/GetFeatureTest.ruta
uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/GetListTest.ruta
uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/GetTest.ruta
uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/MarkFastTest.ruta
uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/MarkLastTest.ruta
uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/MarkScoreTest.ruta
uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/MarkTableTest.ruta
uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/MergeTest.ruta
uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/RemoveDuplicateTest.ruta
uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/RemoveFilterTypeTest.ruta
uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/RemoveRetainTypeTest.ruta
uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/RemoveTest.ruta
uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/ReplaceTest.ruta
uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/RetainTypeTest.ruta
uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/SetFeatureTest.ruta
uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/Shift1Test.ruta
uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/Shift2Test.ruta
uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/TransferTest.ruta
uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/TrieTest.ruta
uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/TrieTestWithFeature.ruta
uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/TrieTest_compressed.ruta
uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/TrimTest.ruta
uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/condition/FeatureTest.ruta
uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/condition/TotalCountTest.ruta
uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/engine/RutaModifierTest.ruta
Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaEngine.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaEngine.java?rev=1676707&r1=1676706&r2=1676707&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaEngine.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaEngine.java Wed Apr 29 09:56:57 2015
@@ -159,7 +159,7 @@ public class RutaEngine extends JCasAnno
* refered to by language elements, e.g., by executing the containing rules. An exemplary value of
* this parameter is "org.apache.uima.SecondaryScript". In this example, the main script could
* import this script file by the declaration "SCRIPT org.apache.uima.SecondaryScript;" and then
- * could execute it with the rule "Document{-> CALL(SecondaryScript)};".
+ * could execute it with the rule "CALL(SecondaryScript);".
*/
public static final String PARAM_ADDITIONAL_SCRIPTS = "additionalScripts";
Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/LoadResourceFromClassPathTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/LoadResourceFromClassPathTest.java?rev=1676707&r1=1676706&r2=1676707&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/LoadResourceFromClassPathTest.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/LoadResourceFromClassPathTest.java Wed Apr 29 09:56:57 2015
@@ -45,9 +45,9 @@ public class LoadResourceFromClassPathTe
String script = "WORDTABLE table = '/org/apache/uima/ruta/action/table.csv';\n";
script += "WORDLIST list = '/org/apache/uima/ruta/action/trie.mtwl';\n";
script += "WORDLIST list2 = '/org/apache/uima/ruta/action/firstnames.txt';\n";
- script += "Document{->TRIE(\"FirstNames.txt\" = T1, \"LastNames.txt\" = T2, list, true, 4, false, 0, \".,-/\")};\n";
- script += "Document{-> MARKTABLE(Person, 1, table, true, 0, \"\", 0, \"firstname\" = 2, \"system\" = 3)};\n";
- script += "Document{-> MARKFAST(T3, list2)};\n";
+ script += "TRIE(\"FirstNames.txt\" = T1, \"LastNames.txt\" = T2, list, true, 4, false, 0, \".,-/\");\n";
+ script += "MARKTABLE(Person, 1, table, true, 0, \"\", 0, \"firstname\" = 2, \"system\" = 3);\n";
+ script += "MARKFAST(T3, list2);\n";
Map<String, String> complexTypes = new TreeMap<String, String>();
String typeName = "org.apache.uima.Person";
@@ -137,9 +137,9 @@ public class LoadResourceFromClassPathTe
String script = "WORDTABLE table = 'classpath:/org/apache/uima/ruta/action/table.csv';\n";
script += "WORDLIST list = 'classpath:/org/apache/uima/ruta/action/trie.mtwl';\n";
script += "WORDLIST list2 = 'classpath:/org/apache/uima/ruta/action/firstnames.txt';\n";
- script += "Document{->TRIE(\"FirstNames.txt\" = T1, \"LastNames.txt\" = T2, list, true, 4, false, 0, \".,-/\")};\n";
- script += "Document{-> MARKTABLE(Person, 1, table, true, 0, \"\", 0, \"firstname\" = 2, \"system\" = 3)};\n";
- script += "Document{-> MARKFAST(T3, list2)};\n";
+ script += "TRIE(\"FirstNames.txt\" = T1, \"LastNames.txt\" = T2, list, true, 4, false, 0, \".,-/\");\n";
+ script += "MARKTABLE(Person, 1, table, true, 0, \"\", 0, \"firstname\" = 2, \"system\" = 3);\n";
+ script += "MARKFAST(T3, list2);\n";
Map<String, String> complexTypes = new TreeMap<String, String>();
String typeName = "org.apache.uima.Person";
Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/LoadScriptFromClassPathTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/LoadScriptFromClassPathTest.java?rev=1676707&r1=1676706&r2=1676707&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/LoadScriptFromClassPathTest.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/LoadScriptFromClassPathTest.java Wed Apr 29 09:56:57 2015
@@ -40,7 +40,7 @@ public class LoadScriptFromClassPathTest
public void test() {
String document = "Peter, Jochen, Flo und Georg.";
String script = "SCRIPT org.apache.uima.ruta.RuleInference1Test;\n";
- script += "Document{-> CALL(RuleInference1Test)};\n";
+ script += "CALL(RuleInference1Test);\n";
Map<String, Object> parameters = new HashMap<String, Object>();
parameters.put(RutaEngine.PARAM_ADDITIONAL_SCRIPTS,
Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/NBSPWSTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/NBSPWSTest.java?rev=1676707&r1=1676706&r2=1676707&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/NBSPWSTest.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/NBSPWSTest.java Wed Apr 29 09:56:57 2015
@@ -35,7 +35,7 @@ public class NBSPWSTest {
public void test() {
String document = ((char) 160) + "-" + ((char) 8239) + "-" + ((char) 65279) + "-" + ((char) 8199)
+ "-" + ((char) 6158);
- String script = "Document{-> RETAINTYPE(SPACE)};";
+ String script = "RETAINTYPE(SPACE);";
script += "WS{-> T1};";
CAS cas = null;
try {
Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/NullExpressionTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/NullExpressionTest.java?rev=1676707&r1=1676706&r2=1676707&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/NullExpressionTest.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/NullExpressionTest.java Wed Apr 29 09:56:57 2015
@@ -42,7 +42,7 @@ public class NullExpressionTest {
public void test() {
String document = "Some text.";
String script = "";
- script += "Document{-> CREATE(A, \"a\" = \"test\", \"b\" = SW), CREATE(B, \"a\" = \"test\", \"b\" = SW)};\n";
+ script += "CREATE(A, \"a\" = \"test\", \"b\" = SW), CREATE(B, \"a\" = \"test\", \"b\" = SW);\n";
script += "A.a != null{-> T5};";
script += "A.b != null{-> T6};";
script += "A{-> A.a = null, A.b = null};";
Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/Quantifier6Test.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/Quantifier6Test.java?rev=1676707&r1=1676706&r2=1676707&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/Quantifier6Test.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/Quantifier6Test.java Wed Apr 29 09:56:57 2015
@@ -34,9 +34,9 @@ public class Quantifier6Test {
@Test
public void test() {
String document = "A1B-2C3-D4E";
- String script = "Document{->RETAINTYPE(WS)};\n";
+ String script = "RETAINTYPE(WS);\n";
script += "(CW | NUM)+{-PARTOF(T1)-> MARK(T1, 1, 2)} (SPECIAL{REGEXP(\"-\")} (CW | NUM)+)+;\n";
- script += "Document{->RETAINTYPE};\n";
+ script += "RETAINTYPE;\n";
CAS cas = null;
try {
Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/RemoveDocumentAnnotationTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/RemoveDocumentAnnotationTest.java?rev=1676707&r1=1676706&r2=1676707&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/RemoveDocumentAnnotationTest.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/RemoveDocumentAnnotationTest.java Wed Apr 29 09:56:57 2015
@@ -43,7 +43,7 @@ public class RemoveDocumentAnnotationTes
script += "\"text\" -> T2;";
script += "(T1 T2){-> T3};";
script += "DocumentAnnotation{-> T4};";
- script += "Document{-> T5};";
+ script += "T5;";
CAS cas = null;
try {
cas = RutaTestUtils.getCAS(document);
Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/WSDictionaryTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/WSDictionaryTest.java?rev=1676707&r1=1676706&r2=1676707&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/WSDictionaryTest.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/WSDictionaryTest.java Wed Apr 29 09:56:57 2015
@@ -47,7 +47,7 @@ public class WSDictionaryTest {
document += "PeterKluegl, MarshallSchor, JoernKottmann\n";
document += "Peter<x>Kluegl, Marshall<x>Schor, Joern<x>Kottmann\n";
String script = "WORDLIST list = 'org/apache/uima/ruta/WSDictionaryTestList.txt';";
- script += "Document{-> MARKFAST(T1,list)};";
+ script += "MARKFAST(T1, list);";
CAS cas = null;
try {
cas = RutaTestUtils.getCAS(document);
@@ -85,7 +85,7 @@ public class WSDictionaryTest {
document += "PeterKluegl, MarshallSchor, JoernKottmann\n";
document += "Peter<x>Kluegl, Marshall<x>Schor, Joern<x>Kottmann\n";
String script = "WORDLIST list = 'org/apache/uima/ruta/WSDictionaryTestList.txt';";
- script += "Document{-> MARKFAST(T1,list, true, 0, false)};";
+ script += "MARKFAST(T1, list, true, 0, false);";
CAS cas = null;
Map<String,Object> map = new HashMap<String, Object>();
map.put(RutaEngine.PARAM_DICT_REMOVE_WS, true);
@@ -125,7 +125,7 @@ public class WSDictionaryTest {
document += "PeterKluegl, MarshallSchor, JoernKottmann\n";
document += "Peter<x>Kluegl, Marshall<x>Schor, Joern<x>Kottmann\n";
String script = "WORDTABLE table = 'org/apache/uima/ruta/table2.csv';";
- script += "Document{-> MARKTABLE(Struct, 1, table, true, 0, \"-.,\", 10, \"name\" = 1, \"system\" = 2)};";
+ script += "MARKTABLE(Struct, 1, table, true, 0, \"-.,\", 10, \"name\" = 1, \"system\" = 2);";
Map<String, String> complexTypes = new TreeMap<String, String>();
String typeName = "org.apache.uima.Struct";
Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/WildCard2Test.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/WildCard2Test.java?rev=1676707&r1=1676706&r2=1676707&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/WildCard2Test.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/WildCard2Test.java Wed Apr 29 09:56:57 2015
@@ -38,11 +38,11 @@ public class WildCard2Test {
document +="\n";
document += "Stephen Soderland, Claire Cardie, and Raymond Mooney. Learning Information Extraction Rules for Semi-Structured and Free Text. In Machine Learning, volume 34, pages 233â272, 1999.";
String script = "";
- script += "Document{-> RETAINTYPE(BREAK, SPACE)};\n";
+ script += "RETAINTYPE(BREAK, SPACE);\n";
script += "#{-> T6} BREAK #{-> T6};\n";
script += "T6{-> TRIM(BREAK, SPACE)};\n";
script += "CW{REGEXP(\".\")} PERIOD{->T7};\n";
- script += "Document{-> RETAINTYPE};\n";
+ script += "RETAINTYPE;\n";
script += "BLOCK(forEach) T6 {}{\n";
script += "(# COLON){-> T1} (# PERIOD){-> T2} # \"(\" NUM{REGEXP(\"....\")-> T3} \")\";\n";
script += "(#{-CONTAINS(COLON)} PERIOD{-PARTOF(T7)}){-> T1} (# PERIOD){-> T2} # NUM{REGEXP(\"....\")-> T3};\n";
Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MarkFirstActionTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MarkFirstActionTest.java?rev=1676707&r1=1676706&r2=1676707&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MarkFirstActionTest.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MarkFirstActionTest.java Wed Apr 29 09:56:57 2015
@@ -35,7 +35,7 @@ public class MarkFirstActionTest {
@Test
public void test() {
String document = "Peter Kluegl, Joern Kottmann, Marshall Schor.";
- String script = "Document{-> MARKFIRST(T1)};\n";
+ String script = "MARKFIRST(T1);\n";
CAS cas = null;
try {
cas = RutaTestUtils.getCAS(document);
Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/ViewWriterTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/ViewWriterTest.java?rev=1676707&r1=1676706&r2=1676707&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/ViewWriterTest.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/ViewWriterTest.java Wed Apr 29 09:56:57 2015
@@ -112,9 +112,9 @@ public class ViewWriterTest {
StringBuilder scriptSB = new StringBuilder();
scriptSB.append("ENGINE ViewWriter;\n");
String absolutePath = xmiOutputFile.getAbsolutePath().replaceAll("\\\\", "/");
- scriptSB.append("Document{ -> CONFIGURE(ViewWriter, \"inputView\" = \"" + NEW_VIEW
+ scriptSB.append("CONFIGURE(ViewWriter, \"inputView\" = \"" + NEW_VIEW
+ "\", \"outputView\" = \"_InitialView\", \"output\" = \"" + absolutePath
- + "\"), EXEC(ViewWriter)};\n");
+ + "\"), EXEC(ViewWriter);\n");
FileUtils.saveString2File(scriptSB.toString(), scriptFile, "UTF-8");
URL url = RutaEngine.class.getClassLoader().getResource("BasicEngine.xml");
Modified: uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/FilteringTest.ruta
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/FilteringTest.ruta?rev=1676707&r1=1676706&r2=1676707&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/FilteringTest.ruta (original)
+++ uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/FilteringTest.ruta Wed Apr 29 09:56:57 2015
@@ -3,26 +3,26 @@ PACKAGE org.apache.uima;
DECLARE T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25;
-Document{-> RETAINTYPE(SPACE)};
+RETAINTYPE(SPACE);
W W{-> MARK(T1)};
W PM SPACE W{-> MARK(T2,1,2,3,4)};
-Document{-> FILTERTYPE(W)};
+FILTERTYPE(W);
W{-> MARK(T3)};
(PM SPACE)+{-> MARK(T4)};
-Document{-> RETAINTYPE(W)};
+RETAINTYPE(W);
-Document{-> FILTERTYPE(T4)};
+FILTERTYPE(T4);
W ANY{-> MARK(T5,1,2)};
-Document{-> FILTERTYPE, RETAINTYPE};
+FILTERTYPE, RETAINTYPE;
(((CW PM) CW){-> MARK(T15)} COMMA)
(CW SW (CW PERIOD){-> MARK(T16)})
- {-> MARK(T17)};
\ No newline at end of file
+ {-> MARK(T17)};
Modified: uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/Main.ruta
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/Main.ruta?rev=1676707&r1=1676706&r2=1676707&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/Main.ruta (original)
+++ uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/Main.ruta Wed Apr 29 09:56:57 2015
@@ -1,3 +1,3 @@
PACKAGE org.apache.uima.ruta;
SCRIPT org.apache.uima.ruta.Additional;
-Document{-> CALL(Additional)};
+CALL(Additional);
Modified: uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/OutOfWindowTest.ruta
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/OutOfWindowTest.ruta?rev=1676707&r1=1676706&r2=1676707&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/OutOfWindowTest.ruta (original)
+++ uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/OutOfWindowTest.ruta Wed Apr 29 09:56:57 2015
@@ -1,13 +1,13 @@
PACKAGE org.apache.uima;
DECLARE T1, T2, T3, T4;
-Document{-> RETAINTYPE(BREAK)};
+RETAINTYPE(BREAK);
ANY+{-PARTOF(BREAK), -PARTOF(T1) -> MARK(T1)};
-Document{-> RETAINTYPE};
+RETAINTYPE;
W PM W{-> MARK(T2,1,2,3)};
BLOCK(forEach) T1{}{
T2{-> MARK(T3)};
ANY T2{-> MARK(T4)};
-}
\ No newline at end of file
+}
Modified: uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/Quantifier2Test.ruta
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/Quantifier2Test.ruta?rev=1676707&r1=1676706&r2=1676707&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/Quantifier2Test.ruta (original)
+++ uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/Quantifier2Test.ruta Wed Apr 29 09:56:57 2015
@@ -12,9 +12,9 @@ W {REGEXP("C") -> MARK(T22)};
T20+?{->MARK(T1, 1, 2)} T20;
-Document{-> FILTERTYPE(T21)};
+FILTERTYPE(T21);
T20+?{-PARTOF(T1) -> MARK(T2, 1, 2)} T20;
T20+{-PARTOF(T1) -> MARK(T3, 1, 2)} T20;
T20+?{ -> MARK(T4, 1, 2)} T20;
-T20*{ -> MARK(T5, 1, 2)} T20;
\ No newline at end of file
+T20*{ -> MARK(T5, 1, 2)} T20;
Modified: uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/RuleInference2Test.ruta
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/RuleInference2Test.ruta?rev=1676707&r1=1676706&r2=1676707&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/RuleInference2Test.ruta (original)
+++ uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/RuleInference2Test.ruta Wed Apr 29 09:56:57 2015
@@ -3,9 +3,9 @@ PACKAGE org.apache.uima;
DECLARE T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25;
-Document{->RETAINTYPE(BREAK)};
+RETAINTYPE(BREAK);
//BREAK BREAK{-> MARK(T1,1,2,3,4)} BREAK BREAK{-> LOG("FOUND T2 BREAK")};
BREAK BREAK{-> MARK(T1,1,2)};
ANY+{-PARTOF(T2), -PARTOF(BREAK)-> MARK(T2)} BREAK;
T2 BREAK[1,2] ANY+{-PARTOF(BREAK),-PARTOF(T2) -> MARK(T2)};
-Document{->RETAINTYPE};
\ No newline at end of file
+RETAINTYPE;
Modified: uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/RuleInference3Test.ruta
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/RuleInference3Test.ruta?rev=1676707&r1=1676706&r2=1676707&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/RuleInference3Test.ruta (original)
+++ uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/RuleInference3Test.ruta Wed Apr 29 09:56:57 2015
@@ -7,7 +7,7 @@ DECLARE T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T
// T3 = FirstLBrack
// T4 = RefStart
-Document{-> RETAINTYPE(BREAK)};
+RETAINTYPE(BREAK);
SPECIAL{REGEXP("\\[") -> MARK(T1)};
SPECIAL{REGEXP("\\]") -> MARK(T2)};
@@ -15,4 +15,4 @@ SPECIAL{REGEXP("\\]") -> MARK(T2)};
T1{POSITION(Document,1) -> MARK(T3)};
BREAK T1 ANY[1,10]{-PARTOF(T2) -> MARK(T4, 2, 3, 4)} T2;
-T1{PARTOF(T3)} ANY[1,10]{-PARTOF(T2) -> MARK(T4, 1, 2, 3, 4)} T2;
\ No newline at end of file
+T1{PARTOF(T3)} ANY[1,10]{-PARTOF(T2) -> MARK(T4, 1, 2, 3, 4)} T2;
Modified: uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/WildCard1Test.ruta
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/WildCard1Test.ruta?rev=1676707&r1=1676706&r2=1676707&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/WildCard1Test.ruta (original)
+++ uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/WildCard1Test.ruta Wed Apr 29 09:56:57 2015
@@ -5,15 +5,15 @@ DECLARE T1, T2, T3, T4, T5, T6, T7, T8,
CW{-PARTOF(T1)} #{-> MARK(T1,1,2)};
-Document{-> DYNAMICANCHORING(true)};
+DYNAMICANCHORING(true);
#{-PARTOF(T2)-> MARK(T2,1,2)} CW;
#{-PARTOF(T3) -> MARK(T3,1,2)} PERIOD;
-Document{-> DYNAMICANCHORING(false)};
+DYNAMICANCHORING(false);
CW{-PARTOF(T4)} #{-> MARK(T4,1,2,3)} PERIOD;
#{-> MARK(T5)} PERIOD;
-Document{-> DYNAMICANCHORING(true)};
+DYNAMICANCHORING(true);
#{-PARTOF(T6) -> MARK(T6)} PERIOD;
-Document{-> DYNAMICANCHORING(false)};
+DYNAMICANCHORING(false);
#{-> MARK(T7)};
# #{-> MARK(T8)};
"Ruta" #{-> MARK(T9)} ".";
@@ -27,15 +27,15 @@ T4{-PARTOF(T15) -> MARK(T15,1,2)} T4;
BLOCK(window) T15{}{
CW{-PARTOF(T16)} #{-> MARK(T16,1,2)};
- Document{-> DYNAMICANCHORING(true)};
+ DYNAMICANCHORING(true);
#{-PARTOF(T17)-> MARK(T17,1,2)} CW;
#{-PARTOF(T18) -> MARK(T18,1,2)} PERIOD;
- Document{-> DYNAMICANCHORING(false)};
+ DYNAMICANCHORING(false);
CW{-PARTOF(T19)} #{-> MARK(T19,1,2,3)} PERIOD;
#{-> MARK(T20)} PERIOD;
- Document{-> DYNAMICANCHORING(true)};
+ DYNAMICANCHORING(true);
#{-PARTOF(T21) -> MARK(T21)} PERIOD;
- Document{-> DYNAMICANCHORING(false)};
+ DYNAMICANCHORING(false);
#{-> MARK(T22)};
# #{-> MARK(T23)};
"Ruta" #{-> MARK(T24)} ".";
@@ -45,7 +45,3 @@ BLOCK(window) T15{}{
CW{-PARTOF(T28)} #{-> MARK(T28,1,2,3)} (SW PERIOD);
CW{-PARTOF(T29)} #{-> MARK(T29,1,2,3)} ("elements" PERIOD);
}
-
-
-
-
Modified: uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/AddFilterTypeTest.ruta
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/AddFilterTypeTest.ruta?rev=1676707&r1=1676706&r2=1676707&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/AddFilterTypeTest.ruta (original)
+++ uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/AddFilterTypeTest.ruta Wed Apr 29 09:56:57 2015
@@ -2,7 +2,6 @@ PACKAGE org.apache.uima;
DECLARE T1, T2, T3, T4, T5, T6, T7, T8;
-Document{ -> RETAINTYPE(SPACE, MARKUP)};
-Document{ -> ADDFILTERTYPE(W)};
+RETAINTYPE(SPACE, MARKUP);
+ADDFILTERTYPE(W);
SPACE MARKUP{-> MARK(T1,1,2)};
-
Modified: uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/AddRetainTypeTest.ruta
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/AddRetainTypeTest.ruta?rev=1676707&r1=1676706&r2=1676707&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/AddRetainTypeTest.ruta (original)
+++ uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/AddRetainTypeTest.ruta Wed Apr 29 09:56:57 2015
@@ -2,7 +2,7 @@ PACKAGE org.apache.uima;
DECLARE T1, T2, T3, T4, T5, T6, T7, T8;
-Document{ -> ADDRETAINTYPE(SPACE, MARKUP)};
-Document{ -> FILTERTYPE(W)};
+ADDRETAINTYPE(SPACE, MARKUP);
+FILTERTYPE(W);
SPACE MARKUP{-> MARK(T1,1,2)};
Modified: uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/ClearTest.ruta
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/ClearTest.ruta?rev=1676707&r1=1676706&r2=1676707&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/ClearTest.ruta (original)
+++ uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/ClearTest.ruta Wed Apr 29 09:56:57 2015
@@ -5,9 +5,9 @@ DECLARE T1, T2, T3, T4, T5, T6, T7, T8;
TYPELIST list1 = {ANY, W, CW};
TYPELIST list2;
-Document{-> ADD(list1, NUM)};
-Document{-> ADD(list2, NUM)};
+ADD(list1, NUM);
+ADD(list2, NUM);
-Document{ -> CLEAR(list1), CLEAR(list2)};
+CLEAR(list1), CLEAR(list2);
Document{SIZE(list1,3,3) -> MARK(T1)};
-Document{SIZE(list2,0,0) -> MARK(T2)};
\ No newline at end of file
+Document{SIZE(list2,0,0) -> MARK(T2)};
Modified: uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/FillTest.ruta
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/FillTest.ruta?rev=1676707&r1=1676706&r2=1676707&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/FillTest.ruta (original)
+++ uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/FillTest.ruta Wed Apr 29 09:56:57 2015
@@ -2,5 +2,5 @@ PACKAGE org.apache.uima;
DECLARE Document LanguageStorage(STRING language);
-Document{ -> MARK(LanguageStorage)};
+MARK(LanguageStorage);
LanguageStorage{-> FILL(LanguageStorage, "language" = "en")};
Modified: uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/FilterTypeTest.ruta
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/FilterTypeTest.ruta?rev=1676707&r1=1676706&r2=1676707&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/FilterTypeTest.ruta (original)
+++ uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/FilterTypeTest.ruta Wed Apr 29 09:56:57 2015
@@ -2,7 +2,7 @@ PACKAGE org.apache.uima;
DECLARE T1, T2, T3, T4, T5, T6, T7, T8;
-Document{ -> RETAINTYPE(SPACE, MARKUP)};
-Document{ -> FILTERTYPE(W)};
+RETAINTYPE(SPACE, MARKUP);
+FILTERTYPE(W);
SPACE MARKUP{-> MARK(T1,1,2)};
Modified: uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/GetFeatureTest.ruta
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/GetFeatureTest.ruta?rev=1676707&r1=1676706&r2=1676707&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/GetFeatureTest.ruta (original)
+++ uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/GetFeatureTest.ruta Wed Apr 29 09:56:57 2015
@@ -3,5 +3,5 @@ PACKAGE org.apache.uima;
DECLARE T1;
STRING language;
-Document{-> GETFEATURE("language", language)};
+GETFEATURE("language", language);
Document{REGEXP(language, "x-unspecified") -> MARK(T1)};
Modified: uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/GetListTest.ruta
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/GetListTest.ruta?rev=1676707&r1=1676706&r2=1676707&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/GetListTest.ruta (original)
+++ uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/GetListTest.ruta Wed Apr 29 09:56:57 2015
@@ -6,11 +6,11 @@ TYPELIST list1;
TYPELIST list2;
TYPELIST list3;
-Document{ -> GETLIST(list1, "Types")};
+GETLIST(list1, "Types");
Document{SIZE(list1,1,1) -> MARK(T1)};
-Document{ -> GETLIST(list1, "Types:Begin")};
+GETLIST(list1, "Types:Begin");
Document{SIZE(list1,3,3) -> MARK(T2)};
-Document{ -> GETLIST(list1, "Types:End")};
-Document{SIZE(list1,4,4) -> MARK(T3)};
\ No newline at end of file
+GETLIST(list1, "Types:End");
+Document{SIZE(list1,4,4) -> MARK(T3)};
Modified: uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/GetTest.ruta
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/GetTest.ruta?rev=1676707&r1=1676706&r2=1676707&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/GetTest.ruta (original)
+++ uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/GetTest.ruta Wed Apr 29 09:56:57 2015
@@ -5,5 +5,5 @@ DECLARE T1, T2, T3, T4, T5, T6, T7, T8;
TYPELIST list = {W, SW, CW, SW, CW, W, ANY, CW};
TYPE type;
-Document{-> GET(list, type, "dominant")};
+GET(list, type, "dominant");
type{-> MARK(T1)};
Modified: uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/MarkFastTest.ruta
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/MarkFastTest.ruta?rev=1676707&r1=1676706&r2=1676707&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/MarkFastTest.ruta (original)
+++ uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/MarkFastTest.ruta Wed Apr 29 09:56:57 2015
@@ -4,12 +4,12 @@ WORDLIST list1 = 'MarkFastTestList.txt';
DECLARE T1, T2, T3, T4, T5;
-Document{->MARKFAST(T1, list1, false, 0, true)};
+MARKFAST(T1, list1, false, 0, true);
-Document{->MARKFAST(T2, list1, false, 0, false)};
+MARKFAST(T2, list1, false, 0, false);
-Document{-> RETAINTYPE(SPACE)};
+RETAINTYPE(SPACE);
-Document{->MARKFAST(T3, list1, false, 0, true)};
+MARKFAST(T3, list1, false, 0, true);
-Document{->MARKFAST(T4, list1, false, 0, false)};
\ No newline at end of file
+MARKFAST(T4, list1, false, 0, false);
Modified: uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/MarkLastTest.ruta
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/MarkLastTest.ruta?rev=1676707&r1=1676706&r2=1676707&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/MarkLastTest.ruta (original)
+++ uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/MarkLastTest.ruta Wed Apr 29 09:56:57 2015
@@ -2,6 +2,4 @@ PACKAGE org.apache.uima;
DECLARE T1, T2, T3, T4, T5, T6, T7, T8;
-Document{-> MARKLAST(T1)};
-
-
+MARKLAST(T1);
Modified: uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/MarkScoreTest.ruta
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/MarkScoreTest.ruta?rev=1676707&r1=1676706&r2=1676707&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/MarkScoreTest.ruta (original)
+++ uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/MarkScoreTest.ruta Wed Apr 29 09:56:57 2015
@@ -2,7 +2,7 @@ PACKAGE org.apache.uima;
DECLARE T1, T2, T3, T4, T5, T6, T7, T8;
-Document{-> RETAINTYPE(BREAK)};
+RETAINTYPE(BREAK);
ANY+{-PARTOF(BREAK), -PARTOF(T1) -> MARK(T1)};
T1{CONTAINS(W,1,2) -> MARKSCORE(10, T2)};
Modified: uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/MarkTableTest.ruta
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/MarkTableTest.ruta?rev=1676707&r1=1676706&r2=1676707&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/MarkTableTest.ruta (original)
+++ uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/MarkTableTest.ruta Wed Apr 29 09:56:57 2015
@@ -6,4 +6,4 @@ DECLARE T1, T2, T3, T4, T5;
DECLARE Annotation Person (STRING firstname, STRING system);
-Document{-> MARKTABLE(Person, 1, table, true, 0, "-.,", 10, "firstname" = 2, "system" = 3)};
\ No newline at end of file
+MARKTABLE(Person, 1, table, true, 0, "-.,", 10, "firstname" = 2, "system" = 3);
Modified: uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/MergeTest.ruta
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/MergeTest.ruta?rev=1676707&r1=1676706&r2=1676707&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/MergeTest.ruta (original)
+++ uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/MergeTest.ruta Wed Apr 29 09:56:57 2015
@@ -9,9 +9,9 @@ TYPELIST list3 = {ANY, NUM};
TYPELIST intersection;
TYPELIST union;
-Document{ -> MERGE(true, union, list1, list2, list3)};
+MERGE(true, union, list1, list2, list3);
Document{SIZE(union,8,8) -> MARK(T1)};
-Document{ -> MERGE(false, intersection, list1, list2, list3)};
+MERGE(false, intersection, list1, list2, list3);
Document{SIZE(intersection,1,1) -> MARK(T2)};
Modified: uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/RemoveDuplicateTest.ruta
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/RemoveDuplicateTest.ruta?rev=1676707&r1=1676706&r2=1676707&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/RemoveDuplicateTest.ruta (original)
+++ uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/RemoveDuplicateTest.ruta Wed Apr 29 09:56:57 2015
@@ -4,7 +4,5 @@ DECLARE T1, T2, T3, T4, T5, T6, T7, T8;
TYPELIST typeList = {CW, CW, SW, SW, W};
-Document{ -> REMOVEDUPLICATE(typeList)};
+REMOVEDUPLICATE(typeList);
Document{SIZE(typeList,3,3) -> MARK(T1)};
-
-
Modified: uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/RemoveFilterTypeTest.ruta
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/RemoveFilterTypeTest.ruta?rev=1676707&r1=1676706&r2=1676707&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/RemoveFilterTypeTest.ruta (original)
+++ uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/RemoveFilterTypeTest.ruta Wed Apr 29 09:56:57 2015
@@ -2,9 +2,8 @@ PACKAGE org.apache.uima;
DECLARE T1, T2, T3, T4, T5, T6, T7, T8;
-
-Document{ -> RETAINTYPE(MARKUP)};
-Document{ -> FILTERTYPE(W, NUM)};
-Document{ -> REMOVEFILTERTYPE(W)};
+RETAINTYPE(MARKUP);
+FILTERTYPE(W, NUM);
+REMOVEFILTERTYPE(W);
ANY ANY MARKUP{-> MARK(T1,1,2)};
Modified: uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/RemoveRetainTypeTest.ruta
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/RemoveRetainTypeTest.ruta?rev=1676707&r1=1676706&r2=1676707&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/RemoveRetainTypeTest.ruta (original)
+++ uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/RemoveRetainTypeTest.ruta Wed Apr 29 09:56:57 2015
@@ -2,8 +2,8 @@ PACKAGE org.apache.uima;
DECLARE T1, T2, T3, T4, T5, T6, T7, T8;
-Document{ -> RETAINTYPE(SPACE, MARKUP, CW, SW, NUM)};
-Document{ -> REMOVERETAINTYPE(CW, SW, NUM)};
-Document{ -> FILTERTYPE(W)};
+RETAINTYPE(SPACE, MARKUP, CW, SW, NUM);
+REMOVERETAINTYPE(CW, SW, NUM);
+FILTERTYPE(W);
SPACE MARKUP{-> MARK(T1,1,2)};
Modified: uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/RemoveTest.ruta
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/RemoveTest.ruta?rev=1676707&r1=1676706&r2=1676707&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/RemoveTest.ruta (original)
+++ uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/RemoveTest.ruta Wed Apr 29 09:56:57 2015
@@ -4,7 +4,7 @@ DECLARE T1, T2, T3, T4, T5, T6, T7, T8;
TYPELIST typeList = {CW, CW, SW, SW, W};
-Document{ -> REMOVE(typeList, CW)};
+REMOVE(typeList, CW);
Document{SIZE(typeList,3,3) -> MARK(T1)};
Modified: uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/ReplaceTest.ruta
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/ReplaceTest.ruta?rev=1676707&r1=1676706&r2=1676707&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/ReplaceTest.ruta (original)
+++ uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/ReplaceTest.ruta Wed Apr 29 09:56:57 2015
@@ -2,6 +2,6 @@ PACKAGE org.apache.uima;
DECLARE T1, T2, T3, T4, T5, T6, T7, T8;
-Document{ -> RETAINTYPE(MARKUP)};
+RETAINTYPE(MARKUP);
MARKUP{-> REPLACE("MARKUP")};
Modified: uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/RetainTypeTest.ruta
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/RetainTypeTest.ruta?rev=1676707&r1=1676706&r2=1676707&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/RetainTypeTest.ruta (original)
+++ uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/RetainTypeTest.ruta Wed Apr 29 09:56:57 2015
@@ -2,7 +2,7 @@ PACKAGE org.apache.uima;
DECLARE T1, T2, T3, T4, T5, T6, T7, T8;
-Document{ -> RETAINTYPE(SPACE, MARKUP)};
+RETAINTYPE(SPACE, MARKUP);
SPACE ANY{-> MARK(T1,1,2)};
ANY MARKUP{-> MARK(T2,1,2)};
Modified: uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/SetFeatureTest.ruta
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/SetFeatureTest.ruta?rev=1676707&r1=1676706&r2=1676707&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/SetFeatureTest.ruta (original)
+++ uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/SetFeatureTest.ruta Wed Apr 29 09:56:57 2015
@@ -2,5 +2,5 @@ PACKAGE org.apache.uima;
DECLARE Document LanguageStorage(STRING language);
-Document{ -> MARK(LanguageStorage)};
+MARK(LanguageStorage);
LanguageStorage{-> SETFEATURE("language", "en")};
Modified: uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/Shift1Test.ruta
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/Shift1Test.ruta?rev=1676707&r1=1676706&r2=1676707&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/Shift1Test.ruta (original)
+++ uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/Shift1Test.ruta Wed Apr 29 09:56:57 2015
@@ -2,7 +2,7 @@ PACKAGE org.apache.uima;
DECLARE T1, T2, T3, T4, T5, T6, T7, T8;
-Document{ -> RETAINTYPE(MARKUP)};
+RETAINTYPE(MARKUP);
W+{-PARTOF(T1) -> MARK(T1)};
T1{-> SHIFT(T1, 1, 2)} MARKUP;
Modified: uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/Shift2Test.ruta
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/Shift2Test.ruta?rev=1676707&r1=1676706&r2=1676707&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/Shift2Test.ruta (original)
+++ uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/Shift2Test.ruta Wed Apr 29 09:56:57 2015
@@ -4,6 +4,6 @@ DECLARE T1, T2, T3, T4, T5, T6, T7, T8;
DECLARE Annotation FS (Annotation doc, STRING lang);
-Document{-> CREATE(FS, "doc" = Document, "lang" = "unknown")};
-Document{ -> RETAINTYPE(MARKUP)};
-W{STARTSWITH(FS) -> SHIFT(FS, 1, 2)} W+ MARKUP;
\ No newline at end of file
+CREATE(FS, "doc" = Document, "lang" = "unknown");
+RETAINTYPE(MARKUP);
+W{STARTSWITH(FS) -> SHIFT(FS, 1, 2)} W+ MARKUP;
Modified: uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/TransferTest.ruta
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/TransferTest.ruta?rev=1676707&r1=1676706&r2=1676707&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/TransferTest.ruta (original)
+++ uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/TransferTest.ruta Wed Apr 29 09:56:57 2015
@@ -2,4 +2,4 @@ PACKAGE org.apache.uima;
DECLARE Document LanguageStorage(STRING language);
-Document{ -> TRANSFER(LanguageStorage)};
+TRANSFER(LanguageStorage);
Modified: uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/TrieTest.ruta
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/TrieTest.ruta?rev=1676707&r1=1676706&r2=1676707&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/TrieTest.ruta (original)
+++ uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/TrieTest.ruta Wed Apr 29 09:56:57 2015
@@ -4,6 +4,6 @@ WORDLIST list1 = 'trie.mtwl';
DECLARE T1, T2, T3, T4, T5;
-Document{->TRIE("FirstNames.txt" = T1, "LastNames.txt" = T2,
- "CompleteNames.txt" = T3, "NamesWithSystems.txt" = T4,
- list1, true, 4, false, 0, ":")};
+TRIE("FirstNames.txt" = T1, "LastNames.txt" = T2,
+ "CompleteNames.txt" = T3, "NamesWithSystems.txt" = T4,
+ list1, true, 4, false, 0, ":");
Modified: uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/TrieTestWithFeature.ruta
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/TrieTestWithFeature.ruta?rev=1676707&r1=1676706&r2=1676707&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/TrieTestWithFeature.ruta (original)
+++ uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/TrieTestWithFeature.ruta Wed Apr 29 09:56:57 2015
@@ -2,6 +2,6 @@ PACKAGE org.apache.uima;
WORDLIST list1 = 'trie.mtwl';
-Document{->TRIE("FirstNames.txt" = {A, "a", "first"}, "LastNames.txt" = {B, "b", true},
+TRIE("FirstNames.txt" = {A, "a", "first"}, "LastNames.txt" = {B, "b", true},
"CompleteNames.txt" = {C, "c", 6},
- list1, true, 4, false, 0, ":")};
+ list1, true, 4, false, 0, ":");
Modified: uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/TrieTest_compressed.ruta
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/TrieTest_compressed.ruta?rev=1676707&r1=1676706&r2=1676707&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/TrieTest_compressed.ruta (original)
+++ uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/TrieTest_compressed.ruta Wed Apr 29 09:56:57 2015
@@ -4,6 +4,6 @@ WORDLIST list1 = 'trie_compressed.mtwl';
DECLARE T1, T2, T3, T4, T5;
-Document{->TRIE("FirstNames.txt" = T1, "LastNames.txt" = T2,
+TRIE("FirstNames.txt" = T1, "LastNames.txt" = T2,
"CompleteNames.txt" = T3, "NamesWithSystems.txt" = T4,
- list1, true, 4, false, 0, ":")};
+ list1, true, 4, false, 0, ":");
Modified: uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/TrimTest.ruta
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/TrimTest.ruta?rev=1676707&r1=1676706&r2=1676707&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/TrimTest.ruta (original)
+++ uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/TrimTest.ruta Wed Apr 29 09:56:57 2015
@@ -2,9 +2,9 @@ PACKAGE org.apache.uima;
DECLARE T1, T2, T3, T4, T5, T6, T7, T8;
-Document{ -> RETAINTYPE(SPACE, MARKUP)};
+RETAINTYPE(SPACE, MARKUP);
SPACE ANY+{-PARTOF(T1) -> MARK(T1), MARK(T2), MARK(T3)};
T1{-> TRIM(SPACE), TRIM(MARKUP)};
T2{-> TRIM(SPACE, MARKUP)};
-T3{-> TRIM({SPACE, MARKUP})};
\ No newline at end of file
+T3{-> TRIM({SPACE, MARKUP})};
Modified: uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/condition/FeatureTest.ruta
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/condition/FeatureTest.ruta?rev=1676707&r1=1676706&r2=1676707&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/condition/FeatureTest.ruta (original)
+++ uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/condition/FeatureTest.ruta Wed Apr 29 09:56:57 2015
@@ -5,7 +5,7 @@ DECLARE T1, T2, T3, T4, T5, T6, T7, T8,
DECLARE Annotation FS (STRING string, DOUBLE double, INT int, BOOLEAN boolean);
-Document{-> CREATE(FS, "string" = "string", "double" = 0.5, "int" = 2, "boolean" = true)};
+CREATE(FS, "string" = "string", "double" = 0.5, "int" = 2, "boolean" = true);
FS{FEATURE("string", "string") -> MARK(T1)};
FS{FEATURE("double", 0.5) -> MARK(T2)};
@@ -15,4 +15,4 @@ FS{FEATURE("boolean", true) -> MARK(T4)}
FS{FEATURE("string", "") -> MARK(T5)};
FS{FEATURE("double", 0.6) -> MARK(T5)};
FS{FEATURE("int", 3) -> MARK(T5)};
-FS{FEATURE("boolean", false) -> MARK(T5)};
\ No newline at end of file
+FS{FEATURE("boolean", false) -> MARK(T5)};
Modified: uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/condition/TotalCountTest.ruta
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/condition/TotalCountTest.ruta?rev=1676707&r1=1676706&r2=1676707&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/condition/TotalCountTest.ruta (original)
+++ uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/condition/TotalCountTest.ruta Wed Apr 29 09:56:57 2015
@@ -4,8 +4,8 @@ INT int1 = 0;
DECLARE T1, T2, T3, T4;
-Document{-> RETAINTYPE(SPACE)};
+RETAINTYPE(SPACE);
Document{TOTALCOUNT(CW) -> MARK(T1)};
Document{TOTALCOUNT(SPACE,1,5) -> MARK(T2)};
-Document{TOTALCOUNT(PM,1,10,int1), IF((int1 == 2)) -> MARK(T3)};
\ No newline at end of file
+Document{TOTALCOUNT(PM,1,10,int1), IF((int1 == 2)) -> MARK(T3)};
Modified: uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/engine/RutaModifierTest.ruta
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/engine/RutaModifierTest.ruta?rev=1676707&r1=1676706&r2=1676707&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/engine/RutaModifierTest.ruta (original)
+++ uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/engine/RutaModifierTest.ruta Wed Apr 29 09:56:57 2015
@@ -2,7 +2,7 @@ PACKAGE org.apache.uima;
DECLARE T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24,T25;
-Document{-> RETAINTYPE(MARKUP, SPACE, BREAK)};
+RETAINTYPE(MARKUP, SPACE, BREAK);
MARKUP{ -> DEL}; BREAK{-> DEL};