Updated expression parser to support array variables

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@19148 ac1ea38d-2e2b-0410-8846-a27921b304fc

diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParser.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParser.java
index 5a64a01e7997d63fd1185c38c7eedb06b065c950..4eba9ba17de493d4d2550ccfd35807e0e4c9b0b7 100644 (file)
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParser.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParser.java
@@ -1,14 +1,3 @@
-/*******************************************************************************\r
- * Copyright (c) 2010 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
 /* Generated By:JavaCC: Do not edit this line. ExpressionParser.java */\r
 package org.simantics.sysdyn.expressionParser;\r
 \r
@@ -18,13 +7,21 @@ import java.util.List;
 import java.util.ArrayList;\r
 import java.util.HashMap;\r
 \r
+\r
 public class ExpressionParser implements ExpressionParserConstants {\r
+\r
         HashMap<String, List<Token>> references = new HashMap<String, List<Token>>();\r
 \r
     public HashMap<String, List<Token>> getReferences() {\r
         return references;\r
     }\r
 \r
+    HashMap<String, List<List<Token>>> ranges = new HashMap<String, List<List<Token>>>();\r
+\r
+    public HashMap<String, List<List<Token>>> getRanges() {\r
+        return ranges;\r
+    }\r
+\r
 /*** Parser ********************************************************/\r
 \r
 // https://javacc.dev.java.net/doc/javaccgrm.html\r
@@ -445,18 +442,27 @@ public class ExpressionParser implements ExpressionParserConstants {
 \r
   final public void component_reference() throws ParseException {\r
     jj_consume_token(IDENT);\r
-        if(references.get(token.image) == null) {\r
-                references.put(token.image, new ArrayList<Token>());\r
+        String name = token.image;\r
+        if(references.get(name) == null) {\r
+                references.put(name, new ArrayList<Token>());\r
         }\r
-        List list = references.get(token.image);\r
+        List<Token> list = references.get(name);\r
         list.add(token);\r
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {\r
+    case 66:\r
+      array_subscripts();\r
+      break;\r
+    default:\r
+      jj_la1[22] = jj_gen;\r
+      ;\r
+    }\r
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {\r
     case 68:\r
       jj_consume_token(68);\r
       component_reference();\r
       break;\r
     default:\r
-      jj_la1[22] = jj_gen;\r
+      jj_la1[23] = jj_gen;\r
       ;\r
     }\r
   }\r
@@ -483,7 +489,7 @@ public class ExpressionParser implements ExpressionParserConstants {
       function_arguments();\r
       break;\r
     default:\r
-      jj_la1[23] = jj_gen;\r
+      jj_la1[24] = jj_gen;\r
       ;\r
     }\r
     jj_consume_token(63);\r
@@ -498,7 +504,7 @@ public class ExpressionParser implements ExpressionParserConstants {
         function_arguments();\r
         break;\r
       default:\r
-        jj_la1[24] = jj_gen;\r
+        jj_la1[25] = jj_gen;\r
         ;\r
       }\r
     } else {\r
@@ -507,7 +513,7 @@ public class ExpressionParser implements ExpressionParserConstants {
         named_arguments();\r
         break;\r
       default:\r
-        jj_la1[25] = jj_gen;\r
+        jj_la1[26] = jj_gen;\r
         jj_consume_token(-1);\r
         throw new ParseException();\r
       }\r
@@ -522,7 +528,7 @@ public class ExpressionParser implements ExpressionParserConstants {
       named_arguments();\r
       break;\r
     default:\r
-      jj_la1[26] = jj_gen;\r
+      jj_la1[27] = jj_gen;\r
       ;\r
     }\r
   }\r
@@ -554,7 +560,7 @@ public class ExpressionParser implements ExpressionParserConstants {
       expression();\r
       break;\r
     default:\r
-      jj_la1[27] = jj_gen;\r
+      jj_la1[28] = jj_gen;\r
       ;\r
     }\r
     label_8:\r
@@ -564,7 +570,7 @@ public class ExpressionParser implements ExpressionParserConstants {
         ;\r
         break;\r
       default:\r
-        jj_la1[28] = jj_gen;\r
+        jj_la1[29] = jj_gen;\r
         break label_8;\r
       }\r
       jj_consume_token(71);\r
@@ -588,7 +594,7 @@ public class ExpressionParser implements ExpressionParserConstants {
         expression();\r
         break;\r
       default:\r
-        jj_la1[29] = jj_gen;\r
+        jj_la1[30] = jj_gen;\r
         ;\r
       }\r
     }\r
@@ -603,7 +609,7 @@ public class ExpressionParser implements ExpressionParserConstants {
         ;\r
         break;\r
       default:\r
-        jj_la1[30] = jj_gen;\r
+        jj_la1[31] = jj_gen;\r
         break label_9;\r
       }\r
       jj_consume_token(71);\r
@@ -611,6 +617,82 @@ public class ExpressionParser implements ExpressionParserConstants {
     }\r
   }\r
 \r
