svn commit: r1481376 - in /uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta: expression/ExpressionFactory.java verbalize/ExpressionVerbalizer.java

[pkluegl]

Author: pkluegl
Date: Sat May 11 17:07:24 2013
New Revision: 1481376

URL: http://svn.apache.org/r1481376
Log:
UIMA-2758
- fixed stackoverflow in verbalization
- fixed missing op assignment

Modified:
    
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/ExpressionFactory.java
    
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/verbalize/ExpressionVerbalizer.java

Modified: 
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/ExpressionFactory.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/ExpressionFactory.java?rev=1481376&r1=1481375&r2=1481376&view=diff
==============================================================================
--- 
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/ExpressionFactory.java
 (original)
+++ 
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/ExpressionFactory.java
 Sat May 11 17:07:24 2013
@@ -242,7 +242,7 @@ public class ExpressionFactory {
     String match = refToken.getText();
     String op = null;
     if (opToken != null) {
-      opToken.getText();
+      op = opToken.getText();
     }
     return new MatchReference(match, op, arg);
   }

Modified: 
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/verbalize/ExpressionVerbalizer.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/verbalize/ExpressionVerbalizer.java?rev=1481376&r1=1481375&r2=1481376&view=diff
==============================================================================
--- 
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/verbalize/ExpressionVerbalizer.java
 (original)
+++ 
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/verbalize/ExpressionVerbalizer.java
 Sat May 11 17:07:24 2013
@@ -258,12 +258,12 @@ public class ExpressionVerbalizer {
       head = verbalize(expression.getRawTypeExpression());
     } else {
       head = expression.getMatch();
+      if (expression.getOp() != null) {
+        tail += expression.getOp();
+        if (expression.getArg() != null) {
+          tail += verbalize(expression.getArg());
+        }
     }
-    if (expression.getOp() != null) {
-      tail += expression.getOp();
-      if (expression.getArg() != null) {
-        tail += verbalize(expression.getArg());
-      }
     }
     return head + tail;
   }
@@ -280,7 +280,7 @@ public class ExpressionVerbalizer {
   }
 
   public String verbalize(FeatureMatchExpression expression) {
-    return verbalize(expression) + expression.getOp() + 
verbalize(expression.getArg());
+    return verbalize((FeatureExpression)expression) + expression.getOp() + 
verbalize(expression.getArg());
   }
 
 }