velocity-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nbu...@apache.org
Subject svn commit: r752697 [2/3] - in /velocity/engine/branches/2.0_Exp/src: java/org/apache/velocity/runtime/parser/ java/org/apache/velocity/runtime/parser/node/ parser/ test/org/apache/velocity/test/
Date Wed, 11 Mar 2009 23:45:28 GMT
Modified: velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/parser/ParserTokenManager.java
URL: http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/parser/ParserTokenManager.java?rev=752697&r1=752696&r2=752697&view=diff
==============================================================================
--- velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/parser/ParserTokenManager.java (original)
+++ velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/parser/ParserTokenManager.java Wed Mar 11 23:45:28 2009
@@ -12,6 +12,7 @@
 import org.apache.commons.lang.text.StrBuilder;
 import org.apache.velocity.runtime.RuntimeConstants;
 
+/** Token Manager. */
 public class ParserTokenManager implements ParserConstants
 {
     private int fileDepth = 0;
@@ -169,7 +170,10 @@
             }
         }
     }
+
+  /** Debug output. */
   public  java.io.PrintStream debugStream = System.out;
+  /** Set debug output. */
   public  void setDebugStream(java.io.PrintStream ds) { debugStream = ds; }
 private final int jjStopStringLiteralDfa_3(int pos, long active0)
 {
@@ -178,44 +182,44 @@
       case 0:
          if ((active0 & 0x40L) != 0L)
             return 58;
-         if ((active0 & 0x4000000000L) != 0L)
+         if ((active0 & 0x1000000000L) != 0L)
             return 101;
          if ((active0 & 0x100L) != 0L)
             return 65;
-         if ((active0 & 0x1800000000L) != 0L)
+         if ((active0 & 0x600000000L) != 0L)
          {
-            jjmatchedKind = 63;
+            jjmatchedKind = 61;
             return 63;
          }
-         if ((active0 & 0x10000000000000L) != 0L)
+         if ((active0 & 0x4000000000000L) != 0L)
             return 50;
-         if ((active0 & 0xe80000L) != 0L)
+         if ((active0 & 0x3a0000L) != 0L)
             return 7;
          return -1;
       case 1:
-         if ((active0 & 0x1800000000L) != 0L)
+         if ((active0 & 0x80000L) != 0L)
+            return 5;
+         if ((active0 & 0x600000000L) != 0L)
          {
-            jjmatchedKind = 63;
+            jjmatchedKind = 61;
             jjmatchedPos = 1;
             return 63;
          }
-         if ((active0 & 0x200000L) != 0L)
-            return 5;
          return -1;
       case 2:
-         if ((active0 & 0x1800000000L) != 0L)
+         if ((active0 & 0x600000000L) != 0L)
          {
-            jjmatchedKind = 63;
+            jjmatchedKind = 61;
             jjmatchedPos = 2;
             return 63;
          }
          return -1;
       case 3:
-         if ((active0 & 0x800000000L) != 0L)
+         if ((active0 & 0x200000000L) != 0L)
             return 63;
-         if ((active0 & 0x1000000000L) != 0L)
+         if ((active0 & 0x400000000L) != 0L)
          {
-            jjmatchedKind = 63;
+            jjmatchedKind = 61;
             jjmatchedPos = 3;
             return 63;
          }
@@ -228,55 +232,47 @@
 {
    return jjMoveNfa_3(jjStopStringLiteralDfa_3(pos, active0), pos + 1);
 }
-private final int jjStopAtPos(int pos, int kind)
+private int jjStopAtPos(int pos, int kind)
 {
    jjmatchedKind = kind;
    jjmatchedPos = pos;
    return pos + 1;
 }
-private final int jjStartNfaWithStates_3(int pos, int kind, int state)
-{
-   jjmatchedKind = kind;
-   jjmatchedPos = pos;
-   try { curChar = input_stream.readChar(); }
-   catch(java.io.IOException e) { return pos + 1; }
-   return jjMoveNfa_3(state, pos + 1);
-}
-private final int jjMoveStringLiteralDfa0_3()
+private int jjMoveStringLiteralDfa0_3()
 {
    switch(curChar)
    {
       case 35:
-         jjmatchedKind = 22;
-         return jjMoveStringLiteralDfa1_3(0xa80000L);
+         jjmatchedKind = 20;
+         return jjMoveStringLiteralDfa1_3(0x2a0000L);
       case 37:
-         return jjStopAtPos(0, 42);
+         return jjStopAtPos(0, 40);
       case 40:
          return jjStopAtPos(0, 10);
       case 42:
-         return jjStopAtPos(0, 40);
+         return jjStopAtPos(0, 38);
       case 43:
-         return jjStopAtPos(0, 39);
+         return jjStopAtPos(0, 37);
       case 44:
          return jjStopAtPos(0, 5);
       case 45:
-         return jjStartNfaWithStates_3(0, 38, 101);
+         return jjStartNfaWithStates_3(0, 36, 101);
       case 46:
          return jjMoveStringLiteralDfa1_3(0x40L);
       case 47:
-         return jjStopAtPos(0, 41);
+         return jjStopAtPos(0, 39);
       case 58:
          return jjStopAtPos(0, 7);
       case 61:
-         return jjStartNfaWithStates_3(0, 52, 50);
+         return jjStartNfaWithStates_3(0, 50, 50);
       case 91:
          return jjStopAtPos(0, 3);
       case 93:
          return jjStopAtPos(0, 4);
       case 102:
-         return jjMoveStringLiteralDfa1_3(0x1000000000L);
+         return jjMoveStringLiteralDfa1_3(0x400000000L);
       case 116:
-         return jjMoveStringLiteralDfa1_3(0x800000000L);
+         return jjMoveStringLiteralDfa1_3(0x200000000L);
       case 123:
          return jjStartNfaWithStates_3(0, 8, 65);
       case 125:
@@ -285,7 +281,7 @@
          return jjMoveNfa_3(0, 0);
    }
 }
-private final int jjMoveStringLiteralDfa1_3(long active0)
+private int jjMoveStringLiteralDfa1_3(long active0)
 {
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
@@ -295,32 +291,32 @@
    switch(curChar)
    {
       case 35:
-         if ((active0 & 0x800000L) != 0L)
-            return jjStopAtPos(1, 23);
+         if ((active0 & 0x200000L) != 0L)
+            return jjStopAtPos(1, 21);
          break;
       case 42:
-         if ((active0 & 0x200000L) != 0L)
-            return jjStartNfaWithStates_3(1, 21, 5);
+         if ((active0 & 0x80000L) != 0L)
+            return jjStartNfaWithStates_3(1, 19, 5);
          break;
       case 46:
          if ((active0 & 0x40L) != 0L)
             return jjStopAtPos(1, 6);
          break;
       case 91:
-         return jjMoveStringLiteralDfa2_3(active0, 0x80000L);
+         return jjMoveStringLiteralDfa2_3(active0, 0x20000L);
       case 97:
-         return jjMoveStringLiteralDfa2_3(active0, 0x1000000000L);
+         return jjMoveStringLiteralDfa2_3(active0, 0x400000000L);
       case 114:
-         return jjMoveStringLiteralDfa2_3(active0, 0x800000000L);
+         return jjMoveStringLiteralDfa2_3(active0, 0x200000000L);
       default :
          break;
    }
    return jjStartNfa_3(0, active0);
 }
-private final int jjMoveStringLiteralDfa2_3(long old0, long active0)
+private int jjMoveStringLiteralDfa2_3(long old0, long active0)
 {
    if (((active0 &= old0)) == 0L)
-      return jjStartNfa_3(0, old0); 
+      return jjStartNfa_3(0, old0);
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
       jjStopStringLiteralDfa_3(1, active0);
@@ -329,22 +325,22 @@
    switch(curChar)
    {
       case 91:
-         if ((active0 & 0x80000L) != 0L)
-            return jjStopAtPos(2, 19);
+         if ((active0 & 0x20000L) != 0L)
+            return jjStopAtPos(2, 17);
          break;
       case 108:
-         return jjMoveStringLiteralDfa3_3(active0, 0x1000000000L);
+         return jjMoveStringLiteralDfa3_3(active0, 0x400000000L);
       case 117:
-         return jjMoveStringLiteralDfa3_3(active0, 0x800000000L);
+         return jjMoveStringLiteralDfa3_3(active0, 0x200000000L);
       default :
          break;
    }
    return jjStartNfa_3(1, active0);
 }
-private final int jjMoveStringLiteralDfa3_3(long old0, long active0)
+private int jjMoveStringLiteralDfa3_3(long old0, long active0)
 {
    if (((active0 &= old0)) == 0L)
-      return jjStartNfa_3(1, old0); 
+      return jjStartNfa_3(1, old0);
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
       jjStopStringLiteralDfa_3(2, active0);
@@ -353,20 +349,20 @@
    switch(curChar)
    {
       case 101:
-         if ((active0 & 0x800000000L) != 0L)
-            return jjStartNfaWithStates_3(3, 35, 63);
+         if ((active0 & 0x200000000L) != 0L)
+            return jjStartNfaWithStates_3(3, 33, 63);
          break;
       case 115:
-         return jjMoveStringLiteralDfa4_3(active0, 0x1000000000L);
+         return jjMoveStringLiteralDfa4_3(active0, 0x400000000L);
       default :
          break;
    }
    return jjStartNfa_3(2, active0);
 }
-private final int jjMoveStringLiteralDfa4_3(long old0, long active0)
+private int jjMoveStringLiteralDfa4_3(long old0, long active0)
 {
    if (((active0 &= old0)) == 0L)
-      return jjStartNfa_3(2, old0); 
+      return jjStartNfa_3(2, old0);
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
       jjStopStringLiteralDfa_3(3, active0);
@@ -375,43 +371,21 @@
    switch(curChar)
    {
       case 101:
-         if ((active0 & 0x1000000000L) != 0L)
-            return jjStartNfaWithStates_3(4, 36, 63);
+         if ((active0 & 0x400000000L) != 0L)
+            return jjStartNfaWithStates_3(4, 34, 63);
          break;
       default :
          break;
    }
    return jjStartNfa_3(3, active0);
 }
-private final void jjCheckNAdd(int state)
-{
-   if (jjrounds[state] != jjround)
-   {
-      jjstateSet[jjnewStateCnt++] = state;
-      jjrounds[state] = jjround;
-   }
-}
-private final void jjAddStates(int start, int end)
-{
-   do {
-      jjstateSet[jjnewStateCnt++] = jjnextStates[start];
-   } while (start++ != end);
-}
-private final void jjCheckNAddTwoStates(int state1, int state2)
-{
-   jjCheckNAdd(state1);
-   jjCheckNAdd(state2);
-}
-private final void jjCheckNAddStates(int start, int end)
-{
-   do {
-      jjCheckNAdd(jjnextStates[start]);
-   } while (start++ != end);
-}
-private final void jjCheckNAddStates(int start)
+private int jjStartNfaWithStates_3(int pos, int kind, int state)
 {
-   jjCheckNAdd(jjnextStates[start]);
-   jjCheckNAdd(jjnextStates[start + 1]);
+   jjmatchedKind = kind;
+   jjmatchedPos = pos;
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) { return pos + 1; }
+   return jjMoveNfa_3(state, pos + 1);
 }
 static final long[] jjbitVec0 = {
    0xfffffffffffffffeL, 0xffffffffffffffffL, 0xffffffffffffffffL, 0xffffffffffffffffL
@@ -419,14 +393,13 @@
 static final long[] jjbitVec2 = {
    0x0L, 0x0L, 0xffffffffffffffffL, 0xffffffffffffffffL
 };
-private final int jjMoveNfa_3(int startState, int curPos)
+private int jjMoveNfa_3(int startState, int curPos)
 {
-   int[] nextStates;
    int startsAt = 0;
    jjnewStateCnt = 101;
    int i = 1;
    jjstateSet[0] = startState;
-   int j, kind = 0x7fffffff;
+   int kind = 0x7fffffff;
    for (;;)
    {
       if (++jjround == 0x7fffffff)
@@ -434,37 +407,37 @@
       if (curChar < 64)
       {
          long l = 1L << curChar;
-         MatchLoop: do
+         do
          {
             switch(jjstateSet[--i])
             {
                case 0:
                   if ((0x3ff000000000000L & l) != 0L)
                   {
-                     if (kind > 58)
-                        kind = 58;
+                     if (kind > 56)
+                        kind = 56;
                      jjCheckNAddStates(0, 5);
                   }
                   else if ((0x100002600L & l) != 0L)
                   {
-                     if (kind > 33)
-                        kind = 33;
+                     if (kind > 31)
+                        kind = 31;
                      jjCheckNAdd(9);
                   }
                   else if (curChar == 45)
                      jjCheckNAddStates(6, 9);
                   else if (curChar == 36)
                   {
-                     if (kind > 17)
-                        kind = 17;
+                     if (kind > 15)
+                        kind = 15;
                      jjCheckNAddTwoStates(73, 74);
                   }
                   else if (curChar == 46)
                      jjCheckNAdd(58);
                   else if (curChar == 33)
                   {
-                     if (kind > 51)
-                        kind = 51;
+                     if (kind > 49)
+                        kind = 49;
                   }
                   else if (curChar == 61)
                      jjstateSet[jjnewStateCnt++] = 50;
@@ -488,20 +461,20 @@
                   }
                   if ((0x2400L & l) != 0L)
                   {
-                     if (kind > 37)
-                        kind = 37;
+                     if (kind > 35)
+                        kind = 35;
                   }
                   else if (curChar == 33)
                      jjstateSet[jjnewStateCnt++] = 54;
                   else if (curChar == 62)
                   {
-                     if (kind > 47)
-                        kind = 47;
+                     if (kind > 45)
+                        kind = 45;
                   }
                   else if (curChar == 60)
                   {
-                     if (kind > 45)
-                        kind = 45;
+                     if (kind > 43)
+                        kind = 43;
                   }
                   if (curChar == 13)
                      jjstateSet[jjnewStateCnt++] = 33;
@@ -515,8 +488,8 @@
                      jjCheckNAddTwoStates(90, 91);
                   if ((0x3ff000000000000L & l) != 0L)
                   {
-                     if (kind > 58)
-                        kind = 58;
+                     if (kind > 56)
+                        kind = 56;
                      jjCheckNAddTwoStates(87, 89);
                   }
                   break;
@@ -541,8 +514,8 @@
                      jjstateSet[jjnewStateCnt++] = 6;
                   break;
                case 6:
-                  if ((0xfffffff7ffffffffL & l) != 0L && kind > 20)
-                     kind = 20;
+                  if ((0xfffffff7ffffffffL & l) != 0L && kind > 18)
+                     kind = 18;
                   break;
                case 7:
                   if (curChar == 42)
@@ -555,8 +528,8 @@
                case 9:
                   if ((0x100002600L & l) == 0L)
                      break;
-                  if (kind > 33)
-                     kind = 33;
+                  if (kind > 31)
+                     kind = 31;
                   jjCheckNAdd(9);
                   break;
                case 10:
@@ -568,8 +541,8 @@
                      jjCheckNAddStates(13, 15);
                   break;
                case 12:
-                  if (curChar == 34 && kind > 34)
-                     kind = 34;
+                  if (curChar == 34 && kind > 32)
+                     kind = 32;
                   break;
                case 14:
                   if ((0x8400000000L & l) != 0L)
@@ -632,72 +605,72 @@
                      jjCheckNAddStates(10, 12);
                   break;
                case 31:
-                  if (curChar == 39 && kind > 34)
-                     kind = 34;
+                  if (curChar == 39 && kind > 32)
+                     kind = 32;
                   break;
                case 32:
-                  if ((0x2400L & l) != 0L && kind > 37)
-                     kind = 37;
+                  if ((0x2400L & l) != 0L && kind > 35)
+                     kind = 35;
                   break;
                case 33:
-                  if (curChar == 10 && kind > 37)
-                     kind = 37;
+                  if (curChar == 10 && kind > 35)
+                     kind = 35;
                   break;
                case 34:
                   if (curChar == 13)
                      jjstateSet[jjnewStateCnt++] = 33;
                   break;
                case 35:
-                  if (curChar == 38 && kind > 43)
-                     kind = 43;
+                  if (curChar == 38 && kind > 41)
+                     kind = 41;
                   break;
                case 36:
                   if (curChar == 38)
                      jjstateSet[jjnewStateCnt++] = 35;
                   break;
                case 44:
-                  if (curChar == 60 && kind > 45)
-                     kind = 45;
+                  if (curChar == 60 && kind > 43)
+                     kind = 43;
                   break;
                case 45:
-                  if (curChar == 61 && kind > 46)
-                     kind = 46;
+                  if (curChar == 61 && kind > 44)
+                     kind = 44;
                   break;
                case 46:
                   if (curChar == 60)
                      jjstateSet[jjnewStateCnt++] = 45;
                   break;
                case 47:
-                  if (curChar == 62 && kind > 47)
-                     kind = 47;
+                  if (curChar == 62 && kind > 45)
+                     kind = 45;
                   break;
                case 48:
-                  if (curChar == 61 && kind > 48)
-                     kind = 48;
+                  if (curChar == 61 && kind > 46)
+                     kind = 46;
                   break;
                case 49:
                   if (curChar == 62)
                      jjstateSet[jjnewStateCnt++] = 48;
                   break;
                case 50:
-                  if (curChar == 61 && kind > 49)
-                     kind = 49;
+                  if (curChar == 61 && kind > 47)
+                     kind = 47;
                   break;
                case 51:
                   if (curChar == 61)
                      jjstateSet[jjnewStateCnt++] = 50;
                   break;
                case 54:
-                  if (curChar == 61 && kind > 50)
-                     kind = 50;
+                  if (curChar == 61 && kind > 48)
+                     kind = 48;
                   break;
                case 55:
                   if (curChar == 33)
                      jjstateSet[jjnewStateCnt++] = 54;
                   break;
                case 56:
-                  if (curChar == 33 && kind > 51)
-                     kind = 51;
+                  if (curChar == 33 && kind > 49)
+                     kind = 49;
                   break;
                case 57:
                   if (curChar == 46)
@@ -706,8 +679,8 @@
                case 58:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 59)
-                     kind = 59;
+                  if (kind > 57)
+                     kind = 57;
                   jjCheckNAddTwoStates(58, 59);
                   break;
                case 60:
@@ -717,15 +690,15 @@
                case 61:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 59)
-                     kind = 59;
+                  if (kind > 57)
+                     kind = 57;
                   jjCheckNAdd(61);
                   break;
                case 63:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 63)
-                     kind = 63;
+                  if (kind > 61)
+                     kind = 61;
                   jjstateSet[jjnewStateCnt++] = 63;
                   break;
                case 66:
@@ -733,22 +706,22 @@
                      jjAddStates(27, 28);
                   break;
                case 70:
-                  if (curChar == 36 && kind > 17)
-                     kind = 17;
+                  if (curChar == 36 && kind > 15)
+                     kind = 15;
                   break;
                case 72:
                   if (curChar == 36)
                      jjCheckNAddTwoStates(73, 74);
                   break;
                case 74:
-                  if (curChar == 33 && kind > 18)
-                     kind = 18;
+                  if (curChar == 33 && kind > 16)
+                     kind = 16;
                   break;
                case 75:
                   if (curChar != 36)
                      break;
-                  if (kind > 17)
-                     kind = 17;
+                  if (kind > 15)
+                     kind = 15;
                   jjCheckNAddTwoStates(73, 74);
                   break;
                case 86:
@@ -758,13 +731,13 @@
                case 87:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 58)
-                     kind = 58;
+                  if (kind > 56)
+                     kind = 56;
                   jjCheckNAddTwoStates(87, 89);
                   break;
                case 88:
-                  if (curChar == 46 && kind > 58)
-                     kind = 58;
+                  if (curChar == 46 && kind > 56)
+                     kind = 56;
                   break;
                case 89:
                   if (curChar == 46)
@@ -777,15 +750,15 @@
                case 91:
                   if (curChar != 46)
                      break;
-                  if (kind > 59)
-                     kind = 59;
+                  if (kind > 57)
+                     kind = 57;
                   jjCheckNAddTwoStates(92, 93);
                   break;
                case 92:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 59)
