velocity-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nbu...@apache.org
Subject svn commit: r736681 [2/3] - in /velocity/engine/trunk/src: changes/ java/org/apache/velocity/runtime/parser/ parser/ test/org/apache/velocity/test/
Date Thu, 22 Jan 2009 15:49:13 GMT
Modified: velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/ParserTokenManager.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/ParserTokenManager.java?rev=736681&r1=736680&r2=736681&view=diff
==============================================================================
--- velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/ParserTokenManager.java (original)
+++ velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/ParserTokenManager.java Thu Jan 22 07:49:12 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)
 {
@@ -228,21 +232,13 @@
 {
    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)
    {
@@ -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) {
@@ -317,10 +313,10 @@
    }
    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);
@@ -341,10 +337,10 @@
    }
    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);
@@ -363,10 +359,10 @@
    }
    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);
@@ -383,35 +379,13 @@
    }
    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)
+private int jjStartNfaWithStates_3(int pos, int kind, int state)
 {
-   do {
-      jjCheckNAdd(jjnextStates[start]);
-   } while (start++ != end);
-}
-private final void jjCheckNAddStates(int start)
-{
-   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,7 +407,7 @@
       if (curChar < 64)
       {
          long l = 1L << curChar;
-         MatchLoop: do
+         do
          {
             switch(jjstateSet[--i])
             {
@@ -828,7 +801,7 @@
       else if (curChar < 128)
       {
          long l = 1L << (curChar & 077);
-         MatchLoop: do
+         do
          {
             switch(jjstateSet[--i])
             {
@@ -1039,7 +1012,7 @@
          long l1 = 1L << (hiByte & 077);
          int i2 = (curChar & 0xff) >> 6;
          long l2 = 1L << (curChar & 077);
-         MatchLoop: do
+         do
          {
             switch(jjstateSet[--i])
             {
@@ -1072,7 +1045,7 @@
       catch(java.io.IOException e) { return curPos; }
    }
 }
-private final int jjStopStringLiteralDfa_9(int pos, long active0)
+private final int jjStopStringLiteralDfa_11(int pos, long active0)
 {
    switch (pos)
    {
@@ -1088,36 +1061,26 @@
          return -1;
    }
 }
-private final int jjStartNfa_9(int pos, long active0)
-{
-   return jjMoveNfa_9(jjStopStringLiteralDfa_9(pos, active0), pos + 1);
-}
-private final int jjStartNfaWithStates_9(int pos, int kind, int state)
+private final int jjStartNfa_11(int pos, long active0)
 {
-   jjmatchedKind = kind;
-   jjmatchedPos = pos;
-   try { curChar = input_stream.readChar(); }
-   catch(java.io.IOException e) { return pos + 1; }
-   return jjMoveNfa_9(state, pos + 1);
+   return jjMoveNfa_11(jjStopStringLiteralDfa_11(pos, active0), pos + 1);
 }
-private final int jjMoveStringLiteralDfa0_9()
+private int jjMoveStringLiteralDfa0_11()
 {
    switch(curChar)
    {
       case 35:
          jjmatchedKind = 20;
-         return jjMoveStringLiteralDfa1_9(0x2a0000L);
-      case 42:
-         return jjMoveStringLiteralDfa1_9(0x8000000L);
+         return jjMoveStringLiteralDfa1_11(0x2a0000L);
       default :
-         return jjMoveNfa_9(3, 0);
+         return jjMoveNfa_11(3, 0);
    }
 }
-private final int jjMoveStringLiteralDfa1_9(long active0)
+private int jjMoveStringLiteralDfa1_11(long active0)
 {
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
-      jjStopStringLiteralDfa_9(0, active0);
+      jjStopStringLiteralDfa_11(0, active0);
       return 1;
    }
    switch(curChar)
@@ -1125,27 +1088,25 @@
       case 35:
          if ((active0 & 0x200000L) != 0L)
             return jjStopAtPos(1, 21);
-         else if ((active0 & 0x8000000L) != 0L)
-            return jjStopAtPos(1, 27);
          break;
       case 42:
          if ((active0 & 0x80000L) != 0L)
-            return jjStartNfaWithStates_9(1, 19, 0);
+            return jjStartNfaWithStates_11(1, 19, 0);
          break;
       case 91:
-         return jjMoveStringLiteralDfa2_9(active0, 0x20000L);
+         return jjMoveStringLiteralDfa2_11(active0, 0x20000L);
       default :
          break;
    }
-   return jjStartNfa_9(0, active0);
+   return jjStartNfa_11(0, active0);
 }
-private final int jjMoveStringLiteralDfa2_9(long old0, long active0)
+private int jjMoveStringLiteralDfa2_11(long old0, long active0)
 {
    if (((active0 &= old0)) == 0L)
-      return jjStartNfa_9(0, old0); 
+      return jjStartNfa_11(0, old0);
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
-      jjStopStringLiteralDfa_9(1, active0);
+      jjStopStringLiteralDfa_11(1, active0);
       return 2;
    }
    switch(curChar)
@@ -1157,226 +1118,23 @@
       default :
          break;
    }
-   return jjStartNfa_9(1, active0);
-}
-private final int jjMoveNfa_9(int startState, int curPos)
-{
-   int[] nextStates;
-   int startsAt = 0;
-   jjnewStateCnt = 12;
-   int i = 1;
-   jjstateSet[0] = startState;
-   int j, kind = 0x7fffffff;
-   for (;;)
-   {
-      if (++jjround == 0x7fffffff)
-         ReInitRounds();
-      if (curChar < 64)
-      {
-         long l = 1L << curChar;
-         MatchLoop: do
-         {
-            switch(jjstateSet[--i])
-            {
-               case 3:
-                  if (curChar == 36)
-                  {
-                     if (kind > 15)
-                        kind = 15;
-                     jjCheckNAddTwoStates(9, 10);
-                  }
-                  else if (curChar == 35)
-                     jjstateSet[jjnewStateCnt++] = 2;
-                  break;
-               case 0:
-                  if (curChar == 42)
-                     jjstateSet[jjnewStateCnt++] = 1;
-                  break;
-               case 1:
-                  if ((0xfffffff7ffffffffL & l) != 0L && kind > 18)
-                     kind = 18;
-                  break;
-               case 2:
-                  if (curChar == 42)
-                     jjstateSet[jjnewStateCnt++] = 0;
-                  break;
-               case 6:
-                  if (curChar == 36 && kind > 15)
-                     kind = 15;
-                  break;
-               case 8:
-                  if (curChar == 36)
-                     jjCheckNAddTwoStates(9, 10);
-                  break;
-               case 10:
-                  if (curChar == 33 && kind > 16)
-                     kind = 16;
-                  break;
-               case 11:
-                  if (curChar != 36)
-                     break;
-                  if (kind > 15)
-                     kind = 15;
-                  jjCheckNAddTwoStates(9, 10);
-                  break;
-               default : break;
-            }
-         } while(i != startsAt);
-      }
-      else if (curChar < 128)
-      {
-         long l = 1L << (curChar & 077);
-         MatchLoop: do
-         {
-            switch(jjstateSet[--i])
-            {
-               case 3:
-                  if (curChar == 92)
-                     jjCheckNAddStates(53, 56);
-                  break;
-               case 1:
-                  if (kind > 18)
-                     kind = 18;
-                  break;
-               case 5:
-                  if (curChar == 92)
-                     jjCheckNAddTwoStates(5, 6);
-                  break;
-               case 7:
-                  if (curChar == 92)
-                     jjCheckNAddTwoStates(7, 8);
-                  break;
-               case 9:
-                  if (curChar == 92)
-                     jjAddStates(57, 58);
-                  break;
-               default : break;
-            }
-         } while(i != startsAt);
-      }
-      else
-      {
-         int hiByte = (int)(curChar >> 8);
-         int i1 = hiByte >> 6;
-         long l1 = 1L << (hiByte & 077);
-         int i2 = (curChar & 0xff) >> 6;
-         long l2 = 1L << (curChar & 077);
-         MatchLoop: do
-         {
-            switch(jjstateSet[--i])
-            {
-               case 1:
-                  if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 18)
-                     kind = 18;
-                  break;
-               default : break;
-            }
-         } while(i != startsAt);
-      }
-      if (kind != 0x7fffffff)
-      {
-         jjmatchedKind = kind;
-         jjmatchedPos = curPos;
-         kind = 0x7fffffff;
-      }
-      ++curPos;
-      if ((i = jjnewStateCnt) == (startsAt = 12 - (jjnewStateCnt = startsAt)))
-         return curPos;
-      try { curChar = input_stream.readChar(); }
-      catch(java.io.IOException e) { return curPos; }
-   }
-}
-private final int jjStopStringLiteralDfa_7(int pos, long active0)
-{
-   switch (pos)
-   {
-      case 0:
-         if ((active0 & 0x3a0000L) != 0L)
-            return 2;
-         return -1;
-      case 1:
-         if ((active0 & 0x80000L) != 0L)
-            return 0;
-         return -1;
-      default :
-         return -1;
-   }
-}
-private final int jjStartNfa_7(int pos, long active0)
-{
-   return jjMoveNfa_7(jjStopStringLiteralDfa_7(pos, active0), pos + 1);
+   return jjStartNfa_11(1, active0);
 }
-private final int jjStartNfaWithStates_7(int pos, int kind, int state)
+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_7(state, pos + 1);
-}
-private final int jjMoveStringLiteralDfa0_7()
-{
-   switch(curChar)
-   {
-      case 35:
-         jjmatchedKind = 20;
-         return jjMoveStringLiteralDfa1_7(0x2a0000L);
-      default :
-         return jjMoveNfa_7(3, 0);
-   }
-}
-private final int jjMoveStringLiteralDfa1_7(long active0)
-{
-   try { curChar = input_stream.readChar(); }
-   catch(java.io.IOException e) {
-      jjStopStringLiteralDfa_7(0, active0);
-      return 1;
-   }
-   switch(curChar)
-   {
-      case 35:
-         if ((active0 & 0x200000L) != 0L)
-            return jjStopAtPos(1, 21);
-         break;
-      case 42:
-         if ((active0 & 0x80000L) != 0L)
-            return jjStartNfaWithStates_7(1, 19, 0);
-         break;
-      case 91:
-         return jjMoveStringLiteralDfa2_7(active0, 0x20000L);
-      default :
-         break;
-   }
-   return jjStartNfa_7(0, active0);
-}
-private final int jjMoveStringLiteralDfa2_7(long old0, long active0)
-{
-   if (((active0 &= old0)) == 0L)
-      return jjStartNfa_7(0, old0); 
-   try { curChar = input_stream.readChar(); }
-   catch(java.io.IOException e) {
-      jjStopStringLiteralDfa_7(1, active0);
-      return 2;
-   }
-   switch(curChar)
-   {
-      case 91:
-         if ((active0 & 0x20000L) != 0L)
-            return jjStopAtPos(2, 17);
-         break;
-      default :
-         break;
-   }
-   return jjStartNfa_7(1, active0);
+   return jjMoveNfa_11(state, pos + 1);
 }
-private final int jjMoveNfa_7(int startState, int curPos)
+private int jjMoveNfa_11(int startState, int curPos)
 {
-   int[] nextStates;
    int startsAt = 0;
    jjnewStateCnt = 92;
    int i = 1;
    jjstateSet[0] = startState;
-   int j, kind = 0x7fffffff;
+   int kind = 0x7fffffff;
    for (;;)
    {
       if (++jjround == 0x7fffffff)
@@ -1384,7 +1142,7 @@
       if (curChar < 64)
       {
          long l = 1L << curChar;
-         MatchLoop: do
+         do
          {
             switch(jjstateSet[--i])
             {
@@ -1393,10 +1151,10 @@
                   {
                      if (kind > 57)
                         kind = 57;
-                     jjCheckNAddStates(59, 64);
+                     jjCheckNAddStates(53, 58);
                   }
                   else if (curChar == 45)
-                     jjCheckNAddStates(65, 68);
+                     jjCheckNAddStates(59, 62);
                   else if (curChar == 36)
                   {
                      if (kind > 15)
@@ -1451,7 +1209,7 @@
                   break;
                case 19:
                   if ((0x3ff000000000000L & l) != 0L)
-                     jjAddStates(69, 70);
+                     jjAddStates(63, 64);
                   break;
                case 23:
                   if (curChar == 36 && kind > 15)
@@ -1474,7 +1232,7 @@
                   break;
                case 31:
                   if ((0x100000200L & l) != 0L)
-                     jjCheckNAddStates(71, 73);
+                     jjCheckNAddStates(65, 67);
                   break;
                case 32:
                   if ((0x2400L & l) != 0L && kind > 51)
@@ -1491,7 +1249,7 @@
                   break;
                case 42:
                   if ((0x100000200L & l) != 0L)
-                     jjCheckNAddStates(74, 76);
+                     jjCheckNAddStates(68, 70);
                   break;
                case 43:
                   if ((0x2400L & l) != 0L && kind > 54)
@@ -1508,15 +1266,15 @@
                   break;
                case 50:
                   if ((0x100000200L & l) != 0L)
-                     jjCheckNAddStates(77, 79);
+                     jjCheckNAddStates(71, 73);
                   break;
                case 66:
                   if ((0x100000200L & l) != 0L)
-                     jjCheckNAddStates(80, 82);
+                     jjCheckNAddStates(74, 76);
                   break;
                case 77:
                   if (curChar == 45)
-                     jjCheckNAddStates(65, 68);
+                     jjCheckNAddStates(59, 62);
                   break;
                case 78:
                   if ((0x3ff000000000000L & l) == 0L)
@@ -1582,7 +1340,7 @@
                      break;
                   if (kind > 57)
                      kind = 57;
-                  jjCheckNAddStates(59, 64);
+                  jjCheckNAddStates(53, 58);
                   break;
                default : break;
             }
@@ -1591,7 +1349,7 @@
       else if (curChar < 128)
       {
          long l = 1L << (curChar & 077);
-         MatchLoop: do
+         do
          {
             switch(jjstateSet[--i])
             {
@@ -1603,11 +1361,11 @@
                      jjCheckNAdd(16);
                   }
                   else if (curChar == 123)
-                     jjAddStates(83, 87);
+                     jjAddStates(77, 81);
                   else if (curChar == 92)
-                     jjCheckNAddStates(88, 91);
+                     jjCheckNAddStates(82, 85);
                   if (curChar == 101)
-                     jjAddStates(92, 94);
+                     jjAddStates(86, 88);
                   else if (curChar == 123)
                      jjstateSet[jjnewStateCnt++] = 18;
                   else if (curChar == 115)
@@ -1645,7 +1403,7 @@
                   break;
                case 12:
                   if ((0x2000000020L & l) != 0L)
-                     jjAddStates(95, 96);
+                     jjAddStates(89, 90);
                   break;
                case 15:
                case 16:
@@ -1673,7 +1431,7 @@
                   break;
                case 21:
                   if (curChar == 92)
-                     jjCheckNAddStates(88, 91);
+                     jjCheckNAddStates(82, 85);
                   break;
                case 22:
                   if (curChar == 92)
@@ -1685,18 +1443,18 @@
                   break;
                case 26:
                   if (curChar == 92)
-                     jjAddStates(97, 98);
+                     jjAddStates(91, 92);
                   break;
                case 29:
                   if (curChar == 101)
-                     jjAddStates(92, 94);
+                     jjAddStates(86, 88);
                   break;
                case 30:
                   if (curChar != 100)
                      break;
                   if (kind > 51)
                      kind = 51;
-                  jjCheckNAddStates(71, 73);
+                  jjCheckNAddStates(65, 67);
                   break;
                case 35:
                   if (curChar == 110)
@@ -1727,7 +1485,7 @@
                      break;
                   if (kind > 54)
                      kind = 54;
-                  jjCheckNAddStates(74, 76);
+                  jjCheckNAddStates(68, 70);
                   break;
                case 46:
                   if (curChar == 115)
@@ -1739,14 +1497,14 @@
                   break;
                case 48:
                   if (curChar == 123)
-                     jjAddStates(83, 87);
+                     jjAddStates(77, 81);
                   break;
                case 49:
                   if (curChar != 125)
                      break;
                   if (kind > 51)
                      kind = 51;
-                  jjCheckNAddStates(77, 79);
+                  jjCheckNAddStates(71, 73);
                   break;
                case 52:
                   if (curChar == 100)
@@ -1805,7 +1563,7 @@
                      break;
                   if (kind > 54)
                      kind = 54;
-                  jjCheckNAddStates(80, 82);
+                  jjCheckNAddStates(74, 76);
                   break;
                case 68:
                   if (curChar == 101)
@@ -1845,11 +1603,11 @@
                   break;
                case 84:
                   if ((0x2000000020L & l) != 0L)
-                     jjAddStates(99, 100);
+                     jjAddStates(93, 94);
                   break;
                case 88:
                   if ((0x2000000020L & l) != 0L)
-                     jjAddStates(101, 102);
+                     jjAddStates(95, 96);
                   break;
                default : break;
             }
@@ -1862,7 +1620,7 @@
          long l1 = 1L << (hiByte & 077);
          int i2 = (curChar & 0xff) >> 6;
          long l2 = 1L << (curChar & 077);
-         MatchLoop: do
+         do
          {
             switch(jjstateSet[--i])
             {
@@ -1887,12 +1645,12 @@
       catch(java.io.IOException e) { return curPos; }
    }
 }
-private final int jjStopStringLiteralDfa_6(int pos, long active0)
+private final int jjStopStringLiteralDfa_8(int pos, long active0)
 {
    switch (pos)
    {
       case 0:
-         if ((active0 & 0x3a0000L) != 0L)
+         if ((active0 & 0x1a0000L) != 0L)
             return 2;
          return -1;
       case 1:
@@ -1903,30 +1661,233 @@
          return -1;
    }
 }
-private final int jjStartNfa_6(int pos, long active0)
+private final int jjStartNfa_8(int pos, long active0)
 {
-   return jjMoveNfa_6(jjStopStringLiteralDfa_6(pos, active0), pos + 1);
+   return jjMoveNfa_8(jjStopStringLiteralDfa_8(pos, active0), pos + 1);
+}
+private int jjMoveStringLiteralDfa0_8()
+{
+   switch(curChar)
+   {
+      case 35:
+         jjmatchedKind = 20;
+         return jjMoveStringLiteralDfa1_8(0xa0000L);
+      case 42:
+         return jjMoveStringLiteralDfa1_8(0x8000000L);
+      default :
+         return jjMoveNfa_8(3, 0);
+   }
+}
+private int jjMoveStringLiteralDfa1_8(long active0)
+{
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+      jjStopStringLiteralDfa_8(0, active0);
+      return 1;
+   }
+   switch(curChar)
+   {
+      case 35:
+         if ((active0 & 0x8000000L) != 0L)
+            return jjStopAtPos(1, 27);
+         break;
+      case 42:
+         if ((active0 & 0x80000L) != 0L)
+            return jjStartNfaWithStates_8(1, 19, 0);
+         break;
+      case 91:
+         return jjMoveStringLiteralDfa2_8(active0, 0x20000L);
+      default :
+         break;
+   }
+   return jjStartNfa_8(0, active0);
+}
+private int jjMoveStringLiteralDfa2_8(long old0, long active0)
+{
+   if (((active0 &= old0)) == 0L)
+      return jjStartNfa_8(0, old0);
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+      jjStopStringLiteralDfa_8(1, active0);
+      return 2;
+   }
+   switch(curChar)
+   {
+      case 91:
+         if ((active0 & 0x20000L) != 0L)
+            return jjStopAtPos(2, 17);
+         break;
+      default :
+         break;
+   }
+   return jjStartNfa_8(1, active0);
 }
-private final int jjStartNfaWithStates_6(int pos, int kind, int state)
+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_6(state, pos + 1);
+   return jjMoveNfa_8(state, pos + 1);
+}
+private int jjMoveNfa_8(int startState, int curPos)
+{
+   int startsAt = 0;
+   jjnewStateCnt = 12;
+   int i = 1;
+   jjstateSet[0] = startState;
+   int kind = 0x7fffffff;
+   for (;;)
+   {
+      if (++jjround == 0x7fffffff)
+         ReInitRounds();
+      if (curChar < 64)
+      {
+         long l = 1L << curChar;
+         do
+         {
+            switch(jjstateSet[--i])
+            {
+               case 3:
+                  if (curChar == 36)
+                  {
+                     if (kind > 15)
+                        kind = 15;
+                     jjCheckNAddTwoStates(9, 10);
+                  }
+                  else if (curChar == 35)
+                     jjstateSet[jjnewStateCnt++] = 2;
+                  break;
+               case 0:
+                  if (curChar == 42)
+                     jjstateSet[jjnewStateCnt++] = 1;
+                  break;
+               case 1:
+                  if ((0xfffffff7ffffffffL & l) != 0L && kind > 18)
+                     kind = 18;
+                  break;
+               case 2:
+                  if (curChar == 42)
+                     jjstateSet[jjnewStateCnt++] = 0;
+                  break;
+               case 6:
+                  if (curChar == 36 && kind > 15)
+                     kind = 15;
+                  break;
+               case 8:
+                  if (curChar == 36)
+                     jjCheckNAddTwoStates(9, 10);
+                  break;
+               case 10:
+                  if (curChar == 33 && kind > 16)
+                     kind = 16;
+                  break;
+               case 11:
+                  if (curChar != 36)
+                     break;
+                  if (kind > 15)
+                     kind = 15;
+                  jjCheckNAddTwoStates(9, 10);
+                  break;
+               default : break;
+            }
+         } while(i != startsAt);
+      }
+      else if (curChar < 128)
+      {
+         long l = 1L << (curChar & 077);
+         do
+         {
+            switch(jjstateSet[--i])
+            {
+               case 3:
+                  if (curChar == 92)
+                     jjCheckNAddStates(97, 100);
+                  break;
+               case 1:
+                  if (kind > 18)
+                     kind = 18;
+                  break;
+               case 5:
+                  if (curChar == 92)
+                     jjCheckNAddTwoStates(5, 6);
+                  break;
+               case 7:
+                  if (curChar == 92)
+                     jjCheckNAddTwoStates(7, 8);
+                  break;
+               case 9:
+                  if (curChar == 92)
+                     jjAddStates(101, 102);
+                  break;
+               default : break;
+            }
+         } while(i != startsAt);
+      }
+      else
+      {
+         int hiByte = (int)(curChar >> 8);
+         int i1 = hiByte >> 6;
+         long l1 = 1L << (hiByte & 077);
+         int i2 = (curChar & 0xff) >> 6;
+         long l2 = 1L << (curChar & 077);
+         do
+         {
+            switch(jjstateSet[--i])
+            {
+               case 1:
+                  if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 18)
+                     kind = 18;
+                  break;
+               default : break;
+            }
+         } while(i != startsAt);
+      }
+      if (kind != 0x7fffffff)
+      {
+         jjmatchedKind = kind;
+         jjmatchedPos = curPos;
+         kind = 0x7fffffff;
+      }
+      ++curPos;
+      if ((i = jjnewStateCnt) == (startsAt = 12 - (jjnewStateCnt = startsAt)))
+         return curPos;
+      try { curChar = input_stream.readChar(); }
+      catch(java.io.IOException e) { return curPos; }
+   }
+}
+private final int jjStopStringLiteralDfa_6(int pos, long active0)
+{
+   switch (pos)
+   {
+      case 0:
+         if ((active0 & 0x1a0000L) != 0L)
+            return 2;
+         return -1;
+      case 1:
+         if ((active0 & 0x80000L) != 0L)
+            return 0;
+         return -1;
+      default :
+         return -1;
+   }
+}
+private final int jjStartNfa_6(int pos, long active0)
+{
+   return jjMoveNfa_6(jjStopStringLiteralDfa_6(pos, active0), pos + 1);
 }
-private final int jjMoveStringLiteralDfa0_6()
+private int jjMoveStringLiteralDfa0_6()
 {
    switch(curChar)
    {
       case 35:
          jjmatchedKind = 20;
-         return jjMoveStringLiteralDfa1_6(0x2a0000L);
+         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) {
@@ -1935,10 +1896,6 @@
    }
    switch(curChar)
    {
-      case 35:
-         if ((active0 & 0x200000L) != 0L)
-            return jjStopAtPos(1, 21);
-         break;
       case 42:
          if ((active0 & 0x80000L) != 0L)
             return jjStartNfaWithStates_6(1, 19, 0);
@@ -1950,10 +1907,10 @@
    }
    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);
@@ -1970,14 +1927,21 @@
    }
    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)
@@ -1985,7 +1949,7 @@
       if (curChar < 64)
       {
          long l = 1L << curChar;
-         MatchLoop: do
+         do
          {
             switch(jjstateSet[--i])
             {
@@ -2037,13 +2001,13 @@
       else if (curChar < 128)
       {
          long l = 1L << (curChar & 077);
-         MatchLoop: do
+         do
          {
             switch(jjstateSet[--i])
             {
                case 3:
                   if (curChar == 92)
-                     jjCheckNAddStates(53, 56);
+                     jjCheckNAddStates(97, 100);
                   break;
                case 1:
                   if (kind > 18)
@@ -2059,7 +2023,7 @@
                   break;
                case 9:
                   if (curChar == 92)
-                     jjAddStates(57, 58);
+                     jjAddStates(101, 102);
                   break;
                default : break;
             }
@@ -2072,7 +2036,7 @@
          long l1 = 1L << (hiByte & 077);
          int i2 = (curChar & 0xff) >> 6;
          long l2 = 1L << (curChar & 077);
-         MatchLoop: do
+         do
          {
             switch(jjstateSet[--i])
             {
@@ -2121,15 +2085,7 @@
 {
    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)
    {
@@ -2143,7 +2099,7 @@
          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) {
@@ -2171,10 +2127,10 @@
    }
    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);
@@ -2191,14 +2147,21 @@
    }
    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 = 39;
    int i = 1;
    jjstateSet[0] = startState;
-   int j, kind = 0x7fffffff;
+   int kind = 0x7fffffff;
    for (;;)
    {
       if (++jjround == 0x7fffffff)
@@ -2206,7 +2169,7 @@
       if (curChar < 64)
       {
          long l = 1L << curChar;
-         MatchLoop: do
+         do
          {
             switch(jjstateSet[--i])
             {
@@ -2335,7 +2298,7 @@
       else if (curChar < 128)
       {
          long l = 1L << (curChar & 077);
-         MatchLoop: do
+         do
          {
             switch(jjstateSet[--i])
             {
@@ -2355,7 +2318,7 @@
                   break;
                case 39:
                   if (curChar == 92)
-                     jjAddStates(69, 70);
+                     jjAddStates(63, 64);
                   if (curChar == 92)
                      jjCheckNAddTwoStates(30, 31);
                   if (curChar == 92)
@@ -2371,7 +2334,7 @@
                   else if (curChar == 92)
                      jjCheckNAddStates(115, 118);
                   if (curChar == 92)
-                     jjAddStates(69, 70);
+                     jjAddStates(63, 64);
                   break;
                case 2:
                   if (curChar == 116)
@@ -2422,7 +2385,7 @@
                   break;
                case 18:
                   if (curChar == 92)
-                     jjAddStates(69, 70);
+                     jjAddStates(63, 64);
                   break;
                case 21:
                case 22:
@@ -2479,7 +2442,7 @@
          long l1 = 1L << (hiByte & 077);
          int i2 = (curChar & 0xff) >> 6;
          long l2 = 1L << (curChar & 077);
-         MatchLoop: do
+         do
          {
             switch(jjstateSet[--i])
             {
@@ -2512,12 +2475,12 @@
       catch(java.io.IOException e) { return curPos; }
    }
 }
-private final int jjStopStringLiteralDfa_10(int pos, long active0)
+private final int jjStopStringLiteralDfa_9(int pos, long active0)
 {
    switch (pos)
    {
       case 0:
-         if ((active0 & 0x3a0000L) != 0L)
+         if ((active0 & 0x1a0000L) != 0L)
             return 2;
          return -1;
       case 1:
@@ -2528,64 +2491,54 @@
          return -1;
    }
 }
-private final int jjStartNfa_10(int pos, long active0)
-{
-   return jjMoveNfa_10(jjStopStringLiteralDfa_10(pos, active0), pos + 1);
-}
-private final int jjStartNfaWithStates_10(int pos, int kind, int state)
+private final int jjStartNfa_9(int pos, long active0)
 {
-   jjmatchedKind = kind;
-   jjmatchedPos = pos;
-   try { curChar = input_stream.readChar(); }
-   catch(java.io.IOException e) { return pos + 1; }
-   return jjMoveNfa_10(state, pos + 1);
+   return jjMoveNfa_9(jjStopStringLiteralDfa_9(pos, active0), pos + 1);
 }
-private final int jjMoveStringLiteralDfa0_10()
+private int jjMoveStringLiteralDfa0_9()
 {
    switch(curChar)
    {
       case 35:
          jjmatchedKind = 20;
-         return jjMoveStringLiteralDfa1_10(0x2a0000L);
+         return jjMoveStringLiteralDfa1_9(0xa0000L);
       case 42:
-         return jjMoveStringLiteralDfa1_10(0x4000000L);
+         return jjMoveStringLiteralDfa1_9(0x4000000L);
       default :
-         return jjMoveNfa_10(3, 0);
+         return jjMoveNfa_9(3, 0);
    }
 }
-private final int jjMoveStringLiteralDfa1_10(long active0)
+private int jjMoveStringLiteralDfa1_9(long active0)
 {
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
-      jjStopStringLiteralDfa_10(0, active0);
+      jjStopStringLiteralDfa_9(0, active0);
       return 1;
    }
    switch(curChar)
    {
       case 35:
-         if ((active0 & 0x200000L) != 0L)
-            return jjStopAtPos(1, 21);
-         else if ((active0 & 0x4000000L) != 0L)
+         if ((active0 & 0x4000000L) != 0L)
             return jjStopAtPos(1, 26);
          break;
       case 42:
          if ((active0 & 0x80000L) != 0L)
-            return jjStartNfaWithStates_10(1, 19, 0);
+            return jjStartNfaWithStates_9(1, 19, 0);
          break;
       case 91:
-         return jjMoveStringLiteralDfa2_10(active0, 0x20000L);
+         return jjMoveStringLiteralDfa2_9(active0, 0x20000L);
       default :
          break;
    }
-   return jjStartNfa_10(0, active0);
+   return jjStartNfa_9(0, active0);
 }
-private final int jjMoveStringLiteralDfa2_10(long old0, long active0)
+private int jjMoveStringLiteralDfa2_9(long old0, long active0)
 {
    if (((active0 &= old0)) == 0L)
-      return jjStartNfa_10(0, old0); 
+      return jjStartNfa_9(0, old0);
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
-      jjStopStringLiteralDfa_10(1, active0);
+      jjStopStringLiteralDfa_9(1, active0);
       return 2;
    }
    switch(curChar)
@@ -2597,16 +2550,23 @@
       default :
          break;
    }
-   return jjStartNfa_10(1, active0);
+   return jjStartNfa_9(1, active0);
 }
-private final int jjMoveNfa_10(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)
@@ -2614,7 +2574,7 @@
       if (curChar < 64)
       {
          long l = 1L << curChar;
-         MatchLoop: do
+         do
          {
             switch(jjstateSet[--i])
             {
@@ -2666,13 +2626,13 @@
       else if (curChar < 128)
       {
          long l = 1L << (curChar & 077);
-         MatchLoop: do
+         do
          {
             switch(jjstateSet[--i])
             {
                case 3:
                   if (curChar == 92)
-                     jjCheckNAddStates(53, 56);
+                     jjCheckNAddStates(97, 100);
                   break;
                case 1:
                   if (kind > 18)
@@ -2688,7 +2648,7 @@
                   break;
                case 9:
                   if (curChar == 92)
-                     jjAddStates(57, 58);
+                     jjAddStates(101, 102);
                   break;
                default : break;
             }
@@ -2701,7 +2661,7 @@
          long l1 = 1L << (hiByte & 077);
          int i2 = (curChar & 0xff) >> 6;
          long l2 = 1L << (curChar & 077);
-         MatchLoop: do
+         do
          {
             switch(jjstateSet[--i])
             {
@@ -2731,7 +2691,7 @@
    switch (pos)
    {
       case 0:
-         if ((active0 & 0x3a0000L) != 0L)
+         if ((active0 & 0x1a0000L) != 0L)
             return 2;
          return -1;
       case 1:
@@ -2746,21 +2706,13 @@
 {
    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()
+private int jjMoveStringLiteralDfa0_2()
 {
    switch(curChar)
    {
       case 35:
          jjmatchedKind = 20;
-         return jjMoveStringLiteralDfa1_2(0x2a0000L);
+         return jjMoveStringLiteralDfa1_2(0xa0000L);
       case 93:
          return jjStopAtPos(0, 2);
       case 102:
@@ -2771,7 +2723,7 @@
          return jjMoveNfa_2(3, 0);
    }
 }
-private final int jjMoveStringLiteralDfa1_2(long active0)
+private int jjMoveStringLiteralDfa1_2(long active0)
 {
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
@@ -2780,10 +2732,6 @@
    }
    switch(curChar)
    {
-      case 35:
-         if ((active0 & 0x200000L) != 0L)
-            return jjStopAtPos(1, 21);
-         break;
       case 42:
          if ((active0 & 0x80000L) != 0L)
             return jjStartNfaWithStates_2(1, 19, 0);
@@ -2799,10 +2747,10 @@
    }
    return jjStartNfa_2(0, active0);
 }
-private final int jjMoveStringLiteralDfa2_2(long old0, long active0)
+private int jjMoveStringLiteralDfa2_2(long old0, long active0)
 {
    if (((active0 &= old0)) == 0L)
-      return jjStartNfa_2(0, old0); 
+      return jjStartNfa_2(0, old0);
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
       jjStopStringLiteralDfa_2(1, active0);
@@ -2823,10 +2771,10 @@
    }
    return jjStartNfa_2(1, active0);
 }
-private final int jjMoveStringLiteralDfa3_2(long old0, long active0)
+private int jjMoveStringLiteralDfa3_2(long old0, long active0)
 {
    if (((active0 &= old0)) == 0L)
-      return jjStartNfa_2(1, old0); 
+      return jjStartNfa_2(1, old0);
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
       jjStopStringLiteralDfa_2(2, active0);
@@ -2845,10 +2793,10 @@
    }
    return jjStartNfa_2(2, active0);
 }
-private final int jjMoveStringLiteralDfa4_2(long old0, long active0)
+private int jjMoveStringLiteralDfa4_2(long old0, long active0)
 {
    if (((active0 &= old0)) == 0L)
-      return jjStartNfa_2(2, old0); 
+      return jjStartNfa_2(2, old0);
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
       jjStopStringLiteralDfa_2(3, active0);
@@ -2865,14 +2813,21 @@
    }
    return jjStartNfa_2(3, active0);
 }
-private final int jjMoveNfa_2(int startState, int curPos)
+private 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 int jjMoveNfa_2(int startState, int curPos)
 {
-   int[] nextStates;
    int startsAt = 0;
    jjnewStateCnt = 55;
    int i = 1;
    jjstateSet[0] = startState;
-   int j, kind = 0x7fffffff;
+   int kind = 0x7fffffff;
    for (;;)
    {
       if (++jjround == 0x7fffffff)
@@ -2880,7 +2835,7 @@
       if (curChar < 64)
       {
          long l = 1L << curChar;
-         MatchLoop: do
+         do
          {
             switch(jjstateSet[--i])
             {
@@ -2983,7 +2938,7 @@
                   break;
                case 19:
                   if (curChar == 32)
-                     jjAddStates(69, 70);
+                     jjAddStates(63, 64);
                   break;
                case 20:
                   if (curChar == 10)
@@ -3127,7 +3082,7 @@
       else if (curChar < 128)
       {
          long l = 1L << (curChar & 077);
-         MatchLoop: do
+         do
          {
             switch(jjstateSet[--i])
             {
@@ -3212,7 +3167,7 @@
          long l1 = 1L << (hiByte & 077);
          int i2 = (curChar & 0xff) >> 6;
          long l2 = 1L << (curChar & 077);
-         MatchLoop: do
+         do
          {
             switch(jjstateSet[--i])
             {
@@ -3245,12 +3200,12 @@
       catch(java.io.IOException e) { return curPos; }
    }
 }
-private final int jjStopStringLiteralDfa_11(int pos, long active0)
+private final int jjStopStringLiteralDfa_10(int pos, long active0)
 {
    switch (pos)
    {
       case 0:
-         if ((active0 & 0x3a0000L) != 0L)
+         if ((active0 & 0x1a0000L) != 0L)
             return 2;
          return -1;
       case 1:
@@ -3261,60 +3216,48 @@
          return -1;
    }
 }
-private final int jjStartNfa_11(int pos, long active0)
-{
-   return jjMoveNfa_11(jjStopStringLiteralDfa_11(pos, active0), pos + 1);
-}
-private final int jjStartNfaWithStates_11(int pos, int kind, int state)
+private final int jjStartNfa_10(int pos, long active0)
 {
-   jjmatchedKind = kind;
-   jjmatchedPos = pos;
-   try { curChar = input_stream.readChar(); }
-   catch(java.io.IOException e) { return pos + 1; }
-   return jjMoveNfa_11(state, pos + 1);
+   return jjMoveNfa_10(jjStopStringLiteralDfa_10(pos, active0), pos + 1);
 }
-private final int jjMoveStringLiteralDfa0_11()
+private int jjMoveStringLiteralDfa0_10()
 {
    switch(curChar)
    {
       case 35:
          jjmatchedKind = 20;
-         return jjMoveStringLiteralDfa1_11(0x2a0000L);
+         return jjMoveStringLiteralDfa1_10(0xa0000L);
       default :
-         return jjMoveNfa_11(3, 0);
+         return jjMoveNfa_10(3, 0);
    }
 }
-private final int jjMoveStringLiteralDfa1_11(long active0)
+private int jjMoveStringLiteralDfa1_10(long active0)
 {
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
-      jjStopStringLiteralDfa_11(0, active0);
+      jjStopStringLiteralDfa_10(0, active0);
       return 1;
    }
    switch(curChar)
    {
-      case 35:
-         if ((active0 & 0x200000L) != 0L)
-            return jjStopAtPos(1, 21);
-         break;
       case 42:
          if ((active0 & 0x80000L) != 0L)
-            return jjStartNfaWithStates_11(1, 19, 0);
+            return jjStartNfaWithStates_10(1, 19, 0);
          break;
       case 91:
-         return jjMoveStringLiteralDfa2_11(active0, 0x20000L);
+         return jjMoveStringLiteralDfa2_10(active0, 0x20000L);
       default :
          break;
    }
-   return jjStartNfa_11(0, active0);
+   return jjStartNfa_10(0, active0);
 }
-private final int jjMoveStringLiteralDfa2_11(long old0, long active0)
+private int jjMoveStringLiteralDfa2_10(long old0, long active0)
 {
    if (((active0 &= old0)) == 0L)
-      return jjStartNfa_11(0, old0); 
+      return jjStartNfa_10(0, old0);
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
-      jjStopStringLiteralDfa_11(1, active0);
+      jjStopStringLiteralDfa_10(1, active0);
       return 2;
    }
    switch(curChar)
@@ -3326,16 +3269,23 @@
       default :
          break;
    }
-   return jjStartNfa_11(1, active0);
+   return jjStartNfa_10(1, active0);
+}
+private int jjStartNfaWithStates_10(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_10(state, pos + 1);
 }
-private final int jjMoveNfa_11(int startState, int curPos)
+private int jjMoveNfa_10(int startState, int curPos)
 {
-   int[] nextStates;
    int startsAt = 0;
    jjnewStateCnt = 15;
    int i = 1;
    jjstateSet[0] = startState;
-   int j, kind = 0x7fffffff;
+   int kind = 0x7fffffff;
    for (;;)
    {
       if (++jjround == 0x7fffffff)
@@ -3343,7 +3293,7 @@
       if (curChar < 64)
       {
          long l = 1L << curChar;
-         MatchLoop: do
+         do
          {
             switch(jjstateSet[--i])
             {
@@ -3414,7 +3364,7 @@
       else if (curChar < 128)
       {
          long l = 1L << (curChar & 077);
-         MatchLoop: do
+         do
          {
             switch(jjstateSet[--i])
             {
@@ -3449,7 +3399,7 @@
          long l1 = 1L << (hiByte & 077);
          int i2 = (curChar & 0xff) >> 6;
          long l2 = 1L << (curChar & 077);
-         MatchLoop: do
+         do
          {
             switch(jjstateSet[--i])
             {
@@ -3523,15 +3473,7 @@
 {
    return jjMoveNfa_0(jjStopStringLiteralDfa_0(pos, active0, active1), pos + 1);
 }
-private final int jjStartNfaWithStates_0(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_0(state, pos + 1);
-}
-private final int jjMoveStringLiteralDfa0_0()
+private int jjMoveStringLiteralDfa0_0()
 {
    switch(curChar)
    {
@@ -3552,7 +3494,7 @@
          return jjMoveNfa_0(12, 0);
    }
 }
-private final int jjMoveStringLiteralDfa1_0(long active0)
+private int jjMoveStringLiteralDfa1_0(long active0)
 {
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
@@ -3580,7 +3522,7 @@
    }
    return jjStartNfa_0(0, active0, 0L);
 }
-private final int jjMoveStringLiteralDfa2_0(long old0, long active0)
+private int jjMoveStringLiteralDfa2_0(long old0, long active0)
 {
    if (((active0 &= old0)) == 0L)
       return jjStartNfa_0(0, old0, 0L);
@@ -3604,7 +3546,7 @@
    }
    return jjStartNfa_0(1, active0, 0L);
 }
-private final int jjMoveStringLiteralDfa3_0(long old0, long active0)
+private int jjMoveStringLiteralDfa3_0(long old0, long active0)
 {
    if (((active0 &= old0)) == 0L)
       return jjStartNfa_0(1, old0, 0L);
@@ -3626,7 +3568,7 @@
    }
    return jjStartNfa_0(2, active0, 0L);
 }
-private final int jjMoveStringLiteralDfa4_0(long old0, long active0)
+private int jjMoveStringLiteralDfa4_0(long old0, long active0)
 {
    if (((active0 &= old0)) == 0L)
       return jjStartNfa_0(2, old0, 0L);
@@ -3646,14 +3588,21 @@
    }
    return jjStartNfa_0(3, active0, 0L);
 }
-private final int jjMoveNfa_0(int startState, int curPos)
+private int jjStartNfaWithStates_0(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_0(state, pos + 1);
+}
+private int jjMoveNfa_0(int startState, int curPos)
 {
-   int[] nextStates;
    int startsAt = 0;
    jjnewStateCnt = 33;
    int i = 1;
    jjstateSet[0] = startState;
-   int j, kind = 0x7fffffff;
+   int kind = 0x7fffffff;
    for (;;)
    {
       if (++jjround == 0x7fffffff)
@@ -3661,7 +3610,7 @@
       if (curChar < 64)
       {
          long l = 1L << curChar;
-         MatchLoop: do
+         do
          {
             switch(jjstateSet[--i])
             {
@@ -3759,7 +3708,7 @@
       else if (curChar < 128)
       {
          long l = 1L << (curChar & 077);
-         MatchLoop: do
+         do
          {
             switch(jjstateSet[--i])
             {
@@ -3771,7 +3720,7 @@
                      jjCheckNAdd(13);
                   }
                   else if (curChar == 92)
-                     jjCheckNAddStates(88, 91);
+                     jjCheckNAddStates(82, 85);
                   break;
                case 32:
                   if (curChar == 123)
@@ -3832,7 +3781,7 @@
                   break;
                case 21:
                   if (curChar == 92)
-                     jjCheckNAddStates(88, 91);
+                     jjCheckNAddStates(82, 85);
                   break;
                case 22:
                   if (curChar == 92)
@@ -3844,7 +3793,7 @@
                   break;
                case 26:
                   if (curChar == 92)
-                     jjAddStates(97, 98);
+                     jjAddStates(91, 92);
                   break;
                case 31:
                   if (kind > 18)
@@ -3861,7 +3810,7 @@
          long l1 = 1L << (hiByte & 077);
          int i2 = (curChar & 0xff) >> 6;
          long l2 = 1L << (curChar & 077);
-         MatchLoop: do
+         do
          {
             switch(jjstateSet[--i])
             {
@@ -3896,7 +3845,7 @@
             jjmatchedKind = 67;
             return 36;
          }
-         if ((active0 & 0x3a0000L) != 0L)
+         if ((active0 & 0x1a0000L) != 0L)
             return 48;
          if ((active0 & 0x40L) != 0L)
             return 70;
@@ -3937,21 +3886,13 @@
 {
    return jjMoveNfa_4(jjStopStringLiteralDfa_4(pos, active0), pos + 1);
 }
-private final int jjStartNfaWithStates_4(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_4(state, pos + 1);
-}
-private final int jjMoveStringLiteralDfa0_4()
+private int jjMoveStringLiteralDfa0_4()
 {
    switch(curChar)
    {
       case 35:
          jjmatchedKind = 20;
-         return jjMoveStringLiteralDfa1_4(0x2a0000L);
+         return jjMoveStringLiteralDfa1_4(0xa0000L);
       case 41:
          return jjStopAtPos(0, 12);
       case 44:
@@ -3976,7 +3917,7 @@
          return jjMoveNfa_4(13, 0);
    }
 }
-private final int jjMoveStringLiteralDfa1_4(long active0)
+private int jjMoveStringLiteralDfa1_4(long active0)
 {
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
@@ -3985,10 +3926,6 @@
    }
    switch(curChar)
    {
-      case 35:
-         if ((active0 & 0x200000L) != 0L)
-            return jjStopAtPos(1, 21);
-         break;
       case 42:
          if ((active0 & 0x80000L) != 0L)
             return jjStartNfaWithStates_4(1, 19, 46);
@@ -4008,10 +3945,10 @@
    }
    return jjStartNfa_4(0, active0);
 }
-private final int jjMoveStringLiteralDfa2_4(long old0, long active0)
+private int jjMoveStringLiteralDfa2_4(long old0, long active0)
 {
    if (((active0 &= old0)) == 0L)
-      return jjStartNfa_4(0, old0); 
+      return jjStartNfa_4(0, old0);
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
       jjStopStringLiteralDfa_4(1, active0);
@@ -4032,10 +3969,10 @@
    }
    return jjStartNfa_4(1, active0);
 }
-private final int jjMoveStringLiteralDfa3_4(long old0, long active0)
+private int jjMoveStringLiteralDfa3_4(long old0, long active0)
 {
    if (((active0 &= old0)) == 0L)
-      return jjStartNfa_4(1, old0); 
+      return jjStartNfa_4(1, old0);
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
       jjStopStringLiteralDfa_4(2, active0);
@@ -4054,10 +3991,10 @@
    }
    return jjStartNfa_4(2, active0);
 }
-private final int jjMoveStringLiteralDfa4_4(long old0, long active0)
+private int jjMoveStringLiteralDfa4_4(long old0, long active0)
 {
    if (((active0 &= old0)) == 0L)
-      return jjStartNfa_4(2, old0); 
+      return jjStartNfa_4(2, old0);
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
       jjStopStringLiteralDfa_4(3, active0);
@@ -4074,14 +4011,21 @@
    }
    return jjStartNfa_4(3, active0);
 }
-private final int jjMoveNfa_4(int startState, int curPos)
+private int jjStartNfaWithStates_4(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_4(state, pos + 1);
+}
+private int jjMoveNfa_4(int startState, int curPos)
 {
-   int[] nextStates;
    int startsAt = 0;
    jjnewStateCnt = 71;
    int i = 1;
    jjstateSet[0] = startState;
-   int j, kind = 0x7fffffff;
+   int kind = 0x7fffffff;
    for (;;)
    {
       if (++jjround == 0x7fffffff)
@@ -4089,7 +4033,7 @@
       if (curChar < 64)
       {
          long l = 1L << curChar;
-         MatchLoop: do
+         do
          {
             switch(jjstateSet[--i])
             {
@@ -4366,7 +4310,7 @@
       else if (curChar < 128)
       {
          long l = 1L << (curChar & 077);
-         MatchLoop: do
+         do
          {
             switch(jjstateSet[--i])
             {
@@ -4511,7 +4455,7 @@
          long l1 = 1L << (hiByte & 077);
          int i2 = (curChar & 0xff) >> 6;
          long l2 = 1L << (curChar & 077);
-         MatchLoop: do
+         do
          {
             switch(jjstateSet[--i])
             {
@@ -4544,105 +4488,183 @@
       catch(java.io.IOException e) { return curPos; }
    }
 }
-private final int jjStopStringLiteralDfa_8(int pos, long active0)
+private final int jjStopStringLiteralDfa_1(int pos, long active0, long active1)
 {
    switch (pos)
    {
       case 0:
-         if ((active0 & 0x3a0000L) != 0L)
-            return 2;
+         if ((active0 & 0x600000000L) != 0L)
+         {
+            jjmatchedKind = 67;
+            return 13;
+         }
+         if ((active0 & 0x1a0000L) != 0L)
+            return 27;
          return -1;
       case 1:
+         if ((active0 & 0x600000000L) != 0L)
+         {
+            jjmatchedKind = 67;
+            jjmatchedPos = 1;
+            return 13;
+         }
          if ((active0 & 0x80000L) != 0L)
-            return 0;
+            return 25;
+         return -1;
+      case 2:
+         if ((active0 & 0x600000000L) != 0L)
+         {
+            jjmatchedKind = 67;
+            jjmatchedPos = 2;
+            return 13;
+         }
+         return -1;
+      case 3:
+         if ((active0 & 0x400000000L) != 0L)
+         {
+            jjmatchedKind = 67;
+            jjmatchedPos = 3;
+            return 13;
+         }
+         if ((active0 & 0x200000000L) != 0L)
+            return 13;
          return -1;
       default :
          return -1;
    }
 }
-private final int jjStartNfa_8(int pos, long active0)
-{
-   return jjMoveNfa_8(jjStopStringLiteralDfa_8(pos, active0), pos + 1);
-}
-private final int jjStartNfaWithStates_8(int pos, int kind, int state)
+private final int jjStartNfa_1(int pos, long active0, long active1)
 {
-   jjmatchedKind = kind;
-   jjmatchedPos = pos;
-   try { curChar = input_stream.readChar(); }
-   catch(java.io.IOException e) { return pos + 1; }
-   return jjMoveNfa_8(state, pos + 1);
+   return jjMoveNfa_1(jjStopStringLiteralDfa_1(pos, active0, active1), pos + 1);
 }
-private final int jjMoveStringLiteralDfa0_8()
+private int jjMoveStringLiteralDfa0_1()
 {
    switch(curChar)
    {
       case 35:
          jjmatchedKind = 20;
-         return jjMoveStringLiteralDfa1_8(0x2a0000L);
-      case 93:
-         return jjMoveStringLiteralDfa1_8(0x10000000L);
+         return jjMoveStringLiteralDfa1_1(0xa0000L);
+      case 40:
+         return jjStopAtPos(0, 10);
+      case 91:
+         return jjStopAtPos(0, 1);
+      case 102:
+         return jjMoveStringLiteralDfa1_1(0x400000000L);
+      case 116:
+         return jjMoveStringLiteralDfa1_1(0x200000000L);
+      case 123:
+         return jjStopAtPos(0, 69);
+      case 125:
+         return jjStopAtPos(0, 70);
       default :
-         return jjMoveNfa_8(3, 0);
+         return jjMoveNfa_1(12, 0);
    }
 }
-private final int jjMoveStringLiteralDfa1_8(long active0)
+private int jjMoveStringLiteralDfa1_1(long active0)
 {
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
-      jjStopStringLiteralDfa_8(0, active0);
+      jjStopStringLiteralDfa_1(0, active0, 0L);
       return 1;
    }
    switch(curChar)
    {
-      case 35:
-         if ((active0 & 0x200000L) != 0L)
-            return jjStopAtPos(1, 21);
-         break;
       case 42:
          if ((active0 & 0x80000L) != 0L)
-            return jjStartNfaWithStates_8(1, 19, 0);
+            return jjStartNfaWithStates_1(1, 19, 25);
          break;
       case 91:
-         return jjMoveStringLiteralDfa2_8(active0, 0x20000L);
-      case 93:
-         return jjMoveStringLiteralDfa2_8(active0, 0x10000000L);
+         return jjMoveStringLiteralDfa2_1(active0, 0x20000L);
+      case 97:
+         return jjMoveStringLiteralDfa2_1(active0, 0x400000000L);
+      case 114:
+         return jjMoveStringLiteralDfa2_1(active0, 0x200000000L);
       default :
          break;
    }
-   return jjStartNfa_8(0, active0);
+   return jjStartNfa_1(0, active0, 0L);
 }
-private final int jjMoveStringLiteralDfa2_8(long old0, long active0)
+private int jjMoveStringLiteralDfa2_1(long old0, long active0)
 {
    if (((active0 &= old0)) == 0L)
-      return jjStartNfa_8(0, old0); 
+      return jjStartNfa_1(0, old0, 0L);
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
-      jjStopStringLiteralDfa_8(1, active0);
+      jjStopStringLiteralDfa_1(1, active0, 0L);
       return 2;
    }
    switch(curChar)
    {
-      case 35:
-         if ((active0 & 0x10000000L) != 0L)
-            return jjStopAtPos(2, 28);
-         break;
       case 91:
          if ((active0 & 0x20000L) != 0L)
             return jjStopAtPos(2, 17);
          break;
+      case 108:
+         return jjMoveStringLiteralDfa3_1(active0, 0x400000000L);
+      case 117:
+         return jjMoveStringLiteralDfa3_1(active0, 0x200000000L);
       default :
          break;
    }
-   return jjStartNfa_8(1, active0);
+   return jjStartNfa_1(1, active0, 0L);
+}
+private int jjMoveStringLiteralDfa3_1(long old0, long active0)
+{
+   if (((active0 &= old0)) == 0L)
+      return jjStartNfa_1(1, old0, 0L);
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+      jjStopStringLiteralDfa_1(2, active0, 0L);
+      return 3;
+   }
+   switch(curChar)
+   {
+      case 101:
+         if ((active0 & 0x200000000L) != 0L)
+            return jjStartNfaWithStates_1(3, 33, 13);
+         break;
+      case 115:
+         return jjMoveStringLiteralDfa4_1(active0, 0x400000000L);
+      default :
+         break;
+   }
+   return jjStartNfa_1(2, active0, 0L);
+}
+private int jjMoveStringLiteralDfa4_1(long old0, long active0)
+{
+   if (((active0 &= old0)) == 0L)
+      return jjStartNfa_1(2, old0, 0L);
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+      jjStopStringLiteralDfa_1(3, active0, 0L);
+      return 4;
+   }
+   switch(curChar)
+   {
+      case 101:
+         if ((active0 & 0x400000000L) != 0L)
+            return jjStartNfaWithStates_1(4, 34, 13);
+         break;
+      default :
+         break;
+   }
+   return jjStartNfa_1(3, active0, 0L);
 }
-private final int jjMoveNfa_8(int startState, int curPos)
+private int jjStartNfaWithStates_1(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_1(state, pos + 1);
+}
+private int jjMoveNfa_1(int startState, int curPos)
 {
-   int[] nextStates;
    int startsAt = 0;
-   jjnewStateCnt = 12;
+   jjnewStateCnt = 28;
    int i = 1;
    jjstateSet[0] = startState;
-   int j, kind = 0x7fffffff;
+   int kind = 0x7fffffff;
    for (;;)
    {
       if (++jjround == 0x7fffffff)
@@ -4650,50 +4672,85 @@
       if (curChar < 64)
       {
          long l = 1L << curChar;
-         MatchLoop: do
+         do
          {
             switch(jjstateSet[--i])
             {
-               case 3:
-                  if (curChar == 36)
-                  {
-                     if (kind > 15)
-                        kind = 15;
-                     jjCheckNAddTwoStates(9, 10);
-                  }
+               case 12:
+                  if ((0x100000200L & l) != 0L)
+                     jjCheckNAddTwoStates(0, 1);
                   else if (curChar == 35)
-                     jjstateSet[jjnewStateCnt++] = 2;
+                     jjCheckNAddStates(212, 214);
+                  else if (curChar == 36)
+                  {
+                     if (kind > 15)
+                        kind = 15;
+                     jjCheckNAddTwoStates(21, 22);
+                  }
+                  else if (curChar == 46)
+                     jjstateSet[jjnewStateCnt++] = 15;
                   break;
-               case 0:
+               case 27:
                   if (curChar == 42)
-                     jjstateSet[jjnewStateCnt++] = 1;
+                     jjstateSet[jjnewStateCnt++] = 25;
+                  break;
+               case 0:
+                  if ((0x100000200L & l) != 0L)
+                     jjCheckNAddTwoStates(0, 1);
                   break;
                case 1:
-                  if ((0xfffffff7ffffffffL & l) != 0L && kind > 18)
-                     kind = 18;
+                  if (curChar == 35)
+                     jjCheckNAddTwoStates(6, 11);
                   break;
-               case 2:
-                  if (curChar == 42)
-                     jjstateSet[jjnewStateCnt++] = 0;
+               case 3:
+                  if (curChar == 32)
+                     jjAddStates(111, 112);
                   break;
-               case 6:
+               case 4:
+                  if (curChar == 40 && kind > 14)
+                     kind = 14;
+                  break;
+               case 13:
+                  if ((0x3ff200000000000L & l) == 0L)
+                     break;
+                  if (kind > 67)
+                     kind = 67;
+                  jjstateSet[jjnewStateCnt++] = 13;
+                  break;
+               case 14:
+                  if (curChar == 46)
+                     jjstateSet[jjnewStateCnt++] = 15;
+                  break;
+               case 18:
                   if (curChar == 36 && kind > 15)
                      kind = 15;
                   break;
-               case 8:
+               case 20:
                   if (curChar == 36)
-                     jjCheckNAddTwoStates(9, 10);
+                     jjCheckNAddTwoStates(21, 22);
                   break;
-               case 10:
+               case 22:
                   if (curChar == 33 && kind > 16)
                      kind = 16;
                   break;
-               case 11:
+               case 23:
                   if (curChar != 36)
                      break;
                   if (kind > 15)
                      kind = 15;
-                  jjCheckNAddTwoStates(9, 10);
+                  jjCheckNAddTwoStates(21, 22);
+                  break;
+               case 24:
+                  if (curChar == 35)
+                     jjCheckNAddStates(212, 214);
+                  break;
+               case 25:
+                  if (curChar == 42)
+                     jjstateSet[jjnewStateCnt++] = 26;
+                  break;
+               case 26:
+                  if ((0xfffffff7ffffffffL & l) != 0L && kind > 18)
+                     kind = 18;
                   break;
                default : break;
             }
@@ -4702,29 +4759,88 @@
       else if (curChar < 128)
       {
          long l = 1L << (curChar & 077);
-         MatchLoop: do
+         do
          {
             switch(jjstateSet[--i])
             {
-               case 3:
-                  if (curChar == 92)
-                     jjCheckNAddStates(53, 56);
+               case 12:
+                  if ((0x7fffffe87fffffeL & l) != 0L)
+                  {
+                     if (kind > 67)
+                        kind = 67;
+                     jjCheckNAdd(13);
+                  }
+                  else if (curChar == 92)
+                     jjCheckNAddStates(215, 218);
                   break;
-               case 1:
-                  if (kind > 18)
-                     kind = 18;
+               case 27:
+                  if (curChar == 123)
+                     jjstateSet[jjnewStateCnt++] = 10;
+                  else if (curChar == 115)
+                     jjstateSet[jjnewStateCnt++] = 5;
+                  break;
+               case 2:
+                  if (curChar == 116)
+                     jjCheckNAddTwoStates(3, 4);
                   break;
                case 5:
-                  if (curChar == 92)
-                     jjCheckNAddTwoStates(5, 6);
+                  if (curChar == 101)
+                     jjstateSet[jjnewStateCnt++] = 2;
+                  break;
+               case 6:
+                  if (curChar == 115)
+                     jjstateSet[jjnewStateCnt++] = 5;
                   break;
                case 7:
-                  if (curChar == 92)
-                     jjCheckNAddTwoStates(7, 8);
+                  if (curChar == 125)
+                     jjCheckNAddTwoStates(3, 4);
+                  break;
+               case 8:
+                  if (curChar == 116)
+                     jjstateSet[jjnewStateCnt++] = 7;
                   break;
                case 9:
+                  if (curChar == 101)
+                     jjstateSet[jjnewStateCnt++] = 8;
+                  break;
+               case 10:
+                  if (curChar == 115)
+                     jjstateSet[jjnewStateCnt++] = 9;
+                  break;
+               case 11:
+                  if (curChar == 123)
+                     jjstateSet[jjnewStateCnt++] = 10;
+                  break;
+               case 13:
+                  if ((0x7fffffe87fffffeL & l) == 0L)
+                     break;
+                  if (kind > 67)
+                     kind = 67;
+                  jjCheckNAdd(13);
+                  break;
+               case 15:
+                  if ((0x7fffffe07fffffeL & l) != 0L && kind > 68)
+                     kind = 68;
+                  break;
+               case 16:
+                  if (curChar == 92)
+                     jjCheckNAddStates(215, 218);
+                  break;
+               case 17:
+                  if (curChar == 92)
+                     jjCheckNAddTwoStates(17, 18);
+                  break;
+               case 19:
                   if (curChar == 92)
-                     jjAddStates(57, 58);
+                     jjCheckNAddTwoStates(19, 20);
+                  break;
+               case 21:
+                  if (curChar == 92)
+                     jjAddStates(219, 220);
+                  break;
+               case 26:
+                  if (kind > 18)
+                     kind = 18;
                   break;
                default : break;
             }
@@ -4737,11 +4853,11 @@
          long l1 = 1L << (hiByte & 077);
          int i2 = (curChar & 0xff) >> 6;
          long l2 = 1L << (curChar & 077);
-         MatchLoop: do
+         do
          {
             switch(jjstateSet[--i])
             {
-               case 1:
+               case 26:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 18)
                      kind = 18;
                   break;
@@ -4756,194 +4872,106 @@
          kind = 0x7fffffff;
       }
       ++curPos;
-      if ((i = jjnewStateCnt) == (startsAt = 12 - (jjnewStateCnt = startsAt)))
+      if ((i = jjnewStateCnt) == (startsAt = 28 - (jjnewStateCnt = startsAt)))
          return curPos;
       try { curChar = input_stream.readChar(); }
       catch(java.io.IOException e) { return curPos; }
    }
 }
-private final int jjStopStringLiteralDfa_1(int pos, long active0, long active1)
+private final int jjStopStringLiteralDfa_7(int pos, long active0)
 {
    switch (pos)
    {
       case 0:
-         if ((active0 & 0x600000000L) != 0L)
-         {
-            jjmatchedKind = 67;
-            return 13;
-         }
-         if ((active0 & 0x3a0000L) != 0L)
-            return 27;
+         if ((active0 & 0x1a0000L) != 0L)
+            return 2;
          return -1;
       case 1:
-         if ((active0 & 0x600000000L) != 0L)
-         {
-            jjmatchedKind = 67;
-            jjmatchedPos = 1;
-            return 13;
-         }
          if ((active0 & 0x80000L) != 0L)
-            return 25;
-         return -1;
-      case 2:
-         if ((active0 & 0x600000000L) != 0L)
-         {
-            jjmatchedKind = 67;
-            jjmatchedPos = 2;
-            return 13;
-         }
-         return -1;
-      case 3:
-         if ((active0 & 0x400000000L) != 0L)
-         {
-            jjmatchedKind = 67;
-            jjmatchedPos = 3;
-            return 13;
-         }
-         if ((active0 & 0x200000000L) != 0L)
-            return 13;
+            return 0;
          return -1;
       default :
          return -1;
    }
 }
-private final int jjStartNfa_1(int pos, long active0, long active1)
-{
-   return jjMoveNfa_1(jjStopStringLiteralDfa_1(pos, active0, active1), pos + 1);
-}
-private final int jjStartNfaWithStates_1(int pos, int kind, int state)
+private final int jjStartNfa_7(int pos, long active0)
 {
-   jjmatchedKind = kind;
-   jjmatchedPos = pos;
-   try { curChar = input_stream.readChar(); }
-   catch(java.io.IOException e) { return pos + 1; }
-   return jjMoveNfa_1(state, pos + 1);
+   return jjMoveNfa_7(jjStopStringLiteralDfa_7(pos, active0), pos + 1);
 }
-private final int jjMoveStringLiteralDfa0_1()
+private int jjMoveStringLiteralDfa0_7()
 {
    switch(curChar)
    {
       case 35:
          jjmatchedKind = 20;
-         return jjMoveStringLiteralDfa1_1(0x2a0000L);
-      case 40:
-         return jjStopAtPos(0, 10);
-      case 91:
-         return jjStopAtPos(0, 1);
-      case 102:
-         return jjMoveStringLiteralDfa1_1(0x400000000L);
-      case 116:
-         return jjMoveStringLiteralDfa1_1(0x200000000L);
-      case 123:
-         return jjStopAtPos(0, 69);
-      case 125:
-         return jjStopAtPos(0, 70);
+         return jjMoveStringLiteralDfa1_7(0xa0000L);
+      case 93:
+         return jjMoveStringLiteralDfa1_7(0x10000000L);
       default :
-         return jjMoveNfa_1(12, 0);
+         return jjMoveNfa_7(3, 0);
    }
 }
-private final int jjMoveStringLiteralDfa1_1(long active0)
+private int jjMoveStringLiteralDfa1_7(long active0)
 {
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
-      jjStopStringLiteralDfa_1(0, active0, 0L);
+      jjStopStringLiteralDfa_7(0, active0);
       return 1;
    }
    switch(curChar)
    {
-      case 35:
-         if ((active0 & 0x200000L) != 0L)
-            return jjStopAtPos(1, 21);
-         break;
       case 42:
          if ((active0 & 0x80000L) != 0L)
-            return jjStartNfaWithStates_1(1, 19, 25);
+            return jjStartNfaWithStates_7(1, 19, 0);
          break;
       case 91:
-         return jjMoveStringLiteralDfa2_1(active0, 0x20000L);
-      case 97:
-         return jjMoveStringLiteralDfa2_1(active0, 0x400000000L);
-      case 114:
-         return jjMoveStringLiteralDfa2_1(active0, 0x200000000L);
+         return jjMoveStringLiteralDfa2_7(active0, 0x20000L);
+      case 93:
+         return jjMoveStringLiteralDfa2_7(active0, 0x10000000L);
       default :
          break;
    }
-   return jjStartNfa_1(0, active0, 0L);
+   return jjStartNfa_7(0, active0);
 }
-private final int jjMoveStringLiteralDfa2_1(long old0, long active0)
+private int jjMoveStringLiteralDfa2_7(long old0, long active0)
 {
    if (((active0 &= old0)) == 0L)
-      return jjStartNfa_1(0, old0, 0L);
+      return jjStartNfa_7(0, old0);
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
-      jjStopStringLiteralDfa_1(1, active0, 0L);
+      jjStopStringLiteralDfa_7(1, active0);
       return 2;
    }
    switch(curChar)
    {
+      case 35:
+         if ((active0 & 0x10000000L) != 0L)
+            return jjStopAtPos(2, 28);
+         break;
       case 91:
          if ((active0 & 0x20000L) != 0L)
             return jjStopAtPos(2, 17);
          break;
-      case 108:
-         return jjMoveStringLiteralDfa3_1(active0, 0x400000000L);
-      case 117:
-         return jjMoveStringLiteralDfa3_1(active0, 0x200000000L);
       default :
          break;
    }
-   return jjStartNfa_1(1, active0, 0L);
-}
-private final int jjMoveStringLiteralDfa3_1(long old0, long active0)
-{
-   if (((active0 &= old0)) == 0L)
-      return jjStartNfa_1(1, old0, 0L);
-   try { curChar = input_stream.readChar(); }
-   catch(java.io.IOException e) {
-      jjStopStringLiteralDfa_1(2, active0, 0L);
-      return 3;
-   }
-   switch(curChar)
-   {
-      case 101:
-         if ((active0 & 0x200000000L) != 0L)
-            return jjStartNfaWithStates_1(3, 33, 13);
-         break;
-      case 115:
-         return jjMoveStringLiteralDfa4_1(active0, 0x400000000L);
-      default :
-         break;
-   }
-   return jjStartNfa_1(2, active0, 0L);
+   return jjStartNfa_7(1, active0);
 }
-private final int jjMoveStringLiteralDfa4_1(long old0, long active0)
+private int jjStartNfaWithStates_7(int pos, int kind, int state)
 {
-   if (((active0 &= old0)) == 0L)
-      return jjStartNfa_1(2, old0, 0L);
+   jjmatchedKind = kind;
+   jjmatchedPos = pos;
    try { curChar = input_stream.readChar(); }
-   catch(java.io.IOException e) {
-      jjStopStringLiteralDfa_1(3, active0, 0L);
-      return 4;
-   }
-   switch(curChar)
-   {
-      case 101:
-         if ((active0 & 0x400000000L) != 0L)
-            return jjStartNfaWithStates_1(4, 34, 13);
-         break;
-      default :
-         break;
-   }
-   return jjStartNfa_1(3, active0, 0L);
+   catch(java.io.IOException e) { return pos + 1; }
+   return jjMoveNfa_7(state, pos + 1);
 }
-private final int jjMoveNfa_1(int startState, int curPos)
+private int jjMoveNfa_7(int startState, int curPos)
 {
-   int[] nextStates;
    int startsAt = 0;
-   jjnewStateCnt = 28;
+   jjnewStateCnt = 12;
    int i = 1;
    jjstateSet[0] = startState;
-   int j, kind = 0x7fffffff;
+   int kind = 0x7fffffff;
    for (;;)
    {
       if (++jjround == 0x7fffffff)
@@ -4951,85 +4979,50 @@
       if (curChar < 64)
       {
          long l = 1L << curChar;
-         MatchLoop: do
+         do
          {
             switch(jjstateSet[--i])
             {
-               case 12:
-                  if ((0x100000200L & l) != 0L)
-                     jjCheckNAddTwoStates(0, 1);
-                  else if (curChar == 35)
-                     jjCheckNAddStates(212, 214);
-                  else if (curChar == 36)
+               case 3:
+                  if (curChar == 36)
                   {
                      if (kind > 15)
                         kind = 15;
-                     jjCheckNAddTwoStates(21, 22);
+                     jjCheckNAddTwoStates(9, 10);
                   }
-                  else if (curChar == 46)
-                     jjstateSet[jjnewStateCnt++] = 15;
-                  break;
-               case 27:
-                  if (curChar == 42)
-                     jjstateSet[jjnewStateCnt++] = 25;
+                  else if (curChar == 35)
+                     jjstateSet[jjnewStateCnt++] = 2;
                   break;
                case 0:
-                  if ((0x100000200L & l) != 0L)
-                     jjCheckNAddTwoStates(0, 1);
+                  if (curChar == 42)
+                     jjstateSet[jjnewStateCnt++] = 1;
                   break;
                case 1:
-                  if (curChar == 35)
-                     jjCheckNAddTwoStates(6, 11);
-                  break;
-               case 3:
-                  if (curChar == 32)
-                     jjAddStates(111, 112);
-                  break;
-               case 4:
-                  if (curChar == 40 && kind > 14)
-                     kind = 14;
-                  break;
-               case 13:
-                  if ((0x3ff200000000000L & l) == 0L)
-                     break;
-                  if (kind > 67)
-                     kind = 67;
-                  jjstateSet[jjnewStateCnt++] = 13;
+                  if ((0xfffffff7ffffffffL & l) != 0L && kind > 18)
+                     kind = 18;
                   break;
-               case 14:
-                  if (curChar == 46)
-                     jjstateSet[jjnewStateCnt++] = 15;
+               case 2:
+                  if (curChar == 42)
+                     jjstateSet[jjnewStateCnt++] = 0;
                   break;
-               case 18:
+               case 6:
                   if (curChar == 36 && kind > 15)
                      kind = 15;
                   break;
-               case 20:
+               case 8:
                   if (curChar == 36)
-                     jjCheckNAddTwoStates(21, 22);
+                     jjCheckNAddTwoStates(9, 10);
                   break;
-               case 22:
+               case 10:
                   if (curChar == 33 && kind > 16)
                      kind = 16;
                   break;
-               case 23:
+               case 11:
                   if (curChar != 36)
                      break;
                   if (kind > 15)
                      kind = 15;
-                  jjCheckNAddTwoStates(21, 22);
-                  break;
-               case 24:
-                  if (curChar == 35)
-                     jjCheckNAddStates(212, 214);
-                  break;
-               case 25:
-                  if (curChar == 42)
-                     jjstateSet[jjnewStateCnt++] = 26;
-                  break;
-               case 26:
-                  if ((0xfffffff7ffffffffL & l) != 0L && kind > 18)
-                     kind = 18;
+                  jjCheckNAddTwoStates(9, 10);
                   break;
                default : break;
             }
@@ -5038,88 +5031,29 @@
       else if (curChar < 128)
       {
          long l = 1L << (curChar & 077);
-         MatchLoop: do
+         do
          {
             switch(jjstateSet[--i])
             {
-               case 12:
-                  if ((0x7fffffe87fffffeL & l) != 0L)
-                  {
-                     if (kind > 67)
-                        kind = 67;
-                     jjCheckNAdd(13);
-                  }
-                  else if (curChar == 92)
-                     jjCheckNAddStates(215, 218);
-                  break;
-               case 27:
-                  if (curChar == 123)
-                     jjstateSet[jjnewStateCnt++] = 10;
-                  else if (curChar == 115)
-                     jjstateSet[jjnewStateCnt++] = 5;
+               case 3:
+                  if (curChar == 92)
+                     jjCheckNAddStates(97, 100);
                   break;
-               case 2:
-                  if (curChar == 116)
-                     jjCheckNAddTwoStates(3, 4);
+               case 1:
+                  if (kind > 18)
+                     kind = 18;
                   break;
                case 5:
-                  if (curChar == 101)
-                     jjstateSet[jjnewStateCnt++] = 2;
-                  break;
-               case 6:
-                  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 (curChar == 101)
-                     jjstateSet[jjnewStateCnt++] = 8;
-                  break;
-               case 10:
-                  if (curChar == 115)
-                     jjstateSet[jjnewStateCnt++] = 9;
-                  break;
-               case 11:
-                  if (curChar == 123)
-                     jjstateSet[jjnewStateCnt++] = 10;
-                  break;
-               case 13:
-                  if ((0x7fffffe87fffffeL & l) == 0L)
-                     break;
-                  if (kind > 67)
-                     kind = 67;
-                  jjCheckNAdd(13);
-                  break;
-               case 15:
-                  if ((0x7fffffe07fffffeL & l) != 0L && kind > 68)
-                     kind = 68;
-                  break;
-               case 16:
-                  if (curChar == 92)
-                     jjCheckNAddStates(215, 218);
-                  break;
-               case 17:
                   if (curChar == 92)
-                     jjCheckNAddTwoStates(17, 18);
+                     jjCheckNAddTwoStates(5, 6);
                   break;
-               case 19:
+               case 7:
                   if (curChar == 92)
-                     jjCheckNAddTwoStates(19, 20);
+                     jjCheckNAddTwoStates(7, 8);
                   break;
-               case 21:
+               case 9:
                   if (curChar == 92)
-                     jjAddStates(219, 220);
-                  break;
-               case 26:
-                  if (kind > 18)
-                     kind = 18;
+                     jjAddStates(101, 102);
                   break;
                default : break;
             }
@@ -5132,11 +5066,11 @@
          long l1 = 1L << (hiByte & 077);
          int i2 = (curChar & 0xff) >> 6;
          long l2 = 1L << (curChar & 077);
-         MatchLoop: do
+         do
          {
             switch(jjstateSet[--i])
             {
-               case 26:
+               case 1:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 18)
                      kind = 18;
                   break;
@@ -5151,7 +5085,7 @@
          kind = 0x7fffffff;
       }
       ++curPos;
-      if ((i = jjnewStateCnt) == (startsAt = 28 - (jjnewStateCnt = startsAt)))
+      if ((i = jjnewStateCnt) == (startsAt = 12 - (jjnewStateCnt = startsAt)))
          return curPos;
       try { curChar = input_stream.readChar(); }
       catch(java.io.IOException e) { return curPos; }
@@ -5161,10 +5095,10 @@
    87, 89, 90, 91, 96, 97, 87, 90, 57, 96, 27, 28, 31, 11, 12, 13, 
    1, 2, 4, 11, 16, 12, 13, 24, 25, 29, 30, 66, 67, 69, 70, 71, 
    72, 83, 85, 80, 81, 77, 78, 14, 15, 17, 19, 24, 25, 60, 61, 73, 
-   74, 94, 95, 98, 99, 5, 6, 7, 8, 9, 10, 78, 80, 81, 82, 87, 
-   88, 78, 81, 10, 87, 19, 20, 31, 32, 34, 42, 43, 45, 50, 32, 51, 
-   66, 43, 67, 54, 57, 64, 71, 76, 22, 23, 24, 25, 35, 40, 47, 13, 
-   14, 26, 27, 85, 86, 89, 90, 21, 23, 6, 11, 38, 14, 15, 17, 3, 
+   74, 94, 95, 98, 99, 78, 80, 81, 82, 87, 88, 78, 81, 10, 87, 19, 
+   20, 31, 32, 34, 42, 43, 45, 50, 32, 51, 66, 43, 67, 54, 57, 64, 
+   71, 76, 22, 23, 24, 25, 35, 40, 47, 13, 14, 26, 27, 85, 86, 89, 
+   90, 5, 6, 7, 8, 9, 10, 21, 23, 6, 11, 38, 14, 15, 17, 3, 
    4, 25, 26, 28, 29, 30, 31, 32, 33, 41, 43, 44, 45, 50, 51, 41, 
    44, 27, 50, 22, 23, 26, 6, 7, 8, 6, 11, 7, 8, 33, 34, 35, 
    36, 9, 10, 12, 14, 19, 20, 30, 31, 37, 38, 48, 49, 52, 53, 8, 
@@ -5179,12 +5113,14 @@
    {
       case 0:
          return ((jjbitVec2[i2] & l2) != 0L);
-      default : 
+      default :
          if ((jjbitVec0[i1] & l1) != 0L)
             return true;
          return false;
    }
 }
+
+/** Token literal values. */
 public static final String[] jjstrLiteralImages = {
 null, null, null, null, null, null, null, null, null, null, null, null, null, 
 null, null, null, null, null, null, null, null, null, null, null, null, null, null, 
@@ -5192,20 +5128,24 @@
 null, null, null, null, null, null, null, null, null, null, null, null, null, null, 
 null, null, null, null, null, null, null, null, null, null, null, null, null, null, 
 null, null, null, null, null, };
+
+/** Lexer state names. */
 public static final String[] lexStateNames = {
-   "REFERENCE", 
-   "REFMODIFIER", 
-   "REFINDEX", 
-   "DIRECTIVE", 
-   "REFMOD2", 
-   "DEFAULT", 
-   "REFMOD", 
-   "PRE_DIRECTIVE", 
-   "IN_TEXTBLOCK", 
-   "IN_MULTI_LINE_COMMENT", 
-   "IN_FORMAL_COMMENT", 
-   "IN_SINGLE_LINE_COMMENT", 
+   "REFERENCE",
+   "REFMODIFIER",
+   "REFINDEX",
+   "DIRECTIVE",
+   "REFMOD2",
+   "DEFAULT",
+   "REFMOD",
+   "IN_TEXTBLOCK",
+   "IN_MULTI_LINE_COMMENT",
+   "IN_FORMAL_COMMENT",
+   "IN_SINGLE_LINE_COMMENT",
+   "PRE_DIRECTIVE",
 };
+
+/** Lex State array. */
 public static final int[] jjnewLexState = {
    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
@@ -5226,19 +5166,23 @@
 protected CharStream input_stream;
 private final int[] jjrounds = new int[101];
 private final int[] jjstateSet = new int[202];
-StringBuffer image;
-int jjimageLen;
-int lengthOfMatch;
+private final StrBuilder jjimage = new StrBuilder();
+private StrBuilder image = jjimage;
+private int jjimageLen;
+private int lengthOfMatch;
 protected char curChar;
-public ParserTokenManager(CharStream stream)
-{
+/** Constructor. */
+public ParserTokenManager(CharStream stream){
    input_stream = stream;
 }
-public ParserTokenManager(CharStream stream, int lexState)
-{
+
+/** Constructor. */
+public ParserTokenManager(CharStream stream, int lexState){
    this(stream);
    SwitchTo(lexState);
 }
+
+/** Reinitialise parser. */
 public void ReInit(CharStream stream)
 {
    jjmatchedPos = jjnewStateCnt = 0;
@@ -5246,18 +5190,22 @@
    input_stream = stream;
    ReInitRounds();
 }
-private final void ReInitRounds()
+private void ReInitRounds()
 {
    int i;
    jjround = 0x80000001;
    for (i = 101; i-- > 0;)
       jjrounds[i] = 0x80000000;
 }
+
+/** Reinitialise parser. */
 public void ReInit(CharStream stream, int lexState)
 {
    ReInit(stream);
    SwitchTo(lexState);
 }
+
+/** Switch to specified lex state. */
 public void SwitchTo(int lexState)
 {
    if (lexState >= 12 || lexState < 0)
@@ -5268,14 +5216,27 @@
 
 protected Token jjFillToken()
 {
-   Token t = Token.newToken(jjmatchedKind);
-   t.kind = jjmatchedKind;
+   final Token t;
+   final String curTokenImage;
+   final int beginLine;
+   final int endLine;
+   final int beginColumn;
+   final int endColumn;
    String im = jjstrLiteralImages[jjmatchedKind];
-   t.image = (im == null) ? input_stream.GetImage() : im;
-   t.beginLine = input_stream.getBeginLine();
-   t.beginColumn = input_stream.getBeginColumn();

[... 462 lines stripped ...]


Mime
View raw message