Allow plus and minus signs in E notation exponent in Sysdyn parsers (refs #4703).

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

diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParser.jj b/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParser.jj
index 5e8c3c2b003d0a3b3837289f76648754f54dffdf..ce3b612684e5278444e2415d1c3e0d07f1f4953f 100644 (file)
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParser.jj
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParser.jj
@@ -109,9 +109,9 @@ TOKEN:
     { matchedToken.image = matchedToken.image.substring(1,matchedToken.image.length()-1); }\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>)? (["e","E"] (["+","-"])? <UNSIGNED_INTEGER>)?\r
+    | "." <UNSIGNED_INTEGER> (["e","E"] (["+","-"])? <UNSIGNED_INTEGER>)?\r
+    | <UNSIGNED_INTEGER> ["e","E"] (["+","-"])? <UNSIGNED_INTEGER>\r
     ) >\r
 }\r
 \r

diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParserTokenManager.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParserTokenManager.java
index 011bc205ad1a481537141b33546ee59ce75bd95c..85adbb7236d356b3c4ab22ce4d04c249110cbc27 100644 (file)
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParserTokenManager.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParserTokenManager.java
@@ -27,7 +27,7 @@ private final int jjStopStringLiteralDfa_0(int pos, long active0, long active1)
             return 2;\r
          }\r
          if ((active1 & 0x20000L) != 0L)\r
-            return 16;\r
+            return 17;\r
          return -1;\r
       case 1:\r
          if ((active0 & 0x84020080400000L) != 0L)\r
@@ -182,7 +182,7 @@ private int jjMoveStringLiteralDfa0_0()
          jjmatchedKind = 66;\r
          return jjMoveStringLiteralDfa1_0(0x0L, 0x2cc000L);\r
       case 47:\r
-         return jjStartNfaWithStates_0(0, 81, 16);\r
+         return jjStartNfaWithStates_0(0, 81, 17);\r
       case 58:\r
          jjmatchedKind = 67;\r
          return jjMoveStringLiteralDfa1_0(0x0L, 0x800000L);\r
@@ -830,7 +830,7 @@ static final long[] jjbitVec0 = {
 private int jjMoveNfa_0(int startState, int curPos)\r
 {\r
    int startsAt = 0;\r
-   jjnewStateCnt = 34;\r
+   jjnewStateCnt = 37;\r
    int i = 1;\r
    jjstateSet[0] = startState;\r
    int kind = 0x7fffffff;\r
@@ -866,12 +866,12 @@ private int jjMoveNfa_0(int startState, int curPos)
                   else if (curChar == 39)\r
                      jjCheckNAddTwoStates(4, 5);\r
                   break;\r
-               case 16:\r
+               case 17:\r
                   if (curChar == 47)\r
                   {\r
                      if (kind > 3)\r
                         kind = 3;\r
-                     jjCheckNAdd(23);\r
+                     jjCheckNAdd(24);\r
                   }\r
                   else if (curChar == 42)\r
                      jjCheckNAddStates(10, 12);\r
@@ -923,99 +923,111 @@ private int jjMoveNfa_0(int startState, int curPos)
                   jjCheckNAddTwoStates(12, 13);\r
                   break;\r
                case 14:\r
+                  if ((0x280000000000L & l) != 0L)\r
+                     jjCheckNAdd(15);\r
+                  break;\r
+               case 15:\r
                   if ((0x3ff000000000000L & l) == 0L)\r
                      break;\r
                   if (kind > 92)\r
                      kind = 92;\r
-                  jjstateSet[jjnewStateCnt++] = 14;\r
+                  jjCheckNAdd(15);\r
                   break;\r
-               case 15:\r
+               case 16:\r
                   if (curChar == 47)\r
                      jjAddStates(5, 6);\r
                   break;\r
-               case 17:\r
+               case 18:\r
                   if ((0xfffffbffffffffffL & l) != 0L)\r
                      jjCheckNAddStates(10, 12);\r
                   break;\r
-               case 18:\r
+               case 19:\r
                   if (curChar == 42)\r
-                     jjstateSet[jjnewStateCnt++] = 19;\r
+                     jjstateSet[jjnewStateCnt++] = 20;\r
                   break;\r
-               case 19:\r
+               case 20:\r
                   if ((0xffff7fffffffffffL & l) != 0L)\r
                      jjCheckNAddStates(10, 12);\r
                   break;\r
-               case 20:\r
+               case 21:\r
                   if (curChar == 47 && kind > 2)\r
                      kind = 2;\r
                   break;\r
-               case 21:\r
+               case 22:\r
                   if (curChar == 42)\r
-                     jjstateSet[jjnewStateCnt++] = 20;\r
+                     jjstateSet[jjnewStateCnt++] = 21;\r
                   break;\r
-               case 22:\r
+               case 23:\r
                   if (curChar != 47)\r
                      break;\r
                   if (kind > 3)\r
                      kind = 3;\r
-                  jjCheckNAdd(23);\r
+                  jjCheckNAdd(24);\r
                   break;\r
-               case 23:\r
+               case 24:\r
                   if ((0xfffffffffffffbffL & l) == 0L)\r
                      break;\r
                   if (kind > 3)\r
                      kind = 3;\r
-                  jjCheckNAdd(23);\r
+                  jjCheckNAdd(24);\r
                   break;\r
-               case 24:\r
+               case 25:\r
                   if ((0x3ff000000000000L & l) == 0L)\r
                      break;\r
                   if (kind > 91)\r
                      kind = 91;\r
                   jjCheckNAddStates(0, 4);\r
                   break;\r
-               case 25:\r
+               case 26:\r
                   if ((0x3ff000000000000L & l) == 0L)\r
                      break;\r
                   if (kind > 91)\r
                      kind = 91;\r
-                  jjCheckNAdd(25);\r
+                  jjCheckNAdd(26);\r
                   break;\r
-               case 26:\r
+               case 27:\r
                   if ((0x3ff000000000000L & l) != 0L)\r
-                     jjCheckNAddTwoStates(26, 27);\r
+                     jjCheckNAddTwoStates(27, 28);\r
                   break;\r
-               case 27:\r
+               case 28:\r
                   if (curChar != 46)\r
                      break;\r
                   if (kind > 92)\r
                      kind = 92;\r
-                  jjCheckNAddTwoStates(28, 29);\r
+                  jjCheckNAddTwoStates(29, 30);\r
                   break;\r
-               case 28:\r
+               case 29:\r
                   if ((0x3ff000000000000L & l) == 0L)\r
                      break;\r
                   if (kind > 92)\r
                      kind = 92;\r
-                  jjCheckNAddTwoStates(28, 29);\r
+                  jjCheckNAddTwoStates(29, 30);\r
                   break;\r
-               case 30:\r
+               case 31:\r
+                  if ((0x280000000000L & l) != 0L)\r
+                     jjCheckNAdd(32);\r
+                  break;\r
+               case 32:\r
                   if ((0x3ff000000000000L & l) == 0L)\r
                      break;\r
                   if (kind > 92)\r
                      kind = 92;\r
-                  jjstateSet[jjnewStateCnt++] = 30;\r
+                  jjCheckNAdd(32);\r
                   break;\r
-               case 31:\r
+               case 33:\r
                   if ((0x3ff000000000000L & l) != 0L)\r
-                     jjCheckNAddTwoStates(31, 32);\r
+                     jjCheckNAddTwoStates(33, 34);\r
                   break;\r
-               case 33:\r
+               case 35:\r
+                  if ((0x280000000000L & l) != 0L)\r
+                     jjCheckNAdd(36);\r
+                  break;\r
+               case 36:\r
                   if ((0x3ff000000000000L & l) == 0L)\r
                      break;\r
                   if (kind > 92)\r
                      kind = 92;\r
-                  jjstateSet[jjnewStateCnt++] = 33;\r
+                  jjCheckNAdd(36);\r
                   break;\r
                default : break;\r
             }\r
@@ -1053,24 +1065,24 @@ private int jjMoveNfa_0(int startState, int curPos)
                   break;\r
                case 13:\r
                   if ((0x2000000020L & l) != 0L)\r
-                     jjstateSet[jjnewStateCnt++] = 14;\r
+                     jjAddStates(15, 16);\r
                   break;\r
-               case 17:\r
-               case 19:\r
+               case 18:\r
+               case 20:\r
                   jjCheckNAddStates(10, 12);\r
                   break;\r
-               case 23:\r
+               case 24:\r
                   if (kind > 3)\r
                      kind = 3;\r
-                  jjstateSet[jjnewStateCnt++] = 23;\r
+                  jjstateSet[jjnewStateCnt++] = 24;\r
                   break;\r
-               case 29:\r
+               case 30:\r
                   if ((0x2000000020L & l) != 0L)\r
-                     jjstateSet[jjnewStateCnt++] = 30;\r
+                     jjAddStates(17, 18);\r
                   break;\r
-               case 32:\r
+               case 34:\r
                   if ((0x2000000020L & l) != 0L)\r
-                     jjstateSet[jjnewStateCnt++] = 33;\r
+                     jjAddStates(19, 20);\r
                   break;\r
                default : break;\r
             }\r