+  final public void array_subscripts() throws ParseException {\r
+        if(ranges.get(token.image) == null) {\r
+                ranges.put(token.image, new ArrayList<List<Token>>());\r
+        }\r
+        List<List<Token>> rangesList = ranges.get(token.image);\r
+        List<Token> currentRange = new ArrayList<Token>();\r
+    jj_consume_token(66);\r
+    subscript(currentRange);\r
+    label_10:\r
+    while (true) {\r
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {\r
+      case 71:\r
+        ;\r
+        break;\r
+      default:\r
+        jj_la1[32] = jj_gen;\r
+        break label_10;\r
+      }\r
+      jj_consume_token(71);\r
+      subscript(currentRange);\r
+    }\r
+    jj_consume_token(67);\r
+        rangesList.add(currentRange);\r
+  }\r
+\r
+  final public void subscript(List<Token> currentRange) throws ParseException {\r
+  Token rangeToken = new Token(token.kind, "");\r
+  rangeToken.beginColumn = token.beginColumn;\r
+  rangeToken.beginLine = token.beginLine;\r
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {\r
+    case 69:\r
+      jj_consume_token(69);\r
+                currentRange.add(token);\r
+      break;\r
+    case IDENT:\r
+    case UNSIGNED_INTEGER:\r
+      rangeIndex(rangeToken, false);\r
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {\r
+      case 69:\r
+        jj_consume_token(69);\r
+        rangeIndex(rangeToken, true);\r
+        break;\r
+      default:\r
+        jj_la1[33] = jj_gen;\r
+        ;\r
+      }\r
+            rangeToken.endColumn = token.endColumn;\r
+            rangeToken.endLine = token.endLine;\r
+                currentRange.add(rangeToken);\r
+      break;\r
+    default:\r
+      jj_la1[34] = jj_gen;\r
+      jj_consume_token(-1);\r
+      throw new ParseException();\r
+    }\r
+  }\r
+\r
+  final public void rangeIndex(Token rangeToken, boolean second) throws ParseException {\r
+  if(second)\r
+        rangeToken.image = rangeToken.image + ":";\r
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {\r
+    case UNSIGNED_INTEGER:\r
+      jj_consume_token(UNSIGNED_INTEGER);\r
+                rangeToken.image = rangeToken.image + token.image;\r
+      break;\r
+    case IDENT:\r
+      jj_consume_token(IDENT);\r
+                rangeToken.image = rangeToken.image + token.image;\r
+      break;\r
+    default:\r
+      jj_la1[35] = jj_gen;\r
+      jj_consume_token(-1);\r
+      throw new ParseException();\r
+    }\r
+  }\r
+\r
   private boolean jj_2_1(int xla) {\r
     jj_la = xla; jj_lastpos = jj_scanpos = token;\r
     try { return !jj_3_1(); }\r
@@ -625,111 +707,82 @@ public class ExpressionParser implements ExpressionParserConstants {
     finally { jj_save(1, xla); }\r
   }\r
 \r
-  private boolean jj_3R_15() {\r
-    if (jj_scan_token(31)) return true;\r
-    if (jj_3R_11()) return true;\r
-    return false;\r
-  }\r
-\r
-  private boolean jj_3R_42() {\r
-    if (jj_scan_token(62)) return true;\r
-    return false;\r
-  }\r
-\r
-  private boolean jj_3R_11() {\r
-    Token xsp;\r
-    xsp = jj_scanpos;\r
-    if (jj_3R_14()) {\r
-    jj_scanpos = xsp;\r
-    if (jj_3R_15()) return true;\r
-    }\r
-    return false;\r
-  }\r
-\r
   private boolean jj_3R_14() {\r
-    if (jj_3R_16()) return true;\r
-    return false;\r
-  }\r
-\r
-  private boolean jj_3R_47() {\r
-    if (jj_scan_token(68)) return true;\r
-    return false;\r
-  }\r
-\r
-  private boolean jj_3R_13() {\r
     if (jj_scan_token(68)) return true;\r
-    if (jj_3R_10()) return true;\r
+    if (jj_3R_11()) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_43() {\r
+  private boolean jj_3R_44() {\r
     if (jj_scan_token(IDENT)) return true;\r
     Token xsp;\r
     xsp = jj_scanpos;\r
-    if (jj_3R_47()) jj_scanpos = xsp;\r
+    if (jj_3R_48()) jj_scanpos = xsp;\r
+    xsp = jj_scanpos;\r
+    if (jj_3R_49()) jj_scanpos = xsp;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_10() {\r
+  private boolean jj_3R_11() {\r
     if (jj_scan_token(IDENT)) return true;\r
     Token xsp;\r
     xsp = jj_scanpos;\r
-    if (jj_3R_13()) jj_scanpos = xsp;\r
+    if (jj_3R_14()) jj_scanpos = xsp;\r
     return false;\r
   }\r
 \r
   private boolean jj_3_1() {\r
-    if (jj_3R_10()) return true;\r
+    if (jj_3R_11()) return true;\r
     if (jj_scan_token(62)) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_41() {\r
+  private boolean jj_3R_42() {\r
     if (jj_scan_token(87)) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_40() {\r
+  private boolean jj_3R_41() {\r
     if (jj_scan_token(64)) return true;\r
-    if (jj_3R_46()) return true;\r
+    if (jj_3R_47()) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_39() {\r
+  private boolean jj_3R_40() {\r
     if (jj_scan_token(66)) return true;\r
-    if (jj_3R_45()) return true;\r
+    if (jj_3R_46()) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_36() {\r
-    if (jj_3R_10()) return true;\r
-    if (jj_3R_42()) return true;\r
+  private boolean jj_3R_37() {\r
+    if (jj_3R_11()) return true;\r
+    if (jj_3R_43()) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_38() {\r
+  private boolean jj_3R_39() {\r
     if (jj_scan_token(62)) return true;\r
-    if (jj_3R_44()) return true;\r
+    if (jj_3R_45()) return true;\r
     if (jj_scan_token(63)) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_34() {\r
+  private boolean jj_3R_35() {\r
     Token xsp;\r
     xsp = jj_scanpos;\r
     if (jj_scan_token(86)) {\r
     jj_scanpos = xsp;\r
-    if (jj_3R_41()) return true;\r
+    if (jj_3R_42()) return true;\r
     }\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_37() {\r
-    if (jj_3R_43()) return true;\r
+  private boolean jj_3R_38() {\r
+    if (jj_3R_44()) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_33() {\r
+  private boolean jj_3R_34() {\r
     Token xsp;\r
     xsp = jj_scanpos;\r
     if (jj_scan_token(93)) {\r
@@ -742,8 +795,6 @@ public class ExpressionParser implements ExpressionParserConstants {
     jj_scanpos = xsp;\r
     if (jj_scan_token(33)) {\r
     jj_scanpos = xsp;\r
-    if (jj_3R_36()) {\r
-    jj_scanpos = xsp;\r
     if (jj_3R_37()) {\r
     jj_scanpos = xsp;\r
     if (jj_3R_38()) {\r
@@ -752,6 +803,8 @@ public class ExpressionParser implements ExpressionParserConstants {
     jj_scanpos = xsp;\r
     if (jj_3R_40()) {\r
     jj_scanpos = xsp;\r
+    if (jj_3R_41()) {\r
+    jj_scanpos = xsp;\r
     if (jj_scan_token(35)) return true;\r
     }\r
     }\r
@@ -766,22 +819,22 @@ public class ExpressionParser implements ExpressionParserConstants {
     return false;\r
   }\r
 \r
-  private boolean jj_3R_32() {\r
-    if (jj_3R_35()) return true;\r
+  private boolean jj_3R_33() {\r
+    if (jj_3R_36()) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_25() {\r
-    if (jj_3R_29()) return true;\r
+  private boolean jj_3R_26() {\r
+    if (jj_3R_30()) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_28() {\r
-    if (jj_3R_30()) return true;\r
+  private boolean jj_3R_29() {\r
+    if (jj_3R_31()) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_35() {\r
+  private boolean jj_3R_36() {\r
     Token xsp;\r
     xsp = jj_scanpos;\r
     if (jj_scan_token(82)) {\r
@@ -797,35 +850,40 @@ public class ExpressionParser implements ExpressionParserConstants {
     return false;\r
   }\r
 \r
-  private boolean jj_3R_31() {\r
-    if (jj_3R_33()) return true;\r
+  private boolean jj_3R_32() {\r
+    if (jj_3R_34()) return true;\r
     Token xsp;\r
     xsp = jj_scanpos;\r
-    if (jj_3R_34()) jj_scanpos = xsp;\r
+    if (jj_3R_35()) jj_scanpos = xsp;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_49() {\r
+  private boolean jj_3R_51() {\r
     if (jj_scan_token(71)) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_27() {\r
-    if (jj_3R_31()) return true;\r
+  private boolean jj_3R_28() {\r
+    if (jj_3R_32()) return true;\r
     Token xsp;\r
     while (true) {\r
       xsp = jj_scanpos;\r
-      if (jj_3R_32()) { jj_scanpos = xsp; break; }\r
+      if (jj_3R_33()) { jj_scanpos = xsp; break; }\r
     }\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_12() {\r
+  private boolean jj_3R_53() {\r
+    if (jj_scan_token(66)) return true;\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_13() {\r
     if (jj_scan_token(71)) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_30() {\r
+  private boolean jj_3R_31() {\r
     Token xsp;\r
     xsp = jj_scanpos;\r
     if (jj_scan_token(78)) {\r
@@ -841,29 +899,29 @@ public class ExpressionParser implements ExpressionParserConstants {
     return false;\r
   }\r
 \r
-  private boolean jj_3R_22() {\r
+  private boolean jj_3R_23() {\r
     if (jj_scan_token(9)) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_26() {\r
-    if (jj_3R_30()) return true;\r
+  private boolean jj_3R_27() {\r
+    if (jj_3R_31()) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_24() {\r
+  private boolean jj_3R_25() {\r
     Token xsp;\r
     xsp = jj_scanpos;\r
-    if (jj_3R_26()) jj_scanpos = xsp;\r
-    if (jj_3R_27()) return true;\r
+    if (jj_3R_27()) jj_scanpos = xsp;\r
+    if (jj_3R_28()) return true;\r
     while (true) {\r
       xsp = jj_scanpos;\r
-      if (jj_3R_28()) { jj_scanpos = xsp; break; }\r
+      if (jj_3R_29()) { jj_scanpos = xsp; break; }\r
     }\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_29() {\r
+  private boolean jj_3R_30() {\r
     Token xsp;\r
     xsp = jj_scanpos;\r
     if (jj_scan_token(72)) {\r
@@ -885,111 +943,147 @@ public class ExpressionParser implements ExpressionParserConstants {
     return false;\r
   }\r
 \r
-  private boolean jj_3R_18() {\r
+  private boolean jj_3R_19() {\r
     if (jj_scan_token(69)) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_20() {\r
+  private boolean jj_3R_21() {\r
     if (jj_scan_token(22)) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_48() {\r
-    if (jj_3R_11()) return true;\r
+  private boolean jj_3R_50() {\r
+    if (jj_3R_12()) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_45() {\r
-    if (jj_3R_11()) return true;\r
+  private boolean jj_3R_46() {\r
+    if (jj_3R_12()) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_23() {\r
-    if (jj_3R_24()) return true;\r
+  private boolean jj_3R_24() {\r
+    if (jj_3R_25()) return true;\r
     Token xsp;\r
     xsp = jj_scanpos;\r
-    if (jj_3R_25()) jj_scanpos = xsp;\r
+    if (jj_3R_26()) jj_scanpos = xsp;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_44() {\r
+  private boolean jj_3R_45() {\r
     Token xsp;\r
     xsp = jj_scanpos;\r
-    if (jj_3R_48()) jj_scanpos = xsp;\r
+    if (jj_3R_50()) jj_scanpos = xsp;\r
     while (true) {\r
       xsp = jj_scanpos;\r
-      if (jj_3R_49()) { jj_scanpos = xsp; break; }\r
+      if (jj_3R_51()) { jj_scanpos = xsp; break; }\r
     }\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_21() {\r
+  private boolean jj_3R_49() {\r
+    if (jj_scan_token(68)) return true;\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_22() {\r
     Token xsp;\r
     xsp = jj_scanpos;\r
     if (jj_scan_token(12)) jj_scanpos = xsp;\r
-    if (jj_3R_23()) return true;\r
+    if (jj_3R_24()) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_52() {\r
+  private boolean jj_3R_55() {\r
     if (jj_scan_token(IDENT)) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_19() {\r
-    if (jj_3R_21()) return true;\r
+  private boolean jj_3R_20() {\r
+    if (jj_3R_22()) return true;\r
     Token xsp;\r
     while (true) {\r
       xsp = jj_scanpos;\r
-      if (jj_3R_22()) { jj_scanpos = xsp; break; }\r
+      if (jj_3R_23()) { jj_scanpos = xsp; break; }\r
     }\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_51() {\r
-    if (jj_3R_52()) return true;\r
+  private boolean jj_3R_54() {\r
+    if (jj_3R_55()) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_50() {\r
-    if (jj_3R_51()) return true;\r
+  private boolean jj_3R_52() {\r
+    if (jj_3R_54()) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_17() {\r
-    if (jj_3R_19()) return true;\r
+  private boolean jj_3R_18() {\r
+    if (jj_3R_20()) return true;\r
     Token xsp;\r
     while (true) {\r
       xsp = jj_scanpos;\r
-      if (jj_3R_20()) { jj_scanpos = xsp; break; }\r
+      if (jj_3R_21()) { jj_scanpos = xsp; break; }\r
     }\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_46() {\r
+  private boolean jj_3R_47() {\r
     Token xsp;\r
     xsp = jj_scanpos;\r
     if (jj_3_2()) {\r
     jj_scanpos = xsp;\r
-    if (jj_3R_50()) return true;\r
+    if (jj_3R_52()) return true;\r
     }\r
     return false;\r
   }\r
 \r
   private boolean jj_3_2() {\r
-    if (jj_3R_11()) return true;\r
+    if (jj_3R_12()) return true;\r
     Token xsp;\r
     xsp = jj_scanpos;\r
-    if (jj_3R_12()) jj_scanpos = xsp;\r
+    if (jj_3R_13()) jj_scanpos = xsp;\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_17() {\r
+    if (jj_3R_18()) return true;\r
+    Token xsp;\r
+    xsp = jj_scanpos;\r
+    if (jj_3R_19()) jj_scanpos = xsp;\r
     return false;\r
   }\r
 \r
   private boolean jj_3R_16() {\r
-    if (jj_3R_17()) return true;\r
+    if (jj_scan_token(31)) return true;\r
+    if (jj_3R_12()) return true;\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_43() {\r
+    if (jj_scan_token(62)) return true;\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_12() {\r
     Token xsp;\r
     xsp = jj_scanpos;\r
-    if (jj_3R_18()) jj_scanpos = xsp;\r
+    if (jj_3R_15()) {\r
+    jj_scanpos = xsp;\r
+    if (jj_3R_16()) return true;\r
+    }\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_15() {\r
+    if (jj_3R_17()) return true;\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_48() {\r
+    if (jj_3R_53()) return true;\r
     return false;\r
   }\r
 \r
@@ -1004,7 +1098,7 @@ public class ExpressionParser implements ExpressionParserConstants {
   private Token jj_scanpos, jj_lastpos;\r
   private int jj_la;\r
   private int jj_gen;\r
-  final private int[] jj_la1 = new int[31];\r
+  final private int[] jj_la1 = new int[36];\r
   static private int[] jj_la1_0;\r
   static private int[] jj_la1_1;\r
   static private int[] jj_la1_2;\r
@@ -1014,13 +1108,13 @@ public class ExpressionParser implements ExpressionParserConstants {
       jj_la1_init_2();\r
    }\r
    private static void jj_la1_init_0() {\r
-      jj_la1_0 = new int[] {0x100000,0x80001040,0x100000,0x80001040,0x0,0x0,0x400000,0x200,0x1000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40,0x0,0x0,0x0,0x80001040,0x0,0x0,0x0,0x80001040,0x0,0x80001040,0x0,};\r
+      jj_la1_0 = new int[] {0x100000,0x80001040,0x100000,0x80001040,0x0,0x0,0x400000,0x200,0x1000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40,0x0,0x0,0x0,0x0,0x80001040,0x0,0x0,0x0,0x80001040,0x0,0x80001040,0x0,0x0,0x0,0x0,0x0,};\r
    }\r
    private static void jj_la1_init_1() {\r
-      jj_la1_1 = new int[] {0x0,0x4000000a,0x0,0x4000000a,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2,0x40000008,0x0,0x0,0x4000000a,0x0,0x0,0x0,0x4000000a,0x0,0x4000000a,0x0,};\r
+      jj_la1_1 = new int[] {0x0,0x4000000a,0x0,0x4000000a,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2,0x40000008,0x0,0x0,0x0,0x4000000a,0x0,0x0,0x0,0x4000000a,0x0,0x4000000a,0x0,0x0,0x0,0x0,0x0,};\r
    }\r
    private static void jj_la1_init_2() {\r
-      jj_la1_2 = new int[] {0x0,0x3c03c005,0x0,0x3c03c005,0x20,0x20,0x0,0x0,0x0,0x3f00,0x3f00,0x3c000,0x3c000,0x3c000,0x3c0000,0xc00000,0xc00000,0x3c0000,0x40,0x38000000,0x4000005,0x10,0x10,0x3c03c005,0x80,0x4000000,0x80,0x3c03c005,0x80,0x3c03c005,0x80,};\r
+      jj_la1_2 = new int[] {0x0,0x3c03c005,0x0,0x3c03c005,0x20,0x20,0x0,0x0,0x0,0x3f00,0x3f00,0x3c000,0x3c000,0x3c000,0x3c0000,0xc00000,0xc00000,0x3c0000,0x40,0x38000000,0x4000005,0x10,0x4,0x10,0x3c03c005,0x80,0x4000000,0x80,0x3c03c005,0x80,0x3c03c005,0x80,0x80,0x20,0x14000020,0x14000000,};\r
    }\r
   final private JJCalls[] jj_2_rtns = new JJCalls[2];\r
   private boolean jj_rescan = false;\r
@@ -1037,7 +1131,7 @@ public class ExpressionParser implements ExpressionParserConstants {
     token = new Token();\r
     jj_ntk = -1;\r
     jj_gen = 0;\r
-    for (int i = 0; i < 31; i++) jj_la1[i] = -1;\r
+    for (int i = 0; i < 36; i++) jj_la1[i] = -1;\r
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();\r
   }\r
 \r
@@ -1052,7 +1146,7 @@ public class ExpressionParser implements ExpressionParserConstants {
     token = new Token();\r
     jj_ntk = -1;\r
     jj_gen = 0;\r
-    for (int i = 0; i < 31; i++) jj_la1[i] = -1;\r
+    for (int i = 0; i < 36; i++) jj_la1[i] = -1;\r
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();\r
   }\r
 \r
@@ -1063,7 +1157,7 @@ public class ExpressionParser implements ExpressionParserConstants {
     token = new Token();\r
     jj_ntk = -1;\r
     jj_gen = 0;\r
-    for (int i = 0; i < 31; i++) jj_la1[i] = -1;\r
+    for (int i = 0; i < 36; i++) jj_la1[i] = -1;\r
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();\r
   }\r
 \r
@@ -1074,7 +1168,7 @@ public class ExpressionParser implements ExpressionParserConstants {
     token = new Token();\r
     jj_ntk = -1;\r
     jj_gen = 0;\r
-    for (int i = 0; i < 31; i++) jj_la1[i] = -1;\r
+    for (int i = 0; i < 36; i++) jj_la1[i] = -1;\r
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();\r
   }\r
 \r
@@ -1084,7 +1178,7 @@ public class ExpressionParser implements ExpressionParserConstants {
     token = new Token();\r
     jj_ntk = -1;\r
     jj_gen = 0;\r
-    for (int i = 0; i < 31; i++) jj_la1[i] = -1;\r
+    for (int i = 0; i < 36; i++) jj_la1[i] = -1;\r
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();\r
   }\r
 \r
@@ -1094,7 +1188,7 @@ public class ExpressionParser implements ExpressionParserConstants {
     token = new Token();\r
     jj_ntk = -1;\r
     jj_gen = 0;\r
-    for (int i = 0; i < 31; i++) jj_la1[i] = -1;\r
+    for (int i = 0; i < 36; i++) jj_la1[i] = -1;\r
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();\r
   }\r
 \r
@@ -1211,7 +1305,7 @@ public class ExpressionParser implements ExpressionParserConstants {
       la1tokens[jj_kind] = true;\r
       jj_kind = -1;\r
     }\r
-    for (int i = 0; i < 31; i++) {\r
+    for (int i = 0; i < 36; i++) {\r
       if (jj_la1[i] == jj_gen) {\r
         for (int j = 0; j < 32; j++) {\r
           if ((jj_la1_0[i] & (1<<j)) != 0) {\r

diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParserConstants.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParserConstants.java
index 9f7b09b14de08ae0185430dc3c85a962802dce43..8af224865537f2f5df3b67d5a86b17584a8c29ce 100644 (file)
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParserConstants.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParserConstants.java
@@ -1,14 +1,3 @@
-/*******************************************************************************\r
- * Copyright (c) 2010 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
 /* Generated By:JavaCC: Do not edit this line. ExpressionParserConstants.java */\r
 package org.simantics.sysdyn.expressionParser;\r
 \r

diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParserTokenManager.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParserTokenManager.java
index 89a1a1d761b0490a0df90cecbbbc1d2f5966874b..2ca8a9d64de915a6a3fe64c248395b5db33dc38f 100644 (file)
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParserTokenManager.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParserTokenManager.java
@@ -1,14 +1,3 @@
-/*******************************************************************************\r
- * Copyright (c) 2010 Association for Decentralized Information Management in\r
- * Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
 /* Generated By:JavaCC: Do not edit this line. ExpressionParserTokenManager.java */\r
 package org.simantics.sysdyn.expressionParser;\r
 import java.util.Set;\r