Generated java files for unit parser (refs #4628).

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

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 8bb34bc7bd1c544d4507c1ad4d00a17388336508..c178f70d51515e17f41d9297fdeadfa2e704d4de 100644 (file)
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/unitParser/UnitParser.jj
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/unitParser/UnitParser.jj
@@ -48,7 +48,7 @@ TOKEN:
 | "*" | "/" | ".*" | "./"\r
 | "^" | ".^"\r
 | "=" | ":=" \r
-| <IDENT: ["a"-"z","A"-"Z","_","\u20ac"] (["a"-"z","A"-"Z","_","\u20ac","0"-"9"])* >\r
+| <IDENT: ["a"-"z","A"-"Z","_","\u20ac","$","\u00a3","%","\u0391"-"\u03c9","\u00b5"] (["a"-"z","A"-"Z","_","\u20ac","$","\u00a3","%","\u0391"-"\u03c9","\u00b5","0"-"9"])* >\r
 | <STRING: "\"" (~["\"", "\\", "\n"] | "\\" ~["\n"])* "\"">\r
     { matchedToken.image = matchedToken.image.substring(1,matchedToken.image.length()-1); }\r
 | <UNSIGNED_INTEGER: (["0"-"9"])+ >\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 bc5fb62cbc05748868ad23ea775b7aa5b31e1fb5..17e5dd5cdda579c63ba85526576c211a18a9034b 100644 (file)
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/unitParser/UnitParserTokenManager.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/unitParser/UnitParserTokenManager.java
@@ -820,12 +820,18 @@ private int jjStartNfaWithStates_0(int pos, int kind, int state)
    return jjMoveNfa_0(state, pos + 1);\r
 }\r
 static final long[] jjbitVec0 = {
-   0x0L, 0x0L, 0x100000000000L, 0x0L
+   0x0L, 0x0L, 0x20000800000000L, 0x0L
 };\r
 static final long[] jjbitVec1 = {
-   0xfffffffffffffffeL, 0xffffffffffffffffL, 0xffffffffffffffffL, 0xffffffffffffffffL
+   0x0L, 0x0L, 0xfffffffffffe0000L, 0x3ffL
+};\r
+static final long[] jjbitVec2 = {
+   0x0L, 0x0L, 0x100000000000L, 0x0L
 };\r
 static final long[] jjbitVec3 = {
+   0xfffffffffffffffeL, 0xffffffffffffffffL, 0xffffffffffffffffL, 0xffffffffffffffffL
+};\r
+static final long[] jjbitVec5 = {
    0x0L, 0x0L, 0xffffffffffffffffL, 0xffffffffffffffffL
 };\r
 private int jjMoveNfa_0(int startState, int curPos)\r
@@ -868,6 +874,12 @@ private int jjMoveNfa_0(int startState, int curPos)
                      if (kind > 1)\r
                         kind = 1;\r
                   }\r
+                  else if ((0x3000000000L & l) != 0L)\r
+                  {\r
+                     if (kind > 88)\r
+                        kind = 88;\r
+                     jjCheckNAdd(2);\r
+                  }\r
                   else if (curChar == 47)\r
                      jjAddStates(8, 9);\r
                   else if (curChar == 46)\r
@@ -875,12 +887,19 @@ private int jjMoveNfa_0(int startState, int curPos)
                   else if (curChar == 34)\r
                      jjCheckNAddStates(10, 12);\r
                   break;\r
+               case 1:\r
+                  if ((0x3000000000L & l) == 0L)\r
+                     break;\r
+                  if (kind > 88)\r
+                     kind = 88;\r
+                  jjCheckNAdd(2);\r
+                  break;\r
                case 2:\r
-                  if ((0x3ff000000000000L & l) == 0L)\r
+                  if ((0x3ff003000000000L & l) == 0L)\r
                      break;\r
                   if (kind > 88)\r
                      kind = 88;\r
-                  jjstateSet[jjnewStateCnt++] = 2;\r
+                  jjCheckNAdd(2);\r
                   break;\r
                case 3:\r
                   if (curChar == 34)\r
@@ -1119,8 +1138,12 @@ private static final boolean jjCanMove_0(int hiByte, int i1, int i2, long l1, lo
 {\r
    switch(hiByte)\r
    {\r
-      case 32:\r
+      case 0:\r
          return ((jjbitVec0[i2] & l2) != 0L);\r
+      case 3:\r
+         return ((jjbitVec1[i2] & l2) != 0L);\r
+      case 32:\r
+         return ((jjbitVec2[i2] & l2) != 0L);\r
       default :\r
          return false;\r
    }\r
@@ -1130,9 +1153,9 @@ private static final boolean jjCanMove_1(int hiByte, int i1, int i2, long l1, lo
    switch(hiByte)\r
    {\r
       case 0:\r
-         return ((jjbitVec3[i2] & l2) != 0L);\r
+         return ((jjbitVec5[i2] & l2) != 0L);\r
       default :\r
-         if ((jjbitVec1[i1] & l1) != 0L)\r
+         if ((jjbitVec3[i1] & l1) != 0L)\r
             return true;\r
          return false;\r
    }\r
@@ -1142,7 +1165,7 @@ private static final boolean jjCanMove_2(int hiByte, int i1, int i2, long l1, lo
    switch(hiByte)\r
    {\r
       case 0:\r
-         return ((jjbitVec3[i2] & l2) != 0L);\r
+         return ((jjbitVec5[i2] & l2) != 0L);\r
       default :\r
          return false;\r
    }\r