@@ -1089,17 +1101,17 @@ private int jjMoveNfa_0(int startState, int curPos)
                   if ((jjbitVec0[i2] & l2) != 0L)\r
                      jjCheckNAddStates(7, 9);\r
                   break;\r
-               case 17:\r
-               case 19:\r
+               case 18:\r
+               case 20:\r
                   if ((jjbitVec0[i2] & l2) != 0L)\r
                      jjCheckNAddStates(10, 12);\r
                   break;\r
-               case 23:\r
+               case 24:\r
                   if ((jjbitVec0[i2] & l2) == 0L)\r
                      break;\r
                   if (kind > 3)\r
                      kind = 3;\r
-                  jjstateSet[jjnewStateCnt++] = 23;\r
+                  jjstateSet[jjnewStateCnt++] = 24;\r
                   break;\r
                default : break;\r
             }\r
@@ -1112,14 +1124,15 @@ private int jjMoveNfa_0(int startState, int curPos)
          kind = 0x7fffffff;\r
       }\r
       ++curPos;\r
-      if ((i = jjnewStateCnt) == (startsAt = 34 - (jjnewStateCnt = startsAt)))\r
+      if ((i = jjnewStateCnt) == (startsAt = 37 - (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 = {
-   25, 26, 27, 31, 32, 16, 22, 7, 8, 10, 17, 18, 21, 4, 5, 
+   26, 27, 28, 33, 34, 17, 23, 7, 8, 10, 18, 19, 22, 4, 5, 14, 
+   15, 31, 32, 35, 36, 
 };\r
 \r
 /** Token literal values. */\r
@@ -1157,8 +1170,8 @@ static final long[] jjtoSkip = {
    0xeL, 0x0L, 
 };\r
 protected SimpleCharStream input_stream;\r
-private final int[] jjrounds = new int[34];\r
-private final int[] jjstateSet = new int[68];\r
+private final int[] jjrounds = new int[37];\r
+private final int[] jjstateSet = new int[74];\r
 private final StringBuilder jjimage = new StringBuilder();\r
 private StringBuilder image = jjimage;\r
 private int jjimageLen;\r
@@ -1189,7 +1202,7 @@ private void ReInitRounds()
 {\r
    int i;\r
    jjround = 0x80000001;\r
-   for (i = 34; i-- > 0;)\r
+   for (i = 37; i-- > 0;)\r
       jjrounds[i] = 0x80000000;\r
 }\r
 \r

diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelParser/ModelParserTokenManager.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelParser/ModelParserTokenManager.java
index 19264f965717f0ccd98c3ee31b3f7732159822d5..ab57915fd8df8ade4aa2fcbdb5108ad606d62da5 100644 (file)
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelParser/ModelParserTokenManager.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelParser/ModelParserTokenManager.java
@@ -15,13 +15,13 @@ private final int jjStopStringLiteralDfa_0(int pos, long active0, long active1)
    switch (pos)
    {\r
       case 0:\r
+         if ((active1 & 0x80000L) != 0L)\r
+            return 14;\r
          if ((active0 & 0x3ffffffffffffff0L) != 0L || (active1 & 0xc0000000L) != 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 -1;\r
@@ -185,7 +185,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, 14);\r
       case 58:\r
          jjmatchedKind = 69;\r
          return jjMoveStringLiteralDfa1_0(0x0L, 0x2000000L);\r
@@ -936,7 +936,7 @@ static final long[] jjbitVec0 = {
 private int jjMoveNfa_0(int startState, int curPos)\r
 {\r
    int startsAt = 0;\r
-   jjnewStateCnt = 31;\r
+   jjnewStateCnt = 34;\r
    int i = 1;\r
    jjstateSet[0] = startState;\r
    int kind = 0x7fffffff;\r
@@ -951,12 +951,12 @@ private int jjMoveNfa_0(int startState, int curPos)
          {\r
             switch(jjstateSet[--i])\r
             {\r
-               case 13:\r
+               case 14:\r
                   if (curChar == 47)\r
                   {\r
                      if (kind > 3)\r
                         kind = 3;\r
-                     jjCheckNAdd(20);\r
+                     jjCheckNAdd(21);\r
                   }\r
                   else if (curChar == 42)\r
                      jjCheckNAddStates(0, 2);\r
@@ -1015,99 +1015,111 @@ private int jjMoveNfa_0(int startState, int curPos)
                   jjCheckNAddTwoStates(9, 10);\r
                   break;\r
                case 11:\r
+                  if ((0x280000000000L & l) != 0L)\r
+                     jjCheckNAdd(12);\r
+                  break;\r
+               case 12:\r
                   if ((0x3ff000000000000L & l) == 0L)\r
                      break;\r
                   if (kind > 93)\r
                      kind = 93;\r
-                  jjstateSet[jjnewStateCnt++] = 11;\r
+                  jjCheckNAdd(12);\r
                   break;\r
-               case 12:\r
+               case 13:\r
                   if (curChar == 47)\r
                      jjAddStates(8, 9);\r
                   break;\r
-               case 14:\r
+               case 15:\r
                   if ((0xfffffbffffffffffL & l) != 0L)\r
                      jjCheckNAddStates(0, 2);\r
                   break;\r
-               case 15:\r
+               case 16:\r
                   if (curChar == 42)\r
-                     jjstateSet[jjnewStateCnt++] = 16;\r
+                     jjstateSet[jjnewStateCnt++] = 17;\r
                   break;\r
-               case 16:\r
+               case 17:\r
                   if ((0xffff7fffffffffffL & l) != 0L)\r
                      jjCheckNAddStates(0, 2);\r
                   break;\r
-               case 17:\r
+               case 18:\r
                   if (curChar == 47 && kind > 2)\r
                      kind = 2;\r
                   break;\r
-               case 18:\r
+               case 19:\r
                   if (curChar == 42)\r
-                     jjstateSet[jjnewStateCnt++] = 17;\r
+                     jjstateSet[jjnewStateCnt++] = 18;\r
                   break;\r
-               case 19:\r
+               case 20:\r
                   if (curChar != 47)\r
                      break;\r
                   if (kind > 3)\r
                      kind = 3;\r
-                  jjCheckNAdd(20);\r
+                  jjCheckNAdd(21);\r
                   break;\r
-               case 20:\r
+               case 21:\r
                   if ((0xfffffffffffffbffL & l) == 0L)\r
                      break;\r
                   if (kind > 3)\r
                      kind = 3;\r
-                  jjCheckNAdd(20);\r
+                  jjCheckNAdd(21);\r
                   break;\r
-               case 21:\r
+               case 22:\r
                   if ((0x3ff000000000000L & l) == 0L)\r
                      break;\r
                   if (kind > 92)\r
                      kind = 92;\r
                   jjCheckNAddStates(3, 7);\r
                   break;\r
-               case 22:\r
+               case 23:\r
                   if ((0x3ff000000000000L & l) == 0L)\r
                      break;\r
                   if (kind > 92)\r
                      kind = 92;\r
-                  jjCheckNAdd(22);\r
+                  jjCheckNAdd(23);\r
                   break;\r
-               case 23:\r
+               case 24:\r
                   if ((0x3ff000000000000L & l) != 0L)\r
-                     jjCheckNAddTwoStates(23, 24);\r
+                     jjCheckNAddTwoStates(24, 25);\r
                   break;\r
-               case 24:\r
+               case 25:\r
                   if (curChar != 46)\r
                      break;\r
                   if (kind > 93)\r
                      kind = 93;\r
-                  jjCheckNAddTwoStates(25, 26);\r
+                  jjCheckNAddTwoStates(26, 27);\r
                   break;\r
-               case 25:\r
+               case 26:\r
                   if ((0x3ff000000000000L & l) == 0L)\r
                      break;\r
                   if (kind > 93)\r
                      kind = 93;\r
-                  jjCheckNAddTwoStates(25, 26);\r
+                  jjCheckNAddTwoStates(26, 27);\r
                   break;\r
-               case 27:\r
+               case 28:\r
+                  if ((0x280000000000L & l) != 0L)\r
+                     jjCheckNAdd(29);\r
+                  break;\r
+               case 29:\r
                   if ((0x3ff000000000000L & l) == 0L)\r
                      break;\r
                   if (kind > 93)\r
                      kind = 93;\r
-                  jjstateSet[jjnewStateCnt++] = 27;\r
+                  jjCheckNAdd(29);\r
                   break;\r
-               case 28:\r
+               case 30:\r
                   if ((0x3ff000000000000L & l) != 0L)\r
-                     jjCheckNAddTwoStates(28, 29);\r
+                     jjCheckNAddTwoStates(30, 31);\r
                   break;\r
-               case 30:\r
+               case 32:\r
+                  if ((0x280000000000L & l) != 0L)\r
+                     jjCheckNAdd(33);\r
+                  break;\r
+               case 33:\r
                   if ((0x3ff000000000000L & l) == 0L)\r
                      break;\r
                   if (kind > 93)\r
                      kind = 93;\r
-                  jjstateSet[jjnewStateCnt++] = 30;\r
+                  jjCheckNAdd(33);\r
                   break;\r
                default : break;\r
             }\r
@@ -1141,24 +1153,24 @@ private int jjMoveNfa_0(int startState, int curPos)
                   break;\r
                case 10:\r
                   if ((0x2000000020L & l) != 0L)\r
-                     jjstateSet[jjnewStateCnt++] = 11;\r
+                     jjAddStates(13, 14);\r
                   break;\r
-               case 14:\r
-               case 16:\r
+               case 15:\r
+               case 17:\r
                   jjCheckNAddStates(0, 2);\r
                   break;\r
-               case 20:\r
+               case 21:\r
                   if (kind > 3)\r
                      kind = 3;\r
-                  jjstateSet[jjnewStateCnt++] = 20;\r
+                  jjstateSet[jjnewStateCnt++] = 21;\r
                   break;\r
-               case 26:\r
+               case 27:\r
                   if ((0x2000000020L & l) != 0L)\r
-                     jjstateSet[jjnewStateCnt++] = 27;\r
+                     jjAddStates(15, 16);\r
                   break;\r
-               case 29:\r
+               case 31:\r
                   if ((0x2000000020L & l) != 0L)\r
-                     jjstateSet[jjnewStateCnt++] = 30;\r
+                     jjAddStates(17, 18);\r
                   break;\r
                default : break;\r
             }\r
@@ -1177,17 +1189,17 @@ private int jjMoveNfa_0(int startState, int curPos)
                   if ((jjbitVec0[i2] & l2) != 0L)\r
                      jjCheckNAddStates(10, 12);\r
                   break;\r
-               case 14:\r
-               case 16:\r
+               case 15:\r
+               case 17:\r
                   if ((jjbitVec0[i2] & l2) != 0L)\r
                      jjCheckNAddStates(0, 2);\r
                   break;\r
-               case 20:\r
+               case 21:\r
                   if ((jjbitVec0[i2] & l2) == 0L)\r
                      break;\r
                   if (kind > 3)\r
                      kind = 3;\r
-                  jjstateSet[jjnewStateCnt++] = 20;\r
+                  jjstateSet[jjnewStateCnt++] = 21;\r
                   break;\r
                default : break;\r
             }\r
@@ -1200,14 +1212,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 = 34 - (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, 
+   15, 16, 19, 23, 24, 25, 30, 31, 14, 20, 4, 5, 7, 11, 12, 28, 
+   29, 32, 33, 
 };\r
 \r
 /** Token literal values. */\r
@@ -1246,8 +1259,8 @@ 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[34];\r
+private final int[] jjstateSet = new int[68];\r
 private final StringBuilder jjimage = new StringBuilder();\r
 private StringBuilder image = jjimage;\r
 private int jjimageLen;\r
@@ -1278,7 +1291,7 @@ private void ReInitRounds()
 {\r
    int i;\r
    jjround = 0x80000001;\r
-   for (i = 31; i-- > 0;)\r
+   for (i = 34; i-- > 0;)\r
       jjrounds[i] = 0x80000000;\r
 }\r
 \r

diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelParser/ModelicaParser.jj b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelParser/ModelicaParser.jj
index 2f9f31eba9ef76ceb225a4ab174046daaf8051fa..04e39995d9fe22ca8264cc541f5cc80f242e00bc 100644 (file)
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/modelParser/ModelicaParser.jj
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/modelParser/ModelicaParser.jj
@@ -77,9 +77,9 @@ TOKEN:
     { matchedToken.image = matchedToken.image.substring(1,matchedToken.image.length()-1); }\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>)? (["e","E"] (["+","-"])? <UNSIGNED_INTEGER>)?\r
+    | "." <UNSIGNED_INTEGER> (["e","E"] (["+","-"])? <UNSIGNED_INTEGER>)?\r
+    | <UNSIGNED_INTEGER> ["e","E"] (["+","-"])? <UNSIGNED_INTEGER>\r
     ) >\r
 }\r
 \r

diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/tableParser/TableParser.jj b/org.simantics.sysdyn/src/org/simantics/sysdyn/tableParser/TableParser.jj
index 74caa34c3de5c19a9dbf921aabca0aeeb5f8545c..c7bd0bd9129b277cdcc8d9e713a677c79728f694 100644 (file)
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/tableParser/TableParser.jj
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/tableParser/TableParser.jj
@@ -57,9 +57,9 @@ TOKEN:
     { matchedToken.image = matchedToken.image.substring(1,matchedToken.image.length()-1); }\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>)? (["e","E"] (["+","-"])? <UNSIGNED_INTEGER>)?\r
+    | "." <UNSIGNED_INTEGER> (["e","E"] (["+","-"])? <UNSIGNED_INTEGER>)?\r
+    | <UNSIGNED_INTEGER> ["e","E"] (["+","-"])? <UNSIGNED_INTEGER>\r
     ) >\r
 | <SIGNED_NUMBER : (("-")? ( <UNSIGNED_NUMBER> | <UNSIGNED_INTEGER> ))>\r
 }\r

diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/tableParser/TableParserTokenManager.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/tableParser/TableParserTokenManager.java
index 3de87d4f274380c0566e57af45e3c7309b789b24..d8eae25d9f37e106d6dc2597d278505a75515c06 100644 (file)
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/tableParser/TableParserTokenManager.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/tableParser/TableParserTokenManager.java
@@ -1,5 +1,6 @@
 /* Generated By:JavaCC: Do not edit this line. TableParserTokenManager.java */\r
 package org.simantics.sysdyn.tableParser;\r
+import java.util.ArrayList;\r
 \r
 /** Token Manager. */\r
 public class TableParserTokenManager implements TableParserConstants\r
@@ -14,17 +15,17 @@ private final int jjStopStringLiteralDfa_0(int pos, long active0, long active1)
    switch (pos)
    {\r
       case 0:\r
-         if ((active1 & 0x80000L) != 0L)\r
-            return 24;\r
          if ((active0 & 0x3ffffffffffffff0L) != 0L)\r
          {\r
             jjmatchedKind = 90;\r
             return 2;\r
          }\r
-         if ((active1 & 0xb30010L) != 0L)\r
-            return 46;\r
          if ((active1 & 0x8000L) != 0L)\r
             return 9;\r
+         if ((active1 & 0xb30010L) != 0L)\r
+            return 52;\r
+         if ((active1 & 0x80000L) != 0L)\r
+            return 27;\r
          return -1;\r
       case 1:\r
          if ((active0 & 0x108420080400000L) != 0L)\r
@@ -179,7 +180,7 @@ private int jjMoveStringLiteralDfa0_0()
          jjmatchedKind = 68;\r
          return jjMoveStringLiteralDfa1_0(0x0L, 0xb30000L);\r
       case 47:\r
-         return jjStartNfaWithStates_0(0, 83, 24);\r
+         return jjStartNfaWithStates_0(0, 83, 27);\r
       case 58:\r
          jjmatchedKind = 69;\r
          return jjMoveStringLiteralDfa1_0(0x0L, 0x2000000L);\r
@@ -831,7 +832,7 @@ static final long[] jjbitVec0 = {
 private int jjMoveNfa_0(int startState, int curPos)\r
 {\r
    int startsAt = 0;\r
-   jjnewStateCnt = 46;\r
+   jjnewStateCnt = 52;\r
    int i = 1;\r
    jjstateSet[0] = startState;\r
    int kind = 0x7fffffff;\r
@@ -846,17 +847,7 @@ private int jjMoveNfa_0(int startState, int curPos)
          {\r
             switch(jjstateSet[--i])\r
             {\r
-               case 24:\r
-                  if (curChar == 47)\r
-                  {\r
-                     if (kind > 3)\r
-                        kind = 3;\r
-                     jjCheckNAdd(31);\r
-                  }\r
-                  else if (curChar == 42)\r
-                     jjCheckNAddStates(0, 2);\r
-                  break;\r
-               case 46:\r
+               case 52:\r
                   if ((0x3ff000000000000L & l) != 0L)\r
                   {\r
                      if (kind > 94)\r
@@ -867,7 +858,7 @@ private int jjMoveNfa_0(int startState, int curPos)
                   {\r
                      if (kind > 93)\r
                         kind = 93;\r
-                     jjCheckNAddTwoStates(43, 44);\r
+                     jjCheckNAddTwoStates(48, 49);\r
                   }\r
                   break;\r
                case 9:\r
@@ -875,7 +866,7 @@ private int jjMoveNfa_0(int startState, int curPos)
                   {\r
                      if (kind > 94)\r
                         kind = 94;\r
-                     jjCheckNAddStates(3, 7);\r
+                     jjCheckNAddStates(0, 4);\r
                   }\r
                   else if (curChar == 46)\r
                      jjCheckNAdd(10);\r
@@ -885,7 +876,7 @@ private int jjMoveNfa_0(int startState, int curPos)
                   {\r
                      if (kind > 92)\r
                         kind = 92;\r
-                     jjCheckNAddStates(8, 17);\r
+                     jjCheckNAddStates(5, 14);\r
                   }\r
                   else if ((0x100002600L & l) != 0L)\r
                   {\r
@@ -893,12 +884,22 @@ private int jjMoveNfa_0(int startState, int curPos)
                         kind = 1;\r
                   }\r
                   else if (curChar == 46)\r
-                     jjCheckNAddTwoStates(43, 10);\r
+                     jjCheckNAddTwoStates(48, 10);\r
                   else if (curChar == 47)\r
-                     jjAddStates(18, 19);\r
+                     jjAddStates(15, 16);\r
                   else if (curChar == 45)\r
-                     jjAddStates(20, 21);\r
+                     jjAddStates(17, 18);\r
                   else if (curChar == 34)\r
+                     jjCheckNAddStates(19, 21);\r
+                  break;\r
+               case 27:\r
+                  if (curChar == 47)\r
+                  {\r
+                     if (kind > 3)\r
+                        kind = 3;\r
+                     jjCheckNAdd(34);\r
+                  }\r
+                  else if (curChar == 42)\r
                      jjCheckNAddStates(22, 24);\r
                   break;\r
                case 2:\r
@@ -910,15 +911,15 @@ private int jjMoveNfa_0(int startState, int curPos)
                   break;\r
                case 3:\r
                   if (curChar == 34)\r
-                     jjCheckNAddStates(22, 24);\r
+                     jjCheckNAddStates(19, 21);\r
                   break;\r
                case 4:\r
                   if ((0xfffffffbfffffbffL & l) != 0L)\r
-                     jjCheckNAddStates(22, 24);\r
+                     jjCheckNAddStates(19, 21);\r
                   break;\r
                case 6:\r
                   if ((0xfffffffffffffbffL & l) != 0L)\r
-                     jjCheckNAddStates(22, 24);\r
+                     jjCheckNAddStates(19, 21);\r
                   break;\r
                case 7:\r
                   if (curChar == 34 && kind > 91)\r
@@ -926,7 +927,7 @@ private int jjMoveNfa_0(int startState, int curPos)
                   break;\r
                case 8:\r
                   if (curChar == 45)\r
-                     jjAddStates(20, 21);\r
+                     jjAddStates(17, 18);\r
                   break;\r
                case 10:\r
                   if ((0x3ff000000000000L & l) == 0L)\r
@@ -936,167 +937,191 @@ private int jjMoveNfa_0(int startState, int curPos)
                   jjCheckNAddTwoStates(10, 11);\r
                   break;\r
                case 12:\r
+                  if ((0x280000000000L & l) != 0L)\r
+                     jjCheckNAdd(13);\r
+                  break;\r
+               case 13:\r
                   if ((0x3ff000000000000L & l) == 0L)\r
                      break;\r
                   if (kind > 94)\r
                      kind = 94;\r
-                  jjstateSet[jjnewStateCnt++] = 12;\r
+                  jjCheckNAdd(13);\r
                   break;\r
-               case 13:\r
+               case 14:\r
                   if ((0x3ff000000000000L & l) == 0L)\r
                      break;\r
                   if (kind > 94)\r
                      kind = 94;\r
-                  jjCheckNAddStates(3, 7);\r
+                  jjCheckNAddStates(0, 4);\r
                   break;\r
-               case 14:\r
+               case 15:\r
                   if ((0x3ff000000000000L & l) == 0L)\r
                      break;\r
                   if (kind > 94)\r
                      kind = 94;\r
-                  jjCheckNAdd(14);\r
+                  jjCheckNAdd(15);\r
                   break;\r
-               case 15:\r
+               case 16:\r
                   if ((0x3ff000000000000L & l) != 0L)\r
-                     jjCheckNAddTwoStates(15, 16);\r
+                     jjCheckNAddTwoStates(16, 17);\r
                   break;\r
-               case 17:\r
+               case 18:\r
+                  if ((0x280000000000L & l) != 0L)\r
+                     jjCheckNAdd(19);\r
+                  break;\r
+               case 19:\r
                   if ((0x3ff000000000000L & l) == 0L)\r
                      break;\r
                   if (kind > 94)\r
                      kind = 94;\r
-                  jjstateSet[jjnewStateCnt++] = 17;\r
+                  jjCheckNAdd(19);\r
                   break;\r
-               case 18:\r
+               case 20:\r
                   if ((0x3ff000000000000L & l) != 0L)\r
-                     jjCheckNAddTwoStates(18, 19);\r
+                     jjCheckNAddTwoStates(20, 21);\r
                   break;\r
-               case 19:\r
+               case 21:\r
                   if (curChar != 46)\r
                      break;\r
                   if (kind > 94)\r
                      kind = 94;\r
-                  jjCheckNAddTwoStates(20, 21);\r
+                  jjCheckNAddTwoStates(22, 23);\r
                   break;\r
-               case 20:\r
+               case 22:\r
                   if ((0x3ff000000000000L & l) == 0L)\r
                      break;\r
                   if (kind > 94)\r
                      kind = 94;\r
-                  jjCheckNAddTwoStates(20, 21);\r
+                  jjCheckNAddTwoStates(22, 23);\r
                   break;\r
-               case 22:\r
+               case 24:\r
+                  if ((0x280000000000L & l) != 0L)\r
+                     jjCheckNAdd(25);\r
+                  break;\r
+               case 25:\r
                   if ((0x3ff000000000000L & l) == 0L)\r
                      break;\r
                   if (kind > 94)\r
                      kind = 94;\r
-                  jjstateSet[jjnewStateCnt++] = 22;\r
+                  jjCheckNAdd(25);\r
                   break;\r
-               case 23:\r
+               case 26:\r
                   if (curChar == 47)\r
-                     jjAddStates(18, 19);\r
+                     jjAddStates(15, 16);\r
                   break;\r
-               case 25:\r
+               case 28:\r
                   if ((0xfffffbffffffffffL & l) != 0L)\r
-                     jjCheckNAddStates(0, 2);\r
+                     jjCheckNAddStates(22, 24);\r
                   break;\r
-               case 26:\r
+               case 29:\r
                   if (curChar == 42)\r
-                     jjstateSet[jjnewStateCnt++] = 27;\r
+                     jjstateSet[jjnewStateCnt++] = 30;\r
                   break;\r
-               case 27:\r
+               case 30:\r
                   if ((0xffff7fffffffffffL & l) != 0L)\r
-                     jjCheckNAddStates(0, 2);\r
+                     jjCheckNAddStates(22, 24);\r
                   break;\r
-               case 28:\r
+               case 31:\r
                   if (curChar == 47 && kind > 2)\r
                      kind = 2;\r
                   break;\r
-               case 29:\r
+               case 32:\r
                   if (curChar == 42)\r
-                     jjstateSet[jjnewStateCnt++] = 28;\r
+                     jjstateSet[jjnewStateCnt++] = 31;\r
                   break;\r
-               case 30:\r
+               case 33:\r
                   if (curChar != 47)\r
                      break;\r
                   if (kind > 3)\r
                      kind = 3;\r
-                  jjCheckNAdd(31);\r
+                  jjCheckNAdd(34);\r
                   break;\r
-               case 31:\r
+               case 34:\r
                   if ((0xfffffffffffffbffL & l) == 0L)\r
                      break;\r
                   if (kind > 3)\r
                      kind = 3;\r
-                  jjCheckNAdd(31);\r
+                  jjCheckNAdd(34);\r
                   break;\r
-               case 32:\r
+               case 35:\r
                   if ((0x3ff000000000000L & l) == 0L)\r
                      break;\r
                   if (kind > 92)\r
                      kind = 92;\r
-                  jjCheckNAddStates(8, 17);\r
+                  jjCheckNAddStates(5, 14);\r
                   break;\r
-               case 33:\r
+               case 36:\r
                   if ((0x3ff000000000000L & l) == 0L)\r
                      break;\r
                   if (kind > 92)\r
                      kind = 92;\r
-                  jjCheckNAdd(33);\r
+                  jjCheckNAdd(36);\r
                   break;\r
-               case 34:\r
+               case 37:\r
                   if ((0x3ff000000000000L & l) != 0L)\r
-                     jjCheckNAddTwoStates(34, 35);\r
+                     jjCheckNAddTwoStates(37, 38);\r
                   break;\r
-               case 35:\r
+               case 38:\r
                   if (curChar != 46)\r
                      break;\r
                   if (kind > 93)\r
                      kind = 93;\r
-                  jjCheckNAddTwoStates(36, 37);\r
+                  jjCheckNAddTwoStates(39, 40);\r
                   break;\r
-               case 36:\r
+               case 39:\r
                   if ((0x3ff000000000000L & l) == 0L)\r
                      break;\r
                   if (kind > 93)\r
                      kind = 93;\r
-                  jjCheckNAddTwoStates(36, 37);\r
+                  jjCheckNAddTwoStates(39, 40);\r
                   break;\r
-               case 38:\r
+               case 41:\r
+                  if ((0x280000000000L & l) != 0L)\r
+                     jjCheckNAdd(42);\r
+                  break;\r
+               case 42:\r
                   if ((0x3ff000000000000L & l) == 0L)\r
                      break;\r
                   if (kind > 93)\r
                      kind = 93;\r
-                  jjstateSet[jjnewStateCnt++] = 38;\r
+                  jjCheckNAdd(42);\r
                   break;\r
-               case 39:\r
+               case 43:\r
                   if ((0x3ff000000000000L & l) != 0L)\r
-                     jjCheckNAddTwoStates(39, 40);\r
+                     jjCheckNAddTwoStates(43, 44);\r
                   break;\r
-               case 41:\r
+               case 45:\r
+                  if ((0x280000000000L & l) != 0L)\r
+                     jjCheckNAdd(46);\r
+                  break;\r
+               case 46:\r
                   if ((0x3ff000000000000L & l) == 0L)\r
                      break;\r
                   if (kind > 93)\r
                      kind = 93;\r
-                  jjstateSet[jjnewStateCnt++] = 41;\r
+                  jjCheckNAdd(46);\r
                   break;\r
-               case 42:\r
+               case 47:\r
                   if (curChar == 46)\r
-                     jjCheckNAddTwoStates(43, 10);\r
+                     jjCheckNAddTwoStates(48, 10);\r
                   break;\r
-               case 43:\r
+               case 48:\r
                   if ((0x3ff000000000000L & l) == 0L)\r
                      break;\r
                   if (kind > 93)\r
                      kind = 93;\r
-                  jjCheckNAddTwoStates(43, 44);\r
+                  jjCheckNAddTwoStates(48, 49);\r
                   break;\r
-               case 45:\r
+               case 50:\r
+                  if ((0x280000000000L & l) != 0L)\r
+                     jjCheckNAdd(51);\r
+                  break;\r
+               case 51:\r
                   if ((0x3ff000000000000L & l) == 0L)\r
                      break;\r
                   if (kind > 93)\r
                      kind = 93;\r
-                  jjstateSet[jjnewStateCnt++] = 45;\r
+                  jjCheckNAdd(51);\r
                   break;\r
                default : break;\r
             }\r
@@ -1119,47 +1144,47 @@ private int jjMoveNfa_0(int startState, int curPos)
                   break;\r
                case 4:\r
                   if ((0xffffffffefffffffL & l) != 0L)\r
-                     jjCheckNAddStates(22, 24);\r
+                     jjCheckNAddStates(19, 21);\r
                   break;\r
                case 5:\r
                   if (curChar == 92)\r
                      jjstateSet[jjnewStateCnt++] = 6;\r
                   break;\r
                case 6:\r
-                  jjCheckNAddStates(22, 24);\r
+                  jjCheckNAddStates(19, 21);\r
                   break;\r
                case 11:\r
                   if ((0x2000000020L & l) != 0L)\r
-                     jjstateSet[jjnewStateCnt++] = 12;\r
+                     jjAddStates(25, 26);\r
                   break;\r
-               case 16:\r
+               case 17:\r
                   if ((0x2000000020L & l) != 0L)\r
-                     jjstateSet[jjnewStateCnt++] = 17;\r
+                     jjAddStates(27, 28);\r
                   break;\r
-               case 21:\r
+               case 23:\r
                   if ((0x2000000020L & l) != 0L)\r
-                     jjstateSet[jjnewStateCnt++] = 22;\r
+                     jjAddStates(29, 30);\r
                   break;\r
-               case 25:\r
-               case 27:\r
-                  jjCheckNAddStates(0, 2);\r
+               case 28:\r
+               case 30:\r
+                  jjCheckNAddStates(22, 24);\r
                   break;\r
-               case 31:\r
+               case 34:\r
                   if (kind > 3)\r
                      kind = 3;\r
-                  jjstateSet[jjnewStateCnt++] = 31;\r
-                  break;\r
-               case 37:\r
-                  if ((0x2000000020L & l) != 0L)\r
-                     jjstateSet[jjnewStateCnt++] = 38;\r
+                  jjstateSet[jjnewStateCnt++] = 34;\r
                   break;\r
                case 40:\r
                   if ((0x2000000020L & l) != 0L)\r
-                     jjstateSet[jjnewStateCnt++] = 41;\r
+                     jjAddStates(31, 32);\r
                   break;\r
                case 44:\r
                   if ((0x2000000020L & l) != 0L)\r
-                     jjstateSet[jjnewStateCnt++] = 45;\r
+                     jjAddStates(33, 34);\r
+                  break;\r
+               case 49:\r
+                  if ((0x2000000020L & l) != 0L)\r
+                     jjAddStates(35, 36);\r
                   break;\r
                default : break;\r
             }\r
@@ -1176,19 +1201,19 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 4:\r
                case 6:\r
                   if ((jjbitVec0[i2] & l2) != 0L)\r
-                     jjCheckNAddStates(22, 24);\r
+                     jjCheckNAddStates(19, 21);\r
                   break;\r
-               case 25:\r
-               case 27:\r
+               case 28:\r
+               case 30:\r
                   if ((jjbitVec0[i2] & l2) != 0L)\r
-                     jjCheckNAddStates(0, 2);\r
+                     jjCheckNAddStates(22, 24);\r
                   break;\r
-               case 31:\r
+               case 34:\r
                   if ((jjbitVec0[i2] & l2) == 0L)\r
                      break;\r
                   if (kind > 3)\r
                      kind = 3;\r
-                  jjstateSet[jjnewStateCnt++] = 31;\r
+                  jjstateSet[jjnewStateCnt++] = 34;\r
                   break;\r
                default : break;\r
             }\r
@@ -1201,15 +1226,16 @@ private int jjMoveNfa_0(int startState, int curPos)
          kind = 0x7fffffff;\r
       }\r
       ++curPos;\r
-      if ((i = jjnewStateCnt) == (startsAt = 46 - (jjnewStateCnt = startsAt)))\r
+      if ((i = jjnewStateCnt) == (startsAt = 52 - (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 = {
-   25, 26, 29, 14, 15, 16, 18, 19, 33, 34, 35, 39, 40, 14, 15, 16, 
-   18, 19, 24, 30, 9, 13, 4, 5, 7, 
+   15, 16, 17, 20, 21, 36, 37, 38, 43, 44, 15, 16, 17, 20, 21, 27, 
+   33, 9, 14, 4, 5, 7, 28, 29, 32, 12, 13, 18, 19, 24, 25, 41, 
+   42, 45, 46, 50, 51, 
 };\r
 \r
 /** Token literal values. */\r
@@ -1247,8 +1273,8 @@ static final long[] jjtoSkip = {
    0xeL, 0x0L, 
 };\r
 protected SimpleCharStream input_stream;\r
-private final int[] jjrounds = new int[46];\r
-private final int[] jjstateSet = new int[92];\r
+private final int[] jjrounds = new int[52];\r
+private final int[] jjstateSet = new int[104];\r
 private final StringBuilder jjimage = new StringBuilder();\r
 private StringBuilder image = jjimage;\r
 private int jjimageLen;\r
@@ -1279,7 +1305,7 @@ private void ReInitRounds()
 {\r
    int i;\r
    jjround = 0x80000001;\r
-   for (i = 46; i-- > 0;)\r
+   for (i = 52; i-- > 0;)\r
       jjrounds[i] = 0x80000000;\r
 }\r
 \r

diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/unitParser/UnitParser.jj b/org.simantics.sysdyn/src/org/simantics/sysdyn/unitParser/UnitParser.jj
index 7261f8cfa074736b8a0372cb29d3ed6688966eb9..35d321e2eafe6244f84465aa19c551f44aa4ca8f 100644 (file)
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/unitParser/UnitParser.jj
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/unitParser/UnitParser.jj
@@ -53,9 +53,9 @@ TOKEN:
     { matchedToken.image = matchedToken.image.substring(1,matchedToken.image.length()-1); }\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>)? (["e","E"] (["+","-"])? <UNSIGNED_INTEGER>)?\r
+    | "." <UNSIGNED_INTEGER> (["e","E"] (["+","-"])? <UNSIGNED_INTEGER>)?\r
+    | <UNSIGNED_INTEGER> ["e","E"] (["+","-"])? <UNSIGNED_INTEGER>\r
     ) >\r
 }\r
 \r

diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/unitParser/UnitParser.jjt b/org.simantics.sysdyn/src/org/simantics/sysdyn/unitParser/UnitParser.jjt
index 81d5fcb861c59cdd4480456ec35a81be8ce2c0b5..af0cd4bfe859d3d51668942b191766dcaf93c092 100644 (file)
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/unitParser/UnitParser.jjt
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/unitParser/UnitParser.jjt
@@ -49,9 +49,9 @@ TOKEN:
     { matchedToken.image = matchedToken.image.substring(1,matchedToken.image.length()-1); }\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>)? (["e","E"] (["+","-"])? <UNSIGNED_INTEGER>)?\r
+    | "." <UNSIGNED_INTEGER> (["e","E"] (["+","-"])? <UNSIGNED_INTEGER>)?\r
+    | <UNSIGNED_INTEGER> ["e","E"] (["+","-"])? <UNSIGNED_INTEGER>\r
     ) >\r
 }\r
 \r

diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/unitParser/UnitParserTokenManager.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/unitParser/UnitParserTokenManager.java
index 17e5dd5cdda579c63ba85526576c211a18a9034b..1758bea8d2e4e2af0469b34a357c513c170a55a4 100644 (file)
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/unitParser/UnitParserTokenManager.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/unitParser/UnitParserTokenManager.java
@@ -20,7 +20,7 @@ private final int jjStopStringLiteralDfa_0(int pos, long active0, long active1)
             return 2;\r
          }\r
          if ((active1 & 0x20000L) != 0L)\r
-            return 13;\r
+            return 14;\r
          if ((active1 & 0x2cc004L) != 0L)\r
             return 9;\r
          return -1;\r
@@ -177,7 +177,7 @@ private int jjMoveStringLiteralDfa0_0()
          jjmatchedKind = 66;\r
          return jjMoveStringLiteralDfa1_0(0x0L, 0x2cc000L);\r
       case 47:\r
-         return jjStartNfaWithStates_0(0, 81, 13);\r
+         return jjStartNfaWithStates_0(0, 81, 14);\r
       case 58:\r
          jjmatchedKind = 67;\r
          return jjMoveStringLiteralDfa1_0(0x0L, 0x800000L);\r
@@ -837,7 +837,7 @@ static final long[] jjbitVec5 = {
 private int jjMoveNfa_0(int startState, int curPos)\r
 {\r
    int startsAt = 0;\r
-   jjnewStateCnt = 31;\r
+   jjnewStateCnt = 34;\r
    int i = 1;\r
    jjstateSet[0] = startState;\r
    int kind = 0x7fffffff;\r
@@ -852,12 +852,12 @@ private int jjMoveNfa_0(int startState, int curPos)
          {\r
             switch(jjstateSet[--i])\r
             {\r
-               case 13:\r
+               case 14:\r
                   if (curChar == 47)\r
                   {\r
                      if (kind > 3)\r
                         kind = 3;\r
-                     jjCheckNAdd(20);\r
+                     jjCheckNAdd(21);\r
                   }\r
                   else if (curChar == 42)\r
                      jjCheckNAddStates(0, 2);\r
@@ -929,99 +929,111 @@ private int jjMoveNfa_0(int startState, int curPos)
                   jjCheckNAddTwoStates(9, 10);\r
                   break;\r
                case 11:\r
+                  if ((0x280000000000L & l) != 0L)\r
+                     jjCheckNAdd(12);\r
+                  break;\r
+               case 12:\r
                   if ((0x3ff000000000000L & l) == 0L)\r
                      break;\r
                   if (kind > 91)\r
                      kind = 91;\r
-                  jjstateSet[jjnewStateCnt++] = 11;\r
+                  jjCheckNAdd(12);\r
                   break;\r
-               case 12:\r
+               case 13:\r
                   if (curChar == 47)\r
                      jjAddStates(8, 9);\r
                   break;\r
-               case 14:\r
+               case 15:\r
                   if ((0xfffffbffffffffffL & l) != 0L)\r
                      jjCheckNAddStates(0, 2);\r
                   break;\r
-               case 15:\r
+               case 16:\r
                   if (curChar == 42)\r
-                     jjstateSet[jjnewStateCnt++] = 16;\r
+                     jjstateSet[jjnewStateCnt++] = 17;\r
                   break;\r
-               case 16:\r
+               case 17:\r
                   if ((0xffff7fffffffffffL & l) != 0L)\r
                      jjCheckNAddStates(0, 2);\r
                   break;\r
-               case 17:\r
+               case 18:\r
                   if (curChar == 47 && kind > 2)\r
                      kind = 2;\r
                   break;\r
-               case 18:\r
+               case 19:\r
                   if (curChar == 42)\r
-                     jjstateSet[jjnewStateCnt++] = 17;\r
+                     jjstateSet[jjnewStateCnt++] = 18;\r
                   break;\r
-               case 19:\r
+               case 20:\r
                   if (curChar != 47)\r
                      break;\r
                   if (kind > 3)\r
                      kind = 3;\r
-                  jjCheckNAdd(20);\r
+                  jjCheckNAdd(21);\r
                   break;\r
-               case 20:\r
+               case 21:\r
                   if ((0xfffffffffffffbffL & l) == 0L)\r
                      break;\r
                   if (kind > 3)\r
                      kind = 3;\r
-                  jjCheckNAdd(20);\r
+                  jjCheckNAdd(21);\r
                   break;\r
-               case 21:\r
+               case 22:\r
                   if ((0x3ff000000000000L & l) == 0L)\r
                      break;\r
                   if (kind > 90)\r
                      kind = 90;\r
                   jjCheckNAddStates(3, 7);\r
                   break;\r
-               case 22:\r
+               case 23:\r
                   if ((0x3ff000000000000L & l) == 0L)\r
                      break;\r
                   if (kind > 90)\r
                      kind = 90;\r
-                  jjCheckNAdd(22);\r
+                  jjCheckNAdd(23);\r
                   break;\r
-               case 23:\r
+               case 24:\r
                   if ((0x3ff000000000000L & l) != 0L)\r
-                     jjCheckNAddTwoStates(23, 24);\r
+                     jjCheckNAddTwoStates(24, 25);\r
                   break;\r
-               case 24:\r
+               case 25:\r
                   if (curChar != 46)\r
                      break;\r
                   if (kind > 91)\r
                      kind = 91;\r
-                  jjCheckNAddTwoStates(25, 26);\r
+                  jjCheckNAddTwoStates(26, 27);\r
                   break;\r
-               case 25:\r
+               case 26:\r
                   if ((0x3ff000000000000L & l) == 0L)\r
                      break;\r
                   if (kind > 91)\r
                      kind = 91;\r
-                  jjCheckNAddTwoStates(25, 26);\r
+                  jjCheckNAddTwoStates(26, 27);\r
                   break;\r
-               case 27:\r
+               case 28:\r
+                  if ((0x280000000000L & l) != 0L)\r
+                     jjCheckNAdd(29);\r
+                  break;\r
+               case 29:\r
                   if ((0x3ff000000000000L & l) == 0L)\r
                      break;\r
                   if (kind > 91)\r
                      kind = 91;\r
-                  jjstateSet[jjnewStateCnt++] = 27;\r
+                  jjCheckNAdd(29);\r
                   break;\r
-               case 28:\r
+               case 30:\r
                   if ((0x3ff000000000000L & l) != 0L)\r
-                     jjCheckNAddTwoStates(28, 29);\r
+                     jjCheckNAddTwoStates(30, 31);\r
                   break;\r
-               case 30:\r
+               case 32:\r
+                  if ((0x280000000000L & l) != 0L)\r
+                     jjCheckNAdd(33);\r
+                  break;\r
+               case 33:\r
                   if ((0x3ff000000000000L & l) == 0L)\r
                      break;\r
                   if (kind > 91)\r
                      kind = 91;\r
-                  jjstateSet[jjnewStateCnt++] = 30;\r
+                  jjCheckNAdd(33);\r
                   break;\r
                default : break;\r
             }\r
@@ -1055,24 +1067,24 @@ private int jjMoveNfa_0(int startState, int curPos)
                   break;\r
                case 10:\r
                   if ((0x2000000020L & l) != 0L)\r
-                     jjstateSet[jjnewStateCnt++] = 11;\r
+                     jjAddStates(13, 14);\r
                   break;\r
-               case 14:\r
-               case 16:\r
+               case 15:\r
+               case 17:\r
                   jjCheckNAddStates(0, 2);\r
                   break;\r
-               case 20:\r
+               case 21:\r
                   if (kind > 3)\r
                      kind = 3;\r
-                  jjstateSet[jjnewStateCnt++] = 20;\r
+                  jjstateSet[jjnewStateCnt++] = 21;\r
                   break;\r
-               case 26:\r
+               case 27:\r
                   if ((0x2000000020L & l) != 0L)\r
-                     jjstateSet[jjnewStateCnt++] = 27;\r
+                     jjAddStates(15, 16);\r
                   break;\r
-               case 29:\r
+               case 31:\r
                   if ((0x2000000020L & l) != 0L)\r
-                     jjstateSet[jjnewStateCnt++] = 30;\r
+                     jjAddStates(17, 18);\r
                   break;\r
                default : break;\r
             }\r
@@ -1102,17 +1114,17 @@ private int jjMoveNfa_0(int startState, int curPos)
                   if (jjCanMove_1(hiByte, i1, i2, l1, l2))\r
                      jjCheckNAddStates(10, 12);\r
                   break;\r
-               case 14:\r
-               case 16:\r
+               case 15:\r
+               case 17:\r
                   if (jjCanMove_2(hiByte, i1, i2, l1, l2))\r
                      jjCheckNAddStates(0, 2);\r
                   break;\r
-               case 20:\r
+               case 21:\r
                   if (!jjCanMove_2(hiByte, i1, i2, l1, l2))\r
                      break;\r
                   if (kind > 3)\r
                      kind = 3;\r
-                  jjstateSet[jjnewStateCnt++] = 20;\r
+                  jjstateSet[jjnewStateCnt++] = 21;\r
                   break;\r
                default : break;\r
             }\r
@@ -1125,14 +1137,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 = 34 - (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, 
+   15, 16, 19, 23, 24, 25, 30, 31, 14, 20, 4, 5, 7, 11, 12, 28, 
+   29, 32, 33, 
 };\r
 private static final boolean jjCanMove_0(int hiByte, int i1, int i2, long l1, long l2)\r
 {\r
@@ -1206,8 +1219,8 @@ 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[34];\r
+private final int[] jjstateSet = new int[68];\r
 private final StringBuilder jjimage = new StringBuilder();\r
 private StringBuilder image = jjimage;\r
 private int jjimageLen;\r
@@ -1238,7 +1251,7 @@ private void ReInitRounds()
 {\r
    int i;\r
    jjround = 0x80000001;\r
-   for (i = 31; i-- > 0;)\r
+   for (i = 34; i-- > 0;)\r
       jjrounds[i] = 0x80000000;\r
 }\r
 \r