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

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

diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/unitParser/UnitParser.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/unitParser/UnitParser.java
index 913534fe8206805fae0fc4837dd30654616bbb6f..6092c8270e64522dda98a021e10c1bb78403e4c2 100644 (file)
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/unitParser/UnitParser.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/unitParser/UnitParser.java
@@ -585,7 +585,28 @@ public class UnitParser/*@bgen(jjtree)*/implements UnitParserTreeConstants, Unit
   jjtree.openNodeScope(jjtn000);\r
   jjtn000.jjtSetFirstToken(getToken(1));\r
     try {\r
-      factor();\r
+      if (jj_2_1(2147483647)) {\r
+        factor();\r
+      } else {\r
+        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {\r
+        case 6:\r
+        case 33:\r
+        case 35:\r
+        case 60:\r
+        case 62:\r
+        case 64:\r
+        case IDENT:\r
+        case STRING:\r
+        case UNSIGNED_INTEGER:\r
+        case UNSIGNED_NUMBER:\r
+          primary();\r
+          break;\r
+        default:\r
+          jj_la1[14] = jj_gen;\r
+          jj_consume_token(-1);\r
+          throw new ParseException();\r
+        }\r
+      }\r
       label_5:\r
       while (true) {\r
         switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {\r
@@ -596,7 +617,7 @@ public class UnitParser/*@bgen(jjtree)*/implements UnitParserTreeConstants, Unit
           ;\r
           break;\r
         default:\r
-          jj_la1[14] = jj_gen;\r
+          jj_la1[15] = jj_gen;\r
           break label_5;\r
         }\r
         switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {\r
@@ -609,11 +630,32 @@ public class UnitParser/*@bgen(jjtree)*/implements UnitParserTreeConstants, Unit
           divide();\r
           break;\r
         default:\r
-          jj_la1[15] = jj_gen;\r
+          jj_la1[16] = jj_gen;\r
           jj_consume_token(-1);\r
           throw new ParseException();\r
         }\r
-        factor();\r
+        if (jj_2_2(2147483647)) {\r
+          factor();\r
+        } else {\r
+          switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {\r
+          case 6:\r
+          case 33:\r
+          case 35:\r
+          case 60:\r
+          case 62:\r
+          case 64:\r
+          case IDENT:\r
+          case STRING:\r
+          case UNSIGNED_INTEGER:\r
+          case UNSIGNED_NUMBER:\r
+            primary();\r
+            break;\r
+          default:\r
+            jj_la1[17] = jj_gen;\r
+            jj_consume_token(-1);\r
+            throw new ParseException();\r
+          }\r
+        }\r
       }\r
     } catch (Throwable jjte000) {\r
       if (jjtc000) {\r
@@ -645,28 +687,8 @@ public class UnitParser/*@bgen(jjtree)*/implements UnitParserTreeConstants, Unit
   jjtn000.jjtSetFirstToken(getToken(1));\r
     try {\r
       primary();\r
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {\r
-      case 84:\r
-      case 85:\r
-        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {\r
-        case 84:\r
-          jj_consume_token(84);\r
-          primary();\r
-          break;\r
-        case 85:\r
-          jj_consume_token(85);\r
-          primary();\r
-          break;\r
-        default:\r
-          jj_la1[16] = jj_gen;\r
-          jj_consume_token(-1);\r
-          throw new ParseException();\r
-        }\r
-        break;\r
-      default:\r
-        jj_la1[17] = jj_gen;\r
-        ;\r
-      }\r
+      power();\r
+      primary();\r
     } catch (Throwable jjte000) {\r
           if (jjtc000) {\r
             jjtree.clearNodeScope(jjtn000);\r
@@ -689,6 +711,33 @@ public class UnitParser/*@bgen(jjtree)*/implements UnitParserTreeConstants, Unit
     }\r
   }\r
 \r
+  final public void power() throws ParseException {\r
+                /*@bgen(jjtree) power */\r
+  UnitCheckingNode jjtn000 = (UnitCheckingNode)UnitCheckingNodeFactory.jjtCreate(JJTPOWER);\r
+  boolean jjtc000 = true;\r
+  jjtree.openNodeScope(jjtn000);\r
+  jjtn000.jjtSetFirstToken(getToken(1));\r
+    try {\r
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {\r
+      case 84:\r
+        jj_consume_token(84);\r
+        break;\r
+      case 85:\r
+        jj_consume_token(85);\r
+        break;\r
+      default:\r
+        jj_la1[18] = jj_gen;\r
+        jj_consume_token(-1);\r
+        throw new ParseException();\r
+      }\r
+    } finally {\r
+          if (jjtc000) {\r
+            jjtree.closeNodeScope(jjtn000, true);\r
+            jjtn000.jjtSetLastToken(getToken(0));\r
+          }\r
+    }\r
+  }\r
+\r
   final public void multiplication() throws ParseException {\r
                          /*@bgen(jjtree) multiplication */\r
   UnitCheckingNode jjtn000 = (UnitCheckingNode)UnitCheckingNodeFactory.jjtCreate(JJTMULTIPLICATION);\r
@@ -704,7 +753,7 @@ public class UnitParser/*@bgen(jjtree)*/implements UnitParserTreeConstants, Unit
         jj_consume_token(82);\r
         break;\r
       default:\r
-        jj_la1[18] = jj_gen;\r
+        jj_la1[19] = jj_gen;\r
         jj_consume_token(-1);\r
         throw new ParseException();\r
       }\r
@@ -731,7 +780,7 @@ public class UnitParser/*@bgen(jjtree)*/implements UnitParserTreeConstants, Unit
         jj_consume_token(83);\r
         break;\r
       default:\r
-        jj_la1[19] = jj_gen;\r
+        jj_la1[20] = jj_gen;\r
         jj_consume_token(-1);\r
         throw new ParseException();\r
       }\r
@@ -759,8 +808,8 @@ public class UnitParser/*@bgen(jjtree)*/implements UnitParserTreeConstants, Unit
         value();\r
         break;\r
       default:\r
-        jj_la1[21] = jj_gen;\r
-        if (jj_2_1(2147483647)) {\r
+        jj_la1[22] = jj_gen;\r
+        if (jj_2_3(2147483647)) {\r
           function_call();\r
         } else {\r
           switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {\r
@@ -780,7 +829,7 @@ public class UnitParser/*@bgen(jjtree)*/implements UnitParserTreeConstants, Unit
                 ;\r
                 break;\r
               default:\r
-                jj_la1[20] = jj_gen;\r
+                jj_la1[21] = jj_gen;\r
                 break label_6;\r
               }\r
               jj_consume_token(68);\r
@@ -795,7 +844,7 @@ public class UnitParser/*@bgen(jjtree)*/implements UnitParserTreeConstants, Unit
             jj_consume_token(35);\r
             break;\r
           default:\r
-            jj_la1[22] = jj_gen;\r
+            jj_la1[23] = jj_gen;\r
             jj_consume_token(-1);\r
             throw new ParseException();\r
           }\r
@@ -972,7 +1021,7 @@ public class UnitParser/*@bgen(jjtree)*/implements UnitParserTreeConstants, Unit
         jj_consume_token(33);\r
         break;\r
       default:\r
-        jj_la1[23] = jj_gen;\r
+        jj_la1[24] = jj_gen;\r
         jj_consume_token(-1);\r
         throw new ParseException();\r
       }\r
@@ -1030,7 +1079,7 @@ public class UnitParser/*@bgen(jjtree)*/implements UnitParserTreeConstants, Unit
         name();\r
         break;\r
       default:\r
-        jj_la1[24] = jj_gen;\r
+        jj_la1[25] = jj_gen;\r
         ;\r
       }\r
     } catch (Throwable jjte000) {\r
@@ -1068,7 +1117,7 @@ public class UnitParser/*@bgen(jjtree)*/implements UnitParserTreeConstants, Unit
         array_subscripts();\r
         break;\r
       default:\r
-        jj_la1[25] = jj_gen;\r
+        jj_la1[26] = jj_gen;\r
         ;\r
       }\r
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {\r
@@ -1077,7 +1126,7 @@ public class UnitParser/*@bgen(jjtree)*/implements UnitParserTreeConstants, Unit
         component_reference();\r
         break;\r
       default:\r
-        jj_la1[26] = jj_gen;\r
+        jj_la1[27] = jj_gen;\r
         ;\r
       }\r
     } catch (Throwable jjte000) {\r
@@ -1117,7 +1166,7 @@ public class UnitParser/*@bgen(jjtree)*/implements UnitParserTreeConstants, Unit
           ;\r
           break;\r
         default:\r
-          jj_la1[27] = jj_gen;\r
+          jj_la1[28] = jj_gen;\r
           break label_7;\r
         }\r
         jj_consume_token(IDENT);\r
