Automatically generated expression parser files. Not committed by eclipse svn. (refs...

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

diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParser.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParser.java
index 2178b0050024b02947ef11c479445ddf5274e99e..ed200eced2c30fa73e3c12574110b7b426015c90 100644 (file)
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParser.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParser.java
@@ -77,13 +77,13 @@ public class ExpressionParser implements ExpressionParserConstants {
     case 12:\r
     case 33:\r
     case 35:\r
+    case 60:\r
     case 62:\r
     case 64:\r
-    case 66:\r
+    case 76:\r
+    case 77:\r
     case 78:\r
     case 79:\r
-    case 80:\r
-    case 81:\r
     case IDENT:\r
     case STRING:\r
     case UNSIGNED_INTEGER:\r
@@ -130,13 +130,13 @@ public class ExpressionParser implements ExpressionParserConstants {
     case 12:\r
     case 33:\r
     case 35:\r
+    case 60:\r
     case 62:\r
     case 64:\r
-    case 66:\r
+    case 76:\r
+    case 77:\r
     case 78:\r
     case 79:\r
-    case 80:\r
-    case 81:\r
     case IDENT:\r
     case STRING:\r
     case UNSIGNED_INTEGER:\r
@@ -176,12 +176,12 @@ public class ExpressionParser implements ExpressionParserConstants {
   final public void simple_expression() throws ParseException {\r
     logical_expression();\r
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {\r
-    case 69:\r
-      jj_consume_token(69);\r
+    case 67:\r
+      jj_consume_token(67);\r
       logical_expression();\r
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {\r
-      case 69:\r
-        jj_consume_token(69);\r
+      case 67:\r
+        jj_consume_token(67);\r
         logical_expression();\r
         break;\r
       default:\r
@@ -244,12 +244,12 @@ public class ExpressionParser implements ExpressionParserConstants {
   final public void relation() throws ParseException {\r
     arithmetic_expression();\r
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {\r
+    case 70:\r
+    case 71:\r
     case 72:\r
     case 73:\r
     case 74:\r
     case 75:\r
-    case 76:\r
-    case 77:\r
       rel_op();\r
       arithmetic_expression();\r
       break;\r
@@ -261,6 +261,12 @@ public class ExpressionParser implements ExpressionParserConstants {
 \r
   final public void rel_op() throws ParseException {\r
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {\r
+    case 70:\r
+      jj_consume_token(70);\r
+      break;\r
+    case 71:\r
+      jj_consume_token(71);\r
+      break;\r
     case 72:\r
       jj_consume_token(72);\r
       break;\r
@@ -273,12 +279,6 @@ public class ExpressionParser implements ExpressionParserConstants {
     case 75:\r
       jj_consume_token(75);\r
       break;\r
-    case 76:\r
-      jj_consume_token(76);\r
-      break;\r
-    case 77:\r
-      jj_consume_token(77);\r
-      break;\r
     default:\r
       jj_la1[10] = jj_gen;\r
       jj_consume_token(-1);\r
@@ -288,10 +288,10 @@ public class ExpressionParser implements ExpressionParserConstants {
 \r
   final public void arithmetic_expression() throws ParseException {\r
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {\r
+    case 76:\r
+    case 77:\r
     case 78:\r
     case 79:\r
-    case 80:\r
-    case 81:\r
       add_op();\r
       break;\r
     default:\r
@@ -302,10 +302,10 @@ public class ExpressionParser implements ExpressionParserConstants {
     label_5:\r
     while (true) {\r
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {\r
+      case 76:\r
+      case 77:\r
       case 78:\r
       case 79:\r
-      case 80:\r
-      case 81:\r
         ;\r
         break;\r
       default:\r
@@ -319,18 +319,18 @@ public class ExpressionParser implements ExpressionParserConstants {
 \r
   final public void add_op() throws ParseException {\r
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {\r
+    case 76:\r
+      jj_consume_token(76);\r
+      break;\r
+    case 77:\r
+      jj_consume_token(77);\r
+      break;\r
     case 78:\r
       jj_consume_token(78);\r
       break;\r
     case 79:\r
       jj_consume_token(79);\r
       break;\r
-    case 80:\r
-      jj_consume_token(80);\r
-      break;\r
-    case 81:\r
-      jj_consume_token(81);\r
-      break;\r
     default:\r
       jj_la1[13] = jj_gen;\r
       jj_consume_token(-1);\r
@@ -343,10 +343,10 @@ public class ExpressionParser implements ExpressionParserConstants {
     label_6:\r
     while (true) {\r
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {\r
+      case 80:\r
+      case 81:\r
       case 82:\r
       case 83:\r
-      case 84:\r
-      case 85:\r
         ;\r
         break;\r
       default:\r
@@ -361,14 +361,14 @@ public class ExpressionParser implements ExpressionParserConstants {
   final public void factor() throws ParseException {\r
     primary();\r
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {\r
-    case 86:\r
-    case 87:\r
+    case 84:\r
+    case 85:\r
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {\r
-      case 86:\r
-        jj_consume_token(86);\r
+      case 84:\r
+        jj_consume_token(84);\r
         break;\r
-      case 87:\r
-        jj_consume_token(87);\r
+      case 85:\r
+        jj_consume_token(85);\r
         primary();\r
         break;\r
       default:\r
@@ -385,18 +385,18 @@ public class ExpressionParser implements ExpressionParserConstants {
 \r
   final public void mul_op() throws ParseException {\r
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {\r
+    case 80:\r
+      jj_consume_token(80);\r
+      break;\r
+    case 81:\r
+      jj_consume_token(81);\r
+      break;\r
     case 82:\r
       jj_consume_token(82);\r
       break;\r
     case 83:\r
       jj_consume_token(83);\r
       break;\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[17] = jj_gen;\r
       jj_consume_token(-1);\r
@@ -433,33 +433,33 @@ public class ExpressionParser implements ExpressionParserConstants {
         case IDENT:\r
           component_reference(null);\r
           break;\r
-        case 62:\r
-          jj_consume_token(62);\r
+        case 60:\r
+          jj_consume_token(60);\r
           output_expression_list();\r
-          jj_consume_token(63);\r
+          jj_consume_token(61);\r
           break;\r
-        case 66:\r
-          jj_consume_token(66);\r
+        case 64:\r
+          jj_consume_token(64);\r
           expression_list();\r
           label_7:\r
           while (true) {\r
             switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {\r
-            case 70:\r
+            case 68:\r
               ;\r
               break;\r
             default:\r
               jj_la1[18] = jj_gen;\r
               break label_7;\r
             }\r
-            jj_consume_token(70);\r
+            jj_consume_token(68);\r
             expression_list();\r
           }\r
-          jj_consume_token(67);\r
+          jj_consume_token(65);\r
           break;\r
-        case 64:\r
-          jj_consume_token(64);\r
+        case 62:\r
+          jj_consume_token(62);\r
           function_arguments();\r
-          jj_consume_token(65);\r
+          jj_consume_token(63);\r
           break;\r
         case 35:\r
           jj_consume_token(35);\r
@@ -480,8 +480,8 @@ public class ExpressionParser implements ExpressionParserConstants {
     else\r
         functionCall += "." + token.image;\r
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {\r
-    case 68:\r
-      jj_consume_token(68);\r
+    case 66:\r
+      jj_consume_token(66);\r
       name();\r
       break;\r
     default:\r
@@ -527,7 +527,7 @@ public class ExpressionParser implements ExpressionParserConstants {
                 }\r
         }\r
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {\r
-    case 66:\r
+    case 64:\r
       array_subscripts();\r
       break;\r
     default:\r
@@ -535,8 +535,8 @@ public class ExpressionParser implements ExpressionParserConstants {
       ;\r
     }\r
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {\r
-    case 68:\r
-      jj_consume_token(68);\r
+    case 66:\r
+      jj_consume_token(66);\r
       component_reference(name);\r
       break;\r
     default:\r
@@ -546,20 +546,20 @@ public class ExpressionParser implements ExpressionParserConstants {
   }\r
 \r
   final public void function_call_args() throws ParseException {\r
-    jj_consume_token(62);\r
+    jj_consume_token(60);\r
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {\r
     case 6:\r
     case 12:\r
     case 31:\r
     case 33:\r
     case 35:\r
+    case 60:\r
     case 62:\r
     case 64:\r
-    case 66:\r
+    case 76:\r
+    case 77:\r
     case 78:\r
     case 79:\r
-    case 80:\r
-    case 81:\r
     case IDENT:\r
     case STRING:\r
     case UNSIGNED_INTEGER:\r
@@ -570,7 +570,7 @@ public class ExpressionParser implements ExpressionParserConstants {
       jj_la1[24] = jj_gen;\r
       ;\r
     }\r
-    jj_consume_token(63);\r
+    jj_consume_token(61);\r
         if(functionCall != null) {\r
           if(!functionCallReferences.containsKey(functionCall))\r
               functionCallReferences.put(functionCall, new ArrayList<Token>());\r
@@ -581,8 +581,8 @@ public class ExpressionParser implements ExpressionParserConstants {
     if (jj_2_2(2)) {\r
       named_argument();\r
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {\r
-      case 71:\r
-        jj_consume_token(71);\r
+      case 69:\r
+        jj_consume_token(69);\r
         function_arguments();\r
         break;\r
       default:\r
@@ -596,13 +596,13 @@ public class ExpressionParser implements ExpressionParserConstants {
       case 31:\r
       case 33:\r
       case 35:\r
+      case 60:\r
       case 62:\r
       case 64:\r
-      case 66:\r
+      case 76:\r
+      case 77:\r
       case 78:\r
       case 79:\r
-      case 80:\r
-      case 81:\r
       case IDENT:\r
       case STRING:\r
       case UNSIGNED_INTEGER:\r
@@ -610,10 +610,10 @@ public class ExpressionParser implements ExpressionParserConstants {
         expression();\r
         switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {\r
         case 21:\r
-        case 71:\r
+        case 69:\r
           switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {\r
-          case 71:\r
-            jj_consume_token(71);\r
+          case 69:\r
+            jj_consume_token(69);\r
             function_arguments();\r
             break;\r
           case 21:\r
@@ -644,14 +644,14 @@ public class ExpressionParser implements ExpressionParserConstants {
     label_8:\r
     while (true) {\r
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {\r
-      case 71:\r
+      case 69:\r
         ;\r
         break;\r
       default:\r
         jj_la1[29] = jj_gen;\r
         break label_8;\r
       }\r
-      jj_consume_token(71);\r
+      jj_consume_token(69);\r
       for_index();\r
     }\r
   }\r
@@ -685,7 +685,7 @@ void named_arguments() : {
 */\r
   final public void named_argument() throws ParseException {\r
     jj_consume_token(IDENT);\r
-    jj_consume_token(88);\r
+    jj_consume_token(86);\r
     expression();\r
   }\r
 \r
@@ -696,13 +696,13 @@ void named_arguments() : {
     case 31:\r
     case 33:\r
     case 35:\r
+    case 60:\r
     case 62:\r
     case 64:\r
-    case 66:\r
+    case 76:\r
+    case 77:\r
     case 78:\r
     case 79:\r
-    case 80:\r
-    case 81:\r
     case IDENT:\r
     case STRING:\r
     case UNSIGNED_INTEGER:\r
@@ -716,27 +716,27 @@ void named_arguments() : {
     label_9:\r
     while (true) {\r
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {\r
-      case 71:\r
+      case 69:\r
         ;\r
         break;\r
       default:\r
         jj_la1[32] = jj_gen;\r
         break label_9;\r
       }\r
-      jj_consume_token(71);\r
+      jj_consume_token(69);\r
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {\r
       case 6:\r
       case 12:\r
       case 31:\r
       case 33:\r
       case 35:\r
+      case 60:\r
       case 62:\r
       case 64:\r
-      case 66:\r
+      case 76:\r
+      case 77:\r
       case 78:\r
       case 79:\r
-      case 80:\r
-      case 81:\r
       case IDENT:\r
       case STRING:\r
       case UNSIGNED_INTEGER:\r
@@ -755,14 +755,14 @@ void named_arguments() : {
     label_10:\r
     while (true) {\r
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {\r
-      case 71:\r
+      case 69:\r
         ;\r
         break;\r
       default:\r
         jj_la1[34] = jj_gen;\r
         break label_10;\r
       }\r
-      jj_consume_token(71);\r
+      jj_consume_token(69);\r
       expression();\r
     }\r
   }\r
@@ -773,22 +773,22 @@ void named_arguments() : {
         }\r
         List<List<Token>> rangesList = ranges.get(token.image);\r
         currentRange = new ArrayList<Token>();\r
-    jj_consume_token(66);\r
+    jj_consume_token(64);\r
     subscript(currentRange);\r
     label_11:\r
     while (true) {\r
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {\r
-      case 71:\r
+      case 69:\r
         ;\r
         break;\r
       default:\r
         jj_la1[35] = jj_gen;\r
         break label_11;\r
       }\r
-      jj_consume_token(71);\r
+      jj_consume_token(69);\r
       subscript(currentRange);\r
     }\r
-    jj_consume_token(67);\r
+    jj_consume_token(65);\r
         rangesList.add(currentRange);\r
   }\r
 \r
@@ -797,16 +797,16 @@ void named_arguments() : {
   rangeToken.beginColumn = token.beginColumn + 1;\r
   rangeToken.beginLine = token.beginLine;\r
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {\r
-    case 69:\r
-      jj_consume_token(69);\r
+    case 67:\r
+      jj_consume_token(67);\r
                 currentRange.add(token);\r
       break;\r
     case IDENT:\r
     case UNSIGNED_INTEGER:\r
       rangeIndex(rangeToken, false);\r
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {\r
-      case 69:\r
-        jj_consume_token(69);\r
+      case 67:\r
+        jj_consume_token(67);\r
         rangeIndex(rangeToken, true);\r
         break;\r
       default:\r
@@ -858,14 +858,14 @@ void named_arguments() : {
   }\r
 \r
   private boolean jj_3R_14() {\r
-    if (jj_scan_token(68)) return true;\r
+    if (jj_scan_token(66)) return true;\r
     if (jj_3R_12()) return true;\r
     return false;\r
   }\r
 \r
   private boolean jj_3R_13() {\r
     if (jj_scan_token(IDENT)) return true;\r
-    if (jj_scan_token(88)) return true;\r
+    if (jj_scan_token(86)) return true;\r
     return false;\r
   }\r
 \r
@@ -876,7 +876,7 @@ void named_arguments() : {
 \r
   private boolean jj_3_1() {\r
     if (jj_3R_12()) return true;\r
-    if (jj_scan_token(62)) return true;\r
+    if (jj_scan_token(60)) return true;\r
     return false;\r
   }\r
 \r
@@ -912,10 +912,10 @@ void named_arguments() : {
       jj_la1_0 = new int[] {0x100000,0x80001040,0x100000,0x80001040,0x0,0x0,0x400000,0x200,0x1000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40,0x0,0x0,0x0,0x0,0x80001040,0x0,0x200000,0x200000,0x80001040,0x0,0x0,0x80001040,0x0,0x80001040,0x0,0x0,0x0,0x0,0x0,};\r
    }\r
    private static void jj_la1_init_1() {\r
-      jj_la1_1 = new int[] {0x0,0x4000000a,0x0,0x4000000a,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2,0x40000008,0x0,0x0,0x0,0x4000000a,0x0,0x0,0x0,0x4000000a,0x0,0x200,0x4000000a,0x0,0x4000000a,0x0,0x0,0x0,0x0,0x0,};\r
+      jj_la1_1 = new int[] {0x0,0x5000000a,0x0,0x5000000a,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2,0x50000008,0x0,0x0,0x0,0x5000000a,0x0,0x0,0x0,0x5000000a,0x0,0x200,0x5000000a,0x0,0x5000000a,0x0,0x0,0x0,0x0,0x0,};\r
    }\r
    private static void jj_la1_init_2() {\r
-      jj_la1_2 = new int[] {0x0,0x3c03c005,0x0,0x3c03c005,0x20,0x20,0x0,0x0,0x0,0x3f00,0x3f00,0x3c000,0x3c000,0x3c000,0x3c0000,0xc00000,0xc00000,0x3c0000,0x40,0x38000000,0x4000005,0x10,0x4,0x10,0x3c03c005,0x80,0x80,0x80,0x3c03c005,0x80,0x0,0x3c03c005,0x80,0x3c03c005,0x80,0x80,0x20,0x14000020,0x14000000,};\r
+      jj_la1_2 = new int[] {0x0,0xf00f001,0x0,0xf00f001,0x8,0x8,0x0,0x0,0x0,0xfc0,0xfc0,0xf000,0xf000,0xf000,0xf0000,0x300000,0x300000,0xf0000,0x10,0xe000000,0x1000001,0x4,0x1,0x4,0xf00f001,0x20,0x20,0x20,0xf00f001,0x20,0x0,0xf00f001,0x20,0xf00f001,0x20,0x20,0x8,0x5000008,0x5000000,};\r
    }\r
   final private JJCalls[] jj_2_rtns = new JJCalls[2];\r
   private boolean jj_rescan = false;\r
@@ -1101,7 +1101,7 @@ void named_arguments() : {
   /** Generate ParseException. */\r
   public ParseException generateParseException() {\r
     jj_expentries.clear();\r
-    boolean[] la1tokens = new boolean[94];\r
+    boolean[] la1tokens = new boolean[92];\r
     if (jj_kind >= 0) {\r
       la1tokens[jj_kind] = true;\r
       jj_kind = -1;\r
@@ -1121,7 +1121,7 @@ void named_arguments() : {
         }\r
       }\r
     }\r
-    for (int i = 0; i < 94; i++) {\r
+    for (int i = 0; i < 92; i++) {\r
       if (la1tokens[i]) {\r
         jj_expentry = new int[1];\r
         jj_expentry[0] = i;\r

diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParserConstants.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParserConstants.java
index 8af224865537f2f5df3b67d5a86b17584a8c29ce..59c2d075f73bf6e878f36e5d86658961bb107a6e 100644 (file)
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParserConstants.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParserConstants.java
@@ -17,13 +17,13 @@ public interface ExpressionParserConstants {
   /** RegularExpression Id. */\r
   int COMMENT2 = 3;\r
   /** RegularExpression Id. */\r
-  int IDENT = 90;\r
+  int IDENT = 88;\r
   /** RegularExpression Id. */\r
-  int STRING = 91;\r
+  int STRING = 89;\r
   /** RegularExpression Id. */\r
-  int UNSIGNED_INTEGER = 92;\r
+  int UNSIGNED_INTEGER = 90;\r
   /** RegularExpression Id. */\r
-  int UNSIGNED_NUMBER = 93;\r
+  int UNSIGNED_NUMBER = 91;\r
 \r
   /** Lexical state. */\r
   int DEFAULT = 0;\r
@@ -76,7 +76,6 @@ public interface ExpressionParserConstants {
     "\"when\"",\r
     "\"connector\"",\r
     "\"equation\"",\r
-    "\"initial\"",\r
     "\"partial\"",\r
     "\"while\"",\r
     "\"constant\"",\r
@@ -88,7 +87,6 @@ public interface ExpressionParserConstants {
     "\"extends\"",\r
     "\"input\"",\r
     "\"public\"",\r
-    "\"der\"",\r
     "\"external\"",\r
     "\"loop\"",\r
     "\"record\"",\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 2ca8a9d64de915a6a3fe64c248395b5db33dc38f..7c7a5cfc9be151db201cb012850c77d650791e1a 100644 (file)
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParserTokenManager.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParserTokenManager.java
@@ -19,121 +19,121 @@ private final int jjStopStringLiteralDfa_0(int pos, long active0, long active1)
    switch (pos)
    {\r
       case 0:\r
-         if ((active0 & 0x3ffffffffffffff0L) != 0L)\r
+         if ((active0 & 0xffffffffffffff0L) != 0L)\r
          {\r
-            jjmatchedKind = 90;\r
+            jjmatchedKind = 88;\r
             return 2;\r
          }\r
-         if ((active1 & 0x80000L) != 0L)\r
+         if ((active1 & 0x20000L) != 0L)\r
             return 13;\r
-         if ((active1 & 0xb30010L) != 0L)\r
+         if ((active1 & 0x2cc004L) != 0L)\r
             return 9;\r
          return -1;\r
       case 1:\r
-         if ((active0 & 0x108420080400000L) != 0L)\r
+         if ((active0 & 0x84020080400000L) != 0L)\r
             return 2;\r
-         if ((active0 & 0x3ef7bdff7fbffff0L) != 0L)\r
+         if ((active0 & 0xf7bfdff7fbffff0L) != 0L)\r
          {\r
             if (jjmatchedPos != 1)\r
             {\r
-               jjmatchedKind = 90;\r
+               jjmatchedKind = 88;\r
                jjmatchedPos = 1;\r
             }\r
             return 2;\r
          }\r
          return -1;\r
       case 2:\r
-         if ((active0 & 0x400000800201200L) != 0L)\r
+         if ((active0 & 0x800201200L) != 0L)\r
             return 2;\r
-         if ((active0 & 0x3bfffdf77f9fedf0L) != 0L)\r
+         if ((active0 & 0xffffdf77f9fedf0L) != 0L)\r
          {\r
-            jjmatchedKind = 90;\r
+            jjmatchedKind = 88;\r
             jjmatchedPos = 2;\r
             return 2;\r
          }\r
          return -1;\r
       case 3:\r
-         if ((active0 & 0x1000084212118400L) != 0L)\r
+         if ((active0 & 0x400084212118400L) != 0L)\r
             return 2;\r
-         if ((active0 & 0x2bfff5b56d8e69f0L) != 0L)\r
+         if ((active0 & 0xbfff5b56d8e69f0L) != 0L)\r
          {\r
             if (jjmatchedPos != 3)\r
             {\r
-               jjmatchedKind = 90;\r
+               jjmatchedKind = 88;\r
                jjmatchedPos = 3;\r
             }\r
             return 2;\r
          }\r
          return -1;\r
       case 4:\r
-         if ((active0 & 0x1090004290008c0L) != 0L)\r
+         if ((active0 & 0x848004290008c0L) != 0L)\r
             return 2;\r
-         if ((active0 & 0x2af6f5b1469e6130L) != 0L)\r
+         if ((active0 & 0xb7b75b1469e6130L) != 0L)\r
          {\r
-            jjmatchedKind = 90;\r
+            jjmatchedKind = 88;\r
             jjmatchedPos = 4;\r
             return 2;\r
          }\r
          return -1;\r
       case 5:\r
-         if ((active0 & 0x22200011009c0000L) != 0L)\r
+         if ((active0 & 0x9100011009c0000L) != 0L)\r
             return 2;\r
-         if ((active0 & 0x8d6f5a046026130L) != 0L)\r
+         if ((active0 & 0x26b75a046026130L) != 0L)\r
          {\r
-            jjmatchedKind = 90;\r
+            jjmatchedKind = 88;\r
             jjmatchedPos = 5;\r
             return 2;\r
          }\r
          return -1;\r
       case 6:\r
-         if ((active0 & 0x80d0a000000000L) != 0L)\r
+         if ((active0 & 0x4050a000000000L) != 0L)\r
             return 2;\r
-         if ((active0 & 0x856250046026130L) != 0L)\r
+         if ((active0 & 0x22b250046026130L) != 0L)\r
          {\r
             if (jjmatchedPos != 6)\r
             {\r
-               jjmatchedKind = 90;\r
+               jjmatchedKind = 88;\r
                jjmatchedPos = 6;\r
             }\r
             return 2;\r
          }\r
          return -1;\r
       case 7:\r
-         if ((active0 & 0x54150040006110L) != 0L)\r
+         if ((active0 & 0x201200006020020L) != 0L)\r
+            return 2;\r
+         if ((active0 & 0x2a150040006110L) != 0L)\r
          {\r
-            jjmatchedKind = 90;\r
+            jjmatchedKind = 88;\r
             jjmatchedPos = 7;\r
             return 2;\r
          }\r
-         if ((active0 & 0x802200006020020L) != 0L)\r
-            return 2;\r
          return -1;\r
       case 8:\r
-         if ((active0 & 0x10140000000110L) != 0L)\r
-            return 2;\r
-         if ((active0 & 0x44010040006000L) != 0L)\r
+         if ((active0 & 0x22010040006000L) != 0L)\r
          {\r
-            jjmatchedKind = 90;\r
+            jjmatchedKind = 88;\r
             jjmatchedPos = 8;\r
             return 2;\r
          }\r
+         if ((active0 & 0x8140000000110L) != 0L)\r
+            return 2;\r
          return -1;\r
       case 9:\r
-         if ((active0 & 0x40010040002000L) != 0L)\r
+         if ((active0 & 0x2000000004000L) != 0L)\r
+            return 2;\r
+         if ((active0 & 0x20010040002000L) != 0L)\r
          {\r
-            jjmatchedKind = 90;\r
+            jjmatchedKind = 88;\r
             jjmatchedPos = 9;\r
             return 2;\r
          }\r
-         if ((active0 & 0x4000000004000L) != 0L)\r
-            return 2;\r
          return -1;\r
       case 10:\r
          if ((active0 & 0x10000002000L) != 0L)\r
             return 2;\r
-         if ((active0 & 0x40000040000000L) != 0L)\r
+         if ((active0 & 0x20000040000000L) != 0L)\r
          {\r
-            jjmatchedKind = 90;\r
+            jjmatchedKind = 88;\r
             jjmatchedPos = 10;\r
             return 2;\r
          }\r
@@ -141,9 +141,9 @@ private final int jjStopStringLiteralDfa_0(int pos, long active0, long active1)
       case 11:\r
          if ((active0 & 0x40000000L) != 0L)\r
             return 2;\r
-         if ((active0 & 0x40000000000000L) != 0L)\r
+         if ((active0 & 0x20000000000000L) != 0L)\r
          {\r
-            jjmatchedKind = 90;\r
+            jjmatchedKind = 88;\r
             jjmatchedPos = 11;\r
             return 2;\r
          }\r
@@ -167,58 +167,58 @@ private int jjMoveStringLiteralDfa0_0()
    switch(curChar)\r
    {\r
       case 40:\r
-         return jjStopAtPos(0, 62);\r
+         return jjStopAtPos(0, 60);\r
       case 41:\r
-         return jjStopAtPos(0, 63);\r
+         return jjStopAtPos(0, 61);\r
       case 42:\r
-         return jjStopAtPos(0, 82);\r
+         return jjStopAtPos(0, 80);\r
       case 43:\r
-         return jjStopAtPos(0, 78);\r
+         return jjStopAtPos(0, 76);\r
       case 44:\r
-         return jjStopAtPos(0, 71);\r
+         return jjStopAtPos(0, 69);\r
       case 45:\r
-         return jjStopAtPos(0, 79);\r
+         return jjStopAtPos(0, 77);\r
       case 46:\r
-         jjmatchedKind = 68;\r
-         return jjMoveStringLiteralDfa1_0(0x0L, 0xb30000L);\r
+         jjmatchedKind = 66;\r
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x2cc000L);\r
       case 47:\r
-         return jjStartNfaWithStates_0(0, 83, 13);\r
+         return jjStartNfaWithStates_0(0, 81, 13);\r
       case 58:\r
-         jjmatchedKind = 69;\r
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x2000000L);\r
+         jjmatchedKind = 67;\r
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x800000L);\r
       case 59:\r
-         return jjStopAtPos(0, 70);\r
+         return jjStopAtPos(0, 68);\r
       case 60:\r
-         jjmatchedKind = 72;\r
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x2200L);\r
+         jjmatchedKind = 70;\r
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x880L);\r
       case 61:\r
-         jjmatchedKind = 88;\r
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x1000L);\r
+         jjmatchedKind = 86;\r
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x400L);\r
       case 62:\r
-         jjmatchedKind = 74;\r
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x800L);\r
+         jjmatchedKind = 72;\r
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x200L);\r
       case 91:\r
-         return jjStopAtPos(0, 66);\r
+         return jjStopAtPos(0, 64);\r
       case 93:\r
-         return jjStopAtPos(0, 67);\r
+         return jjStopAtPos(0, 65);\r
       case 94:\r
-         return jjStopAtPos(0, 86);\r
+         return jjStopAtPos(0, 84);\r
       case 97:\r
          return jjMoveStringLiteralDfa1_0(0x84210L, 0x0L);\r
       case 98:\r
          return jjMoveStringLiteralDfa1_0(0x21000000L, 0x0L);\r
       case 99:\r
-         return jjMoveStringLiteralDfa1_0(0x42108400000000L, 0x0L);\r
+         return jjMoveStringLiteralDfa1_0(0x21108400000000L, 0x0L);\r
       case 100:\r
-         return jjMoveStringLiteralDfa1_0(0x400000000000020L, 0x0L);\r
+         return jjMoveStringLiteralDfa1_0(0x20L, 0x0L);\r
       case 101:\r
-         return jjMoveStringLiteralDfa1_0(0x884210842108400L, 0x0L);\r
+         return jjMoveStringLiteralDfa1_0(0x242210842108400L, 0x0L);\r
       case 102:\r
          return jjMoveStringLiteralDfa1_0(0x4210840L, 0x0L);\r
       case 105:\r
-         return jjMoveStringLiteralDfa1_0(0x108421080000000L, 0x0L);\r
+         return jjMoveStringLiteralDfa1_0(0x84021080000000L, 0x0L);\r
       case 108:\r
-         return jjMoveStringLiteralDfa1_0(0x1000000000000000L, 0x0L);\r
+         return jjMoveStringLiteralDfa1_0(0x400000000000000L, 0x0L);\r
       case 109:\r
          return jjMoveStringLiteralDfa1_0(0x80L, 0x0L);\r
       case 110:\r
@@ -226,19 +226,19 @@ private int jjMoveStringLiteralDfa0_0()
       case 111:\r
          return jjMoveStringLiteralDfa1_0(0x108420000L, 0x0L);\r
       case 112:\r
-         return jjMoveStringLiteralDfa1_0(0x210842000000000L, 0x0L);\r
+         return jjMoveStringLiteralDfa1_0(0x108442000000000L, 0x0L);\r
       case 114:\r
-         return jjMoveStringLiteralDfa1_0(0x2000000000042100L, 0x0L);\r
+         return jjMoveStringLiteralDfa1_0(0x800000000042100L, 0x0L);\r
       case 115:\r
          return jjMoveStringLiteralDfa1_0(0x800000L, 0x0L);\r
       case 116:\r
          return jjMoveStringLiteralDfa1_0(0x4210000000L, 0x0L);\r
       case 119:\r
-         return jjMoveStringLiteralDfa1_0(0x21080000000000L, 0x0L);\r
+         return jjMoveStringLiteralDfa1_0(0x10880000000000L, 0x0L);\r
       case 123:\r
-         return jjStopAtPos(0, 64);\r
+         return jjStopAtPos(0, 62);\r
       case 125:\r
-         return jjStopAtPos(0, 65);\r
+         return jjStopAtPos(0, 63);\r
       default :\r
          return jjMoveNfa_0(0, 0);\r
    }\r
@@ -253,51 +253,51 @@ private int jjMoveStringLiteralDfa1_0(long active0, long active1)
    switch(curChar)\r
    {\r
       case 42:\r
-         if ((active1 & 0x100000L) != 0L)\r
-            return jjStopAtPos(1, 84);\r
+         if ((active1 & 0x40000L) != 0L)\r
+            return jjStopAtPos(1, 82);\r
          break;\r
       case 43:\r
-         if ((active1 & 0x10000L) != 0L)\r
-            return jjStopAtPos(1, 80);\r
+         if ((active1 & 0x4000L) != 0L)\r
+            return jjStopAtPos(1, 78);\r
          break;\r
       case 45:\r
-         if ((active1 & 0x20000L) != 0L)\r
-            return jjStopAtPos(1, 81);\r
+         if ((active1 & 0x8000L) != 0L)\r
+            return jjStopAtPos(1, 79);\r
          break;\r
       case 47:\r
-         if ((active1 & 0x200000L) != 0L)\r
-            return jjStopAtPos(1, 85);\r
+         if ((active1 & 0x80000L) != 0L)\r
+            return jjStopAtPos(1, 83);\r
          break;\r
       case 61:\r
-         if ((active1 & 0x200L) != 0L)\r
+         if ((active1 & 0x80L) != 0L)\r
+            return jjStopAtPos(1, 71);\r
+         else if ((active1 & 0x200L) != 0L)\r
             return jjStopAtPos(1, 73);\r
-         else if ((active1 & 0x800L) != 0L)\r
-            return jjStopAtPos(1, 75);\r
-         else if ((active1 & 0x1000L) != 0L)\r
-            return jjStopAtPos(1, 76);\r
-         else if ((active1 & 0x2000000L) != 0L)\r
-            return jjStopAtPos(1, 89);\r
+         else if ((active1 & 0x400L) != 0L)\r
+            return jjStopAtPos(1, 74);\r
+         else if ((active1 & 0x800000L) != 0L)\r
+            return jjStopAtPos(1, 87);\r
          break;\r
       case 62:\r
-         if ((active1 & 0x2000L) != 0L)\r
-            return jjStopAtPos(1, 77);\r
+         if ((active1 & 0x800L) != 0L)\r
+            return jjStopAtPos(1, 75);\r
          break;\r
       case 94:\r
-         if ((active1 & 0x800000L) != 0L)\r
-            return jjStopAtPos(1, 87);\r
+         if ((active1 & 0x200000L) != 0L)\r
+            return jjStopAtPos(1, 85);\r
          break;\r
       case 97:\r
-         return jjMoveStringLiteralDfa2_0(active0, 0x842000000440L, active1, 0L);\r
+         return jjMoveStringLiteralDfa2_0(active0, 0x442000000440L, active1, 0L);\r
       case 101:\r
-         return jjMoveStringLiteralDfa2_0(active0, 0x2400000000042100L, active1, 0L);\r
+         return jjMoveStringLiteralDfa2_0(active0, 0x800000000042100L, active1, 0L);\r
       case 102:\r
          if ((active0 & 0x80000000L) != 0L)\r
             return jjStartNfaWithStates_0(1, 31, 2);\r
          break;\r
       case 104:\r
-         return jjMoveStringLiteralDfa2_0(active0, 0x1080010000000L, active1, 0L);\r
+         return jjMoveStringLiteralDfa2_0(active0, 0x880010000000L, active1, 0L);\r
       case 105:\r
-         return jjMoveStringLiteralDfa2_0(active0, 0x20000000000820L, active1, 0L);\r
+         return jjMoveStringLiteralDfa2_0(active0, 0x10000000000820L, active1, 0L);\r
       case 108:\r
          return jjMoveStringLiteralDfa2_0(active0, 0x403118010L, active1, 0L);\r
       case 109:\r
@@ -308,9 +308,9 @@ private int jjMoveStringLiteralDfa1_0(long active0, long active1)
             jjmatchedKind = 41;\r
             jjmatchedPos = 1;\r
          }\r
-         return jjMoveStringLiteralDfa2_0(active0, 0x108410840004200L, active1, 0L);\r
+         return jjMoveStringLiteralDfa2_0(active0, 0x84010840004200L, active1, 0L);\r
       case 111:\r
-         return jjMoveStringLiteralDfa2_0(active0, 0x1042108000201080L, active1, 0L);\r
+         return jjMoveStringLiteralDfa2_0(active0, 0x421108000201080L, active1, 0L);\r
       case 112:\r
          return jjMoveStringLiteralDfa2_0(active0, 0x20000L, active1, 0L);\r
       case 113:\r
@@ -318,15 +318,15 @@ private int jjMoveStringLiteralDfa1_0(long active0, long active1)
       case 114:\r
          if ((active0 & 0x400000L) != 0L)\r
             return jjStartNfaWithStates_0(1, 22, 2);\r
-         return jjMoveStringLiteralDfa2_0(active0, 0x10000220000000L, active1, 0L);\r
+         return jjMoveStringLiteralDfa2_0(active0, 0x8000220000000L, active1, 0L);\r
       case 115:\r
          return jjMoveStringLiteralDfa2_0(active0, 0x80000L, active1, 0L);\r
       case 116:\r
          return jjMoveStringLiteralDfa2_0(active0, 0x800000L, active1, 0L);\r
       case 117:\r
-         return jjMoveStringLiteralDfa2_0(active0, 0x20000010c000000L, active1, 0L);\r
+         return jjMoveStringLiteralDfa2_0(active0, 0x10000010c000000L, active1, 0L);\r
       case 120:\r
-         return jjMoveStringLiteralDfa2_0(active0, 0x884000000000000L, active1, 0L);\r
+         return jjMoveStringLiteralDfa2_0(active0, 0x242000000000000L, active1, 0L);\r
       case 121:\r
          return jjMoveStringLiteralDfa2_0(active0, 0x4000000000L, active1, 0L);\r
       default :\r
@@ -348,9 +348,9 @@ private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long a
       case 97:\r
          return jjMoveStringLiteralDfa3_0(active0, 0x400000000L);\r
       case 98:\r
-         return jjMoveStringLiteralDfa3_0(active0, 0x200000000000000L);\r
+         return jjMoveStringLiteralDfa3_0(active0, 0x100000000000000L);\r
       case 99:\r
-         return jjMoveStringLiteralDfa3_0(active0, 0x2000002040000400L);\r
+         return jjMoveStringLiteralDfa3_0(active0, 0x800002040000400L);\r
       case 100:\r
          if ((active0 & 0x200L) != 0L)\r
             return jjStartNfaWithStates_0(2, 9, 2);\r
@@ -362,27 +362,25 @@ private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long a
       case 103:\r
          return jjMoveStringLiteralDfa3_0(active0, 0x10L);\r
       case 105:\r
-         return jjMoveStringLiteralDfa3_0(active0, 0x1400000000000L);\r
+         return jjMoveStringLiteralDfa3_0(active0, 0x800000000000L);\r
       case 108:\r
          return jjMoveStringLiteralDfa3_0(active0, 0x40L);\r
       case 110:\r
-         return jjMoveStringLiteralDfa3_0(active0, 0x4a108004004800L);\r
+         return jjMoveStringLiteralDfa3_0(active0, 0x25108004004800L);\r
       case 111:\r
-         return jjMoveStringLiteralDfa3_0(active0, 0x1010000001010000L);\r
+         return jjMoveStringLiteralDfa3_0(active0, 0x408000001010000L);\r
       case 112:\r
-         return jjMoveStringLiteralDfa3_0(active0, 0x104005000002000L);\r
+         return jjMoveStringLiteralDfa3_0(active0, 0x82005000002000L);\r
       case 114:\r
          if ((active0 & 0x200000L) != 0L)\r
             return jjStartNfaWithStates_0(2, 21, 2);\r
-         else if ((active0 & 0x400000000000000L) != 0L)\r
-            return jjStartNfaWithStates_0(2, 58, 2);\r
-         return jjMoveStringLiteralDfa3_0(active0, 0x840000800000L);\r
+         return jjMoveStringLiteralDfa3_0(active0, 0x440000800000L);\r
       case 115:\r
          return jjMoveStringLiteralDfa3_0(active0, 0x2188020L);\r
       case 116:\r
          if ((active0 & 0x1000L) != 0L)\r
             return jjStartNfaWithStates_0(2, 12, 2);\r
-         return jjMoveStringLiteralDfa3_0(active0, 0x8a0000108040000L);\r
+         return jjMoveStringLiteralDfa3_0(active0, 0x250000108040000L);\r
       case 117:\r
          return jjMoveStringLiteralDfa3_0(active0, 0x210200000000L);\r
       default :\r
@@ -402,7 +400,7 @@ private int jjMoveStringLiteralDfa3_0(long old0, long active0)
    switch(curChar)\r
    {\r
       case 97:\r
-         return jjMoveStringLiteralDfa4_0(active0, 0x4240060000800L);\r
+         return jjMoveStringLiteralDfa4_0(active0, 0x2240060000800L);\r
       case 99:\r
          return jjMoveStringLiteralDfa4_0(active0, 0x5000020L);\r
       case 101:\r
@@ -415,15 +413,15 @@ private int jjMoveStringLiteralDfa3_0(long old0, long active0)
             return jjStartNfaWithStates_0(3, 33, 2);\r
          else if ((active0 & 0x4000000000L) != 0L)\r
             return jjStartNfaWithStates_0(3, 38, 2);\r
-         return jjMoveStringLiteralDfa4_0(active0, 0x88800000a980180L);\r
+         return jjMoveStringLiteralDfa4_0(active0, 0x24400000a980180L);\r
       case 104:\r
          if ((active0 & 0x400L) != 0L)\r
             return jjStartNfaWithStates_0(3, 10, 2);\r
-         return jjMoveStringLiteralDfa4_0(active0, 0x20000000000000L);\r
+         return jjMoveStringLiteralDfa4_0(active0, 0x10000000000000L);\r
       case 107:\r
          return jjMoveStringLiteralDfa4_0(active0, 0x2000000000L);\r
       case 108:\r
-         return jjMoveStringLiteralDfa4_0(active0, 0x201000000002000L);\r
+         return jjMoveStringLiteralDfa4_0(active0, 0x100800000002000L);\r
       case 109:\r
          return jjMoveStringLiteralDfa4_0(active0, 0x10000000000L);\r
       case 110:\r
@@ -433,19 +431,19 @@ private int jjMoveStringLiteralDfa3_0(long old0, long active0)
             return jjStartNfaWithStates_0(3, 43, 2);\r
          return jjMoveStringLiteralDfa4_0(active0, 0x108000000000L);\r
       case 111:\r
-         return jjMoveStringLiteralDfa4_0(active0, 0x2000001000004010L);\r
+         return jjMoveStringLiteralDfa4_0(active0, 0x800001000004010L);\r
       case 112:\r
-         if ((active0 & 0x1000000000000000L) != 0L)\r
-            return jjStartNfaWithStates_0(3, 60, 2);\r
+         if ((active0 & 0x400000000000000L) != 0L)\r
+            return jjStartNfaWithStates_0(3, 58, 2);\r
          return jjMoveStringLiteralDfa4_0(active0, 0x100000000L);\r
       case 114:\r
          return jjMoveStringLiteralDfa4_0(active0, 0x20000L);\r
       case 115:\r
-         return jjMoveStringLiteralDfa4_0(active0, 0x42000400000040L);\r
+         return jjMoveStringLiteralDfa4_0(active0, 0x21000400000040L);\r
       case 116:\r
-         return jjMoveStringLiteralDfa4_0(active0, 0x10c00000000000L);\r
+         return jjMoveStringLiteralDfa4_0(active0, 0x8400000000000L);\r
       case 117:\r
-         return jjMoveStringLiteralDfa4_0(active0, 0x100000000040000L);\r
+         return jjMoveStringLiteralDfa4_0(active0, 0x80000000040000L);\r
       case 119:\r
          if ((active0 & 0x10000L) != 0L)\r
             return jjStartNfaWithStates_0(3, 16, 2);\r
@@ -473,11 +471,11 @@ private int jjMoveStringLiteralDfa4_0(long old0, long active0)
       case 101:\r
          if ((active0 & 0x40L) != 0L)\r
             return jjStartNfaWithStates_0(4, 6, 2);\r
-         else if ((active0 & 0x1000000000000L) != 0L)\r
-            return jjStartNfaWithStates_0(4, 48, 2);\r
-         return jjMoveStringLiteralDfa5_0(active0, 0x10118000000000L);\r
+         else if ((active0 & 0x800000000000L) != 0L)\r
+            return jjStartNfaWithStates_0(4, 47, 2);\r
+         return jjMoveStringLiteralDfa5_0(active0, 0x8118000000000L);\r
       case 105:\r
-         return jjMoveStringLiteralDfa5_0(active0, 0x220c00000100000L);\r
+         return jjMoveStringLiteralDfa5_0(active0, 0x110400000100000L);\r
       case 107:\r
          if ((active0 & 0x1000000L) != 0L)\r
             return jjStartNfaWithStates_0(4, 24, 2);\r
@@ -493,23 +491,23 @@ private int jjMoveStringLiteralDfa4_0(long old0, long active0)
       case 109:\r
          return jjMoveStringLiteralDfa5_0(active0, 0x40000000000L);\r
       case 110:\r
-         return jjMoveStringLiteralDfa5_0(active0, 0x84000000000000L);\r
+         return jjMoveStringLiteralDfa5_0(active0, 0x42000000000000L);\r
       case 112:\r
          return jjMoveStringLiteralDfa5_0(active0, 0x40000000L);\r
       case 114:\r
          if ((active0 & 0x8000000L) != 0L)\r
             return jjStartNfaWithStates_0(4, 27, 2);\r
-         else if ((active0 & 0x8000000000000L) != 0L)\r
-            return jjStartNfaWithStates_0(4, 51, 2);\r
-         return jjMoveStringLiteralDfa5_0(active0, 0x28000010000c0030L);\r
+         else if ((active0 & 0x4000000000000L) != 0L)\r
+            return jjStartNfaWithStates_0(4, 50, 2);\r
+         return jjMoveStringLiteralDfa5_0(active0, 0xa000010000c0030L);\r
       case 115:\r
          if ((active0 & 0x400000000L) != 0L)\r
             return jjStartNfaWithStates_0(4, 34, 2);\r
          break;\r
       case 116:\r
-         if ((active0 & 0x100000000000000L) != 0L)\r
-            return jjStartNfaWithStates_0(4, 56, 2);\r
-         return jjMoveStringLiteralDfa5_0(active0, 0x42200004004000L);\r
+         if ((active0 & 0x80000000000000L) != 0L)\r
+            return jjStartNfaWithStates_0(4, 55, 2);\r
+         return jjMoveStringLiteralDfa5_0(active0, 0x21200004004000L);\r
       case 117:\r
          return jjMoveStringLiteralDfa5_0(active0, 0x100000000L);\r
       case 119:\r
@@ -531,15 +529,15 @@ private int jjMoveStringLiteralDfa5_0(long old0, long active0)
    switch(curChar)\r
    {\r
       case 97:\r
-         return jjMoveStringLiteralDfa6_0(active0, 0x2c00000004000L);\r
+         return jjMoveStringLiteralDfa6_0(active0, 0x1400000004000L);\r
       case 99:\r
-         if ((active0 & 0x200000000000000L) != 0L)\r
-            return jjStartNfaWithStates_0(5, 57, 2);\r
-         return jjMoveStringLiteralDfa6_0(active0, 0x10108000002000L);\r
+         if ((active0 & 0x100000000000000L) != 0L)\r
+            return jjStartNfaWithStates_0(5, 56, 2);\r
+         return jjMoveStringLiteralDfa6_0(active0, 0x8108000002000L);\r
       case 100:\r
-         if ((active0 & 0x2000000000000000L) != 0L)\r
-            return jjStartNfaWithStates_0(5, 61, 2);\r
-         return jjMoveStringLiteralDfa6_0(active0, 0x84000000000000L);\r
+         if ((active0 & 0x800000000000000L) != 0L)\r
+            return jjStartNfaWithStates_0(5, 59, 2);\r
+         return jjMoveStringLiteralDfa6_0(active0, 0x42000000000000L);\r
       case 101:\r
          return jjMoveStringLiteralDfa6_0(active0, 0x40000000020L);\r
       case 102:\r
@@ -561,11 +559,11 @@ private int jjMoveStringLiteralDfa5_0(long old0, long active0)
       case 110:\r
          if ((active0 & 0x40000L) != 0L)\r
             return jjStartNfaWithStates_0(5, 18, 2);\r
-         else if ((active0 & 0x20000000000000L) != 0L)\r
-            return jjStartNfaWithStates_0(5, 53, 2);\r
-         return jjMoveStringLiteralDfa6_0(active0, 0x800000000000000L);\r
+         else if ((active0 & 0x10000000000000L) != 0L)\r
+            return jjStartNfaWithStates_0(5, 52, 2);\r
+         return jjMoveStringLiteralDfa6_0(active0, 0x200000000000000L);\r
       case 114:\r
-         return jjMoveStringLiteralDfa6_0(active0, 0x40010000000000L);\r
+         return jjMoveStringLiteralDfa6_0(active0, 0x20010000000000L);\r
       case 115:\r
          return jjMoveStringLiteralDfa6_0(active0, 0x40000000L);\r
       case 116:\r
@@ -593,7 +591,7 @@ private int jjMoveStringLiteralDfa6_0(long old0, long active0)
    switch(curChar)\r
    {\r
       case 97:\r
-         return jjMoveStringLiteralDfa7_0(active0, 0x844010000000100L);\r
+         return jjMoveStringLiteralDfa7_0(active0, 0x222010000000100L);\r
       case 101:\r
          if ((active0 & 0x2000000000L) != 0L)\r
             return jjStartNfaWithStates_0(6, 37, 2);\r
@@ -601,16 +599,14 @@ private int jjMoveStringLiteralDfa6_0(long old0, long active0)
       case 108:\r
          if ((active0 & 0x400000000000L) != 0L)\r
             return jjStartNfaWithStates_0(6, 46, 2);\r
-         else if ((active0 & 0x800000000000L) != 0L)\r
-            return jjStartNfaWithStates_0(6, 47, 2);\r
          break;\r
       case 110:\r
-         return jjMoveStringLiteralDfa7_0(active0, 0x2000000000000L);\r
+         return jjMoveStringLiteralDfa7_0(active0, 0x1000000000000L);\r
       case 111:\r
          return jjMoveStringLiteralDfa7_0(active0, 0x200004020000L);\r
       case 115:\r
-         if ((active0 & 0x80000000000000L) != 0L)\r
-            return jjStartNfaWithStates_0(6, 55, 2);\r
+         if ((active0 & 0x40000000000000L) != 0L)\r
+            return jjStartNfaWithStates_0(6, 54, 2);\r
          break;\r
       case 116:\r
          if ((active0 & 0x8000000000L) != 0L)\r
@@ -618,7 +614,7 @@ private int jjMoveStringLiteralDfa6_0(long old0, long active0)
             jjmatchedKind = 39;\r
             jjmatchedPos = 6;\r
          }\r
-         return jjMoveStringLiteralDfa7_0(active0, 0x10140000004030L);\r
+         return jjMoveStringLiteralDfa7_0(active0, 0x8140000004030L);\r
       case 117:\r
          return jjMoveStringLiteralDfa7_0(active0, 0x40000000L);\r
       default :\r
@@ -640,18 +636,18 @@ private int jjMoveStringLiteralDfa7_0(long old0, long active0)
       case 97:\r
          return jjMoveStringLiteralDfa8_0(active0, 0x2000L);\r
       case 98:\r
-         return jjMoveStringLiteralDfa8_0(active0, 0x4000000000000L);\r
+         return jjMoveStringLiteralDfa8_0(active0, 0x2000000000000L);\r
       case 101:\r
          if ((active0 & 0x20L) != 0L)\r
             return jjStartNfaWithStates_0(7, 5, 2);\r
-         return jjMoveStringLiteralDfa8_0(active0, 0x10040000000000L);\r
+         return jjMoveStringLiteralDfa8_0(active0, 0x8040000000000L);\r
       case 104:\r
          return jjMoveStringLiteralDfa8_0(active0, 0x10L);\r
       case 105:\r
-         return jjMoveStringLiteralDfa8_0(active0, 0x40000000004000L);\r
+         return jjMoveStringLiteralDfa8_0(active0, 0x20000000004000L);\r
       case 108:\r
-         if ((active0 & 0x800000000000000L) != 0L)\r
-            return jjStartNfaWithStates_0(7, 59, 2);\r
+         if ((active0 & 0x200000000000000L) != 0L)\r
+            return jjStartNfaWithStates_0(7, 57, 2);\r
          return jjMoveStringLiteralDfa8_0(active0, 0x40000000L);\r
       case 110:\r
          if ((active0 & 0x2000000L) != 0L)\r
@@ -668,8 +664,8 @@ private int jjMoveStringLiteralDfa7_0(long old0, long active0)
             return jjStartNfaWithStates_0(7, 17, 2);\r
          return jjMoveStringLiteralDfa8_0(active0, 0x100L);\r
       case 116:\r
-         if ((active0 & 0x2000000000000L) != 0L)\r
-            return jjStartNfaWithStates_0(7, 49, 2);\r
+         if ((active0 & 0x1000000000000L) != 0L)\r
+            return jjStartNfaWithStates_0(7, 48, 2);\r
          return jjMoveStringLiteralDfa8_0(active0, 0x10000000000L);\r
       default :\r
          break;\r
@@ -692,8 +688,8 @@ private int jjMoveStringLiteralDfa8_0(long old0, long active0)
       case 98:\r
          return jjMoveStringLiteralDfa9_0(active0, 0x2000L);\r
       case 100:\r
-         if ((active0 & 0x10000000000000L) != 0L)\r
-            return jjStartNfaWithStates_0(8, 52, 2);\r
+         if ((active0 & 0x8000000000000L) != 0L)\r
+            return jjStartNfaWithStates_0(8, 51, 2);\r
          break;\r
       case 101:\r
          if ((active0 & 0x100L) != 0L)\r
@@ -702,13 +698,13 @@ private int jjMoveStringLiteralDfa8_0(long old0, long active0)
       case 105:\r
          return jjMoveStringLiteralDfa9_0(active0, 0x10000000000L);\r
       case 108:\r
-         return jjMoveStringLiteralDfa9_0(active0, 0x4000000000000L);\r
+         return jjMoveStringLiteralDfa9_0(active0, 0x2000000000000L);\r
       case 109:\r
          if ((active0 & 0x10L) != 0L)\r
             return jjStartNfaWithStates_0(8, 4, 2);\r
          break;\r
       case 110:\r
-         return jjMoveStringLiteralDfa9_0(active0, 0x40000000000000L);\r
+         return jjMoveStringLiteralDfa9_0(active0, 0x20000000000000L);\r
       case 111:\r
          return jjMoveStringLiteralDfa9_0(active0, 0x4000L);\r
       case 114:\r
@@ -734,9 +730,9 @@ private int jjMoveStringLiteralDfa9_0(long old0, long active0)
    switch(curChar)\r
    {\r
       case 101:\r
-         if ((active0 & 0x4000000000000L) != 0L)\r
-            return jjStartNfaWithStates_0(9, 50, 2);\r
-         return jjMoveStringLiteralDfa10_0(active0, 0x40000000000000L);\r
+         if ((active0 & 0x2000000000000L) != 0L)\r
+            return jjStartNfaWithStates_0(9, 49, 2);\r
+         return jjMoveStringLiteralDfa10_0(active0, 0x20000000000000L);\r
       case 108:\r
          return jjMoveStringLiteralDfa10_0(active0, 0x2000L);\r
       case 110:\r
@@ -764,7 +760,7 @@ private int jjMoveStringLiteralDfa10_0(long old0, long active0)
    switch(curChar)\r
    {\r
       case 100:\r
-         return jjMoveStringLiteralDfa11_0(active0, 0x40000000000000L);\r
+         return jjMoveStringLiteralDfa11_0(active0, 0x20000000000000L);\r
       case 101:\r
          if ((active0 & 0x2000L) != 0L)\r
             return jjStartNfaWithStates_0(10, 13, 2);\r
@@ -790,7 +786,7 @@ private int jjMoveStringLiteralDfa11_0(long old0, long active0)
    switch(curChar)\r
    {\r
       case 98:\r
-         return jjMoveStringLiteralDfa12_0(active0, 0x40000000000000L);\r
+         return jjMoveStringLiteralDfa12_0(active0, 0x20000000000000L);\r
       case 100:\r
          if ((active0 & 0x40000000L) != 0L)\r
             return jjStartNfaWithStates_0(11, 30, 2);\r
@@ -812,8 +808,8 @@ private int jjMoveStringLiteralDfa12_0(long old0, long active0)
    switch(curChar)\r
    {\r
       case 121:\r
-         if ((active0 & 0x40000000000000L) != 0L)\r
-            return jjStartNfaWithStates_0(12, 54, 2);\r
+         if ((active0 & 0x20000000000000L) != 0L)\r
+            return jjStartNfaWithStates_0(12, 53, 2);\r
          break;\r
       default :\r
          break;\r
@@ -862,8 +858,8 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 0:\r
                   if ((0x3ff000000000000L & l) != 0L)\r
                   {\r
-                     if (kind > 92)\r
-                        kind = 92;\r
+                     if (kind > 90)\r
+                        kind = 90;\r
                      jjCheckNAddStates(3, 7);\r
                   }\r
                   else if ((0x100002600L & l) != 0L)\r
@@ -881,8 +877,8 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 2:\r
                   if ((0x3ff000000000000L & l) == 0L)\r
                      break;\r
-                  if (kind > 90)\r
-                     kind = 90;\r
+                  if (kind > 88)\r
+                     kind = 88;\r
                   jjstateSet[jjnewStateCnt++] = 2;\r
                   break;\r
                case 3:\r
@@ -898,8 +894,8 @@ private int jjMoveNfa_0(int startState, int curPos)
                      jjCheckNAddStates(10, 12);\r
                   break;\r
                case 7:\r
-                  if (curChar == 34 && kind > 91)\r
-                     kind = 91;\r
+                  if (curChar == 34 && kind > 89)\r
+                     kind = 89;\r
                   break;\r
                case 8:\r
                   if (curChar == 46)\r
@@ -908,15 +904,15 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 9:\r
                   if ((0x3ff000000000000L & l) == 0L)\r
                      break;\r
-                  if (kind > 93)\r
-                     kind = 93;\r
+                  if (kind > 91)\r
+                     kind = 91;\r
                   jjCheckNAddTwoStates(9, 10);\r
                   break;\r
                case 11:\r
                   if ((0x3ff000000000000L & l) == 0L)\r
                      break;\r
-                  if (kind > 93)\r
-                     kind = 93;\r
+                  if (kind > 91)\r
+                     kind = 91;\r
                   jjstateSet[jjnewStateCnt++] = 11;\r
                   break;\r
                case 12:\r
@@ -960,15 +956,15 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 21:\r
                   if ((0x3ff000000000000L & l) == 0L)\r
                      break;\r
-                  if (kind > 92)\r
-                     kind = 92;\r
+                  if (kind > 90)\r
+                     kind = 90;\r
                   jjCheckNAddStates(3, 7);\r
                   break;\r
                case 22:\r
                   if ((0x3ff000000000000L & l) == 0L)\r
                      break;\r
-                  if (kind > 92)\r
-                     kind = 92;\r
+                  if (kind > 90)\r
+                     kind = 90;\r
                   jjCheckNAdd(22);\r
                   break;\r
                case 23:\r
@@ -978,22 +974,22 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 24:\r
                   if (curChar != 46)\r
                      break;\r
-                  if (kind > 93)\r
-                     kind = 93;\r
+                  if (kind > 91)\r
+                     kind = 91;\r
                   jjCheckNAddTwoStates(25, 26);\r
                   break;\r
                case 25:\r
                   if ((0x3ff000000000000L & l) == 0L)\r
                      break;\r
-                  if (kind > 93)\r
-                     kind = 93;\r
+                  if (kind > 91)\r
+                     kind = 91;\r
                   jjCheckNAddTwoStates(25, 26);\r
                   break;\r
                case 27:\r
                   if ((0x3ff000000000000L & l) == 0L)\r
                      break;\r
-                  if (kind > 93)\r
-                     kind = 93;\r
+                  if (kind > 91)\r
+                     kind = 91;\r
                   jjstateSet[jjnewStateCnt++] = 27;\r
                   break;\r
                case 28:\r
@@ -1003,8 +999,8 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 30:\r
                   if ((0x3ff000000000000L & l) == 0L)\r
                      break;\r
-                  if (kind > 93)\r
-                     kind = 93;\r
+                  if (kind > 91)\r
+                     kind = 91;\r
                   jjstateSet[jjnewStateCnt++] = 30;\r
                   break;\r
                default : break;\r
@@ -1022,8 +1018,8 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 2:\r
                   if ((0x7fffffe87fffffeL & l) == 0L)\r
                      break;\r
-                  if (kind > 90)\r
-                     kind = 90;\r
+                  if (kind > 88)\r
+                     kind = 88;\r
                   jjCheckNAdd(2);\r
                   break;\r
                case 4:\r
@@ -1122,11 +1118,11 @@ public static final String[] jjstrLiteralImages = {
 "\143\154\141\163\163", "\145\156\144", "\151\155\160\157\162\164", "\160\141\143\153\141\147\145", \r
 "\164\171\160\145", "\143\157\156\156\145\143\164", \r
 "\145\156\165\155\145\162\141\164\151\157\156", "\151\156", "\160\141\162\141\155\145\164\145\162", "\167\150\145\156", \r
-"\143\157\156\156\145\143\164\157\162", "\145\161\165\141\164\151\157\156", "\151\156\151\164\151\141\154", \r
-"\160\141\162\164\151\141\154", "\167\150\151\154\145", "\143\157\156\163\164\141\156\164", \r
+"\143\157\156\156\145\143\164\157\162", "\145\161\165\141\164\151\157\156", "\160\141\162\164\151\141\154", \r
+"\167\150\151\154\145", "\143\157\156\163\164\141\156\164", \r
 "\145\170\160\141\156\144\141\142\154\145", "\151\156\156\145\162", "\160\162\157\164\145\143\164\145\144", \r
 "\167\151\164\150\151\156", "\143\157\156\163\164\162\141\151\156\145\144\142\171", \r
-"\145\170\164\145\156\144\163", "\151\156\160\165\164", "\160\165\142\154\151\143", "\144\145\162", \r
+"\145\170\164\145\156\144\163", "\151\156\160\165\164", "\160\165\142\154\151\143", \r
 "\145\170\164\145\162\156\141\154", "\154\157\157\160", "\162\145\143\157\162\144", "\50", "\51", "\173", "\175", \r
 "\133", "\135", "\56", "\72", "\73", "\54", "\74", "\74\75", "\76", "\76\75", \r
 "\75\75", "\74\76", "\53", "\55", "\56\53", "\56\55", "\52", "\57", "\56\52", "\56\57", \r
@@ -1137,7 +1133,7 @@ public static final String[] lexStateNames = {
    "DEFAULT",\r
 };\r
 static final long[] jjtoToken = {
-   0xfffffffffffffff1L, 0x3fffffffL, 
+   0xfffffffffffffff1L, 0xfffffffL, 
 };\r
 static final long[] jjtoSkip = {
    0xeL, 0x0L, 
@@ -1296,7 +1292,7 @@ void TokenLexicalActions(Token matchedToken)
 {\r
    switch(jjmatchedKind)\r
    {\r
-      case 91 :\r
+      case 89 :\r
         image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));\r
       matchedToken.image = matchedToken.image.substring(1,matchedToken.image.length()-1);\r
          break;\r