Getting closer

refs #4765

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@29223 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 99bdaaee3a952db76e2ba27c2b69aa2fdb38d912..29ef1f1e0e8041c877a79f8f6c54a8e63a7ba241 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
@@ -119,8 +119,8 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
         case 47:\r
         case 50:\r
         case 61:\r
-        case 94:\r
         case 95:\r
+        case 96:\r
           ;\r
           break;\r
         default:\r
@@ -226,12 +226,12 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
       case 17:\r
         jj_consume_token(17);\r
         break;\r
-      case 94:\r
-        jj_consume_token(94);\r
-        break;\r
       case 95:\r
         jj_consume_token(95);\r
         break;\r
+      case 96:\r
+        jj_consume_token(96);\r
+        break;\r
       default:\r
         jj_la1[7] = jj_gen;\r
         jj_consume_token(-1);\r
@@ -709,8 +709,8 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
         case 61:\r
         case 68:\r
         case IDENT:\r
-        case 94:\r
         case 95:\r
+        case 96:\r
           ;\r
           break;\r
         default:\r
@@ -786,8 +786,8 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
       case 61:\r
       case 68:\r
       case IDENT:\r
-      case 94:\r
       case 95:\r
+      case 96:\r
         switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {\r
         case 8:\r
           jj_consume_token(8);\r
@@ -844,8 +844,8 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
         case 61:\r
         case 68:\r
         case IDENT:\r
-        case 94:\r
         case 95:\r
+        case 96:\r
           switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {\r
           case 7:\r
           case 17:\r
@@ -859,8 +859,8 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
           case 47:\r
           case 50:\r
           case 61:\r
-          case 94:\r
           case 95:\r
+          case 96:\r
             class_definition();\r
             break;\r
           case 5:\r
@@ -895,8 +895,8 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
           case 47:\r
           case 50:\r
           case 61:\r
-          case 94:\r
           case 95:\r
+          case 96:\r
             class_definition();\r
             break;\r
           case 5:\r
@@ -1772,8 +1772,8 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
       case 61:\r
       case 68:\r
       case IDENT:\r
-      case 94:\r
       case 95:\r
+      case 96:\r
         switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {\r
         case 7:\r
         case 17:\r
@@ -1787,8 +1787,8 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
         case 47:\r
         case 50:\r
         case 61:\r
-        case 94:\r
         case 95:\r
+        case 96:\r
           class_definition();\r
           break;\r
         case 5:\r
@@ -1857,8 +1857,8 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
       case 47:\r
       case 50:\r
       case 61:\r
-      case 94:\r
       case 95:\r
+      case 96:\r
         class_definition();\r
         break;\r
       case 5:\r
@@ -4997,9 +4997,9 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
     jj_scanpos = xsp;\r
     if (jj_scan_token(17)) {\r
     jj_scanpos = xsp;\r
-    if (jj_scan_token(94)) {\r
+    if (jj_scan_token(95)) {\r
     jj_scanpos = xsp;\r
-    if (jj_scan_token(95)) return true;\r
+    if (jj_scan_token(96)) return true;\r
     }\r
     }\r
     }\r
@@ -5736,10 +5736,12 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
   static private int[] jj_la1_0;\r
   static private int[] jj_la1_1;\r
   static private int[] jj_la1_2;\r
+  static private int[] jj_la1_3;\r
   static {\r
       jj_la1_init_0();\r
       jj_la1_init_1();\r
       jj_la1_init_2();\r
+      jj_la1_init_3();\r
    }\r
    private static void jj_la1_init_0() {\r
       jj_la1_0 = new int[] {0x0,0x0,0x45020880,0x800,0x40000000,0x0,0x0,0x5020080,0x0,0x0,0x0,0x0,0x0,0x10,0x10,0x0,0x0,0x4000,0x0,0x4000,0x0,0x80001040,0x4d8329a0,0x100,0x800,0x0,0x8000000,0x458300a0,0x458300a0,0x0,0x458320a0,0x4d8329a0,0x0,0x0,0x0,0x4000,0x0,0x0,0x810000,0x810000,0x20,0x20,0x0,0x0,0x0,0x80000000,0x0,0x0,0x0,0x0,0x2d00,0x0,0x2d00,0x400,0x800,0x2000,0x0,0x400,0x800,0x458300a0,0x458320a0,0x458300a0,0x0,0x0,0x0,0xa0240000,0x80200000,0x0,0xa0240000,0x80201040,0x100000,0x80201040,0x80201040,0x8000,0xa0240000,0x100000,0xa0240000,0xa0240000,0x8000,0x80201040,0xa0240000,0x0,0x0,0xa0240000,0x80201040,0x2000000,0x80201040,0xa0240000,0x2000000,0xa0240000,0x100000,0x80001040,0x100000,0x80001040,0x0,0x0,0x400000,0x200,0x1000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80001040,0x200000,0x200000,0x0,0x0,0x80001040,0x0,0x80001040,0x0,0x0,0x80001040,0x4000,0x0,0x0,};\r
@@ -5748,7 +5750,10 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
       jj_la1_1 = new int[] {0x0,0x200000,0x20049064,0x0,0x0,0x8000,0x40000,0x20041064,0x0,0x40000000,0x0,0x0,0x0,0x2106000,0x106000,0x0,0x0,0x0,0x8000000,0x0,0x0,0x4400400a,0x218e9475,0x0,0x0,0x80000,0x0,0x21069465,0x21069465,0x400000,0x21069465,0x218e9475,0x0,0x0,0x40000000,0x0,0x40000000,0x0,0x0,0x0,0x20400,0x20400,0x1000001,0x1000001,0x0,0x0,0x0,0x40000000,0x0,0x40000000,0x0,0x0,0x0,0x0,0x0,0x0,0x40000000,0x0,0x0,0x21069465,0x21069465,0x21069465,0x400000,0x4000,0x4000,0x40010800,0x880,0x40000000,0x40010800,0x4400488a,0x0,0x4400488a,0x4400488a,0x0,0x40010800,0x0,0x40010800,0x40010800,0x0,0x4400488a,0x40010800,0x0,0x200,0x40010800,0x4400488a,0x0,0x4400488a,0x40010800,0x0,0x40010800,0x0,0x4400400a,0x0,0x4400400a,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4004000,0x0,0x2,0x40000008,0x0,0x0,0x0,0x0,0x0,0x0,0x4400400a,0x0,0x0,0x0,0x0,0x4400400a,0x0,0x4400400a,0x0,0x0,0x4400400a,0x0,0x0,0x0,};\r
    }\r
    private static void jj_la1_init_2() {\r
-      jj_la1_2 = new int[] {0x4000010,0x0,0xc0000000,0x0,0x0,0x0,0x0,0xc0000000,0x4,0x0,0x80,0x4000000,0x80,0x0,0x0,0x8000000,0x4000010,0x0,0x0,0x0,0x4000010,0x3c03c015,0xc4000010,0x0,0x0,0x0,0x0,0xc4000010,0xc4000010,0x0,0xc4000010,0xc4000010,0x10,0x4000010,0x0,0x0,0x0,0x4,0x0,0x0,0x0,0x0,0x0,0x0,0x80,0x0,0x4,0x3000000,0x1000000,0x3000000,0x4000010,0x80,0x4000010,0x0,0x0,0x4000010,0x3000000,0x0,0x0,0xc4000010,0xc4000010,0xc4000010,0x0,0x0,0x0,0x4000010,0x4000000,0x2000000,0x4000010,0x3c03c015,0x0,0x3c03c015,0x3c03c015,0x0,0x4000010,0x0,0x4000010,0x4000010,0x0,0x3c03c015,0x4000010,0x80,0x0,0x4000010,0x3c03c015,0x0,0x3c03c015,0x4000010,0x0,0x4000010,0x0,0x3c03c015,0x0,0x3c03c015,0x20,0x20,0x0,0x0,0x0,0x3f00,0x3f00,0x3c000,0x3c000,0x3c000,0x3c0000,0x3c0000,0xc00000,0xc00000,0x4000010,0x40,0x38000000,0x4000015,0x10,0x10,0x10,0x4,0x10,0x4,0x3c03c015,0x80,0x80,0x4000000,0x80,0x3c03c015,0x80,0x3c03c015,0x80,0x80,0x3c03c035,0x0,0x4000,0x8000000,};\r
+      jj_la1_2 = new int[] {0x4000010,0x0,0x80000000,0x0,0x0,0x0,0x0,0x80000000,0x4,0x0,0x80,0x4000000,0x80,0x0,0x0,0x8000000,0x4000010,0x0,0x0,0x0,0x4000010,0x6c03c015,0x84000010,0x0,0x0,0x0,0x0,0x84000010,0x84000010,0x0,0x84000010,0x84000010,0x10,0x4000010,0x0,0x0,0x0,0x4,0x0,0x0,0x0,0x0,0x0,0x0,0x80,0x0,0x4,0x3000000,0x1000000,0x3000000,0x4000010,0x80,0x4000010,0x0,0x0,0x4000010,0x3000000,0x0,0x0,0x84000010,0x84000010,0x84000010,0x0,0x0,0x0,0x4000010,0x4000000,0x2000000,0x4000010,0x6c03c015,0x0,0x6c03c015,0x6c03c015,0x0,0x4000010,0x0,0x4000010,0x4000010,0x0,0x6c03c015,0x4000010,0x80,0x0,0x4000010,0x6c03c015,0x0,0x6c03c015,0x4000010,0x0,0x4000010,0x0,0x6c03c015,0x0,0x6c03c015,0x20,0x20,0x0,0x0,0x0,0x3f00,0x3f00,0x3c000,0x3c000,0x3c000,0x3c0000,0x3c0000,0xc00000,0xc00000,0x4000010,0x40,0x68000000,0x4000015,0x10,0x10,0x10,0x4,0x10,0x4,0x6c03c015,0x80,0x80,0x4000000,0x80,0x6c03c015,0x80,0x6c03c015,0x80,0x80,0x6c03c035,0x0,0x4000,0x8000000,};\r
+   }\r
+   private static void jj_la1_init_3() {\r
+      jj_la1_3 = new int[] {0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x1,0x1,0x0,0x1,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x1,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};\r
    }\r
   final private JJCalls[] jj_2_rtns = new JJCalls[10];\r
   private boolean jj_rescan = false;\r
@@ -5937,7 +5942,7 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
   /** Generate ParseException. */\r
   public ParseException generateParseException() {\r
     jj_expentries.clear();\r
-    boolean[] la1tokens = new boolean[96];\r
+    boolean[] la1tokens = new boolean[97];\r
     if (jj_kind >= 0) {\r
       la1tokens[jj_kind] = true;\r
       jj_kind = -1;\r
@@ -5954,10 +5959,13 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
           if ((jj_la1_2[i] & (1<<j)) != 0) {\r
             la1tokens[64+j] = true;\r
           }\r
+          if ((jj_la1_3[i] & (1<<j)) != 0) {\r
+            la1tokens[96+j] = true;\r
+          }\r
         }\r
       }\r
     }\r
-    for (int i = 0; i < 96; i++) {\r
+    for (int i = 0; i < 97; i++) {\r
       if (la1tokens[i]) {\r
         jj_expentry = new int[1];\r
         jj_expentry[0] = i;\r

diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/parser/ModelParserConstants.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/parser/ModelParserConstants.java
index 1f375ca73edc9a887856c9633d08fac496f563f5..0407262ea8334314c00a5a0dab82e233d5d09121 100644 (file)
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/parser/ModelParserConstants.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/parser/ModelParserConstants.java
@@ -21,9 +21,11 @@ public interface ModelParserConstants {
   /** RegularExpression Id. */\r
   int STRING = 91;\r
   /** RegularExpression Id. */\r
-  int UNSIGNED_INTEGER = 92;\r
+  int EXP = 92;\r
   /** RegularExpression Id. */\r
-  int UNSIGNED_NUMBER = 93;\r
+  int UNSIGNED_INTEGER = 93;\r
+  /** RegularExpression Id. */\r
+  int UNSIGNED_NUMBER = 94;\r
 \r
   /** Lexical state. */\r
   int DEFAULT = 0;\r
@@ -122,6 +124,7 @@ public interface ModelParserConstants {
     "\":=\"",\r
     "<IDENT>",\r
     "<STRING>",\r
+    "<EXP>",\r
     "<UNSIGNED_INTEGER>",\r
     "<UNSIGNED_NUMBER>",\r
     "\"operator function\"",\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 754f36e8fa3403579cc02a03dce08da9bbbd7c02..5aa460e21333bbe30566c613a29635e61ee1aa4b 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
@@ -15,20 +15,25 @@ private final int jjStopStringLiteralDfa_0(int pos, long active0, long active1)
    switch (pos)
    {\r
       case 0:\r
-         if ((active0 & 0x3ffffffffffffff0L) != 0L || (active1 & 0xc0000000L) != 0L)\r
+         if ((active1 & 0x80000L) != 0L)\r
+            return 20;\r
+         if ((active0 & 0x377bdef7bdef7bf0L) != 0L || (active1 & 0x180000000L) != 0L)\r
          {\r
             jjmatchedKind = 90;\r
             return 2;\r
          }\r
-         if ((active1 & 0x80000L) != 0L)\r
-            return 13;\r
          if ((active1 & 0xb30010L) != 0L)\r
-            return 9;\r
+            return 13;\r
+         if ((active0 & 0x884210842108400L) != 0L)\r
+         {\r
+            jjmatchedKind = 90;\r
+            return 44;\r
+         }\r
          return -1;\r
       case 1:\r
          if ((active0 & 0x108420080400000L) != 0L)\r
             return 2;\r
-         if ((active0 & 0x3ef7bdff7fbffff0L) != 0L || (active1 & 0xc0000000L) != 0L)\r
+         if ((active0 & 0x3ef7bdff7fbffff0L) != 0L || (active1 & 0x180000000L) != 0L)\r
          {\r
             if (jjmatchedPos != 1)\r
             {\r
@@ -41,7 +46,7 @@ private final int jjStopStringLiteralDfa_0(int pos, long active0, long active1)
       case 2:\r
          if ((active0 & 0x400000800201200L) != 0L)\r
             return 2;\r
-         if ((active0 & 0x3bfffdf77f9fedf0L) != 0L || (active1 & 0xc0000000L) != 0L)\r
+         if ((active0 & 0x3bfffdf77f9fedf0L) != 0L || (active1 & 0x180000000L) != 0L)\r
          {\r
             jjmatchedKind = 90;\r
             jjmatchedPos = 2;\r
@@ -51,7 +56,7 @@ private final int jjStopStringLiteralDfa_0(int pos, long active0, long active1)
       case 3:\r
          if ((active0 & 0x1000084212118400L) != 0L)\r
             return 2;\r
-         if ((active0 & 0x2bfff5b56d8e69f0L) != 0L || (active1 & 0xc0000000L) != 0L)\r
+         if ((active0 & 0x2bfff5b56d8e69f0L) != 0L || (active1 & 0x180000000L) != 0L)\r
          {\r
             if (jjmatchedPos != 3)\r
             {\r
@@ -64,7 +69,7 @@ private final int jjStopStringLiteralDfa_0(int pos, long active0, long active1)
       case 4:\r
          if ((active0 & 0x1090004290008c0L) != 0L)\r
             return 2;\r
-         if ((active0 & 0x2af6f5b1469e6130L) != 0L || (active1 & 0xc0000000L) != 0L)\r
+         if ((active0 & 0x2af6f5b1469e6130L) != 0L || (active1 & 0x180000000L) != 0L)\r
          {\r
             jjmatchedKind = 90;\r
             jjmatchedPos = 4;\r
@@ -74,7 +79,7 @@ private final int jjStopStringLiteralDfa_0(int pos, long active0, long active1)
       case 5:\r
          if ((active0 & 0x22200011009c0000L) != 0L)\r
             return 2;\r
-         if ((active0 & 0x8d6f5a046026130L) != 0L || (active1 & 0xc0000000L) != 0L)\r
+         if ((active0 & 0x8d6f5a046026130L) != 0L || (active1 & 0x180000000L) != 0L)\r
          {\r
             jjmatchedKind = 90;\r
             jjmatchedPos = 5;\r
@@ -84,7 +89,7 @@ private final int jjStopStringLiteralDfa_0(int pos, long active0, long active1)
       case 6:\r
          if ((active0 & 0x80d0a000000000L) != 0L)\r
             return 2;\r
-         if ((active0 & 0x856250046026130L) != 0L || (active1 & 0xc0000000L) != 0L)\r
+         if ((active0 & 0x856250046026130L) != 0L || (active1 & 0x180000000L) != 0L)\r
          {\r
             if (jjmatchedPos != 6)\r
             {\r
@@ -104,7 +109,7 @@ private final int jjStopStringLiteralDfa_0(int pos, long active0, long active1)
             }\r
             return 2;\r
          }\r
-         if ((active0 & 0x802200006020020L) != 0L || (active1 & 0xc0000000L) != 0L)\r
+         if ((active0 & 0x802200006020020L) != 0L || (active1 & 0x180000000L) != 0L)\r
             return 2;\r
          return -1;\r
       case 8:\r
@@ -185,7 +190,7 @@ private int jjMoveStringLiteralDfa0_0()
          jjmatchedKind = 68;\r
          return jjMoveStringLiteralDfa1_0(0x0L, 0xb30000L);\r
       case 47:\r
-         return jjStartNfaWithStates_0(0, 83, 13);\r
+         return jjStartNfaWithStates_0(0, 83, 20);\r
       case 58:\r
          jjmatchedKind = 69;\r
          return jjMoveStringLiteralDfa1_0(0x0L, 0x2000000L);\r
@@ -227,7 +232,7 @@ private int jjMoveStringLiteralDfa0_0()
       case 110:\r
          return jjMoveStringLiteralDfa1_0(0x1000L, 0x0L);\r
       case 111:\r
-         return jjMoveStringLiteralDfa1_0(0x108420000L, 0xc0000000L);\r
+         return jjMoveStringLiteralDfa1_0(0x108420000L, 0x180000000L);\r
       case 112:\r
          return jjMoveStringLiteralDfa1_0(0x210842000000000L, 0x0L);\r
       case 114:\r
@@ -315,7 +320,7 @@ private int jjMoveStringLiteralDfa1_0(long active0, long active1)
       case 111:\r
          return jjMoveStringLiteralDfa2_0(active0, 0x1042108000201080L, active1, 0L);\r
       case 112:\r
-         return jjMoveStringLiteralDfa2_0(active0, 0x20000L, active1, 0xc0000000L);\r
+         return jjMoveStringLiteralDfa2_0(active0, 0x20000L, active1, 0x180000000L);\r
       case 113:\r
          return jjMoveStringLiteralDfa2_0(active0, 0x200000000000L, active1, 0L);\r
       case 114:\r
@@ -361,7 +366,7 @@ private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long a
             return jjStartNfaWithStates_0(2, 35, 2);\r
          return jjMoveStringLiteralDfa3_0(active0, 0x180L, active1, 0L);\r
       case 101:\r
-         return jjMoveStringLiteralDfa3_0(active0, 0x80030020000L, active1, 0xc0000000L);\r
+         return jjMoveStringLiteralDfa3_0(active0, 0x80030020000L, active1, 0x180000000L);\r
       case 103:\r
          return jjMoveStringLiteralDfa3_0(active0, 0x10L, active1, 0L);\r
       case 105:\r
@@ -442,7 +447,7 @@ private int jjMoveStringLiteralDfa3_0(long old0, long active0, long old1, long a
             return jjStartNfaWithStates_0(3, 60, 2);\r
          return jjMoveStringLiteralDfa4_0(active0, 0x100000000L, active1, 0L);\r
       case 114:\r
-         return jjMoveStringLiteralDfa4_0(active0, 0x20000L, active1, 0xc0000000L);\r
+         return jjMoveStringLiteralDfa4_0(active0, 0x20000L, active1, 0x180000000L);\r
       case 115:\r
          return jjMoveStringLiteralDfa4_0(active0, 0x42000400000040L, active1, 0L);\r
       case 116:\r
@@ -470,7 +475,7 @@ private int jjMoveStringLiteralDfa4_0(long old0, long active0, long old1, long a
    switch(curChar)\r
    {\r
       case 97:\r
-         return jjMoveStringLiteralDfa5_0(active0, 0x2000822000L, active1, 0xc0000000L);\r
+         return jjMoveStringLiteralDfa5_0(active0, 0x2000822000L, active1, 0x180000000L);\r
       case 99:\r
          return jjMoveStringLiteralDfa5_0(active0, 0x100L, active1, 0L);\r
       case 101:\r
@@ -578,7 +583,7 @@ private int jjMoveStringLiteralDfa5_0(long old0, long active0, long old1, long a
             return jjStartNfaWithStates_0(5, 32, 2);\r
          else if ((active0 & 0x1000000000L) != 0L)\r
             return jjStartNfaWithStates_0(5, 36, 2);\r
-         return jjMoveStringLiteralDfa6_0(active0, 0x20000L, active1, 0xc0000000L);\r
+         return jjMoveStringLiteralDfa6_0(active0, 0x20000L, active1, 0x180000000L);\r
       default :\r
          break;\r
    }\r
@@ -610,7 +615,7 @@ private int jjMoveStringLiteralDfa6_0(long old0, long active0, long old1, long a
       case 110:\r
          return jjMoveStringLiteralDfa7_0(active0, 0x2000000000000L, active1, 0L);\r
       case 111:\r
-         return jjMoveStringLiteralDfa7_0(active0, 0x200004020000L, active1, 0xc0000000L);\r
+         return jjMoveStringLiteralDfa7_0(active0, 0x200004020000L, active1, 0x180000000L);\r
       case 115:\r
          if ((active0 & 0x80000000000000L) != 0L)\r
             return jjStartNfaWithStates_0(6, 55, 2);\r
@@ -672,7 +677,7 @@ private int jjMoveStringLiteralDfa7_0(long old0, long active0, long old1, long a
             jjmatchedKind = 17;\r
             jjmatchedPos = 7;\r
          }\r
-         return jjMoveStringLiteralDfa8_0(active0, 0x100L, active1, 0xc0000000L);\r
+         return jjMoveStringLiteralDfa8_0(active0, 0x100L, active1, 0x180000000L);\r
       case 116:\r
          if ((active0 & 0x2000000000000L) != 0L)\r
             return jjStartNfaWithStates_0(7, 49, 2);\r
@@ -694,7 +699,7 @@ private int jjMoveStringLiteralDfa8_0(long old0, long active0, long old1, long a
    switch(curChar)\r
    {\r
       case 32:\r
-         return jjMoveStringLiteralDfa9_0(active0, 0L, active1, 0xc0000000L);\r
+         return jjMoveStringLiteralDfa9_0(active0, 0L, active1, 0x180000000L);\r
       case 97:\r
          return jjMoveStringLiteralDfa9_0(active0, 0x40000000L, active1, 0L);\r
       case 98:\r
@@ -746,7 +751,7 @@ private int jjMoveStringLiteralDfa9_0(long old0, long active0, long old1, long a
             return jjStartNfaWithStates_0(9, 50, 2);\r
          return jjMoveStringLiteralDfa10_0(active0, 0x40000000000000L, active1, 0L);\r
       case 102:\r
-         return jjMoveStringLiteralDfa10_0(active0, 0L, active1, 0x40000000L);\r
+         return jjMoveStringLiteralDfa10_0(active0, 0L, active1, 0x80000000L);\r
       case 108:\r
          return jjMoveStringLiteralDfa10_0(active0, 0x2000L, active1, 0L);\r
       case 110:\r
@@ -756,7 +761,7 @@ private int jjMoveStringLiteralDfa9_0(long old0, long active0, long old1, long a
       case 111:\r
          return jjMoveStringLiteralDfa10_0(active0, 0x10000000000L, active1, 0L);\r
       case 114:\r
-         return jjMoveStringLiteralDfa10_0(active0, 0L, active1, 0x80000000L);\r
+         return jjMoveStringLiteralDfa10_0(active0, 0L, active1, 0x100000000L);\r
       case 116:\r
          return jjMoveStringLiteralDfa10_0(active0, 0x40000000L, active1, 0L);\r
       default :\r
@@ -780,13 +785,13 @@ private int jjMoveStringLiteralDfa10_0(long old0, long active0, long old1, long
       case 101:\r
          if ((active0 & 0x2000L) != 0L)\r
             return jjStartNfaWithStates_0(10, 13, 2);\r
-         return jjMoveStringLiteralDfa11_0(active0, 0x40000000L, active1, 0x80000000L);\r
+         return jjMoveStringLiteralDfa11_0(active0, 0x40000000L, active1, 0x100000000L);\r
       case 110:\r
          if ((active0 & 0x10000000000L) != 0L)\r
             return jjStartNfaWithStates_0(10, 40, 2);\r
          break;\r
       case 117:\r
-         return jjMoveStringLiteralDfa11_0(active0, 0L, active1, 0x40000000L);\r
+         return jjMoveStringLiteralDfa11_0(active0, 0L, active1, 0x80000000L);\r
       default :\r
          break;\r
    }\r
@@ -806,13 +811,13 @@ private int jjMoveStringLiteralDfa11_0(long old0, long active0, long old1, long
       case 98:\r
          return jjMoveStringLiteralDfa12_0(active0, 0x40000000000000L, active1, 0L);\r
       case 99:\r
-         return jjMoveStringLiteralDfa12_0(active0, 0L, active1, 0x80000000L);\r
+         return jjMoveStringLiteralDfa12_0(active0, 0L, active1, 0x100000000L);\r
       case 100:\r
          if ((active0 & 0x40000000L) != 0L)\r
             return jjStartNfaWithStates_0(11, 30, 2);\r
          break;\r
       case 110:\r
-         return jjMoveStringLiteralDfa12_0(active0, 0L, active1, 0x40000000L);\r
+         return jjMoveStringLiteralDfa12_0(active0, 0L, active1, 0x80000000L);\r
       default :\r
          break;\r
    }\r
@@ -830,9 +835,9 @@ private int jjMoveStringLiteralDfa12_0(long old0, long active0, long old1, long
    switch(curChar)\r
    {\r
       case 99:\r
-         return jjMoveStringLiteralDfa13_0(active0, 0L, active1, 0x40000000L);\r
-      case 111:\r
          return jjMoveStringLiteralDfa13_0(active0, 0L, active1, 0x80000000L);\r
+      case 111:\r
+         return jjMoveStringLiteralDfa13_0(active0, 0L, active1, 0x100000000L);\r
       case 121:\r
          if ((active0 & 0x40000000000000L) != 0L)\r
             return jjStartNfaWithStates_0(12, 54, 2);\r
@@ -854,9 +859,9 @@ private int jjMoveStringLiteralDfa13_0(long old0, long active0, long old1, long
    switch(curChar)\r
    {\r
       case 114:\r
-         return jjMoveStringLiteralDfa14_0(active1, 0x80000000L);\r
+         return jjMoveStringLiteralDfa14_0(active1, 0x100000000L);\r
       case 116:\r
-         return jjMoveStringLiteralDfa14_0(active1, 0x40000000L);\r
+         return jjMoveStringLiteralDfa14_0(active1, 0x80000000L);\r
       default :\r
          break;\r
    }\r
@@ -874,11 +879,11 @@ private int jjMoveStringLiteralDfa14_0(long old1, long active1)
    switch(curChar)\r
    {\r
       case 100:\r
-         if ((active1 & 0x80000000L) != 0L)\r
-            return jjStopAtPos(14, 95);\r
+         if ((active1 & 0x100000000L) != 0L)\r
+            return jjStopAtPos(14, 96);\r
          break;\r
       case 105:\r
-         return jjMoveStringLiteralDfa15_0(active1, 0x40000000L);\r
+         return jjMoveStringLiteralDfa15_0(active1, 0x80000000L);\r
       default :\r
          break;\r
    }\r
@@ -896,7 +901,7 @@ private int jjMoveStringLiteralDfa15_0(long old1, long active1)
    switch(curChar)\r
    {\r
       case 111:\r
-         return jjMoveStringLiteralDfa16_0(active1, 0x40000000L);\r
+         return jjMoveStringLiteralDfa16_0(active1, 0x80000000L);\r
       default :\r
          break;\r
    }\r
@@ -914,8 +919,8 @@ private int jjMoveStringLiteralDfa16_0(long old1, long active1)
    switch(curChar)\r
    {\r
       case 110:\r
-         if ((active1 & 0x40000000L) != 0L)\r
-            return jjStopAtPos(16, 94);\r
+         if ((active1 & 0x80000000L) != 0L)\r
+            return jjStopAtPos(16, 95);\r
          break;\r
       default :\r
          break;\r
@@ -936,7 +941,7 @@ static final long[] jjbitVec0 = {
 private int jjMoveNfa_0(int startState, int curPos)\r
 {\r
    int startsAt = 0;\r
-   jjnewStateCnt = 31;\r
+   jjnewStateCnt = 44;\r
    int i = 1;\r
    jjstateSet[0] = startState;\r
    int kind = 0x7fffffff;\r
@@ -951,22 +956,12 @@ private int jjMoveNfa_0(int startState, int curPos)
          {\r
             switch(jjstateSet[--i])\r
             {\r
-               case 13:\r
-                  if (curChar == 47)\r
-                  {\r
-                     if (kind > 3)\r
-                        kind = 3;\r
-                     jjCheckNAdd(20);\r
-                  }\r
-                  else if (curChar == 42)\r
-                     jjCheckNAddStates(0, 2);\r
-                  break;\r
                case 0:\r
                   if ((0x3ff000000000000L & l) != 0L)\r
                   {\r
-                     if (kind > 92)\r
-                        kind = 92;\r
-                     jjCheckNAddStates(3, 7);\r
+                     if (kind > 93)\r
+                        kind = 93;\r
+                     jjCheckNAddStates(0, 6);\r
                   }\r
                   else if ((0x100002600L & l) != 0L)\r
                   {\r
@@ -974,140 +969,179 @@ private int jjMoveNfa_0(int startState, int curPos)
                         kind = 1;\r
                   }\r
                   else if (curChar == 47)\r
-                     jjAddStates(8, 9);\r
+                     jjAddStates(7, 8);\r
                   else if (curChar == 46)\r
-                     jjCheckNAdd(9);\r
+                     jjCheckNAdd(13);\r
                   else if (curChar == 34)\r
-                     jjCheckNAddStates(10, 12);\r
+                     jjCheckNAddStates(9, 11);\r
+                  break;\r
+               case 44:\r
+                  if ((0x3ff400000000000L & l) != 0L)\r
+                  {\r
+                     if (kind > 90)\r
+                        kind = 90;\r
+                     jjCheckNAdd(2);\r
+                  }\r
+                  else if (curChar == 45)\r
+                  {\r
+                     if (kind > 92)\r
+                        kind = 92;\r
+                  }\r
+                  break;\r
+               case 20:\r
+                  if (curChar == 47)\r
+                  {\r
+                     if (kind > 3)\r
+                        kind = 3;\r
+                     jjCheckNAdd(27);\r
+                  }\r
+                  else if (curChar == 42)\r
+                     jjCheckNAddStates(12, 14);\r
                   break;\r
                case 2:\r
                   if ((0x3ff400000000000L & l) == 0L)\r
                      break;\r
                   if (kind > 90)\r
                      kind = 90;\r
-                  jjstateSet[jjnewStateCnt++] = 2;\r
+                  jjCheckNAdd(2);\r
                   break;\r
                case 3:\r
                   if (curChar == 34)\r
-                     jjCheckNAddStates(10, 12);\r
+                     jjCheckNAddStates(9, 11);\r
                   break;\r
                case 4:\r
                   if ((0xfffffffbfffffbffL & l) != 0L)\r
-                     jjCheckNAddStates(10, 12);\r
+                     jjCheckNAddStates(9, 11);\r
                   break;\r
                case 6:\r
                   if ((0xfffffffffffffbffL & l) != 0L)\r
-                     jjCheckNAddStates(10, 12);\r
+                     jjCheckNAddStates(9, 11);\r
                   break;\r
                case 7:\r
                   if (curChar == 34 && kind > 91)\r
                      kind = 91;\r
                   break;\r
-               case 8:\r
+               case 9:\r
+                  if (curChar == 45 && kind > 92)\r
+                     kind = 92;\r
+                  break;\r
+               case 12:\r
                   if (curChar == 46)\r
-                     jjCheckNAdd(9);\r
+                     jjCheckNAdd(13);\r
                   break;\r
-               case 9:\r
+               case 13:\r
                   if ((0x3ff000000000000L & l) == 0L)\r
                      break;\r
-                  if (kind > 93)\r
-                     kind = 93;\r
-                  jjCheckNAddTwoStates(9, 10);\r
+                  if (kind > 94)\r
+                     kind = 94;\r
+                  jjCheckNAddStates(15, 18);\r
                   break;\r
-               case 11:\r
+               case 15:\r
                   if ((0x3ff000000000000L & l) == 0L)\r
                      break;\r
-                  if (kind > 93)\r
-                     kind = 93;\r
-                  jjstateSet[jjnewStateCnt++] = 11;\r
+                  if (kind > 94)\r
+                     kind = 94;\r
+                  jjCheckNAdd(15);\r
                   break;\r
-               case 12:\r
+               case 16:\r
+                  if (curChar == 45)\r
+                     jjCheckNAdd(15);\r
+                  break;\r
+               case 19:\r
                   if (curChar == 47)\r
-                     jjAddStates(8, 9);\r
+                     jjAddStates(7, 8);\r
                   break;\r
-               case 14:\r
+               case 21:\r
                   if ((0xfffffbffffffffffL & l) != 0L)\r
-                     jjCheckNAddStates(0, 2);\r
+                     jjCheckNAddStates(12, 14);\r
                   break;\r
-               case 15:\r
+               case 22:\r
                   if (curChar == 42)\r
-                     jjstateSet[jjnewStateCnt++] = 16;\r
+                     jjstateSet[jjnewStateCnt++] = 23;\r
                   break;\r
-               case 16:\r
+               case 23:\r
                   if ((0xffff7fffffffffffL & l) != 0L)\r
-                     jjCheckNAddStates(0, 2);\r
+                     jjCheckNAddStates(12, 14);\r
                   break;\r
-               case 17:\r
+               case 24:\r
                   if (curChar == 47 && kind > 2)\r
                      kind = 2;\r
                   break;\r
-               case 18:\r
+               case 25:\r
                   if (curChar == 42)\r
-                     jjstateSet[jjnewStateCnt++] = 17;\r
+                     jjstateSet[jjnewStateCnt++] = 24;\r
                   break;\r
-               case 19:\r
+               case 26:\r
                   if (curChar != 47)\r
                      break;\r
                   if (kind > 3)\r
                      kind = 3;\r
-                  jjCheckNAdd(20);\r
+                  jjCheckNAdd(27);\r
                   break;\r
-               case 20:\r
+               case 27:\r
                   if ((0xfffffffffffffbffL & l) == 0L)\r
                      break;\r
                   if (kind > 3)\r
                      kind = 3;\r
-                  jjCheckNAdd(20);\r
+                  jjCheckNAdd(27);\r
                   break;\r
-               case 21:\r
+               case 28:\r
                   if ((0x3ff000000000000L & l) == 0L)\r
                      break;\r
-                  if (kind > 92)\r
-                     kind = 92;\r
-                  jjCheckNAddStates(3, 7);\r
+                  if (kind > 93)\r
+                     kind = 93;\r
+                  jjCheckNAddStates(0, 6);\r
                   break;\r
-               case 22:\r
+               case 29:\r
                   if ((0x3ff000000000000L & l) == 0L)\r
                      break;\r
-                  if (kind > 92)\r
-                     kind = 92;\r
-                  jjCheckNAdd(22);\r
+                  if (kind > 93)\r
+                     kind = 93;\r
+                  jjCheckNAdd(29);\r
                   break;\r
-               case 23:\r
+               case 30:\r
                   if ((0x3ff000000000000L & l) != 0L)\r
-                     jjCheckNAddTwoStates(23, 24);\r
+                     jjCheckNAddTwoStates(30, 31);\r
                   break;\r
-               case 24:\r
+               case 31:\r
                   if (curChar != 46)\r
                      break;\r
-                  if (kind > 93)\r
-                     kind = 93;\r
-                  jjCheckNAddTwoStates(25, 26);\r
+                  if (kind > 94)\r
+                     kind = 94;\r
+                  jjCheckNAddStates(19, 22);\r
                   break;\r
-               case 25:\r
+               case 32:\r
                   if ((0x3ff000000000000L & l) == 0L)\r
                      break;\r
-                  if (kind > 93)\r
-                     kind = 93;\r
-                  jjCheckNAddTwoStates(25, 26);\r
+                  if (kind > 94)\r
+                     kind = 94;\r
+                  jjCheckNAddStates(19, 22);\r
                   break;\r
-               case 27:\r
+               case 34:\r
                   if ((0x3ff000000000000L & l) == 0L)\r
                      break;\r
-                  if (kind > 93)\r
-                     kind = 93;\r
-                  jjstateSet[jjnewStateCnt++] = 27;\r
+                  if (kind > 94)\r
+                     kind = 94;\r
+                  jjCheckNAdd(34);\r
                   break;\r
-               case 28:\r
+               case 35:\r
+                  if (curChar == 45)\r
+                     jjCheckNAdd(34);\r
+                  break;\r
+               case 38:\r
                   if ((0x3ff000000000000L & l) != 0L)\r
-                     jjCheckNAddTwoStates(28, 29);\r
+                     jjCheckNAddStates(23, 26);\r
                   break;\r
-               case 30:\r
+               case 40:\r
                   if ((0x3ff000000000000L & l) == 0L)\r
                      break;\r
-                  if (kind > 93)\r
-                     kind = 93;\r
-                  jjstateSet[jjnewStateCnt++] = 30;\r
+                  if (kind > 94)\r
+                     kind = 94;\r
+                  jjCheckNAdd(40);\r
+                  break;\r
+               case 41:\r
+                  if (curChar == 45)\r
+                     jjCheckNAdd(40);\r
                   break;\r
                default : break;\r
             }\r
@@ -1121,6 +1155,23 @@ private int jjMoveNfa_0(int startState, int curPos)
             switch(jjstateSet[--i])\r
             {\r
                case 0:\r
+                  if ((0x7fffffe87fffffeL & l) != 0L)\r
+                  {\r
+                     if (kind > 90)\r
+                        kind = 90;\r
+                     jjCheckNAdd(2);\r
+                  }\r
+                  if ((0x2000000020L & l) != 0L)\r
+                  {\r
+                     if (kind > 92)\r
+                        kind = 92;\r
+                  }\r
+                  if (curChar == 69)\r
+                     jjCheckNAdd(9);\r
+                  else if (curChar == 101)\r
+                     jjCheckNAdd(9);\r
+                  break;\r
+               case 44:\r
                case 2:\r
                   if ((0x7fffffe87fffffeL & l) == 0L)\r
                      break;\r
@@ -1128,37 +1179,80 @@ private int jjMoveNfa_0(int startState, int curPos)
                      kind = 90;\r
                   jjCheckNAdd(2);\r
                   break;\r
+               case 1:\r
+                  if ((0x7fffffe87fffffeL & l) == 0L)\r
+                     break;\r
+                  if (kind > 90)\r
+                     kind = 90;\r
+                  jjCheckNAdd(2);\r
+                  break;\r
                case 4:\r
                   if ((0xffffffffefffffffL & l) != 0L)\r
-                     jjCheckNAddStates(10, 12);\r
+                     jjCheckNAddStates(9, 11);\r
                   break;\r
                case 5:\r
                   if (curChar == 92)\r
                      jjstateSet[jjnewStateCnt++] = 6;\r
                   break;\r
                case 6:\r
-                  jjCheckNAddStates(10, 12);\r
+                  jjCheckNAddStates(9, 11);\r
+                  break;\r
+               case 8:\r
+                  if ((0x2000000020L & l) != 0L && kind > 92)\r
+                     kind = 92;\r
                   break;\r
                case 10:\r
-                  if ((0x2000000020L & l) != 0L)\r
-                     jjstateSet[jjnewStateCnt++] = 11;\r
+                  if (curChar == 101)\r
+                     jjCheckNAdd(9);\r
+                  break;\r
+               case 11:\r
+                  if (curChar == 69)\r
+                     jjCheckNAdd(9);\r
                   break;\r
                case 14:\r
-               case 16:\r
-                  jjCheckNAddStates(0, 2);\r
+                  if ((0x2000000020L & l) != 0L)\r
+                     jjstateSet[jjnewStateCnt++] = 15;\r
                   break;\r
-               case 20:\r
+               case 17:\r
+                  if (curChar == 101)\r
+                     jjCheckNAdd(16);\r
+                  break;\r
+               case 18:\r
+                  if (curChar == 69)\r
+                     jjCheckNAdd(16);\r
+                  break;\r
+               case 21:\r
+               case 23:\r
+                  jjCheckNAddStates(12, 14);\r
+                  break;\r
+               case 27:\r
                   if (kind > 3)\r
                      kind = 3;\r
-                  jjstateSet[jjnewStateCnt++] = 20;\r
+                  jjstateSet[jjnewStateCnt++] = 27;\r
                   break;\r
-               case 26:\r
+               case 33:\r
                   if ((0x2000000020L & l) != 0L)\r
-                     jjstateSet[jjnewStateCnt++] = 27;\r
+                     jjstateSet[jjnewStateCnt++] = 34;\r
                   break;\r
-               case 29:\r
+               case 36:\r
+                  if (curChar == 101)\r
+                     jjCheckNAdd(35);\r
+                  break;\r
+               case 37:\r
+                  if (curChar == 69)\r
+                     jjCheckNAdd(35);\r
+                  break;\r
+               case 39:\r
                   if ((0x2000000020L & l) != 0L)\r
-                     jjstateSet[jjnewStateCnt++] = 30;\r
+                     jjstateSet[jjnewStateCnt++] = 40;\r
+                  break;\r
+               case 42:\r
+                  if (curChar == 101)\r
+                     jjCheckNAdd(41);\r
+                  break;\r
+               case 43:\r
+                  if (curChar == 69)\r
+                     jjCheckNAdd(41);\r
                   break;\r
                default : break;\r
             }\r
@@ -1175,19 +1269,19 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 4:\r
                case 6:\r
                   if ((jjbitVec0[i2] & l2) != 0L)\r
-                     jjCheckNAddStates(10, 12);\r
+                     jjCheckNAddStates(9, 11);\r
                   break;\r
-               case 14:\r
-               case 16:\r
+               case 21:\r
+               case 23:\r
                   if ((jjbitVec0[i2] & l2) != 0L)\r
-                     jjCheckNAddStates(0, 2);\r
+                     jjCheckNAddStates(12, 14);\r
                   break;\r
-               case 20:\r
+               case 27:\r
                   if ((jjbitVec0[i2] & l2) == 0L)\r
                      break;\r
                   if (kind > 3)\r
                      kind = 3;\r
-                  jjstateSet[jjnewStateCnt++] = 20;\r
+                  jjstateSet[jjnewStateCnt++] = 27;\r
                   break;\r
                default : break;\r
             }\r
@@ -1200,14 +1294,15 @@ private int jjMoveNfa_0(int startState, int curPos)
          kind = 0x7fffffff;\r
       }\r
       ++curPos;\r
-      if ((i = jjnewStateCnt) == (startsAt = 31 - (jjnewStateCnt = startsAt)))\r
+      if ((i = jjnewStateCnt) == (startsAt = 44 - (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 = {
-   14, 15, 18, 22, 23, 24, 28, 29, 13, 19, 4, 5, 7, 
+   29, 30, 31, 38, 39, 42, 43, 20, 26, 4, 5, 7, 21, 22, 25, 13, 
+   14, 17, 18, 32, 33, 36, 37, 38, 39, 42, 43, 
 };\r
 \r
 /** Token literal values. */\r
@@ -1232,7 +1327,7 @@ public static final String[] jjstrLiteralImages = {
 "\145\170\164\145\162\156\141\154", "\154\157\157\160", "\162\145\143\157\162\144", "\50", "\51", "\173", "\175", \r
 "\133", "\135", "\56", "\72", "\73", "\54", "\74", "\74\75", "\76", "\76\75", \r
 "\75\75", "\74\76", "\53", "\55", "\56\53", "\56\55", "\52", "\57", "\56\52", "\56\57", \r
-"\136", "\56\136", "\75", "\72\75", null, null, null, null, \r
+"\136", "\56\136", "\75", "\72\75", null, null, null, null, null, \r
 "\157\160\145\162\141\164\157\162\40\146\165\156\143\164\151\157\156", "\157\160\145\162\141\164\157\162\40\162\145\143\157\162\144", };\r
 \r
 /** Lexer state names. */\r
@@ -1240,14 +1335,14 @@ public static final String[] lexStateNames = {
    "DEFAULT",\r
 };\r
 static final long[] jjtoToken = {
-   0xfffffffffffffff1L, 0xffffffffL, 
+   0xfffffffffffffff1L, 0x1ffffffffL, 
 };\r
 static final long[] jjtoSkip = {
    0xeL, 0x0L, 
 };\r
 protected SimpleCharStream input_stream;\r
-private final int[] jjrounds = new int[31];\r
-private final int[] jjstateSet = new int[62];\r
+private final int[] jjrounds = new int[44];\r
+private final int[] jjstateSet = new int[88];\r
 private final StringBuilder jjimage = new StringBuilder();\r
 private StringBuilder image = jjimage;\r
 private int jjimageLen;\r
@@ -1278,7 +1373,7 @@ private void ReInitRounds()
 {\r
    int i;\r
    jjround = 0x80000001;\r
-   for (i = 31; i-- > 0;)\r
+   for (i = 44; 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 a6dceb85d65cdb79960463fe08f068fd53bc2f6e..2ba477f3a85ed3191fba293a9daa363f0c2c499d 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
@@ -78,11 +78,12 @@ TOKEN:
 | <IDENT: ["a"-"z","A"-"Z","_"] (["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-" >\r
 | <UNSIGNED_INTEGER: (["0"-"9"])+ >\r
 | <UNSIGNED_NUMBER:  \r
-    ( <UNSIGNED_INTEGER> "." (<UNSIGNED_INTEGER>)? (["e","E"] <UNSIGNED_INTEGER>)?\r
-    | "." <UNSIGNED_INTEGER> (["e","E"] <UNSIGNED_INTEGER>)?\r
-    | <UNSIGNED_INTEGER> ["e","E"] <UNSIGNED_INTEGER>\r
+    ( <UNSIGNED_INTEGER> "." (<UNSIGNED_INTEGER>)? (<EXP> <UNSIGNED_INTEGER>)?\r
+    | "." <UNSIGNED_INTEGER> (<EXP> <UNSIGNED_INTEGER>)?\r
+    | <UNSIGNED_INTEGER> <EXP> <UNSIGNED_INTEGER>\r
     ) >\r
 }\r
 \r

diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/parser/ModelicaParser.jjt b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/parser/ModelicaParser.jjt
index 422e38fdb919627fb17737d09d5b9b1fc05eb3a9..0296fd88e30c78d960d9ee2e7c6a664ca2a8556a 100644 (file)
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/parser/ModelicaParser.jjt
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/parser/ModelicaParser.jjt
@@ -74,11 +74,12 @@ TOKEN:
 | <IDENT: ["a"-"z","A"-"Z","_"] (["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-" >\r
 | <UNSIGNED_INTEGER: (["0"-"9"])+ >\r
 | <UNSIGNED_NUMBER:  \r
-    ( <UNSIGNED_INTEGER> "." (<UNSIGNED_INTEGER>)? (["e","E"] <UNSIGNED_INTEGER>)?\r
-    | "." <UNSIGNED_INTEGER> (["e","E"] <UNSIGNED_INTEGER>)?\r
-    | <UNSIGNED_INTEGER> ["e","E"] <UNSIGNED_INTEGER>\r
+    ( <UNSIGNED_INTEGER> "." (<UNSIGNED_INTEGER>)? (<EXP> <UNSIGNED_INTEGER>)?\r
+    | "." <UNSIGNED_INTEGER> (<EXP> <UNSIGNED_INTEGER>)?\r
+    | <UNSIGNED_INTEGER> <EXP> <UNSIGNED_INTEGER>\r
     ) >\r
 }\r
 \r