@@ -1158,7 +1207,7 @@ public class UnitParser/*@bgen(jjtree)*/implements UnitParserTreeConstants, Unit
         function_arguments();\r
         break;\r
       default:\r
-        jj_la1[28] = jj_gen;\r
+        jj_la1[29] = jj_gen;\r
         ;\r
       }\r
       parenthesis_close();\r
@@ -1191,7 +1240,7 @@ public class UnitParser/*@bgen(jjtree)*/implements UnitParserTreeConstants, Unit
   jjtree.openNodeScope(jjtn000);\r
   jjtn000.jjtSetFirstToken(getToken(1));\r
     try {\r
-      if (jj_2_2(2)) {\r
+      if (jj_2_4(2)) {\r
         named_argument();\r
         switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {\r
         case 69:\r
@@ -1199,7 +1248,7 @@ public class UnitParser/*@bgen(jjtree)*/implements UnitParserTreeConstants, Unit
           function_arguments();\r
           break;\r
         default:\r
-          jj_la1[29] = jj_gen;\r
+          jj_la1[30] = jj_gen;\r
           ;\r
         }\r
       } else {\r
@@ -1234,18 +1283,18 @@ public class UnitParser/*@bgen(jjtree)*/implements UnitParserTreeConstants, Unit
               for_indices();\r
               break;\r
             default:\r
-              jj_la1[30] = jj_gen;\r
+              jj_la1[31] = jj_gen;\r
               jj_consume_token(-1);\r
               throw new ParseException();\r
             }\r
             break;\r
           default:\r
-            jj_la1[31] = jj_gen;\r
+            jj_la1[32] = jj_gen;\r
             ;\r
           }\r
           break;\r
         default:\r
-          jj_la1[32] = jj_gen;\r
+          jj_la1[33] = jj_gen;\r
           jj_consume_token(-1);\r
           throw new ParseException();\r
         }\r
@@ -1287,7 +1336,7 @@ public class UnitParser/*@bgen(jjtree)*/implements UnitParserTreeConstants, Unit
           ;\r
           break;\r
         default:\r
-          jj_la1[33] = jj_gen;\r
+          jj_la1[34] = jj_gen;\r
           break label_8;\r
         }\r
         jj_consume_token(69);\r
@@ -1329,7 +1378,7 @@ public class UnitParser/*@bgen(jjtree)*/implements UnitParserTreeConstants, Unit
         expression();\r
         break;\r
       default:\r
