refs #5198

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

diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/parser/ModelParser.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/parser/ModelParser.java
index c50c60586559b38461a6834f24d3cba36ea9d273..944551684d2d0a1bc33ced4a14dc7a84d00f4107 100644 (file)
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/parser/ModelParser.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/parser/ModelParser.java
@@ -3600,9 +3600,15 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
         break;\r
       case 80:\r
         jj_consume_token(80);\r
+                                                                 jjtree.closeNodeScope(jjtn000, true);\r
+                                                                 jjtc000 = false;\r
+                                                                 jjtn000.op = ".+";\r
         break;\r
       case 81:\r
         jj_consume_token(81);\r
+                                                                                              jjtree.closeNodeScope(jjtn000, true);\r
+                                                                                              jjtc000 = false;\r
+                                                                                              jjtn000.op = ".-";\r
         break;\r
       default:\r
         jj_la1[103] = jj_gen;\r
@@ -3667,29 +3673,29 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
   jjtree.openNodeScope(jjtn000);\r
     try {\r
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {\r
-      case 82:\r
-        jj_consume_token(82);\r
-          jjtree.closeNodeScope(jjtn000, true);\r
-          jjtc000 = false;\r
-          jjtn000.op = "*";\r
-        break;\r
-      case 83:\r
-        jj_consume_token(83);\r
-                                     jjtree.closeNodeScope(jjtn000, true);\r
-                                     jjtc000 = false;\r
-                                     jjtn000.op = "/";\r
-        break;\r
       case 84:\r
         jj_consume_token(84);\r
-                                                                 jjtree.closeNodeScope(jjtn000, true);\r
-                                                                 jjtc000 = false;\r
-                                                                 jjtn000.op = ".*";\r
+           jjtree.closeNodeScope(jjtn000, true);\r
+           jjtc000 = false;\r
+           jjtn000.op = ".*";\r
         break;\r
       case 85:\r
         jj_consume_token(85);\r
-                                                                                               jjtree.closeNodeScope(jjtn000, true);\r
-                                                                                               jjtc000 = false;\r
-                                                                                               jjtn000.op = "./";\r
+                                         jjtree.closeNodeScope(jjtn000, true);\r
+                                         jjtc000 = false;\r
+                                         jjtn000.op = "./";\r
+        break;\r
+      case 82:\r
+        jj_consume_token(82);\r
+                                                                     jjtree.closeNodeScope(jjtn000, true);\r
+                                                                     jjtc000 = false;\r
+                                                                     jjtn000.op = "*";\r
+        break;\r
+      case 83:\r
+        jj_consume_token(83);\r
+                                                                                                jjtree.closeNodeScope(jjtn000, true);\r
+                                                                                                jjtc000 = false;\r
+                                                                                                jjtn000.op = "/";\r
         break;\r
       default:\r
         jj_la1[105] = jj_gen;\r
@@ -4655,11 +4661,16 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
     finally { jj_save(9, xla); }\r
   }\r
 \r
+  private boolean jj_3R_136() {\r
+    if (jj_scan_token(81)) return true;\r
+    return false;\r
+  }\r
+\r
   private boolean jj_3R_74() {\r
     if (jj_scan_token(62)) return true;\r
     Token xsp;\r
     xsp = jj_scanpos;\r
-    if (jj_3R_167()) jj_scanpos = xsp;\r
+    if (jj_3R_169()) jj_scanpos = xsp;\r
     if (jj_scan_token(63)) return true;\r
     return false;\r
   }\r
@@ -4674,16 +4685,16 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
     return false;\r
   }\r
 \r
-  private boolean jj_3R_154() {\r
+  private boolean jj_3R_156() {\r
     Token xsp;\r
     xsp = jj_scanpos;\r
     if (jj_scan_token(68)) jj_scanpos = xsp;\r
     if (jj_scan_token(IDENT)) return true;\r
     xsp = jj_scanpos;\r
-    if (jj_3R_162()) jj_scanpos = xsp;\r
+    if (jj_3R_164()) jj_scanpos = xsp;\r
     while (true) {\r
       xsp = jj_scanpos;\r
-      if (jj_3R_163()) { jj_scanpos = xsp; break; }\r
+      if (jj_3R_165()) { jj_scanpos = xsp; break; }\r
     }\r
     return false;\r
   }\r
@@ -4694,18 +4705,18 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
     return false;\r
   }\r
 \r
