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 18:22:32 UTC
svn commit: r1676781 - in /uima/ruta/trunk/ruta-core/src/main:
antlr3/org/apache/uima/ruta/parser/RutaParser.g
java/org/apache/uima/ruta/RutaScriptBlock.java
java/org/apache/uima/ruta/rule/RutaRule.java
Author: pkluegl
Date: Wed Apr 29 16:22:31 2015
New Revision: 1676781
URL: http://svn.apache.org/r1676781
Log:
UIMA-4315
- reassign correct block parent
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/RutaScriptBlock.java
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RutaRule.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=1676781&r1=1676780&r2=1676781&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 16:22:31 2015
@@ -697,8 +697,9 @@ level--;
LCURLY body = statements RCURLY
{block.setElements(body);
- // really needs to know of the block?
- //$blockDeclaration::env.getScript().addBlock(type,block);
+
+ {$blockDeclaration::env = block.getParent();}
+
}
;
Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaScriptBlock.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaScriptBlock.java?rev=1676781&r1=1676780&r2=1676781&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaScriptBlock.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaScriptBlock.java Wed Apr 29 16:22:31 2015
@@ -73,7 +73,8 @@ public class RutaScriptBlock extends Rut
@Override
public String toString() {
String ruleString = rule == null ? "Document" : rule.toString();
- return "BLOCK(" + name + ") " + ruleString + " containing " + elements.size() + " Elements";
+ int elementSize = elements == null ? 0 : elements.size();
+ return "BLOCK(" + name + ") " + ruleString + " containing " + elementSize + " Elements";
}
}
Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RutaRule.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RutaRule.java?rev=1676781&r1=1676780&r2=1676781&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RutaRule.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RutaRule.java Wed Apr 29 16:22:31 2015
@@ -51,7 +51,7 @@ public class RutaRule extends AbstractRu
@Override
public String toString() {
- return root.toString();
+ return root == null ? "<empty>": root.toString();
}
public final List<RuleElement> getRuleElements() {