-        jj_la1[34] = jj_gen;\r
+        jj_la1[35] = jj_gen;\r
         ;\r
       }\r
     } catch (Throwable jjte000) {\r
@@ -1419,7 +1468,7 @@ void named_arguments() : {
         expression();\r
         break;\r
       default:\r
-        jj_la1[35] = jj_gen;\r
+        jj_la1[36] = jj_gen;\r
         ;\r
       }\r
       label_9:\r
@@ -1429,7 +1478,7 @@ void named_arguments() : {
           ;\r
           break;\r
         default:\r
-          jj_la1[36] = jj_gen;\r
+          jj_la1[37] = jj_gen;\r
           break label_9;\r
         }\r
         jj_consume_token(69);\r
@@ -1453,7 +1502,7 @@ void named_arguments() : {
           expression();\r
           break;\r
         default:\r
-          jj_la1[37] = jj_gen;\r
+          jj_la1[38] = jj_gen;\r
           ;\r
         }\r
       }\r
@@ -1494,7 +1543,7 @@ void named_arguments() : {
           ;\r
           break;\r
         default:\r
-          jj_la1[38] = jj_gen;\r
+          jj_la1[39] = jj_gen;\r
           break label_10;\r
         }\r
         jj_consume_token(69);\r
@@ -1538,7 +1587,7 @@ void named_arguments() : {
           ;\r
           break;\r
         default:\r
-          jj_la1[39] = jj_gen;\r
+          jj_la1[40] = jj_gen;\r
           break label_11;\r
         }\r
         jj_consume_token(69);\r
