svn commit: r1748850 - in /uima/ruta/trunk/ruta-ep-ide/src/main: antlr3/org/apache/uima/ruta/ide/core/parser/RutaParser.g java/org/apache/uima/ruta/ide/parser/ast/ScriptFactory.java

[pkluegl]

Author: pkluegl
Date: Fri Jun 17 12:40:28 2016
New Revision: 1748850

URL: http://svn.apache.org/viewvc?rev=1748850&view=rev
Log:
UIMA-4583
- fixed rule ids for jumpto

Modified:
    
uima/ruta/trunk/ruta-ep-ide/src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaParser.g
    
uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ScriptFactory.java

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=1748850&r1=1748849&r2=1748850&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
 Fri Jun 17 12:40:28 2016
@@ -783,7 +783,7 @@ regexpRule returns [RutaRule stmt = null
        )*
 
        s = SEMI
-       {stmt = scriptFactory.createRegExpRule(exprs, fa, s);}
+       {stmt = scriptFactory.createRegExpRule(exprs, fa, s, true);}
        
        ;
 

Modified: 
uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ScriptFactory.java
URL: 
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ScriptFactory.java?rev=1748850&r1=1748849&r2=1748850&view=diff
==============================================================================
--- 
uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ScriptFactory.java
 (original)
+++ 
uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ScriptFactory.java
 Fri Jun 17 12:40:28 2016
@@ -77,6 +77,11 @@ public class ScriptFactory extends Abstr
 
   public RutaRule createRegExpRule(List<Expression> exprs,
           Map<Expression, Map<Expression, Expression>> fa, Token s) {
+    return createRegExpRule(exprs, fa, s, false);
+  }
+  
+  public RutaRule createRegExpRule(List<Expression> exprs,
+          Map<Expression, Map<Expression, Expression>> fa, Token s, boolean 
updateCounter) {
     List<Expression> expressions = new ArrayList<Expression>();
     for (Expression each : exprs) {
       if (each != null) {
@@ -91,7 +96,10 @@ public class ScriptFactory extends Abstr
         }
       }
     }
-    RutaRegExpRule rule = new RutaRegExpRule(expressions, fa, idCounter++);
+    RutaRegExpRule rule = new RutaRegExpRule(expressions, fa, idCounter);
+    if(updateCounter) {
+      idCounter++;
+    }
     if (s != null) {
       int[] bounds = getBounds(s);
       rule.setEnd(bounds[1]);