-                     kind = 59;
+                  if (kind > 57)
+                     kind = 57;
                   jjCheckNAddTwoStates(92, 93);
                   break;
                case 94:
@@ -795,8 +768,8 @@
                case 95:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 59)
-                     kind = 59;
+                  if (kind > 57)
+                     kind = 57;
                   jjCheckNAdd(95);
                   break;
                case 96:
@@ -810,15 +783,15 @@
                case 99:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 59)
-                     kind = 59;
+                  if (kind > 57)
+                     kind = 57;
                   jjCheckNAdd(99);
                   break;
                case 100:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 58)
-                     kind = 58;
+                  if (kind > 56)
+                     kind = 56;
                   jjCheckNAddStates(0, 5);
                   break;
                default : break;
@@ -828,15 +801,15 @@
       else if (curChar < 128)
       {
          long l = 1L << (curChar & 077);
-         MatchLoop: do
+         do
          {
             switch(jjstateSet[--i])
             {
                case 0:
                   if ((0x7fffffe87ffffffL & l) != 0L)
                   {
-                     if (kind > 63)
-                        kind = 63;
+                     if (kind > 61)
+                        kind = 61;
                      jjCheckNAdd(63);
                   }
                   else if (curChar == 92)
@@ -859,8 +832,8 @@
                      jjstateSet[jjnewStateCnt++] = 38;
                   break;
                case 6:
-                  if (kind > 20)
-                     kind = 20;
+                  if (kind > 18)
+                     kind = 18;
                   break;
                case 11:
                   jjCheckNAddStates(13, 15);
@@ -901,8 +874,8 @@
                      jjAddStates(25, 26);
                   break;
                case 37:
-                  if (curChar == 100 && kind > 43)
-                     kind = 43;
+                  if (curChar == 100 && kind > 41)
+                     kind = 41;
                   break;
                case 38:
                   if (curChar == 110)
@@ -913,24 +886,24 @@
                      jjstateSet[jjnewStateCnt++] = 38;
                   break;
                case 40:
-                  if (curChar == 124 && kind > 44)
-                     kind = 44;
+                  if (curChar == 124 && kind > 42)
+                     kind = 42;
                   break;
                case 41:
                   if (curChar == 124)
                      jjstateSet[jjnewStateCnt++] = 40;
                   break;
                case 42:
-                  if (curChar == 114 && kind > 44)
-                     kind = 44;
+                  if (curChar == 114 && kind > 42)
+                     kind = 42;
                   break;
                case 43:
                   if (curChar == 111)
                      jjstateSet[jjnewStateCnt++] = 42;
                   break;
                case 52:
-                  if (curChar == 113 && kind > 49)
-                     kind = 49;
+                  if (curChar == 113 && kind > 47)
+                     kind = 47;
                   break;
                case 53:
                   if (curChar == 101)
@@ -943,15 +916,15 @@
                case 62:
                   if ((0x7fffffe87ffffffL & l) == 0L)
                      break;
-                  if (kind > 63)
-                     kind = 63;
+                  if (kind > 61)
+                     kind = 61;
                   jjCheckNAdd(63);
                   break;
                case 63:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
-                  if (kind > 63)
-                     kind = 63;
+                  if (kind > 61)
+                     kind = 61;
                   jjCheckNAdd(63);
                   break;
                case 64:
@@ -967,8 +940,8 @@
                      jjCheckNAddTwoStates(66, 67);
                   break;
                case 67:
-                  if (curChar == 125 && kind > 64)
-                     kind = 64;
+                  if (curChar == 125 && kind > 62)
+                     kind = 62;
                   break;
                case 68:
                   if (curChar == 92)
@@ -991,36 +964,36 @@
                      jjAddStates(37, 38);
                   break;
                case 77:
-                  if (curChar == 116 && kind > 45)
-                     kind = 45;
+                  if (curChar == 116 && kind > 43)
+                     kind = 43;
                   break;
                case 78:
-                  if (curChar == 101 && kind > 46)
-                     kind = 46;
+                  if (curChar == 101 && kind > 44)
+                     kind = 44;
                   break;
                case 79:
                   if (curChar == 103)
                      jjAddStates(35, 36);
                   break;
                case 80:
-                  if (curChar == 116 && kind > 47)
-                     kind = 47;
+                  if (curChar == 116 && kind > 45)
+                     kind = 45;
                   break;
                case 81:
-                  if (curChar == 101 && kind > 48)
-                     kind = 48;
+                  if (curChar == 101 && kind > 46)
+                     kind = 46;
                   break;
                case 82:
                   if (curChar == 110)
                      jjAddStates(33, 34);
                   break;
                case 83:
-                  if (curChar == 101 && kind > 50)
-                     kind = 50;
+                  if (curChar == 101 && kind > 48)
+                     kind = 48;
                   break;
                case 84:
-                  if (curChar == 116 && kind > 51)
-                     kind = 51;
+                  if (curChar == 116 && kind > 49)
+                     kind = 49;
                   break;
                case 85:
                   if (curChar == 111)
@@ -1045,13 +1018,13 @@
          long l1 = 1L << (hiByte & 077);
          int i2 = (curChar & 0xff) >> 6;
          long l2 = 1L << (curChar & 077);
-         MatchLoop: do
+         do
          {
             switch(jjstateSet[--i])
             {
                case 6:
-                  if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 20)
-                     kind = 20;
+                  if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 18)
+                     kind = 18;
                   break;
                case 11:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
@@ -1083,11 +1056,11 @@
    switch (pos)
    {
       case 0:
-         if ((active0 & 0xe80000L) != 0L)
+         if ((active0 & 0x3a0000L) != 0L)
             return 2;
          return -1;
       case 1:
-         if ((active0 & 0x200000L) != 0L)
+         if ((active0 & 0x80000L) != 0L)
             return 0;
          return -1;
       default :
@@ -1098,26 +1071,18 @@
 {
    return jjMoveNfa_11(jjStopStringLiteralDfa_11(pos, active0), pos + 1);
 }
-private final int jjStartNfaWithStates_11(int pos, int kind, int state)
-{
-   jjmatchedKind = kind;
-   jjmatchedPos = pos;
-   try { curChar = input_stream.readChar(); }
-   catch(java.io.IOException e) { return pos + 1; }
-   return jjMoveNfa_11(state, pos + 1);
-}
-private final int jjMoveStringLiteralDfa0_11()
+private int jjMoveStringLiteralDfa0_11()
 {
    switch(curChar)
    {
       case 35:
-         jjmatchedKind = 22;
-         return jjMoveStringLiteralDfa1_11(0xa80000L);
+         jjmatchedKind = 20;
+         return jjMoveStringLiteralDfa1_11(0x2a0000L);
       default :
          return jjMoveNfa_11(3, 0);
    }
 }
-private final int jjMoveStringLiteralDfa1_11(long active0)
+private int jjMoveStringLiteralDfa1_11(long active0)
 {
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
@@ -1127,24 +1092,24 @@
    switch(curChar)
    {
       case 35:
-         if ((active0 & 0x800000L) != 0L)
-            return jjStopAtPos(1, 23);
+         if ((active0 & 0x200000L) != 0L)
+            return jjStopAtPos(1, 21);
          break;
       case 42:
-         if ((active0 & 0x200000L) != 0L)
-            return jjStartNfaWithStates_11(1, 21, 0);
+         if ((active0 & 0x80000L) != 0L)
+            return jjStartNfaWithStates_11(1, 19, 0);
          break;
       case 91:
-         return jjMoveStringLiteralDfa2_11(active0, 0x80000L);
+         return jjMoveStringLiteralDfa2_11(active0, 0x20000L);
       default :
          break;
    }
    return jjStartNfa_11(0, active0);
 }
-private final int jjMoveStringLiteralDfa2_11(long old0, long active0)
+private int jjMoveStringLiteralDfa2_11(long old0, long active0)
 {
    if (((active0 &= old0)) == 0L)
-      return jjStartNfa_11(0, old0); 
+      return jjStartNfa_11(0, old0);
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
       jjStopStringLiteralDfa_11(1, active0);
@@ -1153,22 +1118,29 @@
    switch(curChar)
    {
       case 91:
-         if ((active0 & 0x80000L) != 0L)
-            return jjStopAtPos(2, 19);
+         if ((active0 & 0x20000L) != 0L)
+            return jjStopAtPos(2, 17);
          break;
       default :
          break;
    }
    return jjStartNfa_11(1, active0);
 }
-private final int jjMoveNfa_11(int startState, int curPos)
+private int jjStartNfaWithStates_11(int pos, int kind, int state)
+{
+   jjmatchedKind = kind;
+   jjmatchedPos = pos;
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) { return pos + 1; }
+   return jjMoveNfa_11(state, pos + 1);
+}
+private int jjMoveNfa_11(int startState, int curPos)
 {
-   int[] nextStates;
    int startsAt = 0;
    jjnewStateCnt = 83;
    int i = 1;
    jjstateSet[0] = startState;
-   int j, kind = 0x7fffffff;
+   int kind = 0x7fffffff;
    for (;;)
    {
       if (++jjround == 0x7fffffff)
@@ -1176,23 +1148,23 @@
       if (curChar < 64)
       {
          long l = 1L << curChar;
-         MatchLoop: do
+         do
          {
             switch(jjstateSet[--i])
             {
                case 3:
                   if ((0x3ff000000000000L & l) != 0L)
                   {
-                     if (kind > 58)
-                        kind = 58;
+                     if (kind > 56)
+                        kind = 56;
                      jjCheckNAddStates(53, 58);
                   }
                   else if (curChar == 45)
                      jjCheckNAddStates(59, 62);
                   else if (curChar == 36)
                   {
-                     if (kind > 17)
-                        kind = 17;
+                     if (kind > 15)
+                        kind = 15;
                      jjCheckNAddTwoStates(22, 23);
                   }
                   else if (curChar == 46)
@@ -1205,8 +1177,8 @@
                      jjstateSet[jjnewStateCnt++] = 1;
                   break;
                case 1:
-                  if ((0xfffffff7ffffffffL & l) != 0L && kind > 20)
-                     kind = 20;
+                  if ((0xfffffff7ffffffffL & l) != 0L && kind > 18)
+                     kind = 18;
                   break;
                case 2:
                   if (curChar == 42)
@@ -1219,8 +1191,8 @@
                case 7:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 59)
-                     kind = 59;
+                  if (kind > 57)
+                     kind = 57;
                   jjCheckNAddTwoStates(7, 8);
                   break;
                case 9:
@@ -1230,15 +1202,15 @@
                case 10:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 59)
-                     kind = 59;
+                  if (kind > 57)
+                     kind = 57;
                   jjCheckNAdd(10);
                   break;
                case 12:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 63)
-                     kind = 63;
+                  if (kind > 61)
+                     kind = 61;
                   jjstateSet[jjnewStateCnt++] = 12;
                   break;
                case 15:
@@ -1246,22 +1218,22 @@
                      jjAddStates(63, 64);
                   break;
                case 19:
-                  if (curChar == 36 && kind > 17)
-                     kind = 17;
+                  if (curChar == 36 && kind > 15)
+                     kind = 15;
                   break;
                case 21:
                   if (curChar == 36)
                      jjCheckNAddTwoStates(22, 23);
                   break;
                case 23:
-                  if (curChar == 33 && kind > 18)
-                     kind = 18;
+                  if (curChar == 33 && kind > 16)
+                     kind = 16;
                   break;
                case 24:
                   if (curChar != 36)
                      break;
-                  if (kind > 17)
-                     kind = 17;
+                  if (kind > 15)
+                     kind = 15;
                   jjCheckNAddTwoStates(22, 23);
                   break;
                case 27:
@@ -1269,12 +1241,12 @@
                      jjCheckNAddStates(65, 67);
                   break;
                case 28:
-                  if ((0x2400L & l) != 0L && kind > 53)
-                     kind = 53;
+                  if ((0x2400L & l) != 0L && kind > 51)
+                     kind = 51;
                   break;
                case 29:
-                  if (curChar == 10 && kind > 53)
-                     kind = 53;
+                  if (curChar == 10 && kind > 51)
+                     kind = 51;
                   break;
                case 30:
                case 47:
@@ -1286,12 +1258,12 @@
                      jjCheckNAddStates(68, 70);
                   break;
                case 39:
-                  if ((0x2400L & l) != 0L && kind > 56)
-                     kind = 56;
+                  if ((0x2400L & l) != 0L && kind > 54)
+                     kind = 54;
                   break;
                case 40:
-                  if (curChar == 10 && kind > 56)
-                     kind = 56;
+                  if (curChar == 10 && kind > 54)
+                     kind = 54;
                   break;
                case 41:
                case 63:
@@ -1313,13 +1285,13 @@
                case 69:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 58)
-                     kind = 58;
+                  if (kind > 56)
+                     kind = 56;
                   jjCheckNAddTwoStates(69, 71);
                   break;
                case 70:
-                  if (curChar == 46 && kind > 58)
-                     kind = 58;
+                  if (curChar == 46 && kind > 56)
+                     kind = 56;
                   break;
                case 71:
                   if (curChar == 46)
@@ -1332,15 +1304,15 @@
                case 73:
                   if (curChar != 46)
                      break;
-                  if (kind > 59)
-                     kind = 59;
+                  if (kind > 57)
+                     kind = 57;
                   jjCheckNAddTwoStates(74, 75);
                   break;
                case 74:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 59)
-                     kind = 59;
+                  if (kind > 57)
+                     kind = 57;
                   jjCheckNAddTwoStates(74, 75);
                   break;
                case 76:
@@ -1350,8 +1322,8 @@
                case 77:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 59)
-                     kind = 59;
+                  if (kind > 57)
+                     kind = 57;
                   jjCheckNAdd(77);
                   break;
                case 78:
@@ -1365,15 +1337,15 @@
                case 81:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 59)
-                     kind = 59;
+                  if (kind > 57)
+                     kind = 57;
                   jjCheckNAdd(81);
                   break;
                case 82:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 58)