-  private boolean jj_3R_160() {\r
-    if (jj_scan_token(58)) return true;\r
+  private boolean jj_3R_153() {\r
+    if (jj_scan_token(82)) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_77() {\r
-    if (jj_scan_token(68)) return true;\r
+  private boolean jj_3R_162() {\r
+    if (jj_scan_token(58)) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_151() {\r
-    if (jj_scan_token(84)) return true;\r
+  private boolean jj_3R_77() {\r
+    if (jj_scan_token(68)) return true;\r
     return false;\r
   }\r
 \r
@@ -4740,57 +4751,58 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
     return false;\r
   }\r
 \r
+  private boolean jj_3R_135() {\r
+    if (jj_scan_token(80)) return true;\r
+    return false;\r
+  }\r
+\r
   private boolean jj_3R_124() {\r
     if (jj_scan_token(74)) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_147() {\r
-    if (jj_3R_156()) return true;\r
+  private boolean jj_3R_149() {\r
+    if (jj_3R_158()) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_165() {\r
+  private boolean jj_3R_167() {\r
     if (jj_scan_token(70)) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_146() {\r
+  private boolean jj_3R_148() {\r
     if (jj_scan_token(66)) return true;\r
-    if (jj_3R_155()) return true;\r
+    if (jj_3R_157()) return true;\r
     if (jj_scan_token(67)) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_145() {\r
+  private boolean jj_3R_147() {\r
     if (jj_scan_token(62)) return true;\r
     if (jj_3R_47()) return true;\r
     if (jj_scan_token(63)) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_143() {\r
-    if (jj_3R_153()) return true;\r
+  private boolean jj_3R_145() {\r
+    if (jj_3R_155()) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_158() {\r
+  private boolean jj_3R_160() {\r
     if (jj_scan_token(87)) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_144() {\r
-    if (jj_3R_154()) return true;\r
+  private boolean jj_3R_146() {\r
+    if (jj_3R_156()) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_135() {\r
+  private boolean jj_3R_137() {\r
     Token xsp;\r
     xsp = jj_scanpos;\r
-    if (jj_3R_138()) {\r
-    jj_scanpos = xsp;\r
-    if (jj_3R_139()) {\r
-    jj_scanpos = xsp;\r
     if (jj_3R_140()) {\r
     jj_scanpos = xsp;\r
     if (jj_3R_141()) {\r
@@ -4807,6 +4819,10 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
     jj_scanpos = xsp;\r
     if (jj_3R_147()) {\r
     jj_scanpos = xsp;\r
+    if (jj_3R_148()) {\r
+    jj_scanpos = xsp;\r
+    if (jj_3R_149()) {\r
+    jj_scanpos = xsp;\r
     if (jj_scan_token(35)) return true;\r
     }\r
     }\r
@@ -4821,33 +4837,33 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
     return false;\r
   }\r
 \r
-  private boolean jj_3R_138() {\r
+  private boolean jj_3R_140() {\r
     if (jj_scan_token(UNSIGNED_NUMBER)) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_142() {\r
+  private boolean jj_3R_144() {\r
     if (jj_scan_token(33)) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_141() {\r
+  private boolean jj_3R_143() {\r
     if (jj_scan_token(6)) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_140() {\r
+  private boolean jj_3R_142() {\r
     if (jj_scan_token(STRING)) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_139() {\r
+  private boolean jj_3R_141() {\r
     if (jj_scan_token(UNSIGNED_INTEGER)) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_150() {\r
-    if (jj_scan_token(83)) return true;\r
+  private boolean jj_3R_152() {\r
+    if (jj_scan_token(85)) return true;\r
     return false;\r
   }\r
 \r
@@ -4856,30 +4872,30 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
     return false;\r
   }\r
 \r
-  private boolean jj_3R_156() {\r
+  private boolean jj_3R_158() {\r
     if (jj_scan_token(64)) return true;\r
-    if (jj_3R_166()) return true;\r
+    if (jj_3R_168()) return true;\r
     if (jj_scan_token(65)) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_136() {\r
-    if (jj_3R_148()) return true;\r
-    if (jj_3R_135()) return true;\r
+  private boolean jj_3R_138() {\r
+    if (jj_3R_150()) return true;\r
+    if (jj_3R_137()) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_155() {\r
-    if (jj_3R_164()) return true;\r
+  private boolean jj_3R_157() {\r
+    if (jj_3R_166()) return true;\r
     Token xsp;\r
     while (true) {\r
       xsp = jj_scanpos;\r
-      if (jj_3R_165()) { jj_scanpos = xsp; break; }\r
+      if (jj_3R_167()) { jj_scanpos = xsp; break; }\r
     }\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_159() {\r
+  private boolean jj_3R_161() {\r
     if (jj_3R_60()) return true;\r
     return false;\r
   }\r
@@ -4889,14 +4905,14 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
     return false;\r
   }\r
 \r
-  private boolean jj_3R_153() {\r
+  private boolean jj_3R_155() {\r
     Token xsp;\r
     xsp = jj_scanpos;\r
-    if (jj_3R_159()) {\r
+    if (jj_3R_161()) {\r
     jj_scanpos = xsp;\r
-    if (jj_3R_160()) {\r
+    if (jj_3R_162()) {\r
     jj_scanpos = xsp;\r
-    if (jj_3R_161()) return true;\r
+    if (jj_3R_163()) return true;\r
     }\r
     }\r
     if (jj_3R_74()) return true;\r
@@ -4908,31 +4924,31 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
     return false;\r
   }\r
 \r
-  private boolean jj_3R_148() {\r
+  private boolean jj_3R_150() {\r
     Token xsp;\r
     xsp = jj_scanpos;\r
-    if (jj_3R_157()) {\r
+    if (jj_3R_159()) {\r
     jj_scanpos = xsp;\r
-    if (jj_3R_158()) return true;\r
+    if (jj_3R_160()) return true;\r
     }\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_157() {\r
+  private boolean jj_3R_159() {\r
     if (jj_scan_token(86)) return true;\r
     return false;\r
   }\r
 \r
   private boolean jj_3R_120() {\r
-    if (jj_3R_135()) return true;\r
+    if (jj_3R_137()) return true;\r
     Token xsp;\r
     xsp = jj_scanpos;\r
-    if (jj_3R_136()) jj_scanpos = xsp;\r
+    if (jj_3R_138()) jj_scanpos = xsp;\r
     return false;\r
   }\r
 \r
   private boolean jj_3R_121() {\r
-    if (jj_3R_137()) return true;\r
+    if (jj_3R_139()) return true;\r
     if (jj_3R_120()) return true;\r
     return false;\r
   }\r
@@ -4949,24 +4965,24 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
     return false;\r
   }\r
 \r
-  private boolean jj_3R_137() {\r
+  private boolean jj_3R_139() {\r
     Token xsp;\r
     xsp = jj_scanpos;\r
-    if (jj_3R_149()) {\r
+    if (jj_3R_151()) {\r
     jj_scanpos = xsp;\r
-    if (jj_3R_150()) {\r
+    if (jj_3R_152()) {\r
     jj_scanpos = xsp;\r
-    if (jj_3R_151()) {\r
+    if (jj_3R_153()) {\r
     jj_scanpos = xsp;\r
-    if (jj_3R_152()) return true;\r
+    if (jj_3R_154()) return true;\r
     }\r
     }\r
     }\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_149() {\r
-    if (jj_scan_token(82)) return true;\r
+  private boolean jj_3R_151() {\r
+    if (jj_scan_token(84)) return true;\r
     return false;\r
   }\r
 \r
@@ -4997,9 +5013,9 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
     jj_scanpos = xsp;\r
     if (jj_3R_134()) {\r
     jj_scanpos = xsp;\r
-    if (jj_scan_token(80)) {\r
+    if (jj_3R_135()) {\r
     jj_scanpos = xsp;\r
-    if (jj_scan_token(81)) return true;\r
+    if (jj_3R_136()) return true;\r
     }\r
     }\r
     }\r
@@ -5537,7 +5553,7 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
     return false;\r
   }\r
 \r
-  private boolean jj_3R_174() {\r
+  private boolean jj_3R_176() {\r
     if (jj_3R_47()) return true;\r
     return false;\r
   }\r
@@ -5569,7 +5585,7 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
     return false;\r
   }\r
 \r
-  private boolean jj_3R_163() {\r
+  private boolean jj_3R_165() {\r
     if (jj_scan_token(68)) return true;\r
     if (jj_scan_token(IDENT)) return true;\r
     return false;\r
@@ -5625,28 +5641,28 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
     return false;\r
   }\r
 \r
-  private boolean jj_3R_173() {\r
+  private boolean jj_3R_175() {\r
     if (jj_scan_token(69)) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_169() {\r
+  private boolean jj_3R_171() {\r
     if (jj_scan_token(71)) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_171() {\r
+  private boolean jj_3R_173() {\r
     Token xsp;\r
     xsp = jj_scanpos;\r
-    if (jj_3R_173()) {\r
+    if (jj_3R_175()) {\r
     jj_scanpos = xsp;\r
-    if (jj_3R_174()) return true;\r
+    if (jj_3R_176()) return true;\r
     }\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_162() {\r
-    if (jj_3R_168()) return true;\r
+  private boolean jj_3R_164() {\r
+    if (jj_3R_170()) return true;\r
     return false;\r
   }\r
 \r
@@ -5665,9 +5681,9 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
     return false;\r
   }\r
 \r
-  private boolean jj_3R_168() {\r
+  private boolean jj_3R_170() {\r
     if (jj_scan_token(66)) return true;\r
-    if (jj_3R_171()) return true;\r
+    if (jj_3R_173()) return true;\r
     return false;\r
   }\r
 \r
@@ -5676,39 +5692,39 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
     return false;\r
   }\r
 \r
-  private boolean jj_3R_164() {\r
+  private boolean jj_3R_166() {\r
     if (jj_3R_47()) return true;\r
     Token xsp;\r
     while (true) {\r
       xsp = jj_scanpos;\r
-      if (jj_3R_169()) { jj_scanpos = xsp; break; }\r
+      if (jj_3R_171()) { jj_scanpos = xsp; break; }\r
     }\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_175() {\r
+  private boolean jj_3R_177() {\r
     if (jj_scan_token(IDENT)) return true;\r
     if (jj_scan_token(88)) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_161() {\r
+  private boolean jj_3R_163() {\r
     if (jj_scan_token(46)) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_172() {\r
-    if (jj_3R_175()) return true;\r
+  private boolean jj_3R_154() {\r
+    if (jj_scan_token(83)) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_152() {\r
-    if (jj_scan_token(85)) return true;\r
+  private boolean jj_3R_174() {\r
+    if (jj_3R_177()) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_170() {\r
-    if (jj_3R_172()) return true;\r
+  private boolean jj_3R_172() {\r
+    if (jj_3R_174()) return true;\r
     return false;\r
   }\r
 \r
@@ -5720,18 +5736,18 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
     return false;\r
   }\r
 \r
-  private boolean jj_3R_166() {\r
+  private boolean jj_3R_168() {\r
     Token xsp;\r
     xsp = jj_scanpos;\r
     if (jj_3_10()) {\r
     jj_scanpos = xsp;\r
-    if (jj_3R_170()) return true;\r
+    if (jj_3R_172()) return true;\r
     }\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_167() {\r
-    if (jj_3R_166()) return true;\r
+  private boolean jj_3R_169() {\r
+    if (jj_3R_168()) return true;\r
     return false;\r
   }\r
 \r

diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/parser/ModelParserTokenManager.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/parser/ModelParserTokenManager.java
index dd08221904d8064d8f66c0487d4ddbc970b9e44e..1ce5ceba50724edf720ad37c6316f622d413cd93 100644 (file)
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/parser/ModelParserTokenManager.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/parser/ModelParserTokenManager.java
@@ -16,23 +16,21 @@ private final int jjStopStringLiteralDfa_0(int pos, long active0, long active1)
    {\r
       case 0:\r
          if ((active1 & 0x80000L) != 0L)\r
-            return 22;\r
+            return 23;\r
          if ((active1 & 0xb30010L) != 0L)\r
-            return 10;\r
-         if ((active0 & 0x884210842108400L) != 0L)\r
+            return 11;\r
+         if ((active0 & 0x377bdef7bdef7bf0L) != 0L || (active1 & 0x180000000L) != 0L)\r
          {\r
             jjmatchedKind = 90;\r
-            return 48;\r
+            return 49;\r
          }\r
-         if ((active0 & 0x377bdef7bdef7bf0L) != 0L || (active1 & 0x180000000L) != 0L)\r
+         if ((active0 & 0x884210842108400L) != 0L)\r
          {\r
             jjmatchedKind = 90;\r
-            return 2;\r
+            return 50;\r
          }\r
          return -1;\r
       case 1:\r
-         if ((active0 & 0x108420080400000L) != 0L)\r
-            return 2;\r
          if ((active0 & 0x3ef7bdff7fbffff0L) != 0L || (active1 & 0x180000000L) != 0L)\r
          {\r
             if (jjmatchedPos != 1)\r
@@ -40,22 +38,24 @@ private final int jjStopStringLiteralDfa_0(int pos, long active0, long active1)
                jjmatchedKind = 90;\r
                jjmatchedPos = 1;\r
             }\r
-            return 2;\r
+            return 49;\r
          }\r
+         if ((active0 & 0x108420080400000L) != 0L)\r
+            return 49;\r
          return -1;\r
       case 2:\r
          if ((active0 & 0x400000800201200L) != 0L)\r
-            return 2;\r
+            return 49;\r
          if ((active0 & 0x3bfffdf77f9fedf0L) != 0L || (active1 & 0x180000000L) != 0L)\r
          {\r
             jjmatchedKind = 90;\r
             jjmatchedPos = 2;\r
-            return 2;\r
+            return 49;\r
          }\r
          return -1;\r
       case 3:\r
          if ((active0 & 0x1000084212118400L) != 0L)\r
-            return 2;\r
+            return 49;\r
          if ((active0 & 0x2bfff5b56d8e69f0L) != 0L || (active1 & 0x180000000L) != 0L)\r
          {\r
             if (jjmatchedPos != 3)\r
@@ -63,32 +63,30 @@ private final int jjStopStringLiteralDfa_0(int pos, long active0, long active1)
                jjmatchedKind = 90;\r
                jjmatchedPos = 3;\r
             }\r
-            return 2;\r
+            return 49;\r
          }\r
          return -1;\r
       case 4:\r
-         if ((active0 & 0x1090004290008c0L) != 0L)\r
-            return 2;\r
          if ((active0 & 0x2af6f5b1469e6130L) != 0L || (active1 & 0x180000000L) != 0L)\r
          {\r
             jjmatchedKind = 90;\r
             jjmatchedPos = 4;\r
-            return 2;\r
+            return 49;\r
          }\r
+         if ((active0 & 0x1090004290008c0L) != 0L)\r
+            return 49;\r
          return -1;\r
       case 5:\r
          if ((active0 & 0x22200011009c0000L) != 0L)\r
-            return 2;\r
+            return 49;\r
          if ((active0 & 0x8d6f5a046026130L) != 0L || (active1 & 0x180000000L) != 0L)\r
          {\r
             jjmatchedKind = 90;\r
             jjmatchedPos = 5;\r
-            return 2;\r
+            return 49;\r
          }\r
          return -1;\r
       case 6:\r
-         if ((active0 & 0x80d0a000000000L) != 0L)\r
-            return 2;\r
          if ((active0 & 0x856250046026130L) != 0L || (active1 & 0x180000000L) != 0L)\r
          {\r
             if (jjmatchedPos != 6)\r
@@ -96,10 +94,14 @@ private final int jjStopStringLiteralDfa_0(int pos, long active0, long active1)
                jjmatchedKind = 90;\r
                jjmatchedPos = 6;\r
             }\r
-            return 2;\r
+            return 49;\r
          }\r
+         if ((active0 & 0x80d0a000000000L) != 0L)\r
+            return 49;\r
          return -1;\r
       case 7:\r
+         if ((active0 & 0x802200006020020L) != 0L || (active1 & 0x180000000L) != 0L)\r
+            return 49;\r
          if ((active0 & 0x54150040006110L) != 0L)\r
          {\r
             if (jjmatchedPos != 7)\r
@@ -107,19 +109,17 @@ private final int jjStopStringLiteralDfa_0(int pos, long active0, long active1)
                jjmatchedKind = 90;\r
                jjmatchedPos = 7;\r
             }\r
-            return 2;\r
+            return 49;\r
          }\r
-         if ((active0 & 0x802200006020020L) != 0L || (active1 & 0x180000000L) != 0L)\r
-            return 2;\r
          return -1;\r
       case 8:\r
          if ((active0 & 0x10140000000110L) != 0L)\r
-            return 2;\r
+            return 49;\r
          if ((active0 & 0x44010040006000L) != 0L)\r
          {\r
             jjmatchedKind = 90;\r
             jjmatchedPos = 8;\r
-            return 2;\r
+            return 49;\r
          }\r
          return -1;\r
       case 9:\r
@@ -127,34 +127,34 @@ private final int jjStopStringLiteralDfa_0(int pos, long active0, long active1)
          {\r
             jjmatchedKind = 90;\r
             jjmatchedPos = 9;\r
-            return 2;\r
+            return 49;\r
          }\r
          if ((active0 & 0x4000000004000L) != 0L)\r
-            return 2;\r
+            return 49;\r
          return -1;\r
       case 10:\r
-         if ((active0 & 0x10000002000L) != 0L)\r
-            return 2;\r
          if ((active0 & 0x40000040000000L) != 0L)\r
          {\r
             jjmatchedKind = 90;\r
             jjmatchedPos = 10;\r
-            return 2;\r
+            return 49;\r
          }\r
+         if ((active0 & 0x10000002000L) != 0L)\r
+            return 49;\r
          return -1;\r
       case 11:\r
          if ((active0 & 0x40000000L) != 0L)\r
-            return 2;\r
+            return 49;\r
          if ((active0 & 0x40000000000000L) != 0L)\r
          {\r
             jjmatchedKind = 90;\r
             jjmatchedPos = 11;\r
-            return 2;\r
+            return 49;\r
          }\r
          return -1;\r
       case 12:\r
          if ((active0 & 0x40000000000000L) != 0L)\r
-            return 2;\r
+            return 49;\r
          return -1;\r
       default :\r
          return -1;\r
@@ -190,7 +190,7 @@ private int jjMoveStringLiteralDfa0_0()
          jjmatchedKind = 68;\r
          return jjMoveStringLiteralDfa1_0(0x0L, 0xb30000L);\r
       case 47:\r
-         return jjStartNfaWithStates_0(0, 83, 22);\r
+         return jjStartNfaWithStates_0(0, 83, 23);\r
       case 58:\r
          jjmatchedKind = 69;\r
          return jjMoveStringLiteralDfa1_0(0x0L, 0x2000000L);\r
@@ -300,7 +300,7 @@ private int jjMoveStringLiteralDfa1_0(long active0, long active1)
          return jjMoveStringLiteralDfa2_0(active0, 0x2400000000042100L, active1, 0L);\r
       case 102:\r
          if ((active0 & 0x80000000L) != 0L)\r
-            return jjStartNfaWithStates_0(1, 31, 2);\r
+            return jjStartNfaWithStates_0(1, 31, 49);\r
          break;\r
       case 104:\r
          return jjMoveStringLiteralDfa2_0(active0, 0x1080010000000L, active1, 0L);\r
@@ -325,7 +325,7 @@ private int jjMoveStringLiteralDfa1_0(long active0, long active1)
          return jjMoveStringLiteralDfa2_0(active0, 0x200000000000L, active1, 0L);\r
       case 114:\r
          if ((active0 & 0x400000L) != 0L)\r
-            return jjStartNfaWithStates_0(1, 22, 2);\r
+            return jjStartNfaWithStates_0(1, 22, 49);\r
          return jjMoveStringLiteralDfa2_0(active0, 0x10000220000000L, active1, 0L);\r
       case 115:\r
          return jjMoveStringLiteralDfa2_0(active0, 0x80000L, active1, 0L);\r
@@ -361,9 +361,9 @@ private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long a
          return jjMoveStringLiteralDfa3_0(active0, 0x2000002040000400L, active1, 0L);\r
       case 100:\r
          if ((active0 & 0x200L) != 0L)\r
-            return jjStartNfaWithStates_0(2, 9, 2);\r
+            return jjStartNfaWithStates_0(2, 9, 49);\r
          else if ((active0 & 0x800000000L) != 0L)\r
-            return jjStartNfaWithStates_0(2, 35, 2);\r
+            return jjStartNfaWithStates_0(2, 35, 49);\r
          return jjMoveStringLiteralDfa3_0(active0, 0x180L, active1, 0L);\r
       case 101:\r
          return jjMoveStringLiteralDfa3_0(active0, 0x80030020000L, active1, 0x180000000L);\r
@@ -381,15 +381,15 @@ private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long a
          return jjMoveStringLiteralDfa3_0(active0, 0x104005000002000L, active1, 0L);\r
       case 114:\r
          if ((active0 & 0x200000L) != 0L)\r
-            return jjStartNfaWithStates_0(2, 21, 2);\r
+            return jjStartNfaWithStates_0(2, 21, 49);\r
          else if ((active0 & 0x400000000000000L) != 0L)\r
-            return jjStartNfaWithStates_0(2, 58, 2);\r
+            return jjStartNfaWithStates_0(2, 58, 49);\r
          return jjMoveStringLiteralDfa3_0(active0, 0x840000800000L, active1, 0L);\r
       case 115:\r
          return jjMoveStringLiteralDfa3_0(active0, 0x2188020L, active1, 0L);\r
       case 116:\r
          if ((active0 & 0x1000L) != 0L)\r
-            return jjStartNfaWithStates_0(2, 12, 2);\r
+            return jjStartNfaWithStates_0(2, 12, 49);\r
          return jjMoveStringLiteralDfa3_0(active0, 0x8a0000108040000L, active1, 0L);\r
       case 117:\r
          return jjMoveStringLiteralDfa3_0(active0, 0x210200000000L, active1, 0L);\r
@@ -420,13 +420,13 @@ private int jjMoveStringLiteralDfa3_0(long old0, long active0, long old1, long a
             jjmatchedPos = 3;\r
          }\r
          else if ((active0 & 0x200000000L) != 0L)\r
-            return jjStartNfaWithStates_0(3, 33, 2);\r
+            return jjStartNfaWithStates_0(3, 33, 49);\r
          else if ((active0 & 0x4000000000L) != 0L)\r
-            return jjStartNfaWithStates_0(3, 38, 2);\r
+            return jjStartNfaWithStates_0(3, 38, 49);\r
          return jjMoveStringLiteralDfa4_0(active0, 0x88800000a980180L, active1, 0L);\r
       case 104:\r
          if ((active0 & 0x400L) != 0L)\r
-            return jjStartNfaWithStates_0(3, 10, 2);\r
+            return jjStartNfaWithStates_0(3, 10, 49);\r
          return jjMoveStringLiteralDfa4_0(active0, 0x20000000000000L, active1, 0L);\r
       case 107:\r
          return jjMoveStringLiteralDfa4_0(active0, 0x2000000000L, active1, 0L);\r
@@ -436,15 +436,15 @@ private int jjMoveStringLiteralDfa3_0(long old0, long active0, long old1, long a
          return jjMoveStringLiteralDfa4_0(active0, 0x10000000000L, active1, 0L);\r
       case 110:\r
          if ((active0 & 0x10000000L) != 0L)\r
-            return jjStartNfaWithStates_0(3, 28, 2);\r
+            return jjStartNfaWithStates_0(3, 28, 49);\r
          else if ((active0 & 0x80000000000L) != 0L)\r
-            return jjStartNfaWithStates_0(3, 43, 2);\r
+            return jjStartNfaWithStates_0(3, 43, 49);\r
          return jjMoveStringLiteralDfa4_0(active0, 0x108000000000L, active1, 0L);\r
       case 111:\r
          return jjMoveStringLiteralDfa4_0(active0, 0x2000001000004010L, active1, 0L);\r
       case 112:\r
          if ((active0 & 0x1000000000000000L) != 0L)\r
-            return jjStartNfaWithStates_0(3, 60, 2);\r
+            return jjStartNfaWithStates_0(3, 60, 49);\r
          return jjMoveStringLiteralDfa4_0(active0, 0x100000000L, active1, 0L);\r
       case 114:\r
          return jjMoveStringLiteralDfa4_0(active0, 0x20000L, active1, 0x180000000L);\r
@@ -456,7 +456,7 @@ private int jjMoveStringLiteralDfa3_0(long old0, long active0, long old1, long a
          return jjMoveStringLiteralDfa4_0(active0, 0x100000000040000L, active1, 0L);\r
       case 119:\r
          if ((active0 & 0x10000L) != 0L)\r
-            return jjStartNfaWithStates_0(3, 16, 2);\r
+            return jjStartNfaWithStates_0(3, 16, 49);\r
          break;\r
       default :\r
          break;\r
@@ -480,23 +480,23 @@ private int jjMoveStringLiteralDfa4_0(long old0, long active0, long old1, long a
          return jjMoveStringLiteralDfa5_0(active0, 0x100L, active1, 0L);\r
       case 101:\r
          if ((active0 & 0x40L) != 0L)\r
-            return jjStartNfaWithStates_0(4, 6, 2);\r
+            return jjStartNfaWithStates_0(4, 6, 49);\r
          else if ((active0 & 0x1000000000000L) != 0L)\r
-            return jjStartNfaWithStates_0(4, 48, 2);\r
+            return jjStartNfaWithStates_0(4, 48, 49);\r
          return jjMoveStringLiteralDfa5_0(active0, 0x10118000000000L, active1, 0L);\r
       case 105:\r
          return jjMoveStringLiteralDfa5_0(active0, 0x220c00000100000L, active1, 0L);\r
       case 107:\r
          if ((active0 & 0x1000000L) != 0L)\r
-            return jjStartNfaWithStates_0(4, 24, 2);\r
+            return jjStartNfaWithStates_0(4, 24, 49);\r
          else if ((active0 & 0x20000000L) != 0L)\r
-            return jjStartNfaWithStates_0(4, 29, 2);\r
+            return jjStartNfaWithStates_0(4, 29, 49);\r
          break;\r
       case 108:\r
          if ((active0 & 0x80L) != 0L)\r
-            return jjStartNfaWithStates_0(4, 7, 2);\r
+            return jjStartNfaWithStates_0(4, 7, 49);\r
          else if ((active0 & 0x800L) != 0L)\r
-            return jjStartNfaWithStates_0(4, 11, 2);\r
+            return jjStartNfaWithStates_0(4, 11, 49);\r
          break;\r
       case 109:\r
          return jjMoveStringLiteralDfa5_0(active0, 0x40000000000L, active1, 0L);\r
@@ -506,17 +506,17 @@ private int jjMoveStringLiteralDfa4_0(long old0, long active0, long old1, long a
          return jjMoveStringLiteralDfa5_0(active0, 0x40000000L, active1, 0L);\r
       case 114:\r
          if ((active0 & 0x8000000L) != 0L)\r
-            return jjStartNfaWithStates_0(4, 27, 2);\r
+            return jjStartNfaWithStates_0(4, 27, 49);\r
          else if ((active0 & 0x8000000000000L) != 0L)\r
-            return jjStartNfaWithStates_0(4, 51, 2);\r
+            return jjStartNfaWithStates_0(4, 51, 49);\r
          return jjMoveStringLiteralDfa5_0(active0, 0x28000010000c0030L, active1, 0L);\r
       case 115:\r
          if ((active0 & 0x400000000L) != 0L)\r
-            return jjStartNfaWithStates_0(4, 34, 2);\r
+            return jjStartNfaWithStates_0(4, 34, 49);\r
          break;\r
       case 116:\r
          if ((active0 & 0x100000000000000L) != 0L)\r
-            return jjStartNfaWithStates_0(4, 56, 2);\r
+            return jjStartNfaWithStates_0(4, 56, 49);\r
          return jjMoveStringLiteralDfa5_0(active0, 0x42200004004000L, active1, 0L);\r
       case 117:\r
          return jjMoveStringLiteralDfa5_0(active0, 0x100000000L, active1, 0L);\r
@@ -542,17 +542,17 @@ private int jjMoveStringLiteralDfa5_0(long old0, long active0, long old1, long a
          return jjMoveStringLiteralDfa6_0(active0, 0x2c00000004000L, active1, 0L);\r
       case 99:\r
          if ((active0 & 0x200000000000000L) != 0L)\r
-            return jjStartNfaWithStates_0(5, 57, 2);\r
+            return jjStartNfaWithStates_0(5, 57, 49);\r
          return jjMoveStringLiteralDfa6_0(active0, 0x10108000002000L, active1, 0L);\r
       case 100:\r
          if ((active0 & 0x2000000000000000L) != 0L)\r
-            return jjStartNfaWithStates_0(5, 61, 2);\r
+            return jjStartNfaWithStates_0(5, 61, 49);\r
          return jjMoveStringLiteralDfa6_0(active0, 0x84000000000000L, active1, 0L);\r
       case 101:\r
          return jjMoveStringLiteralDfa6_0(active0, 0x40000000020L, active1, 0L);\r
       case 102:\r
          if ((active0 & 0x100000L) != 0L)\r
-            return jjStartNfaWithStates_0(5, 20, 2);\r
+            return jjStartNfaWithStates_0(5, 20, 49);\r
          break;\r
       case 103:\r
          return jjMoveStringLiteralDfa6_0(active0, 0x2000000000L, active1, 0L);\r
@@ -564,13 +564,13 @@ private int jjMoveStringLiteralDfa5_0(long old0, long active0, long old1, long a
          return jjMoveStringLiteralDfa6_0(active0, 0x100L, active1, 0L);\r
       case 109:\r
          if ((active0 & 0x800000L) != 0L)\r
-            return jjStartNfaWithStates_0(5, 23, 2);\r
+            return jjStartNfaWithStates_0(5, 23, 49);\r
          break;\r
       case 110:\r
          if ((active0 & 0x40000L) != 0L)\r
-            return jjStartNfaWithStates_0(5, 18, 2);\r
+            return jjStartNfaWithStates_0(5, 18, 49);\r
          else if ((active0 & 0x20000000000000L) != 0L)\r
-            return jjStartNfaWithStates_0(5, 53, 2);\r
+            return jjStartNfaWithStates_0(5, 53, 49);\r
          return jjMoveStringLiteralDfa6_0(active0, 0x800000000000000L, active1, 0L);\r
       case 114:\r
          return jjMoveStringLiteralDfa6_0(active0, 0x40010000000000L, active1, 0L);\r
@@ -578,11 +578,11 @@ private int jjMoveStringLiteralDfa5_0(long old0, long active0, long old1, long a
          return jjMoveStringLiteralDfa6_0(active0, 0x40000000L, active1, 0L);\r
       case 116:\r
          if ((active0 & 0x80000L) != 0L)\r
-            return jjStartNfaWithStates_0(5, 19, 2);\r
+            return jjStartNfaWithStates_0(5, 19, 49);\r
          else if ((active0 & 0x100000000L) != 0L)\r
-            return jjStartNfaWithStates_0(5, 32, 2);\r
+            return jjStartNfaWithStates_0(5, 32, 49);\r
          else if ((active0 & 0x1000000000L) != 0L)\r
-            return jjStartNfaWithStates_0(5, 36, 2);\r
+            return jjStartNfaWithStates_0(5, 36, 49);\r
          return jjMoveStringLiteralDfa6_0(active0, 0x20000L, active1, 0x180000000L);\r
       default :\r
          break;\r
@@ -604,13 +604,13 @@ private int jjMoveStringLiteralDfa6_0(long old0, long active0, long old1, long a
          return jjMoveStringLiteralDfa7_0(active0, 0x844010000000100L, active1, 0L);\r
       case 101:\r
          if ((active0 & 0x2000000000L) != 0L)\r
-            return jjStartNfaWithStates_0(6, 37, 2);\r
+            return jjStartNfaWithStates_0(6, 37, 49);\r
          return jjMoveStringLiteralDfa7_0(active0, 0x2002000L, active1, 0L);\r
       case 108:\r
          if ((active0 & 0x400000000000L) != 0L)\r
-            return jjStartNfaWithStates_0(6, 46, 2);\r
+            return jjStartNfaWithStates_0(6, 46, 49);\r
          else if ((active0 & 0x800000000000L) != 0L)\r
-            return jjStartNfaWithStates_0(6, 47, 2);\r
+            return jjStartNfaWithStates_0(6, 47, 49);\r
          break;\r
       case 110:\r
          return jjMoveStringLiteralDfa7_0(active0, 0x2000000000000L, active1, 0L);\r
@@ -618,7 +618,7 @@ private int jjMoveStringLiteralDfa6_0(long old0, long active0, long old1, long a
          return jjMoveStringLiteralDfa7_0(active0, 0x200004020000L, active1, 0x180000000L);\r
       case 115:\r
          if ((active0 & 0x80000000000000L) != 0L)\r
-            return jjStartNfaWithStates_0(6, 55, 2);\r
+            return jjStartNfaWithStates_0(6, 55, 49);\r
          break;\r
       case 116:\r
          if ((active0 & 0x8000000000L) != 0L)\r
@@ -651,7 +651,7 @@ private int jjMoveStringLiteralDfa7_0(long old0, long active0, long old1, long a
          return jjMoveStringLiteralDfa8_0(active0, 0x4000000000000L, active1, 0L);\r
       case 101:\r
          if ((active0 & 0x20L) != 0L)\r
-            return jjStartNfaWithStates_0(7, 5, 2);\r
+            return jjStartNfaWithStates_0(7, 5, 49);\r
          return jjMoveStringLiteralDfa8_0(active0, 0x10040000000000L, active1, 0L);\r
       case 104:\r
          return jjMoveStringLiteralDfa8_0(active0, 0x10L, active1, 0L);\r
@@ -659,15 +659,15 @@ private int jjMoveStringLiteralDfa7_0(long old0, long active0, long old1, long a
          return jjMoveStringLiteralDfa8_0(active0, 0x40000000004000L, active1, 0L);\r
       case 108:\r
          if ((active0 & 0x800000000000000L) != 0L)\r
-            return jjStartNfaWithStates_0(7, 59, 2);\r
+            return jjStartNfaWithStates_0(7, 59, 49);\r
          return jjMoveStringLiteralDfa8_0(active0, 0x40000000L, active1, 0L);\r
       case 110:\r
          if ((active0 & 0x2000000L) != 0L)\r
-            return jjStartNfaWithStates_0(7, 25, 2);\r
+            return jjStartNfaWithStates_0(7, 25, 49);\r
          else if ((active0 & 0x4000000L) != 0L)\r
-            return jjStartNfaWithStates_0(7, 26, 2);\r
+            return jjStartNfaWithStates_0(7, 26, 49);\r
          else if ((active0 & 0x200000000000L) != 0L)\r
-            return jjStartNfaWithStates_0(7, 45, 2);\r
+            return jjStartNfaWithStates_0(7, 45, 49);\r
          break;\r
       case 111:\r
          return jjMoveStringLiteralDfa8_0(active0, 0x100000000000L, active1, 0L);\r
@@ -680,7 +680,7 @@ private int jjMoveStringLiteralDfa7_0(long old0, long active0, long old1, long a
          return jjMoveStringLiteralDfa8_0(active0, 0x100L, active1, 0x180000000L);\r
       case 116:\r
          if ((active0 & 0x2000000000000L) != 0L)\r
-            return jjStartNfaWithStates_0(7, 49, 2);\r
+            return jjStartNfaWithStates_0(7, 49, 49);\r
          return jjMoveStringLiteralDfa8_0(active0, 0x10000000000L, active1, 0L);\r
       default :\r
          break;\r
@@ -706,11 +706,11 @@ private int jjMoveStringLiteralDfa8_0(long old0, long active0, long old1, long a
          return jjMoveStringLiteralDfa9_0(active0, 0x2000L, active1, 0L);\r
       case 100:\r
          if ((active0 & 0x10000000000000L) != 0L)\r
-            return jjStartNfaWithStates_0(8, 52, 2);\r
+            return jjStartNfaWithStates_0(8, 52, 49);\r
          break;\r
       case 101:\r
          if ((active0 & 0x100L) != 0L)\r
-            return jjStartNfaWithStates_0(8, 8, 2);\r
+            return jjStartNfaWithStates_0(8, 8, 49);\r
          break;\r
       case 105:\r
          return jjMoveStringLiteralDfa9_0(active0, 0x10000000000L, active1, 0L);\r
@@ -718,7 +718,7 @@ private int jjMoveStringLiteralDfa8_0(long old0, long active0, long old1, long a
          return jjMoveStringLiteralDfa9_0(active0, 0x4000000000000L, active1, 0L);\r
       case 109:\r
          if ((active0 & 0x10L) != 0L)\r
-            return jjStartNfaWithStates_0(8, 4, 2);\r
+            return jjStartNfaWithStates_0(8, 4, 49);\r
          break;\r
       case 110:\r
          return jjMoveStringLiteralDfa9_0(active0, 0x40000000000000L, active1, 0L);\r
@@ -726,9 +726,9 @@ private int jjMoveStringLiteralDfa8_0(long old0, long active0, long old1, long a
          return jjMoveStringLiteralDfa9_0(active0, 0x4000L, active1, 0L);\r
       case 114:\r
          if ((active0 & 0x40000000000L) != 0L)\r
-            return jjStartNfaWithStates_0(8, 42, 2);\r
+            return jjStartNfaWithStates_0(8, 42, 49);\r
          else if ((active0 & 0x100000000000L) != 0L)\r
-            return jjStartNfaWithStates_0(8, 44, 2);\r
+            return jjStartNfaWithStates_0(8, 44, 49);\r
          break;\r
       default :\r
          break;\r
@@ -748,7 +748,7 @@ private int jjMoveStringLiteralDfa9_0(long old0, long active0, long old1, long a
    {\r
       case 101:\r
          if ((active0 & 0x4000000000000L) != 0L)\r
-            return jjStartNfaWithStates_0(9, 50, 2);\r
+            return jjStartNfaWithStates_0(9, 50, 49);\r
          return jjMoveStringLiteralDfa10_0(active0, 0x40000000000000L, active1, 0L);\r
       case 102:\r
          return jjMoveStringLiteralDfa10_0(active0, 0L, active1, 0x80000000L);\r
@@ -756,7 +756,7 @@ private int jjMoveStringLiteralDfa9_0(long old0, long active0, long old1, long a
          return jjMoveStringLiteralDfa10_0(active0, 0x2000L, active1, 0L);\r
       case 110:\r
          if ((active0 & 0x4000L) != 0L)\r
-            return jjStartNfaWithStates_0(9, 14, 2);\r
+            return jjStartNfaWithStates_0(9, 14, 49);\r
          break;\r
       case 111:\r
          return jjMoveStringLiteralDfa10_0(active0, 0x10000000000L, active1, 0L);\r
@@ -784,11 +784,11 @@ private int jjMoveStringLiteralDfa10_0(long old0, long active0, long old1, long
          return jjMoveStringLiteralDfa11_0(active0, 0x40000000000000L, active1, 0L);\r
       case 101:\r
          if ((active0 & 0x2000L) != 0L)\r
-            return jjStartNfaWithStates_0(10, 13, 2);\r
+            return jjStartNfaWithStates_0(10, 13, 49);\r
          return jjMoveStringLiteralDfa11_0(active0, 0x40000000L, active1, 0x100000000L);\r
       case 110:\r
          if ((active0 & 0x10000000000L) != 0L)\r
-            return jjStartNfaWithStates_0(10, 40, 2);\r
+            return jjStartNfaWithStates_0(10, 40, 49);\r
          break;\r
       case 117:\r
          return jjMoveStringLiteralDfa11_0(active0, 0L, active1, 0x80000000L);\r
@@ -814,7 +814,7 @@ private int jjMoveStringLiteralDfa11_0(long old0, long active0, long old1, long
          return jjMoveStringLiteralDfa12_0(active0, 0L, active1, 0x100000000L);\r
       case 100:\r
          if ((active0 & 0x40000000L) != 0L)\r
-            return jjStartNfaWithStates_0(11, 30, 2);\r
+            return jjStartNfaWithStates_0(11, 30, 49);\r
          break;\r
       case 110:\r
          return jjMoveStringLiteralDfa12_0(active0, 0L, active1, 0x80000000L);\r
@@ -840,7 +840,7 @@ private int jjMoveStringLiteralDfa12_0(long old0, long active0, long old1, long
          return jjMoveStringLiteralDfa13_0(active0, 0L, active1, 0x100000000L);\r
       case 121:\r
          if ((active0 & 0x40000000000000L) != 0L)\r
-            return jjStartNfaWithStates_0(12, 54, 2);\r
+            return jjStartNfaWithStates_0(12, 54, 49);\r
          break;\r
       default :\r
          break;\r
@@ -941,7 +941,7 @@ static final long[] jjbitVec0 = {
 private int jjMoveNfa_0(int startState, int curPos)\r
 {\r
    int startsAt = 0;\r
-   jjnewStateCnt = 48;\r
+   jjnewStateCnt = 49;\r
    int i = 1;\r
    jjstateSet[0] = startState;\r
    int kind = 0x7fffffff;\r
@@ -956,12 +956,32 @@ private int jjMoveNfa_0(int startState, int curPos)
          {\r
             switch(jjstateSet[--i])\r
             {\r
+               case 23:\r
+                  if (curChar == 47)\r
+                  {\r
+                     if (kind > 3)\r
+                        kind = 3;\r
+                     jjCheckNAdd(30);\r
+                  }\r
+                  else if (curChar == 42)\r
+                     jjCheckNAddStates(0, 2);\r
+                  break;\r
+               case 49:\r
+                  if ((0x3ff000000000000L & l) != 0L)\r
+                  {\r
+                     if (kind > 90)\r
+                        kind = 90;\r
+                     jjCheckNAddTwoStates(2, 3);\r
+                  }\r
+                  else if (curChar == 46)\r
+                     jjCheckNAdd(2);\r
+                  break;\r
                case 0:\r
                   if ((0x3ff000000000000L & l) != 0L)\r
                   {\r
                      if (kind > 93)\r
                         kind = 93;\r
-                     jjCheckNAddStates(0, 6);\r
+                     jjCheckNAddStates(3, 9);\r
                   }\r
                   else if ((0x100002600L & l) != 0L)\r
                   {\r
@@ -969,18 +989,18 @@ private int jjMoveNfa_0(int startState, int curPos)
                         kind = 1;\r
                   }\r
                   else if (curChar == 47)\r
-                     jjAddStates(7, 8);\r
+                     jjAddStates(10, 11);\r
                   else if (curChar == 46)\r
-                     jjCheckNAdd(10);\r
+                     jjCheckNAdd(11);\r
                   else if (curChar == 34)\r
-                     jjCheckNAddStates(9, 11);\r
+                     jjCheckNAddStates(12, 14);\r
                   break;\r
-               case 48:\r
-                  if ((0x3ff400000000000L & l) != 0L)\r
+               case 50:\r
+                  if ((0x3ff000000000000L & l) != 0L)\r
                   {\r
                      if (kind > 90)\r
                         kind = 90;\r
-                     jjCheckNAdd(2);\r
+                     jjCheckNAddTwoStates(2, 3);\r
                   }\r
                   else if (curChar == 43)\r
                   {\r
@@ -992,177 +1012,173 @@ private int jjMoveNfa_0(int startState, int curPos)
                      if (kind > 92)\r
                         kind = 92;\r
                   }\r
-                  break;\r
-               case 22:\r
-                  if (curChar == 47)\r
-                  {\r
-                     if (kind > 3)\r
-                        kind = 3;\r
-                     jjCheckNAdd(29);\r
-                  }\r
-                  else if (curChar == 42)\r
-                     jjCheckNAddStates(12, 14);\r
+                  else if (curChar == 46)\r
+                     jjCheckNAdd(2);\r
                   break;\r
                case 2:\r
-                  if ((0x3ff400000000000L & l) == 0L)\r
+                  if ((0x3ff000000000000L & l) == 0L)\r
                      break;\r
                   if (kind > 90)\r
                      kind = 90;\r
-                  jjCheckNAdd(2);\r
+                  jjCheckNAddTwoStates(2, 3);\r
                   break;\r
                case 3:\r
-                  if (curChar == 34)\r
-                     jjCheckNAddStates(9, 11);\r
+                  if (curChar == 46)\r
+                     jjCheckNAdd(2);\r
                   break;\r
                case 4:\r
+                  if (curChar == 34)\r
+                     jjCheckNAddStates(12, 14);\r
+                  break;\r
+               case 5:\r
                   if ((0xfffffffbfffffbffL & l) != 0L)\r
-                     jjCheckNAddStates(9, 11);\r
+                     jjCheckNAddStates(12, 14);\r
                   break;\r
-               case 6:\r
+               case 7:\r
                   if ((0xfffffffffffffbffL & l) != 0L)\r
-                     jjCheckNAddStates(9, 11);\r
+                     jjCheckNAddStates(12, 14);\r
                   break;\r
-               case 7:\r
+               case 8:\r
                   if (curChar == 34 && kind > 91)\r
                      kind = 91;\r
                   break;\r
-               case 9:\r
+               case 10:\r
                   if (curChar == 46)\r
-                     jjCheckNAdd(10);\r
+                     jjCheckNAdd(11);\r
                   break;\r
-               case 10:\r
+               case 11:\r
                   if ((0x3ff000000000000L & l) == 0L)\r
                      break;\r
                   if (kind > 94)\r
                      kind = 94;\r
                   jjCheckNAddStates(15, 18);\r
                   break;\r
-               case 12:\r
+               case 13:\r
                   if ((0x3ff000000000000L & l) == 0L)\r
                      break;\r
                   if (kind > 94)\r
                      kind = 94;\r
-                  jjCheckNAdd(12);\r
+                  jjCheckNAdd(13);\r
                   break;\r
-               case 14:\r
+               case 15:\r
                   if (curChar == 45)\r
-                     jjCheckNAdd(12);\r
+                     jjCheckNAdd(13);\r
                   break;\r
-               case 15:\r
+               case 16:\r
                   if (curChar == 43)\r
-                     jjCheckNAdd(12);\r
+                     jjCheckNAdd(13);\r
                   break;\r
-               case 18:\r
+               case 19:\r
                   if (curChar == 45 && kind > 92)\r
                      kind = 92;\r
                   break;\r
-               case 19:\r
+               case 20:\r
                   if (curChar == 43 && kind > 92)\r
                      kind = 92;\r
                   break;\r
-               case 21:\r
+               case 22:\r
                   if (curChar == 47)\r
-                     jjAddStates(7, 8);\r
+                     jjAddStates(10, 11);\r
                   break;\r
-               case 23:\r
+               case 24:\r
                   if ((0xfffffbffffffffffL & l) != 0L)\r
-                     jjCheckNAddStates(12, 14);\r
+                     jjCheckNAddStates(0, 2);\r
                   break;\r
-               case 24:\r
+               case 25:\r
                   if (curChar == 42)\r
-                     jjstateSet[jjnewStateCnt++] = 25;\r
+                     jjstateSet[jjnewStateCnt++] = 26;\r
                   break;\r
-               case 25:\r
+               case 26:\r
                   if ((0xffff7fffffffffffL & l) != 0L)\r
-                     jjCheckNAddStates(12, 14);\r
+                     jjCheckNAddStates(0, 2);\r
                   break;\r
-               case 26:\r
+               case 27:\r
                   if (curChar == 47 && kind > 2)\r
                      kind = 2;\r
                   break;\r
-               case 27:\r
+               case 28:\r
                   if (curChar == 42)\r
-                     jjstateSet[jjnewStateCnt++] = 26;\r
+                     jjstateSet[jjnewStateCnt++] = 27;\r
                   break;\r
-               case 28:\r
+               case 29:\r
                   if (curChar != 47)\r
                      break;\r
                   if (kind > 3)\r
                      kind = 3;\r
-                  jjCheckNAdd(29);\r
+                  jjCheckNAdd(30);\r
                   break;\r
-               case 29:\r
+               case 30:\r
                   if ((0xfffffffffffffbffL & l) == 0L)\r
                      break;\r
                   if (kind > 3)\r
                      kind = 3;\r
-                  jjCheckNAdd(29);\r
+                  jjCheckNAdd(30);\r
                   break;\r
-               case 30:\r
+               case 31:\r
                   if ((0x3ff000000000000L & l) == 0L)\r
                      break;\r
                   if (kind > 93)\r
                      kind = 93;\r
-                  jjCheckNAddStates(0, 6);\r
+                  jjCheckNAddStates(3, 9);\r
                   break;\r
-               case 31:\r
+               case 32:\r
                   if ((0x3ff000000000000L & l) == 0L)\r
                      break;\r
                   if (kind > 93)\r
                      kind = 93;\r
-                  jjCheckNAdd(31);\r
+                  jjCheckNAdd(32);\r
                   break;\r
-               case 32:\r
+               case 33:\r
                   if ((0x3ff000000000000L & l) != 0L)\r
-                     jjCheckNAddTwoStates(32, 33);\r
+                     jjCheckNAddTwoStates(33, 34);\r
                   break;\r
-               case 33:\r
+               case 34:\r
                   if (curChar != 46)\r
                      break;\r
                   if (kind > 94)\r
                      kind = 94;\r
                   jjCheckNAddStates(19, 22);\r
                   break;\r
-               case 34:\r
+               case 35:\r
                   if ((0x3ff000000000000L & l) == 0L)\r
                      break;\r
                   if (kind > 94)\r
                      kind = 94;\r
                   jjCheckNAddStates(19, 22);\r
                   break;\r
-               case 36:\r
+               case 37:\r
                   if ((0x3ff000000000000L & l) == 0L)\r
                      break;\r
                   if (kind > 94)\r
                      kind = 94;\r
-                  jjCheckNAdd(36);\r
+                  jjCheckNAdd(37);\r
                   break;\r
-               case 38:\r
+               case 39:\r
                   if (curChar == 45)\r
-                     jjCheckNAdd(36);\r
+                     jjCheckNAdd(37);\r
                   break;\r
-               case 39:\r
+               case 40:\r
                   if (curChar == 43)\r
-                     jjCheckNAdd(36);\r
+                     jjCheckNAdd(37);\r
                   break;\r
-               case 41:\r
+               case 42:\r
                   if ((0x3ff000000000000L & l) != 0L)\r
                      jjCheckNAddStates(23, 26);\r
                   break;\r
-               case 43:\r
+               case 44:\r
                   if ((0x3ff000000000000L & l) == 0L)\r
                      break;\r
                   if (kind > 94)\r
                      kind = 94;\r
-                  jjCheckNAdd(43);\r
+                  jjCheckNAdd(44);\r
                   break;\r
-               case 45:\r
+               case 46:\r
                   if (curChar == 45)\r
-                     jjCheckNAdd(43);\r
+                     jjCheckNAdd(44);\r
                   break;\r
-               case 46:\r
+               case 47:\r
                   if (curChar == 43)\r
-                     jjCheckNAdd(43);\r
+                     jjCheckNAdd(44);\r
                   break;\r
                default : break;\r
             }\r
@@ -1175,12 +1191,20 @@ private int jjMoveNfa_0(int startState, int curPos)
          {\r
             switch(jjstateSet[--i])\r
             {\r
+               case 49:\r
+               case 2:\r
+                  if ((0x7fffffe87fffffeL & l) == 0L)\r
+                     break;\r
+                  if (kind > 90)\r
+                     kind = 90;\r
+                  jjCheckNAddTwoStates(2, 3);\r
+                  break;\r
                case 0:\r
                   if ((0x7fffffe87fffffeL & l) != 0L)\r
                   {\r
                      if (kind > 90)\r
                         kind = 90;\r
-                     jjCheckNAdd(2);\r
+                     jjCheckNAddTwoStates(2, 3);\r
                   }\r
                   if ((0x2000000020L & l) != 0L)\r
                   {\r
@@ -1188,92 +1212,91 @@ private int jjMoveNfa_0(int startState, int curPos)
                         kind = 92;\r
                   }\r
                   if (curChar == 69)\r
-                     jjCheckNAddTwoStates(18, 19);\r
+                     jjCheckNAddTwoStates(19, 20);\r
                   else if (curChar == 101)\r
-                     jjCheckNAddTwoStates(18, 19);\r
+                     jjCheckNAddTwoStates(19, 20);\r
                   break;\r
-               case 48:\r
-               case 2:\r
+               case 50:\r
                   if ((0x7fffffe87fffffeL & l) == 0L)\r
                      break;\r
                   if (kind > 90)\r
                      kind = 90;\r
-                  jjCheckNAdd(2);\r
+                  jjCheckNAddTwoStates(2, 3);\r
                   break;\r
                case 1:\r
                   if ((0x7fffffe87fffffeL & l) == 0L)\r
                      break;\r
                   if (kind > 90)\r
                      kind = 90;\r
-                  jjCheckNAdd(2);\r
+                  jjCheckNAddTwoStates(2, 3);\r
                   break;\r
-               case 4:\r
+               case 5:\r
                   if ((0xffffffffefffffffL & l) != 0L)\r
-                     jjCheckNAddStates(9, 11);\r
+                     jjCheckNAddStates(12, 14);\r
                   break;\r
-               case 5:\r
+               case 6:\r
                   if (curChar == 92)\r
-                     jjstateSet[jjnewStateCnt++] = 6;\r
+                     jjstateSet[jjnewStateCnt++] = 7;\r
                   break;\r
-               case 6:\r
-                  jjCheckNAddStates(9, 11);\r
+               case 7:\r
+                  jjCheckNAddStates(12, 14);\r
                   break;\r
-               case 8:\r
+               case 9:\r
                   if ((0x2000000020L & l) != 0L && kind > 92)\r
                      kind = 92;\r
                   break;\r
-               case 11:\r
+               case 12:\r
                   if ((0x2000000020L & l) != 0L)\r
-                     jjstateSet[jjnewStateCnt++] = 12;\r
+                     jjstateSet[jjnewStateCnt++] = 13;\r
                   break;\r
-               case 13:\r
+               case 14:\r
                   if (curChar == 101)\r
-                     jjCheckNAddTwoStates(14, 15);\r
+                     jjCheckNAddTwoStates(15, 16);\r
                   break;\r
-               case 16:\r
+               case 17:\r
                   if (curChar == 69)\r
-                     jjCheckNAddTwoStates(14, 15);\r
+                     jjCheckNAddTwoStates(15, 16);\r
                   break;\r
-               case 17:\r
+               case 18:\r
                   if (curChar == 101)\r
-                     jjCheckNAddTwoStates(18, 19);\r
+                     jjCheckNAddTwoStates(19, 20);\r
                   break;\r
-               case 20:\r
+               case 21:\r
                   if (curChar == 69)\r
-                     jjCheckNAddTwoStates(18, 19);\r
+                     jjCheckNAddTwoStates(19, 20);\r
                   break;\r
-               case 23:\r
-               case 25:\r
-                  jjCheckNAddStates(12, 14);\r
+               case 24:\r
+               case 26:\r
+                  jjCheckNAddStates(0, 2);\r
                   break;\r
-               case 29:\r
+               case 30:\r
                   if (kind > 3)\r
                      kind = 3;\r
-                  jjstateSet[jjnewStateCnt++] = 29;\r
+                  jjstateSet[jjnewStateCnt++] = 30;\r
                   break;\r
-               case 35:\r
+               case 36:\r
                   if ((0x2000000020L & l) != 0L)\r
-                     jjstateSet[jjnewStateCnt++] = 36;\r
+                     jjstateSet[jjnewStateCnt++] = 37;\r
                   break;\r
-               case 37:\r
+               case 38:\r
                   if (curChar == 101)\r
-                     jjCheckNAddTwoStates(38, 39);\r
+                     jjCheckNAddTwoStates(39, 40);\r
                   break;\r
-               case 40:\r
+               case 41:\r
                   if (curChar == 69)\r
-                     jjCheckNAddTwoStates(38, 39);\r
+                     jjCheckNAddTwoStates(39, 40);\r
                   break;\r
-               case 42:\r
+               case 43:\r
                   if ((0x2000000020L & l) != 0L)\r
-                     jjstateSet[jjnewStateCnt++] = 43;\r
+                     jjstateSet[jjnewStateCnt++] = 44;\r
                   break;\r
-               case 44:\r
+               case 45:\r
                   if (curChar == 101)\r
-                     jjCheckNAddTwoStates(45, 46);\r
+                     jjCheckNAddTwoStates(46, 47);\r
                   break;\r
-               case 47:\r
+               case 48:\r
                   if (curChar == 69)\r
-                     jjCheckNAddTwoStates(45, 46);\r
+                     jjCheckNAddTwoStates(46, 47);\r
                   break;\r
                default : break;\r
             }\r
@@ -1287,22 +1310,22 @@ private int jjMoveNfa_0(int startState, int curPos)
          {\r
             switch(jjstateSet[--i])\r
             {\r
-               case 4:\r
-               case 6:\r
+               case 5:\r
+               case 7:\r
                   if ((jjbitVec0[i2] & l2) != 0L)\r
-                     jjCheckNAddStates(9, 11);\r
+                     jjCheckNAddStates(12, 14);\r
                   break;\r
-               case 23:\r
-               case 25:\r
+               case 24:\r
+               case 26:\r
                   if ((jjbitVec0[i2] & l2) != 0L)\r
-                     jjCheckNAddStates(12, 14);\r
+                     jjCheckNAddStates(0, 2);\r
                   break;\r
-               case 29:\r
+               case 30:\r
                   if ((jjbitVec0[i2] & l2) == 0L)\r
                      break;\r
                   if (kind > 3)\r
                      kind = 3;\r
-                  jjstateSet[jjnewStateCnt++] = 29;\r
+                  jjstateSet[jjnewStateCnt++] = 30;\r
                   break;\r
                default : break;\r
             }\r
@@ -1315,15 +1338,15 @@ private int jjMoveNfa_0(int startState, int curPos)
          kind = 0x7fffffff;\r
       }\r
       ++curPos;\r
-      if ((i = jjnewStateCnt) == (startsAt = 48 - (jjnewStateCnt = startsAt)))\r
+      if ((i = jjnewStateCnt) == (startsAt = 49 - (jjnewStateCnt = startsAt)))\r
          return curPos;\r
       try { curChar = input_stream.readChar(); }\r
       catch(java.io.IOException e) { return curPos; }\r
    }\r
 }\r
 static final int[] jjnextStates = {
-   31, 32, 33, 41, 42, 44, 47, 22, 28, 4, 5, 7, 23, 24, 27, 10, 
-   11, 13, 16, 34, 35, 37, 40, 41, 42, 44, 47, 
+   24, 25, 28, 32, 33, 34, 42, 43, 45, 48, 23, 29, 5, 6, 8, 11, 
+   12, 14, 17, 35, 36, 38, 41, 42, 43, 45, 48, 
 };\r
 \r
 /** Token literal values. */\r
@@ -1362,8 +1385,8 @@ static final long[] jjtoSkip = {
    0xeL, 0x0L, 
 };\r
 protected SimpleCharStream input_stream;\r
-private final int[] jjrounds = new int[48];\r
-private final int[] jjstateSet = new int[96];\r
+private final int[] jjrounds = new int[49];\r
+private final int[] jjstateSet = new int[98];\r
 private final StringBuilder jjimage = new StringBuilder();\r
 private StringBuilder image = jjimage;\r
 private int jjimageLen;\r
@@ -1394,7 +1417,7 @@ private void ReInitRounds()
 {\r
    int i;\r
    jjround = 0x80000001;\r
-   for (i = 48; i-- > 0;)\r
+   for (i = 49; i-- > 0;)\r
       jjrounds[i] = 0x80000000;\r
 }\r
 \r

diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/parser/ModelicaParser.jj b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/parser/ModelicaParser.jj
index 6c8fb79101ced0ee43ef8a08b1a344422cc4baee..0af3f17b2991c69b13575ea7c6b02b78d8fec676 100644 (file)
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/parser/ModelicaParser.jj
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/parser/ModelicaParser.jj
@@ -75,7 +75,7 @@ TOKEN:
 | "*" | "/" | ".*" | "./"\r
 | "^" | ".^"\r
 | "=" | ":=" \r
-| <IDENT: ["a"-"z","A"-"Z","_"] (["a"-"z","A"-"Z","_",".", "0"-"9"])* >\r
+| <IDENT: ["a"-"z","A"-"Z","_"] (["a"-"z","A"-"Z","_","0"-"9"] | "." ["a"-"z","A"-"Z","_","0"-"9"])* >\r
 | <STRING: "\"" (~["\"", "\\", "\n"] | "\\" ~["\n"])* "\"">\r
     { matchedToken.image = matchedToken.image.substring(1,matchedToken.image.length()-1); }\r
 | <EXP: "e" | "e-" | "E" | "E-" | "E+" | "e+" >\r
@@ -2300,7 +2300,17 @@ void add_op() : {/*@bgen(jjtree) add_op */
                                      jjtree.closeNodeScope(jjtn000, true);\r
                                      jjtc000 = false;\r
                                    }\r
-/*@egen*/ { jjtn000.op = "-";} | ".+" | ".-"/*@bgen(jjtree)*/\r
+/*@egen*/ { jjtn000.op = "-";} | ".+"/*@bgen(jjtree)*/\r
+                                                               {\r
+                                                                 jjtree.closeNodeScope(jjtn000, true);\r
+                                                                 jjtc000 = false;\r
+                                                               }\r
+/*@egen*/ { jjtn000.op = ".+";} | ".-"/*@bgen(jjtree)*/\r
+                                                                                            {\r
+                                                                                              jjtree.closeNodeScope(jjtn000, true);\r
+                                                                                              jjtc000 = false;\r
+                                                                                            }\r
+/*@egen*/ { jjtn000.op = ".-";}/*@bgen(jjtree)*/\r
     } finally {\r
       if (jjtc000) {\r
         jjtree.closeNodeScope(jjtn000, true);\r
@@ -2349,33 +2359,33 @@ void mul_op() : {/*@bgen(jjtree) mul_op */
 } {/*@bgen(jjtree) mul_op */\r
     try {\r
 /*@egen*/\r
-    "*"/*@bgen(jjtree)*/\r
-        {\r
-          jjtree.closeNodeScope(jjtn000, true);\r
-          jjtc000 = false;\r
-        }\r
-/*@egen*/ { jjtn000.op = "*";} | "/"/*@bgen(jjtree)*/\r
-                                   {\r
-                                     jjtree.closeNodeScope(jjtn000, true);\r
-                                     jjtc000 = false;\r
-                                   }\r
-/*@egen*/ { jjtn000.op = "/";} | ".*"/*@bgen(jjtree)*/\r
-                                                               {\r
-                                                                 jjtree.closeNodeScope(jjtn000, true);\r
-                                                                 jjtc000 = false;\r
-                                                               }\r
+    ".*"/*@bgen(jjtree)*/\r
+         {\r
+           jjtree.closeNodeScope(jjtn000, true);\r
+           jjtc000 = false;\r
+         }\r
 /*@egen*/ { jjtn000.op = ".*";} | "./"/*@bgen(jjtree)*/\r
-                                                                                             {\r
-                                                                                               jjtree.closeNodeScope(jjtn000, true);\r
-                                                                                               jjtc000 = false;\r
-                                                                                             }\r
-/*@egen*/  { jjtn000.op = "./";}/*@bgen(jjtree)*/\r
+                                       {\r
+                                         jjtree.closeNodeScope(jjtn000, true);\r
+                                         jjtc000 = false;\r
+                                       }\r
+/*@egen*/  { jjtn000.op = "./";} | "*"/*@bgen(jjtree)*/\r
+                                                                   {\r
+                                                                     jjtree.closeNodeScope(jjtn000, true);\r
+                                                                     jjtc000 = false;\r
+                                                                   }\r
+/*@egen*/ { jjtn000.op = "*";} | "/"/*@bgen(jjtree)*/\r
+                                                                                              {\r
+                                                                                                jjtree.closeNodeScope(jjtn000, true);\r
+                                                                                                jjtc000 = false;\r
+                                                                                              }\r
+/*@egen*/ { jjtn000.op = "/";}/*@bgen(jjtree)*/\r
     } finally {\r
       if (jjtc000) {\r
         jjtree.closeNodeScope(jjtn000, true);\r
       }\r
     }\r
-/*@egen*/\r
+/*@egen*/ \r
 }\r
 \r
 void factor() : {/*@bgen(jjtree) factor */\r