@@ -1579,8 +1628,8 @@ void named_arguments() : {
         jj_consume_token(67);\r
         break;\r
       default:\r
-        jj_la1[41] = jj_gen;\r
-        if (jj_2_3(2147483647)) {\r
+        jj_la1[42] = jj_gen;\r
+        if (jj_2_5(2147483647)) {\r
           function_call();\r
         } else {\r
           switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {\r
@@ -1593,12 +1642,12 @@ void named_arguments() : {
               rangeIndex();\r
               break;\r
             default:\r
-              jj_la1[40] = jj_gen;\r
+              jj_la1[41] = jj_gen;\r
               ;\r
             }\r
             break;\r
           default:\r
-            jj_la1[42] = jj_gen;\r
+            jj_la1[43] = jj_gen;\r
             jj_consume_token(-1);\r
             throw new ParseException();\r
           }\r
@@ -1641,7 +1690,7 @@ void named_arguments() : {
         jj_consume_token(IDENT);\r
         break;\r
       default:\r
-        jj_la1[43] = jj_gen;\r
+        jj_la1[44] = jj_gen;\r
         jj_consume_token(-1);\r
         throw new ParseException();\r
       }\r
@@ -1674,48 +1723,674 @@ void named_arguments() : {
     finally { jj_save(2, xla); }\r
   }\r
 \r
-  private boolean jj_3R_15() {\r
-    if (jj_scan_token(66)) return true;\r
+  private boolean jj_2_4(int xla) {\r
+    jj_la = xla; jj_lastpos = jj_scanpos = token;\r
+    try { return !jj_3_4(); }\r
+    catch(LookaheadSuccess ls) { return true; }\r
+    finally { jj_save(3, xla); }\r
+  }\r
+\r
+  private boolean jj_2_5(int xla) {\r
+    jj_la = xla; jj_lastpos = jj_scanpos = token;\r
+    try { return !jj_3_5(); }\r
+    catch(LookaheadSuccess ls) { return true; }\r
+    finally { jj_save(4, xla); }\r
+  }\r
+\r
+  private boolean jj_3R_79() {\r
     if (jj_3R_12()) return true;\r
     return false;\r
   }\r
 \r
+  private boolean jj_3R_30() {\r
+    if (jj_scan_token(62)) return true;\r
+    if (jj_3R_36()) return true;\r
+    if (jj_scan_token(63)) return true;\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_26() {\r
+    if (jj_3R_32()) return true;\r
+    return false;\r
+  }\r
+\r
   private boolean jj_3_3() {\r
+    if (jj_3R_14()) return true;\r
+    if (jj_3R_15()) return true;\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_22() {\r
+    if (jj_3R_30()) return true;\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_21() {\r
+    if (jj_scan_token(64)) return true;\r
+    if (jj_3R_28()) return true;\r
+    Token xsp;\r
+    while (true) {\r
+      xsp = jj_scanpos;\r
+      if (jj_3R_29()) { jj_scanpos = xsp; break; }\r
+    }\r
+    if (jj_scan_token(65)) return true;\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_20() {\r
+    if (jj_3R_27()) return true;\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_19() {\r
+    if (jj_3R_26()) return true;\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_18() {\r
+    if (jj_3R_25()) return true;\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_12() {\r
+    Token xsp;\r
+    xsp = jj_scanpos;\r
+    if (jj_3R_17()) {\r
+    jj_scanpos = xsp;\r
+    if (jj_3R_18()) {\r
+    jj_scanpos = xsp;\r
+    if (jj_3R_19()) {\r
+    jj_scanpos = xsp;\r
+    if (jj_3R_20()) {\r
+    jj_scanpos = xsp;\r
+    if (jj_3R_21()) {\r
+    jj_scanpos = xsp;\r
+    if (jj_3R_22()) {\r
+    jj_scanpos = xsp;\r
+    if (jj_scan_token(35)) return true;\r
+    }\r
+    }\r
+    }\r
+    }\r
+    }\r
+    }\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_17() {\r
+    if (jj_3R_24()) return true;\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_87() {\r
+    Token xsp;\r
+    xsp = jj_scanpos;\r
+    if (jj_scan_token(81)) {\r
+    jj_scanpos = xsp;\r
+    if (jj_scan_token(83)) return true;\r
+    }\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_86() {\r
+    Token xsp;\r
+    xsp = jj_scanpos;\r
+    if (jj_scan_token(80)) {\r
+    jj_scanpos = xsp;\r
+    if (jj_scan_token(82)) return true;\r
+    }\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_13() {\r
+    Token xsp;\r
+    xsp = jj_scanpos;\r
+    if (jj_scan_token(84)) {\r
+    jj_scanpos = xsp;\r
+    if (jj_scan_token(85)) return true;\r
+    }\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_61() {\r
+    if (jj_scan_token(67)) return true;\r
+    if (jj_3R_51()) return true;\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3_1() {\r
     if (jj_3R_12()) return true;\r
     if (jj_3R_13()) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_13() {\r
-    if (jj_scan_token(60)) return true;\r
+  private boolean jj_3R_72() {\r
+    if (jj_3R_76()) return true;\r
+    if (jj_3R_71()) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_14() {\r
+  private boolean jj_3R_75() {\r
+    if (jj_3R_77()) return true;\r
+    if (jj_3R_74()) return true;\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_81() {\r
+    if (jj_3R_12()) return true;\r
+    if (jj_3R_13()) return true;\r
+    if (jj_3R_12()) return true;\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_78() {\r
+    if (jj_3R_81()) return true;\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_74() {\r
+    Token xsp;\r
+    xsp = jj_scanpos;\r
+    if (jj_3R_78()) {\r
+    jj_scanpos = xsp;\r
+    if (jj_3R_79()) return true;\r
+    }\r
+    while (true) {\r
+      xsp = jj_scanpos;\r
+      if (jj_3R_80()) { jj_scanpos = xsp; break; }\r
+    }\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_77() {\r
+    Token xsp;\r
+    xsp = jj_scanpos;\r
+    if (jj_scan_token(76)) {\r
+    jj_scanpos = xsp;\r
+    if (jj_scan_token(77)) {\r
+    jj_scanpos = xsp;\r
+    if (jj_scan_token(78)) {\r
+    jj_scanpos = xsp;\r
+    if (jj_scan_token(79)) return true;\r
+    }\r
+    }\r
+    }\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_66() {\r
+    if (jj_scan_token(9)) return true;\r
+    if (jj_3R_65()) return true;\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_73() {\r
+    if (jj_3R_77()) return true;\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_71() {\r
+    Token xsp;\r
+    xsp = jj_scanpos;\r
+    if (jj_3R_73()) jj_scanpos = xsp;\r
+    if (jj_3R_74()) return true;\r
+    while (true) {\r
+      xsp = jj_scanpos;\r
+      if (jj_3R_75()) { jj_scanpos = xsp; break; }\r
+    }\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_76() {\r
+    Token xsp;\r
+    xsp = jj_scanpos;\r
+    if (jj_scan_token(70)) {\r
+    jj_scanpos = xsp;\r
+    if (jj_scan_token(71)) {\r
+    jj_scanpos = xsp;\r
+    if (jj_scan_token(72)) {\r
+    jj_scanpos = xsp;\r
+    if (jj_scan_token(73)) {\r
+    jj_scanpos = xsp;\r
+    if (jj_scan_token(74)) {\r
+    jj_scanpos = xsp;\r
+    if (jj_scan_token(75)) return true;\r
+    }\r
+    }\r
+    }\r
+    }\r
+    }\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_52() {\r
+    if (jj_scan_token(67)) return true;\r
+    if (jj_3R_51()) return true;\r
+    Token xsp;\r
+    xsp = jj_scanpos;\r
+    if (jj_3R_61()) jj_scanpos = xsp;\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_60() {\r
+    if (jj_scan_token(22)) return true;\r
+    if (jj_3R_59()) return true;\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_54() {\r
+    if (jj_scan_token(20)) return true;\r
+    if (jj_3R_53()) return true;\r
+    if (jj_scan_token(28)) return true;\r
+    if (jj_3R_33()) return true;\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_69() {\r
+    if (jj_3R_71()) return true;\r
+    Token xsp;\r
+    xsp = jj_scanpos;\r
+    if (jj_3R_72()) jj_scanpos = xsp;\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_64() {\r
+    if (jj_scan_token(67)) return true;\r
+    if (jj_3R_63()) return true;\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_65() {\r
+    Token xsp;\r
+    xsp = jj_scanpos;\r
+    if (jj_scan_token(12)) jj_scanpos = xsp;\r
+    if (jj_3R_69()) return true;\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3_5() {\r
+    if (jj_3R_14()) return true;\r
+    if (jj_3R_15()) return true;\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_59() {\r
+    if (jj_3R_65()) return true;\r
+    Token xsp;\r
+    while (true) {\r
+      xsp = jj_scanpos;\r
+      if (jj_3R_66()) { jj_scanpos = xsp; break; }\r
+    }\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_50() {\r
+    if (jj_scan_token(69)) return true;\r
+    if (jj_3R_49()) return true;\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_51() {\r
+    if (jj_3R_59()) return true;\r
+    Token xsp;\r
+    while (true) {\r
+      xsp = jj_scanpos;\r
+      if (jj_3R_60()) { jj_scanpos = xsp; break; }\r
+    }\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_63() {\r
+    Token xsp;\r
+    xsp = jj_scanpos;\r
+    if (jj_scan_token(90)) {\r
+    jj_scanpos = xsp;\r
+    if (jj_scan_token(88)) return true;\r
+    }\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_57() {\r
+    if (jj_3R_25()) return true;\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_58() {\r
+    if (jj_3R_63()) return true;\r
+    Token xsp;\r
+    xsp = jj_scanpos;\r
+    if (jj_3R_64()) jj_scanpos = xsp;\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_45() {\r
+    if (jj_3R_51()) return true;\r
+    Token xsp;\r
+    xsp = jj_scanpos;\r
+    if (jj_3R_52()) jj_scanpos = xsp;\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_35() {\r
+    if (jj_scan_token(69)) return true;\r
+    if (jj_3R_33()) return true;\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_49() {\r
+    Token xsp;\r
+    xsp = jj_scanpos;\r
+    if (jj_scan_token(67)) {\r
+    jj_scanpos = xsp;\r
+    if (jj_3R_57()) {\r
+    jj_scanpos = xsp;\r
+    if (jj_3R_58()) return true;\r
+    }\r
+    }\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_56() {\r
+    if (jj_scan_token(21)) return true;\r
+    if (jj_3R_62()) return true;\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_44() {\r
+    if (jj_scan_token(64)) return true;\r
+    if (jj_3R_49()) return true;\r
+    Token xsp;\r
+    while (true) {\r
+      xsp = jj_scanpos;\r
+      if (jj_3R_50()) { jj_scanpos = xsp; break; }\r
+    }\r
+    if (jj_scan_token(65)) return true;\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_53() {\r
+    if (jj_3R_33()) return true;\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_42() {\r
+    if (jj_3R_46()) return true;\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_28() {\r
+    if (jj_3R_33()) return true;\r
+    Token xsp;\r
+    while (true) {\r
+      xsp = jj_scanpos;\r
+      if (jj_3R_35()) { jj_scanpos = xsp; break; }\r
+    }\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_47() {\r
+    if (jj_scan_token(69)) return true;\r
+    if (jj_3R_36()) return true;\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_41() {\r
+    if (jj_3R_45()) return true;\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_33() {\r
+    Token xsp;\r
+    xsp = jj_scanpos;\r
+    if (jj_3R_41()) {\r
+    jj_scanpos = xsp;\r
+    if (jj_3R_42()) return true;\r
+    }\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_46() {\r
+    if (jj_scan_token(31)) return true;\r
+    if (jj_3R_53()) return true;\r
+    if (jj_scan_token(28)) return true;\r
+    if (jj_3R_33()) return true;\r
+    Token xsp;\r
+    while (true) {\r
+      xsp = jj_scanpos;\r
+      if (jj_3R_54()) { jj_scanpos = xsp; break; }\r
+    }\r
+    if (jj_scan_token(15)) return true;\r
+    if (jj_3R_33()) return true;\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_40() {\r
+    if (jj_scan_token(66)) return true;\r
+    if (jj_3R_32()) return true;\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_16() {\r
     if (jj_scan_token(IDENT)) return true;\r
     if (jj_scan_token(86)) return true;\r
+    if (jj_3R_33()) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3_2() {\r
-    if (jj_3R_14()) return true;\r
+  private boolean jj_3R_70() {\r
+    if (jj_scan_token(41)) return true;\r
+    if (jj_3R_33()) return true;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3R_12() {\r
+  private boolean jj_3R_85() {\r
+    if (jj_3R_12()) return true;\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_68() {\r
+    if (jj_scan_token(69)) return true;\r
+    if (jj_3R_67()) return true;\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_48() {\r
+    Token xsp;\r
+    xsp = jj_scanpos;\r
+    if (jj_3R_55()) {\r
+    jj_scanpos = xsp;\r
+    if (jj_3R_56()) return true;\r
+    }\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_55() {\r
+    if (jj_scan_token(69)) return true;\r
+    if (jj_3R_36()) return true;\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_37() {\r
+    if (jj_3R_36()) return true;\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_67() {\r
     if (jj_scan_token(IDENT)) return true;\r
     Token xsp;\r
     xsp = jj_scanpos;\r
-    if (jj_3R_15()) jj_scanpos = xsp;\r
+    if (jj_3R_70()) jj_scanpos = xsp;\r
     return false;\r
   }\r
 \r
-  private boolean jj_3_1() {\r
+  private boolean jj_3R_62() {\r
+    if (jj_3R_67()) return true;\r
+    Token xsp;\r
+    while (true) {\r
+      xsp = jj_scanpos;\r
+      if (jj_3R_68()) { jj_scanpos = xsp; break; }\r
+    }\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_39() {\r
+    if (jj_3R_44()) return true;\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_43() {\r
+    if (jj_3R_33()) return true;\r
+    Token xsp;\r
+    xsp = jj_scanpos;\r
+    if (jj_3R_48()) jj_scanpos = xsp;\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3_4() {\r
+    if (jj_3R_16()) return true;\r
+    Token xsp;\r
+    xsp = jj_scanpos;\r
+    if (jj_3R_47()) jj_scanpos = xsp;\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_36() {\r
+    Token xsp;\r
+    xsp = jj_scanpos;\r
+    if (jj_3_4()) {\r
+    jj_scanpos = xsp;\r
+    if (jj_3R_43()) return true;\r
+    }\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_31() {\r
+    if (jj_3R_15()) return true;\r
+    Token xsp;\r
+    xsp = jj_scanpos;\r
+    if (jj_3R_37()) jj_scanpos = xsp;\r
+    if (jj_3R_34()) return true;\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3_2() {\r
     if (jj_3R_12()) return true;\r
     if (jj_3R_13()) return true;\r
     return false;\r
   }\r
 \r
+  private boolean jj_3R_23() {\r
+    if (jj_scan_token(66)) return true;\r
+    if (jj_3R_14()) return true;\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_84() {\r
+    if (jj_3R_81()) return true;\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_38() {\r
+    if (jj_scan_token(IDENT)) return true;\r
+    Token xsp;\r
+    while (true) {\r
+      xsp = jj_scanpos;\r
+      if (jj_scan_token(88)) { jj_scanpos = xsp; break; }\r
+    }\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_32() {\r
+    if (jj_3R_38()) return true;\r
+    Token xsp;\r
+    xsp = jj_scanpos;\r
+    if (jj_3R_39()) jj_scanpos = xsp;\r
+    xsp = jj_scanpos;\r
+    if (jj_3R_40()) jj_scanpos = xsp;\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_14() {\r
+    if (jj_scan_token(IDENT)) return true;\r
+    Token xsp;\r
+    xsp = jj_scanpos;\r
+    if (jj_3R_23()) jj_scanpos = xsp;\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_83() {\r
+    if (jj_3R_87()) return true;\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_34() {\r
+    if (jj_scan_token(61)) return true;\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_15() {\r
+    if (jj_scan_token(60)) return true;\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_24() {\r
+    Token xsp;\r
+    xsp = jj_scanpos;\r
+    if (jj_scan_token(91)) {\r
+    jj_scanpos = xsp;\r
+    if (jj_scan_token(90)) {\r
+    jj_scanpos = xsp;\r
+    if (jj_scan_token(89)) {\r
+    jj_scanpos = xsp;\r
+    if (jj_scan_token(6)) {\r
+    jj_scanpos = xsp;\r
+    if (jj_scan_token(33)) return true;\r
+    }\r
+    }\r
+    }\r
+    }\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_82() {\r
+    if (jj_3R_86()) return true;\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_80() {\r
+    Token xsp;\r
+    xsp = jj_scanpos;\r
+    if (jj_3R_82()) {\r
+    jj_scanpos = xsp;\r
+    if (jj_3R_83()) return true;\r
+    }\r
+    xsp = jj_scanpos;\r
+    if (jj_3R_84()) {\r
+    jj_scanpos = xsp;\r
+    if (jj_3R_85()) return true;\r
+    }\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_29() {\r
+    if (jj_scan_token(68)) return true;\r
+    if (jj_3R_28()) return true;\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_27() {\r
+    if (jj_3R_15()) return true;\r
+    if (jj_3R_33()) return true;\r
+    if (jj_3R_34()) return true;\r
+    return false;\r
+  }\r
+\r
+  private boolean jj_3R_25() {\r
+    if (jj_3R_14()) return true;\r
+    if (jj_3R_31()) return true;\r
+    return false;\r
+  }\r
+\r
   /** Generated Token Manager. */\r
   public UnitParserTokenManager token_source;\r
   SimpleCharStream jj_input_stream;\r
@@ -1727,7 +2402,7 @@ void named_arguments() : {
   private Token jj_scanpos, jj_lastpos;\r
   private int jj_la;\r
   private int jj_gen;\r
-  final private int[] jj_la1 = new int[44];\r
+  final private int[] jj_la1 = new int[45];\r
   static private int[] jj_la1_0;\r
   static private int[] jj_la1_1;\r
   static private int[] jj_la1_2;\r
@@ -1737,15 +2412,15 @@ void named_arguments() : {
       jj_la1_init_2();\r
    }\r
    private static void jj_la1_init_0() {\r
-      jj_la1_0 = new int[] {0x1040,0x80001041,0x80001040,0x100000,0x0,0x0,0x400000,0x200,0x1000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40,0x0,0x40,0x0,0x0,0x0,0x0,0x80001040,0x0,0x200000,0x200000,0x80001040,0x0,0x0,0x80001040,0x0,0x80001040,0x0,0x0,0x0,0x0,0x0,0x0,};\r
+      jj_la1_0 = new int[] {0x1040,0x80001041,0x80001040,0x100000,0x0,0x0,0x400000,0x200,0x1000,0x0,0x0,0x0,0x0,0x0,0x40,0x0,0x0,0x40,0x0,0x0,0x0,0x0,0x40,0x0,0x40,0x0,0x0,0x0,0x0,0x80001040,0x0,0x200000,0x200000,0x80001040,0x0,0x0,0x80001040,0x0,0x80001040,0x0,0x0,0x0,0x0,0x0,0x0,};\r
    }\r
    private static void jj_la1_init_1() {\r
-      jj_la1_1 = new int[] {0x5000000a,0x5000000a,0x5000000a,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2,0x50000008,0x2,0x0,0x0,0x0,0x0,0x5000000a,0x0,0x0,0x0,0x5000000a,0x0,0x200,0x5000000a,0x0,0x5000000a,0x0,0x0,0x0,0x0,0x0,0x0,};\r
+      jj_la1_1 = new int[] {0x5000000a,0x5000000a,0x5000000a,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x5000000a,0x0,0x0,0x5000000a,0x0,0x0,0x0,0x0,0x2,0x50000008,0x2,0x0,0x0,0x0,0x0,0x5000000a,0x0,0x0,0x0,0x5000000a,0x0,0x200,0x5000000a,0x0,0x5000000a,0x0,0x0,0x0,0x0,0x0,0x0,};\r
    }\r
    private static void jj_la1_init_2() {\r
-      jj_la1_2 = new int[] {0xf00f001,0xf00f001,0xf00f001,0x0,0x8,0x8,0x0,0x0,0x0,0xfc0,0xfc0,0xf000,0xf000,0xf000,0xf0000,0xf0000,0x300000,0x300000,0x50000,0xa0000,0x10,0xe000000,0x1000001,0xe000000,0x4,0x1,0x4,0x1000000,0xf00f001,0x20,0x20,0x20,0xf00f001,0x20,0x0,0xf00f001,0x20,0xf00f001,0x20,0x20,0x8,0x8,0x5000000,0x5000000,};\r
+      jj_la1_2 = new int[] {0xf00f001,0xf00f001,0xf00f001,0x0,0x8,0x8,0x0,0x0,0x0,0xfc0,0xfc0,0xf000,0xf000,0xf000,0xf000001,0xf0000,0xf0000,0xf000001,0x300000,0x50000,0xa0000,0x10,0xe000000,0x1000001,0xe000000,0x4,0x1,0x4,0x1000000,0xf00f001,0x20,0x20,0x20,0xf00f001,0x20,0x0,0xf00f001,0x20,0xf00f001,0x20,0x20,0x8,0x8,0x5000000,0x5000000,};\r
    }\r
-  final private JJCalls[] jj_2_rtns = new JJCalls[3];\r
+  final private JJCalls[] jj_2_rtns = new JJCalls[5];\r
   private boolean jj_rescan = false;\r
   private int jj_gc = 0;\r
 \r
@@ -1760,7 +2435,7 @@ void named_arguments() : {
     token = new Token();\r
     jj_ntk = -1;\r
     jj_gen = 0;\r
-    for (int i = 0; i < 44; i++) jj_la1[i] = -1;\r
+    for (int i = 0; i < 45; i++) jj_la1[i] = -1;\r
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();\r
   }\r
 \r
@@ -1776,7 +2451,7 @@ void named_arguments() : {
     jj_ntk = -1;\r
     jjtree.reset();\r
     jj_gen = 0;\r
-    for (int i = 0; i < 44; i++) jj_la1[i] = -1;\r
+    for (int i = 0; i < 45; i++) jj_la1[i] = -1;\r
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();\r
   }\r
 \r
@@ -1787,7 +2462,7 @@ void named_arguments() : {
     token = new Token();\r
     jj_ntk = -1;\r
     jj_gen = 0;\r
-    for (int i = 0; i < 44; i++) jj_la1[i] = -1;\r
+    for (int i = 0; i < 45; i++) jj_la1[i] = -1;\r
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();\r
   }\r
 \r
@@ -1799,7 +2474,7 @@ void named_arguments() : {
     jj_ntk = -1;\r
     jjtree.reset();\r
     jj_gen = 0;\r
-    for (int i = 0; i < 44; i++) jj_la1[i] = -1;\r
+    for (int i = 0; i < 45; i++) jj_la1[i] = -1;\r
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();\r
   }\r
 \r
@@ -1809,7 +2484,7 @@ void named_arguments() : {
     token = new Token();\r
     jj_ntk = -1;\r
     jj_gen = 0;\r
-    for (int i = 0; i < 44; i++) jj_la1[i] = -1;\r
+    for (int i = 0; i < 45; i++) jj_la1[i] = -1;\r
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();\r
   }\r
 \r
@@ -1820,7 +2495,7 @@ void named_arguments() : {
     jj_ntk = -1;\r
     jjtree.reset();\r
     jj_gen = 0;\r
-    for (int i = 0; i < 44; i++) jj_la1[i] = -1;\r
+    for (int i = 0; i < 45; i++) jj_la1[i] = -1;\r
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();\r
   }\r
 \r
@@ -1937,7 +2612,7 @@ void named_arguments() : {
       la1tokens[jj_kind] = true;\r
       jj_kind = -1;\r
     }\r
-    for (int i = 0; i < 44; i++) {\r
+    for (int i = 0; i < 45; i++) {\r
       if (jj_la1[i] == jj_gen) {\r
         for (int j = 0; j < 32; j++) {\r
           if ((jj_la1_0[i] & (1<<j)) != 0) {\r
@@ -1979,7 +2654,7 @@ void named_arguments() : {
 \r
   private void jj_rescan_token() {\r
     jj_rescan = true;\r
-    for (int i = 0; i < 3; i++) {\r
+    for (int i = 0; i < 5; i++) {\r
     try {\r
       JJCalls p = jj_2_rtns[i];\r
       do {\r
@@ -1989,6 +2664,8 @@ void named_arguments() : {
             case 0: jj_3_1(); break;\r
             case 1: jj_3_2(); break;\r
             case 2: jj_3_3(); break;\r
+            case 3: jj_3_4(); break;\r
+            case 4: jj_3_5(); break;\r
           }\r
         }\r
         p = p.next;\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 a3867bf7ed7e769926c8b0928315c7d751125ebd..8bb34bc7bd1c544d4507c1ad4d00a17388336508 100644 (file)
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/unitParser/UnitParser.jj
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/unitParser/UnitParser.jj
@@ -463,7 +463,7 @@ void term() : {/*@bgen(jjtree) term */
 } {/*@bgen(jjtree) term */\r
     try {\r
 /*@egen*/\r
-    factor() ( (multiplication() | divide()) factor() )*/*@bgen(jjtree)*/\r
+    ( LOOKAHEAD(primary() power()) factor() | primary() ) ( (multiplication() | divide()) ( LOOKAHEAD(primary() power()) factor() | primary()) )*/*@bgen(jjtree)*/\r
     } catch (Throwable jjte000) {\r
       if (jjtc000) {\r
         jjtree.clearNodeScope(jjtn000);\r
@@ -496,7 +496,7 @@ void factor() : {/*@bgen(jjtree) factor */
 } {/*@bgen(jjtree) factor */\r
         try {\r
 /*@egen*/\r
-       primary() ( "^" primary() | ".^" primary() )?/*@bgen(jjtree)*/\r
+       primary() power() primary()/*@bgen(jjtree)*/\r
         } catch (Throwable jjte000) {\r
           if (jjtc000) {\r
             jjtree.clearNodeScope(jjtn000);\r
@@ -520,6 +520,24 @@ void factor() : {/*@bgen(jjtree) factor */
 /*@egen*/\r
 }\r
 \r
+void power() : {/*@bgen(jjtree) power */\r
+  UnitCheckingNode jjtn000 = (UnitCheckingNode)UnitCheckingNodeFactory.jjtCreate(JJTPOWER);\r
+  boolean jjtc000 = true;\r
+  jjtree.openNodeScope(jjtn000);\r
+  jjtn000.jjtSetFirstToken(getToken(1));\r
+/*@egen*/\r
+} {/*@bgen(jjtree) power */\r
+        try {\r
+/*@egen*/\r
+       "^" | ".^"/*@bgen(jjtree)*/\r
+        } finally {\r
+          if (jjtc000) {\r
+            jjtree.closeNodeScope(jjtn000, true);\r
+            jjtn000.jjtSetLastToken(getToken(0));\r
+          }\r
+        }\r
+/*@egen*/\r
+}\r  \r
 void multiplication() : {/*@bgen(jjtree) multiplication */\r
   UnitCheckingNode jjtn000 = (UnitCheckingNode)UnitCheckingNodeFactory.jjtCreate(JJTMULTIPLICATION);\r
   boolean jjtc000 = true;\r

diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/unitParser/UnitParserTreeConstants.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/unitParser/UnitParserTreeConstants.java
index 62b026d4992df16cba83588b69a8135f5c31ec8f..c0fd05caf305e671257cc0a74cc0370e481c0567 100644 (file)
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/unitParser/UnitParserTreeConstants.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/unitParser/UnitParserTreeConstants.java
@@ -17,29 +17,30 @@ public interface UnitParserTreeConstants
   public int JJTADD_OP = 11;\r
   public int JJTTERM = 12;\r
   public int JJTFACTOR = 13;\r
-  public int JJTMULTIPLICATION = 14;\r
-  public int JJTDIVIDE = 15;\r
-  public int JJTPRIMARY = 16;\r
-  public int JJTCOMPONENT_REFERENCE_FULL = 17;\r
-  public int JJTARRAY_DEFINITION = 18;\r
-  public int JJTFUNCTION_CALL = 19;\r
-  public int JJTPARENTHESIS_EXPRESSION = 20;\r
-  public int JJTVALUE = 21;\r
-  public int JJTPARENTHESIS_OPEN = 22;\r
-  public int JJTPARENTHESIS_CLOSE = 23;\r
-  public int JJTNAME = 24;\r
-  public int JJTCOMPONENT_REFERENCE = 25;\r
-  public int JJTCOMPONENT_IDENTITY = 26;\r
-  public int JJTFUNCTION_CALL_ARGS = 27;\r
-  public int JJTFUNCTION_ARGUMENTS = 28;\r
-  public int JJTFOR_INDICES = 29;\r
-  public int JJTFOR_INDEX = 30;\r
-  public int JJTNAMED_ARGUMENT = 31;\r
-  public int JJTOUTPUT_EXPRESSION_LIST = 32;\r
-  public int JJTEXPRESSION_LIST = 33;\r
-  public int JJTARRAY_SUBSCRIPTS = 34;\r
-  public int JJTSUBSCRIPT = 35;\r
-  public int JJTRANGEINDEX = 36;\r
+  public int JJTPOWER = 14;\r
+  public int JJTMULTIPLICATION = 15;\r
+  public int JJTDIVIDE = 16;\r
+  public int JJTPRIMARY = 17;\r
+  public int JJTCOMPONENT_REFERENCE_FULL = 18;\r
+  public int JJTARRAY_DEFINITION = 19;\r
+  public int JJTFUNCTION_CALL = 20;\r
+  public int JJTPARENTHESIS_EXPRESSION = 21;\r
+  public int JJTVALUE = 22;\r
+  public int JJTPARENTHESIS_OPEN = 23;\r
+  public int JJTPARENTHESIS_CLOSE = 24;\r
+  public int JJTNAME = 25;\r
+  public int JJTCOMPONENT_REFERENCE = 26;\r
+  public int JJTCOMPONENT_IDENTITY = 27;\r
+  public int JJTFUNCTION_CALL_ARGS = 28;\r
+  public int JJTFUNCTION_ARGUMENTS = 29;\r
+  public int JJTFOR_INDICES = 30;\r
+  public int JJTFOR_INDEX = 31;\r
+  public int JJTNAMED_ARGUMENT = 32;\r
+  public int JJTOUTPUT_EXPRESSION_LIST = 33;\r
+  public int JJTEXPRESSION_LIST = 34;\r
+  public int JJTARRAY_SUBSCRIPTS = 35;\r
+  public int JJTSUBSCRIPT = 36;\r
+  public int JJTRANGEINDEX = 37;\r
 \r
 \r
   public String[] jjtNodeName = {\r
@@ -57,6 +58,7 @@ public interface UnitParserTreeConstants
     "add_op",\r
     "term",\r
     "factor",\r
+    "power",\r
     "multiplication",\r
     "divide",\r
     "primary",\r
@@ -82,4 +84,4 @@ public interface UnitParserTreeConstants
     "rangeIndex",\r
   };\r
 }\r
-/* JavaCC - OriginalChecksum=9313cac9e0951f8836c120d51f6c620b (do not edit this line) */\r
+/* JavaCC - OriginalChecksum=a1957170c02afdfeff8b8b1a0e67790c (do not edit this line) */\r