-                     kind = 58;
+                  if (kind > 56)
+                     kind = 56;
                   jjCheckNAddStates(53, 58);
                   break;
                default : break;
@@ -1383,15 +1355,15 @@
       else if (curChar < 128)
       {
          long l = 1L << (curChar & 077);
-         MatchLoop: do
+         do
          {
             switch(jjstateSet[--i])
             {
                case 3:
                   if ((0x7fffffe87ffffffL & l) != 0L)
                   {
-                     if (kind > 63)
-                        kind = 63;
+                     if (kind > 61)
+                        kind = 61;
                      jjCheckNAdd(12);
                   }
                   else if (curChar == 123)
@@ -1406,12 +1378,12 @@
                      jjstateSet[jjnewStateCnt++] = 4;
                   break;
                case 1:
-                  if (kind > 20)
-                     kind = 20;
+                  if (kind > 18)
+                     kind = 18;
                   break;
                case 4:
-                  if (curChar == 102 && kind > 54)
-                     kind = 54;
+                  if (curChar == 102 && kind > 52)
+                     kind = 52;
                   break;
                case 5:
                   if (curChar == 105)
@@ -1424,15 +1396,15 @@
                case 11:
                   if ((0x7fffffe87ffffffL & l) == 0L)
                      break;
-                  if (kind > 63)
-                     kind = 63;
+                  if (kind > 61)
+                     kind = 61;
                   jjCheckNAdd(12);
                   break;
                case 12:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
-                  if (kind > 63)
-                     kind = 63;
+                  if (kind > 61)
+                     kind = 61;
                   jjCheckNAdd(12);
                   break;
                case 13:
@@ -1448,8 +1420,8 @@
                      jjCheckNAddTwoStates(15, 16);
                   break;
                case 16:
-                  if (curChar == 125 && kind > 64)
-                     kind = 64;
+                  if (curChar == 125 && kind > 62)
+                     kind = 62;
                   break;
                case 17:
                   if (curChar == 92)
@@ -1474,8 +1446,8 @@
                case 26:
                   if (curChar != 100)
                      break;
-                  if (kind > 53)
-                     kind = 53;
+                  if (kind > 51)
+                     kind = 51;
                   jjCheckNAddStates(65, 67);
                   break;
                case 31:
@@ -1483,8 +1455,8 @@
                      jjstateSet[jjnewStateCnt++] = 26;
                   break;
                case 32:
-                  if (curChar == 102 && kind > 55)
-                     kind = 55;
+                  if (curChar == 102 && kind > 53)
+                     kind = 53;
                   break;
                case 33:
                   if (curChar == 105)
@@ -1505,8 +1477,8 @@
                case 37:
                   if (curChar != 101)
                      break;
-                  if (kind > 56)
-                     kind = 56;
+                  if (kind > 54)
+                     kind = 54;
                   jjCheckNAddStates(68, 70);
                   break;
                case 42:
@@ -1524,8 +1496,8 @@
                case 45:
                   if (curChar != 125)
                      break;
-                  if (kind > 53)
-                     kind = 53;
+                  if (kind > 51)
+                     kind = 51;
                   jjCheckNAddStates(71, 73);
                   break;
                case 48:
@@ -1541,8 +1513,8 @@
                      jjstateSet[jjnewStateCnt++] = 49;
                   break;
                case 51:
-                  if (curChar == 125 && kind > 54)
-                     kind = 54;
+                  if (curChar == 125 && kind > 52)
+                     kind = 52;
                   break;
                case 52:
                   if (curChar == 102)
@@ -1553,8 +1525,8 @@
                      jjstateSet[jjnewStateCnt++] = 52;
                   break;
                case 54:
-                  if (curChar == 125 && kind > 55)
-                     kind = 55;
+                  if (curChar == 125 && kind > 53)
+                     kind = 53;
                   break;
                case 55:
                   if (curChar == 102)
@@ -1583,8 +1555,8 @@
                case 61:
                   if (curChar != 125)
                      break;
-                  if (kind > 56)
-                     kind = 56;
+                  if (kind > 54)
+                     kind = 54;
                   jjCheckNAddStates(74, 76);
                   break;
                case 64:
@@ -1622,13 +1594,13 @@
          long l1 = 1L << (hiByte & 077);
          int i2 = (curChar & 0xff) >> 6;
          long l2 = 1L << (curChar & 077);
-         MatchLoop: do
+         do
          {
             switch(jjstateSet[--i])
             {
                case 1:
-                  if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 20)
-                     kind = 20;
+                  if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 18)
+                     kind = 18;
                   break;
                default : break;
             }
@@ -1652,11 +1624,11 @@
    switch (pos)
    {
       case 0:
-         if ((active0 & 0x680000L) != 0L)
+         if ((active0 & 0x1a0000L) != 0L)
             return 2;
          return -1;
       case 1:
-         if ((active0 & 0x200000L) != 0L)
+         if ((active0 & 0x80000L) != 0L)
             return 0;
          return -1;
       default :
@@ -1667,28 +1639,20 @@
 {
    return jjMoveNfa_8(jjStopStringLiteralDfa_8(pos, active0), pos + 1);
 }
-private final int jjStartNfaWithStates_8(int pos, int kind, int state)
-{
-   jjmatchedKind = kind;
-   jjmatchedPos = pos;
-   try { curChar = input_stream.readChar(); }
-   catch(java.io.IOException e) { return pos + 1; }
-   return jjMoveNfa_8(state, pos + 1);
-}
-private final int jjMoveStringLiteralDfa0_8()
+private int jjMoveStringLiteralDfa0_8()
 {
    switch(curChar)
    {
       case 35:
-         jjmatchedKind = 22;
-         return jjMoveStringLiteralDfa1_8(0x280000L);
+         jjmatchedKind = 20;
+         return jjMoveStringLiteralDfa1_8(0xa0000L);
       case 42:
-         return jjMoveStringLiteralDfa1_8(0x20000000L);
+         return jjMoveStringLiteralDfa1_8(0x8000000L);
       default :
          return jjMoveNfa_8(3, 0);
    }
 }
-private final int jjMoveStringLiteralDfa1_8(long active0)
+private int jjMoveStringLiteralDfa1_8(long active0)
 {
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
@@ -1698,24 +1662,24 @@
    switch(curChar)
    {
       case 35:
-         if ((active0 & 0x20000000L) != 0L)
-            return jjStopAtPos(1, 29);
+         if ((active0 & 0x8000000L) != 0L)
+            return jjStopAtPos(1, 27);
          break;
       case 42:
-         if ((active0 & 0x200000L) != 0L)
-            return jjStartNfaWithStates_8(1, 21, 0);
+         if ((active0 & 0x80000L) != 0L)
+            return jjStartNfaWithStates_8(1, 19, 0);
          break;
       case 91:
-         return jjMoveStringLiteralDfa2_8(active0, 0x80000L);
+         return jjMoveStringLiteralDfa2_8(active0, 0x20000L);
       default :
          break;
    }
    return jjStartNfa_8(0, active0);
 }
-private final int jjMoveStringLiteralDfa2_8(long old0, long active0)
+private int jjMoveStringLiteralDfa2_8(long old0, long active0)
 {
    if (((active0 &= old0)) == 0L)
-      return jjStartNfa_8(0, old0); 
+      return jjStartNfa_8(0, old0);
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
       jjStopStringLiteralDfa_8(1, active0);
@@ -1724,22 +1688,29 @@
    switch(curChar)
    {
       case 91:
-         if ((active0 & 0x80000L) != 0L)
-            return jjStopAtPos(2, 19);
+         if ((active0 & 0x20000L) != 0L)
+            return jjStopAtPos(2, 17);
          break;
       default :
          break;
    }
    return jjStartNfa_8(1, active0);
 }
-private final int jjMoveNfa_8(int startState, int curPos)
+private int jjStartNfaWithStates_8(int pos, int kind, int state)
+{
+   jjmatchedKind = kind;
+   jjmatchedPos = pos;
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) { return pos + 1; }
+   return jjMoveNfa_8(state, pos + 1);
+}
+private int jjMoveNfa_8(int startState, int curPos)
 {
-   int[] nextStates;
    int startsAt = 0;
    jjnewStateCnt = 12;
    int i = 1;
    jjstateSet[0] = startState;
-   int j, kind = 0x7fffffff;
+   int kind = 0x7fffffff;
    for (;;)
    {
       if (++jjround == 0x7fffffff)
@@ -1747,15 +1718,15 @@
       if (curChar < 64)
       {
          long l = 1L << curChar;
-         MatchLoop: do
+         do
          {
             switch(jjstateSet[--i])
             {
                case 3:
                   if (curChar == 36)
                   {
-                     if (kind > 17)
-                        kind = 17;
+                     if (kind > 15)
+                        kind = 15;
                      jjCheckNAddTwoStates(9, 10);
                   }
                   else if (curChar == 35)
@@ -1766,30 +1737,30 @@
                      jjstateSet[jjnewStateCnt++] = 1;
                   break;
                case 1:
-                  if ((0xfffffff7ffffffffL & l) != 0L && kind > 20)
-                     kind = 20;
+                  if ((0xfffffff7ffffffffL & l) != 0L && kind > 18)
+                     kind = 18;
                   break;
                case 2:
                   if (curChar == 42)
                      jjstateSet[jjnewStateCnt++] = 0;
                   break;
                case 6:
-                  if (curChar == 36 && kind > 17)
-                     kind = 17;
+                  if (curChar == 36 && kind > 15)
+                     kind = 15;
                   break;
                case 8:
                   if (curChar == 36)
                      jjCheckNAddTwoStates(9, 10);
                   break;
                case 10:
-                  if (curChar == 33 && kind > 18)
-                     kind = 18;
+                  if (curChar == 33 && kind > 16)
+                     kind = 16;
                   break;
                case 11:
                   if (curChar != 36)
                      break;
-                  if (kind > 17)
-                     kind = 17;
+                  if (kind > 15)
+                     kind = 15;
                   jjCheckNAddTwoStates(9, 10);
                   break;
                default : break;
@@ -1799,7 +1770,7 @@
       else if (curChar < 128)
       {
          long l = 1L << (curChar & 077);
-         MatchLoop: do
+         do
          {
             switch(jjstateSet[--i])
             {
@@ -1808,8 +1779,8 @@
                      jjCheckNAddStates(94, 97);
                   break;
                case 1:
-                  if (kind > 20)
-                     kind = 20;
+                  if (kind > 18)
+                     kind = 18;
                   break;
                case 5:
                   if (curChar == 92)
@@ -1834,13 +1805,13 @@
          long l1 = 1L << (hiByte & 077);
          int i2 = (curChar & 0xff) >> 6;
          long l2 = 1L << (curChar & 077);
-         MatchLoop: do
+         do
          {
             switch(jjstateSet[--i])
             {
                case 1:
-                  if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 20)
-                     kind = 20;
+                  if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 18)
+                     kind = 18;
                   break;
                default : break;
             }
@@ -1864,11 +1835,11 @@
    switch (pos)
    {
       case 0:
-         if ((active0 & 0x680000L) != 0L)
+         if ((active0 & 0x1a0000L) != 0L)
             return 2;
          return -1;
       case 1:
-         if ((active0 & 0x200000L) != 0L)
+         if ((active0 & 0x80000L) != 0L)
             return 0;
          return -1;
       default :
@@ -1879,26 +1850,18 @@
 {
    return jjMoveNfa_6(jjStopStringLiteralDfa_6(pos, active0), pos + 1);
 }
-private final int jjStartNfaWithStates_6(int pos, int kind, int state)
-{
-   jjmatchedKind = kind;
-   jjmatchedPos = pos;
-   try { curChar = input_stream.readChar(); }
-   catch(java.io.IOException e) { return pos + 1; }
-   return jjMoveNfa_6(state, pos + 1);
-}
-private final int jjMoveStringLiteralDfa0_6()
+private int jjMoveStringLiteralDfa0_6()
 {
    switch(curChar)
    {
       case 35:
-         jjmatchedKind = 22;
-         return jjMoveStringLiteralDfa1_6(0x280000L);
+         jjmatchedKind = 20;
+         return jjMoveStringLiteralDfa1_6(0xa0000L);
       default :
          return jjMoveNfa_6(3, 0);
    }
 }
-private final int jjMoveStringLiteralDfa1_6(long active0)
+private int jjMoveStringLiteralDfa1_6(long active0)
 {
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
@@ -1908,20 +1871,20 @@
    switch(curChar)
    {
       case 42:
-         if ((active0 & 0x200000L) != 0L)
-            return jjStartNfaWithStates_6(1, 21, 0);
+         if ((active0 & 0x80000L) != 0L)
+            return jjStartNfaWithStates_6(1, 19, 0);
          break;
       case 91:
-         return jjMoveStringLiteralDfa2_6(active0, 0x80000L);
+         return jjMoveStringLiteralDfa2_6(active0, 0x20000L);
       default :
          break;
    }
    return jjStartNfa_6(0, active0);
 }
-private final int jjMoveStringLiteralDfa2_6(long old0, long active0)
+private int jjMoveStringLiteralDfa2_6(long old0, long active0)
 {
    if (((active0 &= old0)) == 0L)
-      return jjStartNfa_6(0, old0); 
+      return jjStartNfa_6(0, old0);
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
       jjStopStringLiteralDfa_6(1, active0);
@@ -1930,22 +1893,29 @@
    switch(curChar)
    {
       case 91:
-         if ((active0 & 0x80000L) != 0L)
-            return jjStopAtPos(2, 19);
+         if ((active0 & 0x20000L) != 0L)
+            return jjStopAtPos(2, 17);
          break;
       default :
          break;
    }
    return jjStartNfa_6(1, active0);
 }
-private final int jjMoveNfa_6(int startState, int curPos)
+private int jjStartNfaWithStates_6(int pos, int kind, int state)
+{
+   jjmatchedKind = kind;
+   jjmatchedPos = pos;
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) { return pos + 1; }
+   return jjMoveNfa_6(state, pos + 1);
+}
+private int jjMoveNfa_6(int startState, int curPos)
 {
-   int[] nextStates;
    int startsAt = 0;
    jjnewStateCnt = 12;
    int i = 1;
    jjstateSet[0] = startState;
-   int j, kind = 0x7fffffff;
+   int kind = 0x7fffffff;
    for (;;)
    {
       if (++jjround == 0x7fffffff)
@@ -1953,15 +1923,15 @@
       if (curChar < 64)
       {
          long l = 1L << curChar;
-         MatchLoop: do
+         do
          {
             switch(jjstateSet[--i])
             {
                case 3:
                   if (curChar == 36)
                   {
-                     if (kind > 17)
-                        kind = 17;
+                     if (kind > 15)
+                        kind = 15;
                      jjCheckNAddTwoStates(9, 10);
                   }
                   else if (curChar == 35)
@@ -1972,30 +1942,30 @@
                      jjstateSet[jjnewStateCnt++] = 1;
                   break;
                case 1:
-                  if ((0xfffffff7ffffffffL & l) != 0L && kind > 20)
-                     kind = 20;
+                  if ((0xfffffff7ffffffffL & l) != 0L && kind > 18)
+                     kind = 18;
                   break;
                case 2:
                   if (curChar == 42)
                      jjstateSet[jjnewStateCnt++] = 0;
                   break;
                case 6:
-                  if (curChar == 36 && kind > 17)
-                     kind = 17;
+                  if (curChar == 36 && kind > 15)
+                     kind = 15;
                   break;
                case 8:
                   if (curChar == 36)
                      jjCheckNAddTwoStates(9, 10);
                   break;
                case 10:
-                  if (curChar == 33 && kind > 18)
-                     kind = 18;
+                  if (curChar == 33 && kind > 16)
+                     kind = 16;
                   break;
                case 11:
                   if (curChar != 36)
                      break;
-                  if (kind > 17)
-                     kind = 17;
+                  if (kind > 15)
+                     kind = 15;
                   jjCheckNAddTwoStates(9, 10);
                   break;
                default : break;
@@ -2005,7 +1975,7 @@
       else if (curChar < 128)
       {
          long l = 1L << (curChar & 077);
-         MatchLoop: do
+         do
          {
             switch(jjstateSet[--i])
             {
@@ -2014,8 +1984,8 @@
                      jjCheckNAddStates(94, 97);
                   break;
                case 1:
-                  if (kind > 20)
-                     kind = 20;
+                  if (kind > 18)
+                     kind = 18;
                   break;
                case 5:
                   if (curChar == 92)
@@ -2040,13 +2010,13 @@
          long l1 = 1L << (hiByte & 077);
          int i2 = (curChar & 0xff) >> 6;
          long l2 = 1L << (curChar & 077);
-         MatchLoop: do
+         do
          {
             switch(jjstateSet[--i])
             {
                case 1:
-                  if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 20)
-                     kind = 20;
+                  if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 18)
+                     kind = 18;
                   break;
                default : break;
             }
@@ -2070,16 +2040,16 @@
    switch (pos)
    {
       case 0:
-         if ((active0 & 0x3000000L) != 0L)
-            return 7;
-         if ((active0 & 0xe80000L) != 0L)
-            return 73;
+         if ((active0 & 0xc00000L) != 0L)
+            return 19;
+         if ((active0 & 0x3a0000L) != 0L)
+            return 38;
          return -1;
       case 1:
-         if ((active0 & 0x200000L) != 0L)
-            return 71;
-         if ((active0 & 0x1000000L) != 0L)
-            return 74;
+         if ((active0 & 0x400000L) != 0L)
+            return 39;
+         if ((active0 & 0x80000L) != 0L)
+            return 36;
          return -1;
       default :
          return -1;
@@ -2089,29 +2059,21 @@
 {
    return jjMoveNfa_5(jjStopStringLiteralDfa_5(pos, active0), pos + 1);
 }
-private final int jjStartNfaWithStates_5(int pos, int kind, int state)
-{
-   jjmatchedKind = kind;
-   jjmatchedPos = pos;
-   try { curChar = input_stream.readChar(); }
-   catch(java.io.IOException e) { return pos + 1; }
-   return jjMoveNfa_5(state, pos + 1);
-}
-private final int jjMoveStringLiteralDfa0_5()
+private int jjMoveStringLiteralDfa0_5()
 {
    switch(curChar)
    {
       case 35:
-         jjmatchedKind = 22;
-         return jjMoveStringLiteralDfa1_5(0xa80000L);
+         jjmatchedKind = 20;
+         return jjMoveStringLiteralDfa1_5(0x2a0000L);
       case 92:
-         jjmatchedKind = 25;
-         return jjMoveStringLiteralDfa1_5(0x1000000L);
+         jjmatchedKind = 23;
+         return jjMoveStringLiteralDfa1_5(0x400000L);
       default :
-         return jjMoveNfa_5(1, 0);
+         return jjMoveNfa_5(13, 0);
    }
 }
-private final int jjMoveStringLiteralDfa1_5(long active0)
+private int jjMoveStringLiteralDfa1_5(long active0)
 {
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
@@ -2121,28 +2083,28 @@
    switch(curChar)
    {
       case 35:
-         if ((active0 & 0x800000L) != 0L)
-            return jjStopAtPos(1, 23);
+         if ((active0 & 0x200000L) != 0L)
+            return jjStopAtPos(1, 21);
          break;
       case 42:
-         if ((active0 & 0x200000L) != 0L)
-            return jjStartNfaWithStates_5(1, 21, 71);
+         if ((active0 & 0x80000L) != 0L)
+            return jjStartNfaWithStates_5(1, 19, 36);
          break;
       case 91:
-         return jjMoveStringLiteralDfa2_5(active0, 0x80000L);
+         return jjMoveStringLiteralDfa2_5(active0, 0x20000L);
       case 92:
-         if ((active0 & 0x1000000L) != 0L)
-            return jjStartNfaWithStates_5(1, 24, 74);
+         if ((active0 & 0x400000L) != 0L)
+            return jjStartNfaWithStates_5(1, 22, 39);
          break;
       default :
          break;
    }
    return jjStartNfa_5(0, active0);
 }
-private final int jjMoveStringLiteralDfa2_5(long old0, long active0)
+private int jjMoveStringLiteralDfa2_5(long old0, long active0)
 {
    if (((active0 &= old0)) == 0L)
-      return jjStartNfa_5(0, old0); 
+      return jjStartNfa_5(0, old0);
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
       jjStopStringLiteralDfa_5(1, active0);
@@ -2151,22 +2113,29 @@
    switch(curChar)
    {
       case 91:
-         if ((active0 & 0x80000L) != 0L)
-            return jjStopAtPos(2, 19);
+         if ((active0 & 0x20000L) != 0L)
+            return jjStopAtPos(2, 17);
          break;
       default :
          break;
    }
    return jjStartNfa_5(1, active0);
 }
-private final int jjMoveNfa_5(int startState, int curPos)
+private int jjStartNfaWithStates_5(int pos, int kind, int state)
+{
+   jjmatchedKind = kind;
+   jjmatchedPos = pos;
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) { return pos + 1; }
+   return jjMoveNfa_5(state, pos + 1);
+}
+private int jjMoveNfa_5(int startState, int curPos)
 {
-   int[] nextStates;
    int startsAt = 0;
-   jjnewStateCnt = 74;
+   jjnewStateCnt = 39;
    int i = 1;
    jjstateSet[0] = startState;
-   int j, kind = 0x7fffffff;
+   int kind = 0x7fffffff;
    for (;;)
    {
       if (++jjround == 0x7fffffff)
@@ -2174,163 +2143,127 @@
       if (curChar < 64)
       {
          long l = 1L << curChar;
-         MatchLoop: do
+         do
          {
             switch(jjstateSet[--i])
             {
-               case 7:
+               case 19:
                   if (curChar == 36)
-                     jjCheckNAddTwoStates(67, 68);
+                     jjCheckNAddTwoStates(32, 33);
                   else if (curChar == 35)
                      jjAddStates(98, 99);
                   if (curChar == 36)
                   {
-                     if (kind > 17)
-                        kind = 17;
+                     if (kind > 15)
+                        kind = 15;
                   }
                   break;
-               case 73:
+               case 38:
                   if (curChar == 42)
-                     jjstateSet[jjnewStateCnt++] = 71;
+                     jjstateSet[jjnewStateCnt++] = 36;
                   break;
-               case 1:
+               case 39:
+                  if (curChar == 36)
+                     jjCheckNAddTwoStates(32, 33);
+                  if (curChar == 36)
+                  {
+                     if (kind > 15)
+                        kind = 15;
+                  }
+                  break;
+               case 13:
                   if ((0xffffffe7ffffffffL & l) != 0L)
                   {
-                     if (kind > 26)
-                        kind = 26;
-                     jjCheckNAdd(0);
+                     if (kind > 24)
+                        kind = 24;
+                     jjCheckNAdd(12);
                   }
                   else if (curChar == 35)
-                     jjCheckNAddStates(100, 106);
+                     jjCheckNAddStates(100, 102);
                   else if (curChar == 36)
                   {
-                     if (kind > 17)
-                        kind = 17;
-                     jjCheckNAddTwoStates(67, 68);
+                     if (kind > 15)
+                        kind = 15;
+                     jjCheckNAddTwoStates(32, 33);
                   }
                   if ((0x100000200L & l) != 0L)
-                     jjCheckNAddStates(107, 112);
+                     jjCheckNAddTwoStates(0, 1);
                   else if (curChar == 36)
-                     jjCheckNAddStates(113, 115);
-                  break;
-               case 74:
-                  if (curChar == 36)
-                     jjCheckNAddTwoStates(67, 68);
-                  if (curChar == 36)
-                  {
-                     if (kind > 17)
-                        kind = 17;
-                  }
+                     jjCheckNAddStates(103, 105);
                   break;
                case 0:
-                  if ((0xffffffe7ffffffffL & l) == 0L)
-                     break;
-                  if (kind > 26)
-                     kind = 26;
-                  jjCheckNAdd(0);
+                  if ((0x100000200L & l) != 0L)
+                     jjCheckNAddTwoStates(0, 1);
+                  break;
+               case 1:
+                  if (curChar == 35)
+                     jjCheckNAddTwoStates(6, 11);
+                  break;
+               case 3:
+                  if (curChar == 32)
+                     jjAddStates(106, 107);
                   break;
-               case 3:
                case 4:
+                  if (curChar == 40 && kind > 14)
+                     kind = 14;
+                  break;
+               case 12:
+                  if ((0xffffffe7ffffffffL & l) == 0L)
+                     break;
+                  if (kind > 24)
+                     kind = 24;
+                  jjCheckNAdd(12);
+                  break;
+               case 15:
+               case 16:
                   if (curChar == 33)
-                     jjCheckNAdd(2);
+                     jjCheckNAdd(14);
                   break;
-               case 8:
+               case 20:
                   if (curChar == 35)
                      jjAddStates(98, 99);
                   break;
-               case 10:
+               case 22:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 13)
                      kind = 13;
-                  jjstateSet[jjnewStateCnt++] = 10;
+                  jjstateSet[jjnewStateCnt++] = 22;
                   break;
-               case 13:
+               case 25:
                   if ((0x3ff000000000000L & l) != 0L)
-                     jjAddStates(116, 117);
-                  break;
-               case 15:
-                  if ((0x100000200L & l) != 0L)
-                     jjCheckNAddStates(107, 112);
-                  break;
-               case 16:
-                  if ((0x100000200L & l) != 0L)
-                     jjCheckNAddTwoStates(16, 17);
-                  break;
-               case 17:
-                  if (curChar == 35)
-                     jjCheckNAddTwoStates(22, 27);
-                  break;
-               case 19:
-                  if (curChar == 32)
-                     jjAddStates(118, 119);
-                  break;
-               case 20:
-                  if (curChar == 40 && kind > 14)
-                     kind = 14;
-                  break;
-               case 28:
-                  if ((0x100000200L & l) != 0L)
-                     jjCheckNAddTwoStates(28, 29);
+                     jjAddStates(108, 109);
                   break;
                case 29:
-                  if (curChar == 35)
-                     jjCheckNAddTwoStates(36, 43);
-                  break;
-               case 31:
-                  if (curChar == 32)
-                     jjAddStates(120, 121);
-                  break;
-               case 32:
-                  if (curChar == 40 && kind > 15)
+                  if (curChar == 36 && kind > 15)
                      kind = 15;
                   break;
-               case 44:
-                  if ((0x100000200L & l) != 0L)
-                     jjCheckNAddTwoStates(44, 45);
-                  break;
-               case 45:
-                  if (curChar == 35)
-                     jjCheckNAddTwoStates(53, 61);
-                  break;
-               case 47:
-                  if (curChar == 32)
-                     jjAddStates(122, 123);
-                  break;
-               case 48:
-                  if (curChar == 40 && kind > 16)
-                     kind = 16;
-                  break;
-               case 64:
-                  if (curChar == 36 && kind > 17)
-                     kind = 17;
-                  break;
-               case 66:
+               case 31:
                   if (curChar == 36)
-                     jjCheckNAddTwoStates(67, 68);
+                     jjCheckNAddTwoStates(32, 33);
                   break;
-               case 68:
-                  if (curChar == 33 && kind > 18)
-                     kind = 18;
+               case 33:
+                  if (curChar == 33 && kind > 16)
+                     kind = 16;
                   break;
-               case 69:
+               case 34:
                   if (curChar != 36)
                      break;
-                  if (kind > 17)
-                     kind = 17;
-                  jjCheckNAddTwoStates(67, 68);
+                  if (kind > 15)
+                     kind = 15;
+                  jjCheckNAddTwoStates(32, 33);
                   break;
-               case 70:
+               case 35:
                   if (curChar == 35)
-                     jjCheckNAddStates(100, 106);
+                     jjCheckNAddStates(100, 102);
                   break;
-               case 71:
+               case 36:
                   if (curChar == 42)
-                     jjstateSet[jjnewStateCnt++] = 72;
+                     jjstateSet[jjnewStateCnt++] = 37;
                   break;
-               case 72:
-                  if ((0xfffffff7ffffffffL & l) != 0L && kind > 20)
-                     kind = 20;
+               case 37:
+                  if ((0xfffffff7ffffffffL & l) != 0L && kind > 18)
+                     kind = 18;
                   break;
                default : break;
             }
@@ -2339,256 +2272,144 @@
       else if (curChar < 128)
       {
          long l = 1L << (curChar & 077);
-         MatchLoop: do
+         do
          {
             switch(jjstateSet[--i])
             {
-               case 7:
+               case 19:
                   if (curChar == 92)
-                     jjCheckNAddTwoStates(65, 66);
+                     jjCheckNAddTwoStates(30, 31);
                   if (curChar == 92)
-                     jjCheckNAddTwoStates(63, 64);
+                     jjCheckNAddTwoStates(28, 29);
                   if (curChar == 92)
-                     jjstateSet[jjnewStateCnt++] = 6;
+                     jjstateSet[jjnewStateCnt++] = 18;
                   break;
-               case 73:
+               case 38:
                   if (curChar == 123)
-                     jjstateSet[jjnewStateCnt++] = 60;
-                  else if (curChar == 103)
-                     jjstateSet[jjnewStateCnt++] = 52;
-                  else if (curChar == 108)
-                     jjstateSet[jjnewStateCnt++] = 35;
+                     jjstateSet[jjnewStateCnt++] = 10;
                   else if (curChar == 115)
-                     jjstateSet[jjnewStateCnt++] = 21;
-                  if (curChar == 123)
-                     jjstateSet[jjnewStateCnt++] = 42;
-                  if (curChar == 123)
-                     jjstateSet[jjnewStateCnt++] = 26;
+                     jjstateSet[jjnewStateCnt++] = 5;
                   break;
-               case 1:
+               case 39:
+                  if (curChar == 92)
+                     jjAddStates(110, 111);
+                  if (curChar == 92)
+                     jjCheckNAddTwoStates(30, 31);
+                  if (curChar == 92)
+                     jjCheckNAddTwoStates(28, 29);
+                  break;
+               case 13:
                   if ((0xffffffffefffffffL & l) != 0L)
                   {
-                     if (kind > 26)
-                        kind = 26;
-                     jjCheckNAdd(0);
+                     if (kind > 24)
+                        kind = 24;
+                     jjCheckNAdd(12);
                   }
                   else if (curChar == 92)
-                     jjCheckNAddStates(124, 127);
-                  if (curChar == 92)
-                     jjAddStates(128, 129);
-                  break;
-               case 74:
-                  if (curChar == 92)
-                     jjAddStates(128, 129);
+                     jjCheckNAddStates(112, 115);
                   if (curChar == 92)
-                     jjCheckNAddTwoStates(65, 66);
-                  if (curChar == 92)
-                     jjCheckNAddTwoStates(63, 64);
-                  break;
-               case 0:
-                  if ((0xffffffffefffffffL & l) == 0L)
-                     break;
-                  if (kind > 26)
-                     kind = 26;
-                  jjCheckNAdd(0);
+                     jjAddStates(110, 111);
                   break;
                case 2:
-                  if (curChar == 91 && kind > 74)
-                     kind = 74;
+                  if (curChar == 116)
+                     jjCheckNAddTwoStates(3, 4);
                   break;
                case 5:
-                  if (curChar == 92)
-                     jjstateSet[jjnewStateCnt++] = 4;
+                  if (curChar == 101)
+                     jjstateSet[jjnewStateCnt++] = 2;
                   break;
                case 6:
-                  if (curChar == 92)
-                     jjAddStates(128, 129);
+                  if (curChar == 115)
+                     jjstateSet[jjnewStateCnt++] = 5;
+                  break;
+               case 7:
+                  if (curChar == 125)
+                     jjCheckNAddTwoStates(3, 4);
+                  break;
+               case 8:
+                  if (curChar == 116)
+                     jjstateSet[jjnewStateCnt++] = 7;
                   break;
                case 9:
-                  if ((0x7fffffe87ffffffL & l) == 0L)
-                     break;
-                  if (kind > 13)
-                     kind = 13;
-                  jjCheckNAdd(10);
+                  if (curChar == 101)
+                     jjstateSet[jjnewStateCnt++] = 8;
                   break;
                case 10:
-                  if ((0x7fffffe87fffffeL & l) == 0L)
-                     break;
-                  if (kind > 13)
-                     kind = 13;
-                  jjCheckNAdd(10);
+                  if (curChar == 115)
+                     jjstateSet[jjnewStateCnt++] = 9;
                   break;
                case 11:
                   if (curChar == 123)
-                     jjstateSet[jjnewStateCnt++] = 12;
+                     jjstateSet[jjnewStateCnt++] = 10;
                   break;
                case 12:
-                  if ((0x7fffffe87ffffffL & l) != 0L)
-                     jjCheckNAddTwoStates(13, 14);
-                  break;
-               case 13:
-                  if ((0x7fffffe87fffffeL & l) != 0L)
-                     jjCheckNAddTwoStates(13, 14);
+                  if ((0xffffffffefffffffL & l) == 0L)
+                     break;
+                  if (kind > 24)
+                     kind = 24;
+                  jjCheckNAdd(12);
                   break;
                case 14:
-                  if (curChar == 125 && kind > 13)
-                     kind = 13;
+                  if (curChar == 91 && kind > 72)
+                     kind = 72;
+                  break;
+               case 17:
+                  if (curChar == 92)
+                     jjstateSet[jjnewStateCnt++] = 16;
                   break;
                case 18:
-                  if (curChar == 116)
-                     jjCheckNAddTwoStates(19, 20);
+                  if (curChar == 92)
+                     jjAddStates(110, 111);
                   break;
                case 21:
-                  if (curChar == 101)
-                     jjstateSet[jjnewStateCnt++] = 18;
+                  if ((0x7fffffe87ffffffL & l) == 0L)
+                     break;
+                  if (kind > 13)
+                     kind = 13;
+                  jjCheckNAdd(22);
                   break;
                case 22:
-                  if (curChar == 115)
-                     jjstateSet[jjnewStateCnt++] = 21;
+                  if ((0x7fffffe87fffffeL & l) == 0L)
+                     break;
+                  if (kind > 13)
+                     kind = 13;
+                  jjCheckNAdd(22);
                   break;
                case 23:
-                  if (curChar == 125)
-                     jjCheckNAddTwoStates(19, 20);
+                  if (curChar == 123)
+                     jjstateSet[jjnewStateCnt++] = 24;
                   break;
                case 24:
-                  if (curChar == 116)
-                     jjstateSet[jjnewStateCnt++] = 23;
+                  if ((0x7fffffe87ffffffL & l) != 0L)
+                     jjCheckNAddTwoStates(25, 26);
                   break;
                case 25:
-                  if (curChar == 101)
-                     jjstateSet[jjnewStateCnt++] = 24;
+                  if ((0x7fffffe87fffffeL & l) != 0L)
+                     jjCheckNAddTwoStates(25, 26);
                   break;
                case 26:
-                  if (curChar == 115)
-                     jjstateSet[jjnewStateCnt++] = 25;
+                  if (curChar == 125 && kind > 13)
+                     kind = 13;
                   break;
                case 27:
-                  if (curChar == 123)
-                     jjstateSet[jjnewStateCnt++] = 26;
-                  break;
-               case 30:
-                  if (curChar == 108)
-                     jjCheckNAddTwoStates(31, 32);
-                  break;
-               case 33:
-                  if (curChar == 97)
-                     jjstateSet[jjnewStateCnt++] = 30;
-                  break;
-               case 34:
-                  if (curChar == 99)
-                     jjstateSet[jjnewStateCnt++] = 33;
-                  break;
-               case 35:
-                  if (curChar == 111)
-                     jjstateSet[jjnewStateCnt++] = 34;
-                  break;
-               case 36:
-                  if (curChar == 108)
-                     jjstateSet[jjnewStateCnt++] = 35;
-                  break;
-               case 37:
-                  if (curChar == 125)
-                     jjCheckNAddTwoStates(31, 32);
-                  break;
-               case 38:
-                  if (curChar == 108)
-                     jjstateSet[jjnewStateCnt++] = 37;
-                  break;
-               case 39:
-                  if (curChar == 97)
-                     jjstateSet[jjnewStateCnt++] = 38;
-                  break;
-               case 40:
-                  if (curChar == 99)
-                     jjstateSet[jjnewStateCnt++] = 39;
-                  break;
-               case 41:
-                  if (curChar == 111)
-                     jjstateSet[jjnewStateCnt++] = 40;
-                  break;
-               case 42:
-                  if (curChar == 108)
-                     jjstateSet[jjnewStateCnt++] = 41;
-                  break;
-               case 43:
-                  if (curChar == 123)
-                     jjstateSet[jjnewStateCnt++] = 42;
-                  break;
-               case 46:
-                  if (curChar == 108)
-                     jjCheckNAddTwoStates(47, 48);
-                  break;
-               case 49:
-                  if (curChar == 97)
-                     jjstateSet[jjnewStateCnt++] = 46;
-                  break;
-               case 50:
-                  if (curChar == 98)
-                     jjstateSet[jjnewStateCnt++] = 49;
-                  break;
-               case 51:
-                  if (curChar == 111)
-                     jjstateSet[jjnewStateCnt++] = 50;
-                  break;
-               case 52:
-                  if (curChar == 108)
-                     jjstateSet[jjnewStateCnt++] = 51;
-                  break;
-               case 53:
-                  if (curChar == 103)
-                     jjstateSet[jjnewStateCnt++] = 52;
-                  break;
-               case 54:
-                  if (curChar == 125)
-                     jjCheckNAddTwoStates(47, 48);
-                  break;
-               case 55:
-                  if (curChar == 108)
-                     jjstateSet[jjnewStateCnt++] = 54;
-                  break;
-               case 56:
-                  if (curChar == 97)
-                     jjstateSet[jjnewStateCnt++] = 55;
-                  break;
-               case 57:
-                  if (curChar == 98)
-                     jjstateSet[jjnewStateCnt++] = 56;
-                  break;
-               case 58:
-                  if (curChar == 111)
-                     jjstateSet[jjnewStateCnt++] = 57;
-                  break;
-               case 59:
-                  if (curChar == 108)
-                     jjstateSet[jjnewStateCnt++] = 58;
-                  break;
-               case 60:
-                  if (curChar == 103)
-                     jjstateSet[jjnewStateCnt++] = 59;
-                  break;
-               case 61:
-                  if (curChar == 123)
-                     jjstateSet[jjnewStateCnt++] = 60;
-                  break;
-               case 62:
                   if (curChar == 92)
-                     jjCheckNAddStates(124, 127);
+                     jjCheckNAddStates(112, 115);
                   break;
-               case 63:
+               case 28:
                   if (curChar == 92)
-                     jjCheckNAddTwoStates(63, 64);
+                     jjCheckNAddTwoStates(28, 29);
                   break;
-               case 65:
+               case 30:
                   if (curChar == 92)
-                     jjCheckNAddTwoStates(65, 66);
+                     jjCheckNAddTwoStates(30, 31);
                   break;
-               case 67:
+               case 32:
                   if (curChar == 92)
-                     jjAddStates(130, 131);
+                     jjAddStates(116, 117);
                   break;
-               case 72:
-                  if (kind > 20)
-                     kind = 20;
+               case 37:
+                  if (kind > 18)
+                     kind = 18;
                   break;
                default : break;
             }
@@ -2601,21 +2422,21 @@
          long l1 = 1L << (hiByte & 077);
          int i2 = (curChar & 0xff) >> 6;
          long l2 = 1L << (curChar & 077);
-         MatchLoop: do
+         do
          {
             switch(jjstateSet[--i])
             {
-               case 1:
-               case 0:
+               case 13:
+               case 12:
                   if (!jjCanMove_0(hiByte, i1, i2, l1, l2))
                      break;
-                  if (kind > 26)
-                     kind = 26;
-                  jjCheckNAdd(0);
+                  if (kind > 24)
+                     kind = 24;
+                  jjCheckNAdd(12);
                   break;
-               case 72:
-                  if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 20)
-                     kind = 20;
+               case 37:
+                  if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 18)
+                     kind = 18;
                   break;
                default : break;
             }
@@ -2628,7 +2449,7 @@
          kind = 0x7fffffff;
       }
       ++curPos;
-      if ((i = jjnewStateCnt) == (startsAt = 74 - (jjnewStateCnt = startsAt)))
+      if ((i = jjnewStateCnt) == (startsAt = 39 - (jjnewStateCnt = startsAt)))
          return curPos;
       try { curChar = input_stream.readChar(); }
       catch(java.io.IOException e) { return curPos; }
@@ -2639,11 +2460,11 @@
    switch (pos)
    {
       case 0:
-         if ((active0 & 0x680000L) != 0L)
+         if ((active0 & 0x1a0000L) != 0L)
             return 2;
          return -1;
       case 1:
-         if ((active0 & 0x200000L) != 0L)
+         if ((active0 & 0x80000L) != 0L)
             return 0;
          return -1;
       default :
@@ -2654,28 +2475,20 @@
 {
    return jjMoveNfa_9(jjStopStringLiteralDfa_9(pos, active0), pos + 1);
 }
-private final int jjStartNfaWithStates_9(int pos, int kind, int state)
-{
-   jjmatchedKind = kind;
-   jjmatchedPos = pos;
-   try { curChar = input_stream.readChar(); }
-   catch(java.io.IOException e) { return pos + 1; }
-   return jjMoveNfa_9(state, pos + 1);
-}
-private final int jjMoveStringLiteralDfa0_9()
+private int jjMoveStringLiteralDfa0_9()
 {
    switch(curChar)
    {
       case 35:
-         jjmatchedKind = 22;
-         return jjMoveStringLiteralDfa1_9(0x280000L);
+         jjmatchedKind = 20;
+         return jjMoveStringLiteralDfa1_9(0xa0000L);
       case 42:
-         return jjMoveStringLiteralDfa1_9(0x10000000L);
+         return jjMoveStringLiteralDfa1_9(0x4000000L);
       default :
          return jjMoveNfa_9(3, 0);
    }
 }
-private final int jjMoveStringLiteralDfa1_9(long active0)
+private int jjMoveStringLiteralDfa1_9(long active0)
 {
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
@@ -2685,24 +2498,24 @@
    switch(curChar)
    {
       case 35:
-         if ((active0 & 0x10000000L) != 0L)
-            return jjStopAtPos(1, 28);
+         if ((active0 & 0x4000000L) != 0L)
+            return jjStopAtPos(1, 26);
          break;
       case 42:
-         if ((active0 & 0x200000L) != 0L)
-            return jjStartNfaWithStates_9(1, 21, 0);
+         if ((active0 & 0x80000L) != 0L)
+            return jjStartNfaWithStates_9(1, 19, 0);
          break;
       case 91:
-         return jjMoveStringLiteralDfa2_9(active0, 0x80000L);
+         return jjMoveStringLiteralDfa2_9(active0, 0x20000L);
       default :
          break;
    }
    return jjStartNfa_9(0, active0);
 }
-private final int jjMoveStringLiteralDfa2_9(long old0, long active0)
+private int jjMoveStringLiteralDfa2_9(long old0, long active0)
 {
    if (((active0 &= old0)) == 0L)
-      return jjStartNfa_9(0, old0); 
+      return jjStartNfa_9(0, old0);
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
       jjStopStringLiteralDfa_9(1, active0);
@@ -2711,22 +2524,29 @@
    switch(curChar)
    {
       case 91:
-         if ((active0 & 0x80000L) != 0L)
-            return jjStopAtPos(2, 19);
+         if ((active0 & 0x20000L) != 0L)
+            return jjStopAtPos(2, 17);
          break;
       default :
          break;
    }
    return jjStartNfa_9(1, active0);
 }
-private final int jjMoveNfa_9(int startState, int curPos)
+private int jjStartNfaWithStates_9(int pos, int kind, int state)
+{
+   jjmatchedKind = kind;
+   jjmatchedPos = pos;
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) { return pos + 1; }
+   return jjMoveNfa_9(state, pos + 1);
+}
+private int jjMoveNfa_9(int startState, int curPos)
 {
-   int[] nextStates;
    int startsAt = 0;
    jjnewStateCnt = 12;
    int i = 1;
    jjstateSet[0] = startState;
-   int j, kind = 0x7fffffff;
+   int kind = 0x7fffffff;
    for (;;)
    {
       if (++jjround == 0x7fffffff)
@@ -2734,15 +2554,15 @@
       if (curChar < 64)
       {
          long l = 1L << curChar;
-         MatchLoop: do
+         do
          {
             switch(jjstateSet[--i])
             {
                case 3:
                   if (curChar == 36)
                   {
-                     if (kind > 17)
-                        kind = 17;
+                     if (kind > 15)
+                        kind = 15;
                      jjCheckNAddTwoStates(9, 10);
                   }
                   else if (curChar == 35)
@@ -2753,30 +2573,30 @@
                      jjstateSet[jjnewStateCnt++] = 1;
                   break;
                case 1:
-                  if ((0xfffffff7ffffffffL & l) != 0L && kind > 20)
-                     kind = 20;
+                  if ((0xfffffff7ffffffffL & l) != 0L && kind > 18)
+                     kind = 18;
                   break;
                case 2:
                   if (curChar == 42)
                      jjstateSet[jjnewStateCnt++] = 0;
                   break;
                case 6:
-                  if (curChar == 36 && kind > 17)
-                     kind = 17;
+                  if (curChar == 36 && kind > 15)
+                     kind = 15;
                   break;
                case 8:
                   if (curChar == 36)
                      jjCheckNAddTwoStates(9, 10);
                   break;
                case 10:
-                  if (curChar == 33 && kind > 18)
-                     kind = 18;
+                  if (curChar == 33 && kind > 16)
+                     kind = 16;
                   break;
                case 11:
                   if (curChar != 36)
                      break;
-                  if (kind > 17)
-                     kind = 17;
+                  if (kind > 15)
+                     kind = 15;
                   jjCheckNAddTwoStates(9, 10);
                   break;
                default : break;
@@ -2786,7 +2606,7 @@
       else if (curChar < 128)
       {
          long l = 1L << (curChar & 077);
-         MatchLoop: do
+         do
          {
             switch(jjstateSet[--i])
             {
@@ -2795,8 +2615,8 @@
                      jjCheckNAddStates(94, 97);
                   break;
                case 1:
-                  if (kind > 20)
-                     kind = 20;
+                  if (kind > 18)
+                     kind = 18;
                   break;
                case 5:
                   if (curChar == 92)
@@ -2821,13 +2641,13 @@
          long l1 = 1L << (hiByte & 077);
          int i2 = (curChar & 0xff) >> 6;
          long l2 = 1L << (curChar & 077);
-         MatchLoop: do
+         do
          {
             switch(jjstateSet[--i])
             {
                case 1:
-                  if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 20)
-                     kind = 20;
+                  if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 18)
+                     kind = 18;
                   break;
                default : break;
             }
@@ -2851,11 +2671,11 @@
    switch (pos)
    {
       case 0:
-         if ((active0 & 0x680000L) != 0L)
+         if ((active0 & 0x1a0000L) != 0L)
             return 2;
          return -1;
       case 1:
-         if ((active0 & 0x200000L) != 0L)
+         if ((active0 & 0x80000L) != 0L)
             return 0;
          return -1;
       default :
@@ -2866,32 +2686,24 @@
 {
    return jjMoveNfa_2(jjStopStringLiteralDfa_2(pos, active0), pos + 1);
 }
-private final int jjStartNfaWithStates_2(int pos, int kind, int state)
-{
-   jjmatchedKind = kind;
-   jjmatchedPos = pos;
-   try { curChar = input_stream.readChar(); }
-   catch(java.io.IOException e) { return pos + 1; }
-   return jjMoveNfa_2(state, pos + 1);
-}
-private final int jjMoveStringLiteralDfa0_2()

[... 4242 lines stripped ...]


Mime
View raw message