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 20:52:38 UTC
svn commit: r1676816 - in /uima/ruta/trunk:
ruta-core/src/main/antlr3/org/apache/uima/ruta/parser/
ruta-core/src/main/antlr3/org/apache/uima/ruta/parser/output/
ruta-core/src/test/java/org/apache/uima/ruta/
ruta-ep-ide/src/main/antlr3/org/apache/uima/r...
Author: pkluegl
Date: Wed Apr 29 18:52:37 2015
New Revision: 1676816
URL: http://svn.apache.org/r1676816
Log:
UIMA-4369
- do not allow implicit actions for action-only rules
- fixed test
Added:
uima/ruta/trunk/ruta-core/src/main/antlr3/org/apache/uima/ruta/parser/output/
Modified:
uima/ruta/trunk/ruta-core/src/main/antlr3/org/apache/uima/ruta/parser/RutaParser.g
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/RemoveDocumentAnnotationTest.java
uima/ruta/trunk/ruta-ep-ide/src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaParser.g
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=1676816&r1=1676815&r2=1676816&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 Wed Apr 29 18:52:37 2015
@@ -741,7 +741,7 @@ options {
{stmt = rer;}
|
- as = actions
+ as = rawActions
{stmt = factory.createImplicitRule(as, $blockDeclaration::env);}
SEMI
|
@@ -958,7 +958,10 @@ actions returns [List<AbstractRutaAction
:
a = action {actions.add(a);} (COMMA a = action {actions.add(a);} )*
;
-
+rawActions returns [List<AbstractRutaAction> actions = new ArrayList<AbstractRutaAction>()]
+ :
+ a = rawAction {actions.add(a);} (COMMA a = rawAction {actions.add(a);} )*
+ ;
listExpression returns [ListExpression expr = null]
:
@@ -1522,6 +1525,56 @@ action returns [AbstractRutaAction resu
// | a = variableAction
) {result = a;}
;
+rawAction returns [AbstractRutaAction result = null]
+ :
+ (
+ a = actionColor
+ | a = actionDel
+ | a = actionLog
+ | a = actionMark
+ | a = actionMarkScore
+ | a = actionMarkFast
+ | a = actionMarkLast
+ | a = actionMarkFirst
+ | a = actionReplace
+ | a = actionFilterType
+ | a = actionRetainType
+ | a = actionCreate
+ | a = actionFill
+ | a = actionCall
+ | a = actionAssign
+ | a = actionSetFeature
+ | a = actionGetFeature
+ | a = actionUnmark
+ | a = actionUnmarkAll
+ | a = actionTransfer
+ | a = actionMarkOnce
+ | a = actionTrie
+ | a = actionGather
+ | a = actionExec
+ | a = actionMarkTable
+ | a = actionAdd
+ | a = actionRemove
+ | a = actionRemoveDuplicate
+ | a = actionMerge
+ | a = actionGet
+ | a = actionGetList
+ | a = actionMatchedText
+ | a = actionClear
+ | a = actionShift
+ | a = actionConfigure
+ | a = actionDynamicAnchoring
+ | a = actionGreedyAnchoring
+ | a = actionTrim
+ | a = actionAddRetainType
+ | a = actionRemoveRetainType
+ | a = actionAddFilterType
+ | a = actionRemoveFilterType
+ | (externalAction)=> a = externalAction
+
+// | a = variableAction
+ ) {result = a;}
+ ;
//variableAction returns [AbstractRutaAction action = null]
// :
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=1676816&r1=1676815&r2=1676816&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 18:52:37 2015
@@ -35,7 +35,7 @@ public class RemoveDocumentAnnotationTes
script += "\"text\" -> T2;";
script += "(T1 T2){-> T3};";
script += "DocumentAnnotation{-> T4};";
- script += "T5;";
+ script += "Document{-> T5};";
CAS cas = null;
try {
cas = RutaTestUtils.getCAS(document);
Modified: uima/ruta/trunk/ruta-ep-ide/src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaParser.g
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-ide/src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaParser.g?rev=1676816&r1=1676815&r2=1676816&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-ep-ide/src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaParser.g (original)
+++ uima/ruta/trunk/ruta-ep-ide/src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaParser.g Wed Apr 29 18:52:37 2015
@@ -646,13 +646,14 @@ options {
:
(regexpRule)=> rer = regexpRule {stmt = rer;}
|
+ as = rawActions s = SEMI
+ {stmt = scriptFactory.createImplicitRule(as, s);}
+ |
elements=ruleElementsRoot
{stmt = scriptFactory.createRule(elements, null, false);}
s = SEMI
{stmt = scriptFactory.createRule(elements, s);}
- |
- as = actions s = SEMI
- {stmt = scriptFactory.createImplicitRule(as, s);}
+
;
@@ -825,7 +826,10 @@ actions returns [List<RutaAction> action
:
a = action {actions.add(a);} (COMMA a = action {actions.add(a);} )*
;
-
+rawActions returns [List<RutaAction> actions = new ArrayList<RutaAction>()]
+ :
+ a = rawAction {actions.add(a);} (COMMA a = rawAction {actions.add(a);} )*
+ ;
listExpression returns [Expression expr = null]
:
@@ -1366,6 +1370,59 @@ conditionSize returns [RutaCondition con
RPAREN
;
+rawAction returns [RutaAction result = null]
+@init {
+result = ActionFactory.createEmptyAction(input.LT(1));
+}
+ :
+ (
+ a = actionColor
+ | a = actionDel
+ | a = actionLog
+ | a = actionMark
+ | a = actionMarkScore
+ | a = actionMarkFast
+ | a = actionMarkLast
+ | a = actionMarkFirst
+ | a = actionReplace
+ | a = actionRetainType
+ | a = actionFilterType
+ | a = actionCreate
+ | a = actionFill
+ | a = actionCall
+ | a = actionAssign
+ | a = actionSetFeature
+ | a = actionGetFeature
+ | a = actionUnmark
+ | a = actionUnmarkAll
+ | a = actionTransfer
+ | a = actionMarkOnce
+ | a = actionTrie
+ | a = actionGather
+ | a = actionExec
+ | a = actionMarkTable
+ | a = actionAdd
+ | a = actionRemove
+ | a = actionRemoveDuplicate
+ | a = actionMerge
+ | a = actionGet
+ | a = actionGetList
+ | a = actionMatchedText
+ | a = actionClear
+ | a = actionShift
+ | a = actionConfigure
+ | a = actionDynamicAnchoring
+ | a = actionGreedyAnchoring
+ | a = actionTrim
+ | a = actionAddFilterType
+ | a = actionAddRetainType
+ | a = actionRemoveFilterType
+ | a = actionRemoveRetainType
+ | (externalAction)=> a = externalAction
+
+ // | a = variableAction
+ ) {result = a;}
+ ;
action returns [RutaAction result = null]
@init {