3m9 compatible;
[phpeclipse.git] / net.sourceforge.phpeclipse / src / test / PHPParserTokenManager.java
index 3374c31..d651379 100644 (file)
@@ -16,28 +16,259 @@ import net.sourceforge.phpdt.internal.compiler.ast.*;
 import net.sourceforge.phpdt.internal.compiler.parser.OutlineableWithChildren;
 import net.sourceforge.phpdt.internal.compiler.parser.Outlineable;
 import net.sourceforge.phpdt.internal.compiler.parser.PHPOutlineInfo;
+import net.sourceforge.phpdt.internal.corext.Assert;
 
 public class PHPParserTokenManager implements PHPParserConstants
 {
-  public static  java.io.PrintStream debugStream = System.out;
-  public static  void setDebugStream(java.io.PrintStream ds) { debugStream = ds; }
-static private final int jjStopAtPos(int pos, int kind)
+  // CommonTokenAction: use the begins/ends fields added to the Jack
+  // CharStream class to set corresponding fields in each Token (which was
+  // also extended with new fields). By default Jack doesn't supply absolute
+  // offsets, just line/column offsets
+  void CommonTokenAction(Token t) {
+    t.sourceStart = input_stream.getBeginOffset();
+    t.sourceEnd = input_stream.getBeginOffset();
+  }
+  public  java.io.PrintStream debugStream = System.out;
+  public  void setDebugStream(java.io.PrintStream ds) { debugStream = ds; }
+private final int jjStopAtPos(int pos, int kind)
 {
    jjmatchedKind = kind;
    jjmatchedPos = pos;
    return pos + 1;
 }
-static private final int jjMoveStringLiteralDfa0_0()
+private final int jjMoveStringLiteralDfa0_5()
+{
+   switch(curChar)
+   {
+      case 42:
+         return jjMoveStringLiteralDfa1_5(0x2000000L);
+      case 84:
+      case 116:
+         return jjMoveStringLiteralDfa1_5(0x400000L);
+      default :
+         return 1;
+   }
+}
+private final int jjMoveStringLiteralDfa1_5(long active0)
+{
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+      return 1;
+   }
+   switch(curChar)
+   {
+      case 47:
+         if ((active0 & 0x2000000L) != 0L)
+            return jjStopAtPos(1, 25);
+         break;
+      case 79:
+      case 111:
+         return jjMoveStringLiteralDfa2_5(active0, 0x400000L);
+      default :
+         return 2;
+   }
+   return 2;
+}
+private final int jjMoveStringLiteralDfa2_5(long old0, long active0)
+{
+   if (((active0 &= old0)) == 0L)
+      return 2;
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+      return 2;
+   }
+   switch(curChar)
+   {
+      case 68:
+      case 100:
+         return jjMoveStringLiteralDfa3_5(active0, 0x400000L);
+      default :
+         return 3;
+   }
+}
+private final int jjMoveStringLiteralDfa3_5(long old0, long active0)
+{
+   if (((active0 &= old0)) == 0L)
+      return 3;
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+      return 3;
+   }
+   switch(curChar)
+   {
+      case 79:
+      case 111:
+         if ((active0 & 0x400000L) != 0L)
+            return jjStopAtPos(3, 22);
+         break;
+      default :
+         return 4;
+   }
+   return 4;
+}
+private final int jjMoveStringLiteralDfa0_8()
+{
+   switch(curChar)
+   {
+      case 125:
+         return jjStopAtPos(0, 117);
+      default :
+         return 1;
+   }
+}
+private final int jjStopStringLiteralDfa_9(int pos, long active0, long active1)
+{
+   switch (pos)
+   {
+      default :
+         return -1;
+   }
+}
+private final int jjStartNfa_9(int pos, long active0, long active1)
+{
+   return jjMoveNfa_9(jjStopStringLiteralDfa_9(pos, active0, active1), 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()
+{
+   switch(curChar)
+   {
+      case 125:
+         return jjStopAtPos(0, 119);
+      default :
+         return jjMoveNfa_9(0, 0);
+   }
+}
+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)
+{
+   jjCheckNAdd(jjnextStates[start]);
+   jjCheckNAdd(jjnextStates[start + 1]);
+}
+static final long[] jjbitVec0 = {
+   0x0L, 0x0L, 0xffffffffffffffffL, 0xffffffffffffffffL
+};
+private final int jjMoveNfa_9(int startState, int curPos)
+{
+   int[] nextStates;
+   int startsAt = 0;
+   jjnewStateCnt = 1;
+   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 0:
+                  kind = 120;
+                  jjstateSet[jjnewStateCnt++] = 0;
+                  break;
+               default : break;
+            }
+         } while(i != startsAt);
+      }
+      else if (curChar < 128)
+      {
+         long l = 1L << (curChar & 077);
+         MatchLoop: do
+         {
+            switch(jjstateSet[--i])
+            {
+               case 0:
+                  if ((0xdfffffffffffffffL & l) == 0L)
+                     break;
+                  kind = 120;
+                  jjstateSet[jjnewStateCnt++] = 0;
+                  break;
+               default : break;
+            }
+         } while(i != startsAt);
+      }
+      else
+      {
+         int i2 = (curChar & 0xff) >> 6;
+         long l2 = 1L << (curChar & 077);
+         MatchLoop: do
+         {
+            switch(jjstateSet[--i])
+            {
+               case 0:
+                  if ((jjbitVec0[i2] & l2) == 0L)
+                     break;
+                  if (kind > 120)
+                     kind = 120;
+                  jjstateSet[jjnewStateCnt++] = 0;
+                  break;
+               default : break;
+            }
+         } while(i != startsAt);
+      }
+      if (kind != 0x7fffffff)
+      {
+         jjmatchedKind = kind;
+         jjmatchedPos = curPos;
+         kind = 0x7fffffff;
+      }
+      ++curPos;
+      if ((i = jjnewStateCnt) == (startsAt = 1 - (jjnewStateCnt = startsAt)))
+         return curPos;
+      try { curChar = input_stream.readChar(); }
+      catch(java.io.IOException e) { return curPos; }
+   }
+}
+private final int jjMoveStringLiteralDfa0_0()
 {
    switch(curChar)
    {
       case 60:
          return jjMoveStringLiteralDfa1_0(0xeL);
+      case 84:
+      case 116:
+         return jjMoveStringLiteralDfa1_0(0x800000L);
       default :
          return 1;
    }
 }
-static private final int jjMoveStringLiteralDfa1_0(long active0)
+private final int jjMoveStringLiteralDfa1_0(long active0)
 {
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
@@ -52,11 +283,14 @@ static private final int jjMoveStringLiteralDfa1_0(long active0)
             jjmatchedPos = 1;
          }
          return jjMoveStringLiteralDfa2_0(active0, 0xcL);
+      case 79:
+      case 111:
+         return jjMoveStringLiteralDfa2_0(active0, 0x800000L);
       default :
          return 2;
    }
 }
-static private final int jjMoveStringLiteralDfa2_0(long old0, long active0)
+private final int jjMoveStringLiteralDfa2_0(long old0, long active0)
 {
    if (((active0 &= old0)) == 0L)
       return 2;
@@ -70,6 +304,9 @@ static private final int jjMoveStringLiteralDfa2_0(long old0, long active0)
          if ((active0 & 0x8L) != 0L)
             return jjStopAtPos(2, 3);
          break;
+      case 68:
+      case 100:
+         return jjMoveStringLiteralDfa3_0(active0, 0x800000L);
       case 80:
       case 112:
          return jjMoveStringLiteralDfa3_0(active0, 0x4L);
@@ -78,7 +315,7 @@ static private final int jjMoveStringLiteralDfa2_0(long old0, long active0)
    }
    return 3;
 }
-static private final int jjMoveStringLiteralDfa3_0(long old0, long active0)
+private final int jjMoveStringLiteralDfa3_0(long old0, long active0)
 {
    if (((active0 &= old0)) == 0L)
       return 3;
@@ -91,11 +328,17 @@ static private final int jjMoveStringLiteralDfa3_0(long old0, long active0)
       case 72:
       case 104:
          return jjMoveStringLiteralDfa4_0(active0, 0x4L);
+      case 79:
+      case 111:
+         if ((active0 & 0x800000L) != 0L)
+            return jjStopAtPos(3, 23);
+         break;
       default :
          return 4;
    }
+   return 4;
 }
-static private final int jjMoveStringLiteralDfa4_0(long old0, long active0)
+private final int jjMoveStringLiteralDfa4_0(long old0, long active0)
 {
    if (((active0 &= old0)) == 0L)
       return 4;
@@ -115,20 +358,20 @@ static private final int jjMoveStringLiteralDfa4_0(long old0, long active0)
    }
    return 5;
 }
-static private final int jjMoveStringLiteralDfa0_4()
+private final int jjMoveStringLiteralDfa0_4()
 {
    switch(curChar)
    {
       case 42:
-         return jjMoveStringLiteralDfa1_4(0x80000L);
+         return jjMoveStringLiteralDfa1_4(0x1000000L);
       case 84:
       case 116:
-         return jjMoveStringLiteralDfa1_4(0x20000L);
+         return jjMoveStringLiteralDfa1_4(0x400000L);
       default :
          return 1;
    }
 }
-static private final int jjMoveStringLiteralDfa1_4(long active0)
+private final int jjMoveStringLiteralDfa1_4(long active0)
 {
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
@@ -137,18 +380,18 @@ static private final int jjMoveStringLiteralDfa1_4(long active0)
    switch(curChar)
    {
       case 47:
-         if ((active0 & 0x80000L) != 0L)
-            return jjStopAtPos(1, 19);
+         if ((active0 & 0x1000000L) != 0L)
+            return jjStopAtPos(1, 24);
          break;
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa2_4(active0, 0x20000L);
+         return jjMoveStringLiteralDfa2_4(active0, 0x400000L);
       default :
          return 2;
    }
    return 2;
 }
-static private final int jjMoveStringLiteralDfa2_4(long old0, long active0)
+private final int jjMoveStringLiteralDfa2_4(long old0, long active0)
 {
    if (((active0 &= old0)) == 0L)
       return 2;
@@ -160,12 +403,12 @@ static private final int jjMoveStringLiteralDfa2_4(long old0, long active0)
    {
       case 68:
       case 100:
-         return jjMoveStringLiteralDfa3_4(active0, 0x20000L);
+         return jjMoveStringLiteralDfa3_4(active0, 0x400000L);
       default :
          return 3;
    }
 }
-static private final int jjMoveStringLiteralDfa3_4(long old0, long active0)
+private final int jjMoveStringLiteralDfa3_4(long old0, long active0)
 {
    if (((active0 &= old0)) == 0L)
       return 3;
@@ -177,15 +420,471 @@ static private final int jjMoveStringLiteralDfa3_4(long old0, long active0)
    {
       case 79:
       case 111:
-         if ((active0 & 0x20000L) != 0L)
-            return jjStopAtPos(3, 17);
+         if ((active0 & 0x400000L) != 0L)
+            return jjStopAtPos(3, 22);
          break;
       default :
          return 4;
    }
    return 4;
 }
-private static final int jjStopStringLiteralDfa_2(int pos, long active0)
+private final int jjStopStringLiteralDfa_3(int pos, long active0, long active1, long active2)
+{
+   switch (pos)
+   {
+      case 0:
+         if ((active1 & 0x3000000000L) != 0L)
+         {
+            jjmatchedKind = 124;
+            return 1;
+         }
+         return -1;
+      case 1:
+         if ((active1 & 0x1000000000L) != 0L)
+            return 1;
+         if ((active1 & 0x2000000000L) != 0L)
+         {
+            if (jjmatchedPos != 1)
+            {
+               jjmatchedKind = 124;
+               jjmatchedPos = 1;
+            }
+            return 1;
+         }
+         return -1;
+      default :
+         return -1;
+   }
+}
+private final int jjStartNfa_3(int pos, long active0, long active1, long active2)
+{
+   return jjMoveNfa_3(jjStopStringLiteralDfa_3(pos, active0, active1, active2), 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()
+{
+   switch(curChar)
+   {
+      case 9:
+         return jjStopAtPos(0, 12);
+      case 10:
+         return jjStopAtPos(0, 13);
+      case 12:
+         return jjStopAtPos(0, 15);
+      case 13:
+         return jjStopAtPos(0, 14);
+      case 32:
+         return jjStopAtPos(0, 11);
+      case 33:
+         jjmatchedKind = 81;
+         return jjMoveStringLiteralDfa1_3(0x0L, 0x0L, 0x28000L);
+      case 36:
+         return jjStopAtPos(0, 123);
+      case 37:
+         jjmatchedKind = 96;
+         return jjMoveStringLiteralDfa1_3(0x0L, 0x0L, 0x10000000L);
+      case 38:
+         jjmatchedKind = 93;
+         return jjMoveStringLiteralDfa1_3(0x0L, 0x400000L, 0x1000000L);
+      case 40:
+         return jjStopAtPos(0, 129);
+      case 41:
+         return jjStopAtPos(0, 130);
+      case 42:
+         jjmatchedKind = 91;
+         return jjMoveStringLiteralDfa1_3(0x0L, 0x0L, 0x400000L);
+      case 43:
+         jjmatchedKind = 89;
+         return jjMoveStringLiteralDfa1_3(0x0L, 0x800000L, 0x100000L);
+      case 44:
+         return jjStopAtPos(0, 136);
+      case 45:
+         jjmatchedKind = 90;
+         return jjMoveStringLiteralDfa1_3(0x200000000000L, 0x1000000L, 0x200000L);
+      case 46:
+         jjmatchedKind = 137;
+         return jjMoveStringLiteralDfa1_3(0x0L, 0x0L, 0x8000000L);
+      case 47:
+         jjmatchedKind = 92;
+         return jjMoveStringLiteralDfa1_3(0x0L, 0x0L, 0x800000L);
+      case 58:
+         jjmatchedKind = 84;
+         return jjMoveStringLiteralDfa1_3(0x400000000000L, 0x0L, 0x0L);
+      case 59:
+         return jjStopAtPos(0, 135);
+      case 60:
+         jjmatchedKind = 139;
+         return jjMoveStringLiteralDfa1_3(0x0L, 0x200000000L, 0x40012000L);
+      case 61:
+         jjmatchedKind = 147;
+         return jjMoveStringLiteralDfa1_3(0x800000000000L, 0x0L, 0x41000L);
+      case 62:
+         jjmatchedKind = 138;
+         return jjMoveStringLiteralDfa1_3(0x0L, 0xc00000000L, 0x80004000L);
+      case 63:
+         jjmatchedKind = 83;
+         return jjMoveStringLiteralDfa1_3(0x10L, 0x0L, 0x0L);
+      case 64:
+         return jjStopAtPos(0, 80);
+      case 91:
+         return jjStopAtPos(0, 133);
+      case 93:
+         return jjStopAtPos(0, 134);
+      case 94:
+         jjmatchedKind = 95;
+         return jjMoveStringLiteralDfa1_3(0x0L, 0x0L, 0x4000000L);
+      case 65:
+      case 97:
+         return jjMoveStringLiteralDfa1_3(0x0L, 0x2000000000L, 0x0L);
+      case 79:
+      case 111:
+         return jjMoveStringLiteralDfa1_3(0x0L, 0x1000000000L, 0x0L);
+      case 123:
+         return jjStopAtPos(0, 131);
+      case 124:
+         jjmatchedKind = 94;
+         return jjMoveStringLiteralDfa1_3(0x0L, 0x200000L, 0x2000000L);
+      case 125:
+         return jjStopAtPos(0, 132);
+      case 126:
+         jjmatchedKind = 82;
+         return jjMoveStringLiteralDfa1_3(0x0L, 0x0L, 0x20000000L);
+      default :
+         return jjMoveNfa_3(0, 0);
+   }
+}
+private final int jjMoveStringLiteralDfa1_3(long active0, long active1, long active2)
+{
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+      jjStopStringLiteralDfa_3(0, active0, active1, active2);
+      return 1;
+   }
+   switch(curChar)
+   {
+      case 38:
+         if ((active1 & 0x400000L) != 0L)
+            return jjStopAtPos(1, 86);
+         break;
+      case 43:
+         if ((active1 & 0x800000L) != 0L)
+            return jjStopAtPos(1, 87);
+         break;
+      case 45:
+         if ((active1 & 0x1000000L) != 0L)
+            return jjStopAtPos(1, 88);
+         break;
+      case 58:
+         if ((active0 & 0x400000000000L) != 0L)
+            return jjStopAtPos(1, 46);
+         break;
+      case 60:
+         if ((active1 & 0x200000000L) != 0L)
+         {
+            jjmatchedKind = 97;
+            jjmatchedPos = 1;
+         }
+         return jjMoveStringLiteralDfa2_3(active0, 0L, active1, 0L, active2, 0x40000000L);
+      case 61:
+         if ((active2 & 0x1000L) != 0L)
+         {
+            jjmatchedKind = 140;
+            jjmatchedPos = 1;
+         }
+         else if ((active2 & 0x2000L) != 0L)
+            return jjStopAtPos(1, 141);
+         else if ((active2 & 0x4000L) != 0L)
+            return jjStopAtPos(1, 142);
+         else if ((active2 & 0x8000L) != 0L)
+         {
+            jjmatchedKind = 143;
+            jjmatchedPos = 1;
+         }
+         else if ((active2 & 0x100000L) != 0L)
+            return jjStopAtPos(1, 148);
+         else if ((active2 & 0x200000L) != 0L)
+            return jjStopAtPos(1, 149);
+         else if ((active2 & 0x400000L) != 0L)
+            return jjStopAtPos(1, 150);
+         else if ((active2 & 0x800000L) != 0L)
+            return jjStopAtPos(1, 151);
+         else if ((active2 & 0x1000000L) != 0L)
+            return jjStopAtPos(1, 152);
+         else if ((active2 & 0x2000000L) != 0L)
+            return jjStopAtPos(1, 153);
+         else if ((active2 & 0x4000000L) != 0L)
+            return jjStopAtPos(1, 154);
+         else if ((active2 & 0x8000000L) != 0L)
+            return jjStopAtPos(1, 155);
+         else if ((active2 & 0x10000000L) != 0L)
+            return jjStopAtPos(1, 156);
+         else if ((active2 & 0x20000000L) != 0L)
+            return jjStopAtPos(1, 157);
+         return jjMoveStringLiteralDfa2_3(active0, 0L, active1, 0L, active2, 0x60000L);
+      case 62:
+         if ((active0 & 0x10L) != 0L)
+            return jjStopAtPos(1, 4);
+         else if ((active0 & 0x200000000000L) != 0L)
+            return jjStopAtPos(1, 45);
+         else if ((active0 & 0x800000000000L) != 0L)
+            return jjStopAtPos(1, 47);
+         else if ((active1 & 0x400000000L) != 0L)
+         {
+            jjmatchedKind = 98;
+            jjmatchedPos = 1;
+         }
+         else if ((active2 & 0x10000L) != 0L)
+            return jjStopAtPos(1, 144);
+         return jjMoveStringLiteralDfa2_3(active0, 0L, active1, 0x800000000L, active2, 0x80000000L);
+      case 78:
+      case 110:
+         return jjMoveStringLiteralDfa2_3(active0, 0L, active1, 0x2000000000L, active2, 0L);
+      case 82:
+      case 114:
+         if ((active1 & 0x1000000000L) != 0L)
+            return jjStartNfaWithStates_3(1, 100, 1);
+         break;
+      case 124:
+         if ((active1 & 0x200000L) != 0L)
+            return jjStopAtPos(1, 85);
+         break;
+      default :
+         break;
+   }
+   return jjStartNfa_3(0, active0, active1, active2);
+}
+private final int jjMoveStringLiteralDfa2_3(long old0, long active0, long old1, long active1, long old2, long active2)
+{
+   if (((active0 &= old0) | (active1 &= old1) | (active2 &= old2)) == 0L)
+      return jjStartNfa_3(0, old0, old1, old2); 
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+      jjStopStringLiteralDfa_3(1, 0L, active1, active2);
+      return 2;
+   }
+   switch(curChar)
+   {
+      case 61:
+         if ((active2 & 0x20000L) != 0L)
+            return jjStopAtPos(2, 145);
+         else if ((active2 & 0x40000L) != 0L)
+            return jjStopAtPos(2, 146);
+         else if ((active2 & 0x40000000L) != 0L)
+            return jjStopAtPos(2, 158);
+         else if ((active2 & 0x80000000L) != 0L)
+            return jjStopAtPos(2, 159);
+         break;
+      case 62:
+         if ((active1 & 0x800000000L) != 0L)
+            return jjStopAtPos(2, 99);
+         break;
+      case 68:
+      case 100:
+         if ((active1 & 0x2000000000L) != 0L)
+            return jjStartNfaWithStates_3(2, 101, 1);
+         break;
+      default :
+         break;
+   }
+   return jjStartNfa_3(1, 0L, active1, active2);
+}
+private final int jjMoveNfa_3(int startState, int curPos)
+{
+   int[] nextStates;
+   int startsAt = 0;
+   jjnewStateCnt = 2;
+   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 1:
+                  if ((0x3ff000000000000L & l) == 0L)
+                     break;
+                  kind = 124;
+                  jjstateSet[jjnewStateCnt++] = 1;
+                  break;
+               default : break;
+            }
+         } while(i != startsAt);
+      }
+      else if (curChar < 128)
+      {
+         long l = 1L << (curChar & 077);
+         MatchLoop: do
+         {
+            switch(jjstateSet[--i])
+            {
+               case 0:
+               case 1:
+                  if ((0x87fffffe87fffffeL & l) == 0L)
+                     break;
+                  if (kind > 124)
+                     kind = 124;
+                  jjCheckNAdd(1);
+                  break;
+               default : break;
+            }
+         } while(i != startsAt);
+      }
+      else
+      {
+         int i2 = (curChar & 0xff) >> 6;
+         long l2 = 1L << (curChar & 077);
+         MatchLoop: do
+         {
+            switch(jjstateSet[--i])
+            {
+               case 0:
+               case 1:
+                  if ((jjbitVec0[i2] & l2) == 0L)
+                     break;
+                  if (kind > 124)
+                     kind = 124;
+                  jjCheckNAdd(1);
+                  break;
+               default : break;
+            }
+         } while(i != startsAt);
+      }
+      if (kind != 0x7fffffff)
+      {
+         jjmatchedKind = kind;
+         jjmatchedPos = curPos;
+         kind = 0x7fffffff;
+      }
+      ++curPos;
+      if ((i = jjnewStateCnt) == (startsAt = 2 - (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, long active1)
+{
+   switch (pos)
+   {
+      default :
+         return -1;
+   }
+}
+private final int jjStartNfa_6(int pos, long active0, long active1)
+{
+   return jjMoveNfa_6(jjStopStringLiteralDfa_6(pos, active0, active1), 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()
+{
+   switch(curChar)
+   {
+      case 34:
+         return jjStopAtPos(0, 114);
+      case 36:
+         return jjStopAtPos(0, 113);
+      case 123:
+         return jjStopAtPos(0, 116);
+      default :
+         return jjMoveNfa_6(0, 0);
+   }
+}
+private final int jjMoveNfa_6(int startState, int curPos)
+{
+   int[] nextStates;
+   int startsAt = 0;
+   jjnewStateCnt = 2;
+   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 1:
+                  kind = 111;
+                  break;
+               default : break;
+            }
+         } while(i != startsAt);
+      }
+      else if (curChar < 128)
+      {
+         long l = 1L << (curChar & 077);
+         MatchLoop: do
+         {
+            switch(jjstateSet[--i])
+            {
+               case 0:
+                  if (curChar == 92)
+                     jjstateSet[jjnewStateCnt++] = 1;
+                  break;
+               case 1:
+                  if (kind > 111)
+                     kind = 111;
+                  break;
+               default : break;
+            }
+         } while(i != startsAt);
+      }
+      else
+      {
+         int i2 = (curChar & 0xff) >> 6;
+         long l2 = 1L << (curChar & 077);
+         MatchLoop: do
+         {
+            switch(jjstateSet[--i])
+            {
+               case 1:
+                  if ((jjbitVec0[i2] & l2) != 0L && kind > 111)
+                     kind = 111;
+                  break;
+               default : break;
+            }
+         } while(i != startsAt);
+      }
+      if (kind != 0x7fffffff)
+      {
+         jjmatchedKind = kind;
+         jjmatchedPos = curPos;
+         kind = 0x7fffffff;
+      }
+      ++curPos;
+      if ((i = jjnewStateCnt) == (startsAt = 2 - (jjnewStateCnt = startsAt)))
+         return curPos;
+      try { curChar = input_stream.readChar(); }
+      catch(java.io.IOException e) { return curPos; }
+   }
+}
+private final int jjStopStringLiteralDfa_2(int pos, long active0)
 {
    switch (pos)
    {
@@ -193,11 +892,11 @@ private static final int jjStopStringLiteralDfa_2(int pos, long active0)
          return -1;
    }
 }
-private static final int jjStartNfa_2(int pos, long active0)
+private final int jjStartNfa_2(int pos, long active0)
 {
    return jjMoveNfa_2(jjStopStringLiteralDfa_2(pos, active0), pos + 1);
 }
-static private final int jjStartNfaWithStates_2(int pos, int kind, int state)
+private final int jjStartNfaWithStates_2(int pos, int kind, int state)
 {
    jjmatchedKind = kind;
    jjmatchedPos = pos;
@@ -205,20 +904,20 @@ static private final int jjStartNfaWithStates_2(int pos, int kind, int state)
    catch(java.io.IOException e) { return pos + 1; }
    return jjMoveNfa_2(state, pos + 1);
 }
-static private final int jjMoveStringLiteralDfa0_2()
+private final int jjMoveStringLiteralDfa0_2()
 {
    switch(curChar)
    {
       case 63:
-         return jjMoveStringLiteralDfa1_2(0x10000L);
+         return jjMoveStringLiteralDfa1_2(0x10L);
       case 84:
       case 116:
-         return jjMoveStringLiteralDfa1_2(0x20000L);
+         return jjMoveStringLiteralDfa1_2(0x400000L);
       default :
          return jjMoveNfa_2(0, 0);
    }
 }
-static private final int jjMoveStringLiteralDfa1_2(long active0)
+private final int jjMoveStringLiteralDfa1_2(long active0)
 {
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
@@ -228,18 +927,18 @@ static private final int jjMoveStringLiteralDfa1_2(long active0)
    switch(curChar)
    {
       case 62:
-         if ((active0 & 0x10000L) != 0L)
-            return jjStopAtPos(1, 16);
+         if ((active0 & 0x10L) != 0L)
+            return jjStopAtPos(1, 4);
          break;
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa2_2(active0, 0x20000L);
+         return jjMoveStringLiteralDfa2_2(active0, 0x400000L);
       default :
          break;
    }
    return jjStartNfa_2(0, active0);
 }
-static private final int jjMoveStringLiteralDfa2_2(long old0, long active0)
+private final int jjMoveStringLiteralDfa2_2(long old0, long active0)
 {
    if (((active0 &= old0)) == 0L)
       return jjStartNfa_2(0, old0); 
@@ -252,13 +951,13 @@ static private final int jjMoveStringLiteralDfa2_2(long old0, long active0)
    {
       case 68:
       case 100:
-         return jjMoveStringLiteralDfa3_2(active0, 0x20000L);
+         return jjMoveStringLiteralDfa3_2(active0, 0x400000L);
       default :
          break;
    }
    return jjStartNfa_2(1, active0);
 }
-static private final int jjMoveStringLiteralDfa3_2(long old0, long active0)
+private final int jjMoveStringLiteralDfa3_2(long old0, long active0)
 {
    if (((active0 &= old0)) == 0L)
       return jjStartNfa_2(1, old0); 
@@ -271,45 +970,15 @@ static private final int jjMoveStringLiteralDfa3_2(long old0, long active0)
    {
       case 79:
       case 111:
-         if ((active0 & 0x20000L) != 0L)
-            return jjStopAtPos(3, 17);
+         if ((active0 & 0x400000L) != 0L)
+            return jjStopAtPos(3, 22);
          break;
       default :
          break;
    }
    return jjStartNfa_2(2, active0);
 }
-static private final void jjCheckNAdd(int state)
-{
-   if (jjrounds[state] != jjround)
-   {
-      jjstateSet[jjnewStateCnt++] = state;
-      jjrounds[state] = jjround;
-   }
-}
-static private final void jjAddStates(int start, int end)
-{
-   do {
-      jjstateSet[jjnewStateCnt++] = jjnextStates[start];
-   } while (start++ != end);
-}
-static private final void jjCheckNAddTwoStates(int state1, int state2)
-{
-   jjCheckNAdd(state1);
-   jjCheckNAdd(state2);
-}
-static private final void jjCheckNAddStates(int start, int end)
-{
-   do {
-      jjCheckNAdd(jjnextStates[start]);
-   } while (start++ != end);
-}
-static private final void jjCheckNAddStates(int start)
-{
-   jjCheckNAdd(jjnextStates[start]);
-   jjCheckNAdd(jjnextStates[start + 1]);
-}
-static private final int jjMoveNfa_2(int startState, int curPos)
+private final int jjMoveNfa_2(int startState, int curPos)
 {
    int[] nextStates;
    int startsAt = 0;
@@ -331,15 +1000,15 @@ static private final int jjMoveNfa_2(int startState, int curPos)
                case 0:
                   if ((0x2400L & l) != 0L)
                   {
-                     if (kind > 15)
-                        kind = 15;
+                     if (kind > 20)
+                        kind = 20;
                   }
                   if (curChar == 13)
                      jjstateSet[jjnewStateCnt++] = 1;
                   break;
                case 1:
-                  if (curChar == 10 && kind > 15)
-                     kind = 15;
+                  if (curChar == 10 && kind > 20)
+                     kind = 20;
                   break;
                case 2:
                   if (curChar == 13)
@@ -385,129 +1054,127 @@ static private final int jjMoveNfa_2(int startState, int curPos)
       catch(java.io.IOException e) { return curPos; }
    }
 }
-private static final int jjStopStringLiteralDfa_1(int pos, long active0, long active1, long active2)
+private final int jjStopStringLiteralDfa_1(int pos, long active0, long active1, long active2)
 {
    switch (pos)
    {
       case 0:
-         if ((active0 & 0x4800L) != 0L || (active1 & 0x800000L) != 0L || (active2 & 0x20L) != 0L)
-            return 2;
-         if ((active1 & 0x800L) != 0L)
-            return 16;
-         if ((active1 & 0x80000000000000L) != 0L || (active2 & 0x200L) != 0L)
-            return 8;
-         if ((active0 & 0xfffffc7fffe00000L) != 0L || (active1 & 0x1800003ffL) != 0L)
+         if ((active0 & 0xffff1ffff8000000L) != 0L || (active1 & 0x300000ffffL) != 0L)
          {
-            jjmatchedKind = 107;
+            jjmatchedKind = 124;
             return 14;
          }
+         if ((active0 & 0x90000L) != 0L || (active1 & 0x10000000L) != 0L || (active2 & 0x800000L) != 0L)
+            return 2;
+         if ((active2 & 0x8000200L) != 0L)
+            return 8;
          return -1;
       case 1:
-         if ((active0 & 0x4000L) != 0L)
+         if ((active0 & 0x80000L) != 0L)
             return 0;
-         if ((active0 & 0x400001000000L) != 0L || (active1 & 0x80000041L) != 0L)
+         if ((active0 & 0x10000040000000L) != 0L || (active1 & 0x1000001040L) != 0L)
             return 14;
-         if ((active0 & 0xffffbc7ffee00000L) != 0L || (active1 & 0x1000003beL) != 0L)
+         if ((active0 & 0xffef1fffb8000000L) != 0L || (active1 & 0x200000efbfL) != 0L)
          {
             if (jjmatchedPos != 1)
             {
-               jjmatchedKind = 107;
+               jjmatchedKind = 124;
                jjmatchedPos = 1;
             }
             return 14;
          }
          return -1;
       case 2:
-         if ((active0 & 0x8005000000800000L) != 0L || (active1 & 0x100000300L) != 0L)
+         if ((active0 & 0x140000020000000L) != 0L || (active1 & 0x200000c020L) != 0L)
             return 14;
-         if ((active0 & 0x7ffabc7ffe600000L) != 0L || (active1 & 0xfeL) != 0L)
+         if ((active0 & 0xfeaf1fff98000000L) != 0L || (active1 & 0x3f9fL) != 0L)
          {
             if (jjmatchedPos != 2)
             {
-               jjmatchedKind = 107;
+               jjmatchedKind = 124;
                jjmatchedPos = 2;
             }
             return 14;
          }
          return -1;
       case 3:
-         if ((active0 & 0x18a0400a6000000L) != 0L || (active1 & 0x38L) != 0L)
-            return 14;
-         if ((active0 & 0xfe70b87f58600000L) != 0L || (active1 & 0x2c6L) != 0L)
+         if ((active0 & 0x9c2e1fd618000000L) != 0L || (active1 & 0xb1bfL) != 0L)
          {
             if (jjmatchedPos != 3)
             {
-               jjmatchedKind = 107;
+               jjmatchedKind = 124;
                jjmatchedPos = 3;
             }
             return 14;
          }
+         if ((active0 & 0x6281002980000000L) != 0L || (active1 & 0xe00L) != 0L)
+            return 14;
          return -1;
       case 4:
-         if ((active0 & 0x2620080058200000L) != 0L || (active1 & 0x80L) != 0L)
+         if ((active0 & 0x8802001608000000L) != 0L || (active1 & 0x2009L) != 0L)
             return 14;
-         if ((active0 & 0xd850b07f02400000L) != 0L || (active1 & 0x256L) != 0L)
+         if ((active0 & 0x142c1fc090000000L) != 0L || (active1 & 0x95b6L) != 0L)
          {
-            jjmatchedKind = 107;
+            jjmatchedKind = 124;
             jjmatchedPos = 4;
             return 14;
          }
          return -1;
       case 5:
-         if ((active0 & 0x4050007002000000L) != 0L || (active1 & 0x46L) != 0L)
+         if ((active0 & 0x14001c0080000000L) != 0L || (active1 & 0x1190L) != 0L)
             return 14;
-         if ((active0 & 0x9800b00f00400000L) != 0L || (active1 & 0x210L) != 0L)
+         if ((active0 & 0x2c03c010000000L) != 0L || (active1 & 0x8426L) != 0L)
          {
-            jjmatchedKind = 107;
+            jjmatchedKind = 124;
             jjmatchedPos = 5;
             return 14;
          }
          return -1;
       case 6:
-         if ((active0 & 0x8000a00f00000000L) != 0L || (active1 & 0x210L) != 0L)
+         if ((active0 & 0x2803c000000000L) != 0L || (active1 & 0x8420L) != 0L)
             return 14;
-         if ((active0 & 0x1800100000400000L) != 0L)
+         if ((active0 & 0x4000010000000L) != 0L || (active1 & 0x6L) != 0L)
          {
             if (jjmatchedPos != 6)
             {
-               jjmatchedKind = 107;
+               jjmatchedKind = 124;
                jjmatchedPos = 6;
             }
             return 14;
          }
          return -1;
       case 7:
-         if ((active0 & 0x800100000400000L) != 0L)
-            return 14;
-         if ((active0 & 0x1000000c00000000L) != 0L)
+         if ((active0 & 0x30000000000L) != 0L || (active1 & 0x4L) != 0L)
          {
-            jjmatchedKind = 107;
+            jjmatchedKind = 124;
             jjmatchedPos = 7;
             return 14;
          }
+         if ((active0 & 0x4000010000000L) != 0L || (active1 & 0x2L) != 0L)
+            return 14;
          return -1;
       case 8:
-         if ((active0 & 0xc00000000L) != 0L)
+         if ((active1 & 0x4L) != 0L)
+            return 14;
+         if ((active0 & 0x30000000000L) != 0L)
          {
-            jjmatchedKind = 107;
+            jjmatchedKind = 124;
             jjmatchedPos = 8;
             return 14;
          }
-         if ((active0 & 0x1000000000000000L) != 0L)
-            return 14;
          return -1;
       case 9:
-         if ((active0 & 0xc00000000L) != 0L)
+         if ((active0 & 0x30000000000L) != 0L)
          {
-            jjmatchedKind = 107;
+            jjmatchedKind = 124;
             jjmatchedPos = 9;
             return 14;
          }
          return -1;
       case 10:
-         if ((active0 & 0xc00000000L) != 0L)
+         if ((active0 & 0x30000000000L) != 0L)
          {
-            jjmatchedKind = 107;
+            jjmatchedKind = 124;
             jjmatchedPos = 10;
             return 14;
          }
@@ -516,11 +1183,11 @@ private static final int jjStopStringLiteralDfa_1(int pos, long active0, long ac
          return -1;
    }
 }
-private static final int jjStartNfa_1(int pos, long active0, long active1, long active2)
+private final int jjStartNfa_1(int pos, long active0, long active1, long active2)
 {
    return jjMoveNfa_1(jjStopStringLiteralDfa_1(pos, active0, active1, active2), pos + 1);
 }
-static private final int jjStartNfaWithStates_1(int pos, int kind, int state)
+private final int jjStartNfaWithStates_1(int pos, int kind, int state)
 {
    jjmatchedKind = kind;
    jjmatchedPos = pos;
@@ -528,136 +1195,138 @@ static private final int jjStartNfaWithStates_1(int pos, int kind, int state)
    catch(java.io.IOException e) { return pos + 1; }
    return jjMoveNfa_1(state, pos + 1);
 }
-static private final int jjMoveStringLiteralDfa0_1()
+private final int jjMoveStringLiteralDfa0_1()
 {
    switch(curChar)
    {
       case 33:
-         jjmatchedKind = 76;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0xa000000000000000L, 0x0L);
+         jjmatchedKind = 81;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x28000L);
+      case 34:
+         return jjStopAtPos(0, 112);
       case 35:
-         return jjStopAtPos(0, 12);
+         return jjStopAtPos(0, 17);
       case 36:
-         return jjStartNfaWithStates_1(0, 75, 16);
+         return jjStopAtPos(0, 123);
       case 37:
-         jjmatchedKind = 91;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x400L);
+         jjmatchedKind = 96;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x10000000L);
       case 38:
-         jjmatchedKind = 88;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x20000L, 0x40L);
+         jjmatchedKind = 93;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x400000L, 0x1000000L);
       case 40:
-         return jjStopAtPos(0, 111);
+         return jjStopAtPos(0, 129);
       case 41:
-         return jjStopAtPos(0, 112);
+         return jjStopAtPos(0, 130);
       case 42:
-         jjmatchedKind = 86;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x10L);
+         jjmatchedKind = 91;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x400000L);
       case 43:
-         jjmatchedKind = 84;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x40000L, 0x4L);
+         jjmatchedKind = 89;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x800000L, 0x100000L);
       case 44:
-         return jjStopAtPos(0, 118);
+         return jjStopAtPos(0, 136);
       case 45:
-         jjmatchedKind = 85;
-         return jjMoveStringLiteralDfa1_1(0x8000000000L, 0x80000L, 0x8L);
+         jjmatchedKind = 90;
+         return jjMoveStringLiteralDfa1_1(0x200000000000L, 0x1000000L, 0x200000L);
       case 46:
-         jjmatchedKind = 119;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x200L);
+         jjmatchedKind = 137;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x8000000L);
       case 47:
-         jjmatchedKind = 87;
-         return jjMoveStringLiteralDfa1_1(0x4800L, 0x0L, 0x20L);
+         jjmatchedKind = 92;
+         return jjMoveStringLiteralDfa1_1(0x90000L, 0x0L, 0x800000L);
       case 58:
-         jjmatchedKind = 79;
-         return jjMoveStringLiteralDfa1_1(0x10000000000L, 0x0L, 0x0L);
+         jjmatchedKind = 84;
+         return jjMoveStringLiteralDfa1_1(0x400000000000L, 0x0L, 0x0L);
       case 59:
-         return jjStopAtPos(0, 117);
+         return jjStopAtPos(0, 135);
       case 60:
-         jjmatchedKind = 121;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x4800000010000000L, 0x1000L);
+         jjmatchedKind = 139;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x200000000L, 0x40012000L);
       case 61:
-         jjmatchedKind = 129;
-         return jjMoveStringLiteralDfa1_1(0x20000000000L, 0x400000000000000L, 0x1L);
+         jjmatchedKind = 147;
+         return jjMoveStringLiteralDfa1_1(0x800000000000L, 0x0L, 0x41000L);
       case 62:
-         jjmatchedKind = 120;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x1000000060000000L, 0x2000L);
+         jjmatchedKind = 138;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0xc00000000L, 0x80004000L);
       case 63:
-         jjmatchedKind = 78;
+         jjmatchedKind = 83;
          return jjMoveStringLiteralDfa1_1(0x10L, 0x0L, 0x0L);
       case 64:
-         return jjStopAtPos(0, 74);
+         return jjStopAtPos(0, 80);
       case 91:
-         return jjStopAtPos(0, 115);
+         return jjStopAtPos(0, 133);
       case 93:
-         return jjStopAtPos(0, 116);
+         return jjStopAtPos(0, 134);
       case 94:
-         jjmatchedKind = 90;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x100L);
+         jjmatchedKind = 95;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x4000000L);
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa1_1(0x8000000L, 0x100000001L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x200000000L, 0x2000000040L, 0x0L);
       case 66:
       case 98:
-         return jjMoveStringLiteralDfa1_1(0x10000000L, 0x18L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x400000000L, 0x600L, 0x0L);
       case 67:
       case 99:
-         return jjMoveStringLiteralDfa1_1(0x1c0000200000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x7000008000000L, 0x0L, 0x0L);
       case 68:
       case 100:
-         return jjMoveStringLiteralDfa1_1(0x602000000000L, 0x40L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x18080000000000L, 0x1000L, 0x0L);
       case 69:
       case 101:
-         return jjMoveStringLiteralDfa1_1(0x7800800086000000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x20002180000000L, 0x1eL, 0x0L);
       case 70:
       case 102:
-         return jjMoveStringLiteralDfa1_1(0x8201000000400000L, 0x80L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x8040000010000000L, 0x2020L, 0x0L);
       case 71:
       case 103:
-         return jjMoveStringLiteralDfa1_1(0x2001000000000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x80040000000000L, 0x0L, 0x0L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa1_1(0x501000000L, 0x300L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x14040000000L, 0xc000L, 0x0L);
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa1_1(0x20000000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x800000000L, 0x0L, 0x0L);
       case 78:
       case 110:
-         return jjMoveStringLiteralDfa1_1(0xc000000000000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x300000000000000L, 0x0L, 0x0L);
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x80000004L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x1000000100L, 0x0L);
       case 80:
       case 112:
-         return jjMoveStringLiteralDfa1_1(0x40000000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x1000000000L, 0x0L, 0x0L);
       case 82:
       case 114:
-         return jjMoveStringLiteralDfa1_1(0x10000a00000000L, 0x20L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x400028000000000L, 0x800L, 0x0L);
       case 83:
       case 115:
-         return jjMoveStringLiteralDfa1_1(0x60004000000000L, 0x2L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x1800100000000000L, 0x80L, 0x0L);
       case 84:
       case 116:
-         return jjMoveStringLiteralDfa1_1(0x180000000000000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x6000000000000000L, 0x0L, 0x0L);
       case 86:
       case 118:
-         return jjMoveStringLiteralDfa1_1(0x800000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x20000000L, 0x0L, 0x0L);
       case 87:
       case 119:
-         return jjMoveStringLiteralDfa1_1(0x400000000000000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x1L, 0x0L);
       case 123:
-         return jjStopAtPos(0, 113);
+         return jjStopAtPos(0, 131);
       case 124:
-         jjmatchedKind = 89;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x10000L, 0x80L);
+         jjmatchedKind = 94;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x200000L, 0x2000000L);
       case 125:
-         return jjStopAtPos(0, 114);
+         return jjStopAtPos(0, 132);
       case 126:
-         jjmatchedKind = 77;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x800L);
+         jjmatchedKind = 82;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x20000000L);
       default :
          return jjMoveNfa_1(3, 0);
    }
 }
-static private final int jjMoveStringLiteralDfa1_1(long active0, long active1, long active2)
+private final int jjMoveStringLiteralDfa1_1(long active0, long active1, long active2)
 {
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
@@ -667,156 +1336,156 @@ static private final int jjMoveStringLiteralDfa1_1(long active0, long active1, l
    switch(curChar)
    {
       case 38:
-         if ((active1 & 0x20000L) != 0L)
-            return jjStopAtPos(1, 81);
+         if ((active1 & 0x400000L) != 0L)
+            return jjStopAtPos(1, 86);
          break;
       case 42:
-         if ((active0 & 0x4000L) != 0L)
-            return jjStartNfaWithStates_1(1, 14, 0);
+         if ((active0 & 0x80000L) != 0L)
+            return jjStartNfaWithStates_1(1, 19, 0);
          break;
       case 43:
-         if ((active1 & 0x40000L) != 0L)
-            return jjStopAtPos(1, 82);
+         if ((active1 & 0x800000L) != 0L)
+            return jjStopAtPos(1, 87);
          break;
       case 45:
-         if ((active1 & 0x80000L) != 0L)
-            return jjStopAtPos(1, 83);
+         if ((active1 & 0x1000000L) != 0L)
+            return jjStopAtPos(1, 88);
          break;
       case 47:
-         if ((active0 & 0x800L) != 0L)
-            return jjStopAtPos(1, 11);
+         if ((active0 & 0x10000L) != 0L)
+            return jjStopAtPos(1, 16);
          break;
       case 58:
-         if ((active0 & 0x10000000000L) != 0L)
-            return jjStopAtPos(1, 40);
+         if ((active0 & 0x400000000000L) != 0L)
+            return jjStopAtPos(1, 46);
          break;
       case 60:
-         if ((active1 & 0x10000000L) != 0L)
+         if ((active1 & 0x200000000L) != 0L)
          {
-            jjmatchedKind = 92;
+            jjmatchedKind = 97;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0L, active2, 0x1000L);
+         return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0L, active2, 0x40000000L);
       case 61:
-         if ((active1 & 0x400000000000000L) != 0L)
+         if ((active2 & 0x1000L) != 0L)
          {
-            jjmatchedKind = 122;
+            jjmatchedKind = 140;
             jjmatchedPos = 1;
          }
-         else if ((active1 & 0x800000000000000L) != 0L)
-            return jjStopAtPos(1, 123);
-         else if ((active1 & 0x1000000000000000L) != 0L)
-            return jjStopAtPos(1, 124);
-         else if ((active1 & 0x2000000000000000L) != 0L)
+         else if ((active2 & 0x2000L) != 0L)
+            return jjStopAtPos(1, 141);
+         else if ((active2 & 0x4000L) != 0L)
+            return jjStopAtPos(1, 142);
+         else if ((active2 & 0x8000L) != 0L)
          {
-            jjmatchedKind = 125;
+            jjmatchedKind = 143;
             jjmatchedPos = 1;
          }
-         else if ((active2 & 0x4L) != 0L)
-            return jjStopAtPos(1, 130);
-         else if ((active2 & 0x8L) != 0L)
-            return jjStopAtPos(1, 131);
-         else if ((active2 & 0x10L) != 0L)
-            return jjStopAtPos(1, 132);
-         else if ((active2 & 0x20L) != 0L)
-            return jjStopAtPos(1, 133);
-         else if ((active2 & 0x40L) != 0L)
-            return jjStopAtPos(1, 134);
-         else if ((active2 & 0x80L) != 0L)
-            return jjStopAtPos(1, 135);
-         else if ((active2 & 0x100L) != 0L)
-            return jjStopAtPos(1, 136);
-         else if ((active2 & 0x200L) != 0L)
-            return jjStopAtPos(1, 137);
-         else if ((active2 & 0x400L) != 0L)
-            return jjStopAtPos(1, 138);
-         else if ((active2 & 0x800L) != 0L)
-            return jjStopAtPos(1, 139);
-         return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x8000000000000000L, active2, 0x1L);
+         else if ((active2 & 0x100000L) != 0L)
+            return jjStopAtPos(1, 148);
+         else if ((active2 & 0x200000L) != 0L)
+            return jjStopAtPos(1, 149);
+         else if ((active2 & 0x400000L) != 0L)
+            return jjStopAtPos(1, 150);
+         else if ((active2 & 0x800000L) != 0L)
+            return jjStopAtPos(1, 151);
+         else if ((active2 & 0x1000000L) != 0L)
+            return jjStopAtPos(1, 152);
+         else if ((active2 & 0x2000000L) != 0L)
+            return jjStopAtPos(1, 153);
+         else if ((active2 & 0x4000000L) != 0L)
+            return jjStopAtPos(1, 154);
+         else if ((active2 & 0x8000000L) != 0L)
+            return jjStopAtPos(1, 155);
+         else if ((active2 & 0x10000000L) != 0L)
+            return jjStopAtPos(1, 156);
+         else if ((active2 & 0x20000000L) != 0L)
+            return jjStopAtPos(1, 157);
+         return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0L, active2, 0x60000L);
       case 62:
          if ((active0 & 0x10L) != 0L)
             return jjStopAtPos(1, 4);
-         else if ((active0 & 0x8000000000L) != 0L)
-            return jjStopAtPos(1, 39);
-         else if ((active0 & 0x20000000000L) != 0L)
-            return jjStopAtPos(1, 41);
-         else if ((active1 & 0x20000000L) != 0L)
+         else if ((active0 & 0x200000000000L) != 0L)
+            return jjStopAtPos(1, 45);
+         else if ((active0 & 0x800000000000L) != 0L)
+            return jjStopAtPos(1, 47);
+         else if ((active1 & 0x400000000L) != 0L)
          {
-            jjmatchedKind = 93;
+            jjmatchedKind = 98;
             jjmatchedPos = 1;
          }
-         else if ((active1 & 0x4000000000000000L) != 0L)
-            return jjStopAtPos(1, 126);
-         return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x40000000L, active2, 0x2000L);
+         else if ((active2 & 0x10000L) != 0L)
+            return jjStopAtPos(1, 144);
+         return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x800000000L, active2, 0x80000000L);
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa2_1(active0, 0x200040000800000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0x8001000020000000L, active1, 0L, active2, 0L);
       case 66:
       case 98:
-         return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x4L, active2, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x100L, active2, 0L);
       case 67:
       case 99:
-         return jjMoveStringLiteralDfa2_1(active0, 0x80000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0x2000000000L, active1, 0L, active2, 0L);
       case 69:
       case 101:
-         return jjMoveStringLiteralDfa2_1(active0, 0x14202a00000000L, active1, 0x20L, active2, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0x5080a8000000000L, active1, 0x800L, active2, 0L);
       case 70:
       case 102:
-         if ((active0 & 0x1000000L) != 0L)
-            return jjStartNfaWithStates_1(1, 24, 14);
+         if ((active0 & 0x40000000L) != 0L)
+            return jjStartNfaWithStates_1(1, 30, 14);
          break;
       case 72:
       case 104:
-         return jjMoveStringLiteralDfa2_1(active0, 0x480000000000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0x2000000000000000L, active1, 0x1L, active2, 0L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa2_1(active0, 0x20000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0x800000000L, active1, 0L, active2, 0L);
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa2_1(active0, 0x1006200000L, active1, 0x80L, active2, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0x40188000000L, active1, 0x2000L, active2, 0L);
       case 78:
       case 110:
-         return jjMoveStringLiteralDfa2_1(active0, 0x7800000500000000L, active1, 0x100000300L, active2, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0x14000000000L, active1, 0x200000c01eL, active2, 0L);
       case 79:
       case 111:
-         if ((active0 & 0x400000000000L) != 0L)
+         if ((active0 & 0x10000000000000L) != 0L)
          {
-            jjmatchedKind = 46;
+            jjmatchedKind = 52;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_1(active0, 0x8003180000000000L, active1, 0x58L, active2, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0xc6000000000000L, active1, 0x1620L, active2, 0L);
       case 82:
       case 114:
-         if ((active1 & 0x80000000L) != 0L)
-            return jjStartNfaWithStates_1(1, 95, 14);
-         return jjMoveStringLiteralDfa2_1(active0, 0x100000058000000L, active1, 0L, active2, 0L);
+         if ((active1 & 0x1000000000L) != 0L)
+            return jjStartNfaWithStates_1(1, 100, 14);
+         return jjMoveStringLiteralDfa2_1(active0, 0x4000001600000000L, active1, 0L, active2, 0L);
       case 83:
       case 115:
-         if ((active1 & 0x1L) != 0L)
-            return jjStartNfaWithStates_1(1, 64, 14);
+         if ((active1 & 0x40L) != 0L)
+            return jjStartNfaWithStates_1(1, 70, 14);
          break;
       case 84:
       case 116:
-         return jjMoveStringLiteralDfa2_1(active0, 0x4000000000L, active1, 0x2L, active2, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0x100000000000L, active1, 0x80L, active2, 0L);
       case 85:
       case 117:
-         return jjMoveStringLiteralDfa2_1(active0, 0x28000000400000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0xa00000010000000L, active1, 0L, active2, 0L);
       case 87:
       case 119:
-         return jjMoveStringLiteralDfa2_1(active0, 0x40000000000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0x1000000000000000L, active1, 0L, active2, 0L);
       case 88:
       case 120:
-         return jjMoveStringLiteralDfa2_1(active0, 0x800000000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0x20000000000000L, active1, 0L, active2, 0L);
       case 124:
-         if ((active1 & 0x10000L) != 0L)
-            return jjStopAtPos(1, 80);
+         if ((active1 & 0x200000L) != 0L)
+            return jjStopAtPos(1, 85);
          break;
       default :
          break;
    }
    return jjStartNfa_1(0, active0, active1, active2);
 }
-static private final int jjMoveStringLiteralDfa2_1(long old0, long active0, long old1, long active1, long old2, long active2)
+private final int jjMoveStringLiteralDfa2_1(long old0, long active0, long old1, long active1, long old2, long active2)
 {
    if (((active0 &= old0) | (active1 &= old1) | (active2 &= old2)) == 0L)
       return jjStartNfa_1(0, old0, old1, old2); 
@@ -828,95 +1497,95 @@ static private final int jjMoveStringLiteralDfa2_1(long old0, long active0, long
    switch(curChar)
    {
       case 61:
-         if ((active1 & 0x8000000000000000L) != 0L)
-            return jjStopAtPos(2, 127);
-         else if ((active2 & 0x1L) != 0L)
-            return jjStopAtPos(2, 128);
-         else if ((active2 & 0x1000L) != 0L)
-            return jjStopAtPos(2, 140);
-         else if ((active2 & 0x2000L) != 0L)
-            return jjStopAtPos(2, 141);
+         if ((active2 & 0x20000L) != 0L)
+            return jjStopAtPos(2, 145);
+         else if ((active2 & 0x40000L) != 0L)
+            return jjStopAtPos(2, 146);
+         else if ((active2 & 0x40000000L) != 0L)
+            return jjStopAtPos(2, 158);
+         else if ((active2 & 0x80000000L) != 0L)
+            return jjStopAtPos(2, 159);
          break;
       case 62:
-         if ((active1 & 0x40000000L) != 0L)
-            return jjStopAtPos(2, 94);
+         if ((active1 & 0x800000000L) != 0L)
+            return jjStopAtPos(2, 99);
          break;
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa3_1(active0, 0x4000200000L, active1, 0x20L, active2, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x100008000000L, active1, 0x800L, active2, 0L);
       case 67:
       case 99:
-         return jjMoveStringLiteralDfa3_1(active0, 0x500000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x14000000000L, active1, 0L, active2, 0L);
       case 68:
       case 100:
-         if ((active1 & 0x100000000L) != 0L)
-            return jjStartNfaWithStates_1(2, 96, 14);
-         return jjMoveStringLiteralDfa3_1(active0, 0x7800000000000000L, active1, 0L, active2, 0L);
+         if ((active1 & 0x2000000000L) != 0L)
+            return jjStartNfaWithStates_1(2, 101, 14);
+         return jjMoveStringLiteralDfa3_1(active0, 0L, active1, 0x1eL, active2, 0L);
       case 69:
       case 101:
-         return jjMoveStringLiteralDfa3_1(active0, 0x10000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x400000000L, active1, 0L, active2, 0L);
       case 70:
       case 102:
-         return jjMoveStringLiteralDfa3_1(active0, 0x202000000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x8080000000000L, active1, 0L, active2, 0L);
       case 72:
       case 104:
-         return jjMoveStringLiteralDfa3_1(active0, 0x80000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x2000000000L, active1, 0L, active2, 0L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa3_1(active0, 0x4c0000040000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x3000001000000000L, active1, 0x1L, active2, 0L);
       case 74:
       case 106:
-         return jjMoveStringLiteralDfa3_1(active0, 0L, active1, 0x4L, active2, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0L, active1, 0x100L, active2, 0L);
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa3_1(active0, 0x208000000000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x8200000000000000L, active1, 0L, active2, 0L);
       case 78:
       case 110:
-         return jjMoveStringLiteralDfa3_1(active0, 0x180000400000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x6000010000000L, active1, 0L, active2, 0L);
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa3_1(active0, 0x1000000000L, active1, 0x98L, active2, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x40000000000L, active1, 0x2600L, active2, 0L);
       case 80:
       case 112:
-         return jjMoveStringLiteralDfa3_1(active0, 0x20000000000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x800000000000000L, active1, 0L, active2, 0L);
       case 81:
       case 113:
-         return jjMoveStringLiteralDfa3_1(active0, 0xa00000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x28000000000L, active1, 0L, active2, 0L);
       case 82:
       case 114:
-         if ((active0 & 0x800000L) != 0L)
-            return jjStartNfaWithStates_1(2, 23, 14);
-         else if ((active0 & 0x1000000000000L) != 0L)
+         if ((active0 & 0x20000000L) != 0L)
+            return jjStartNfaWithStates_1(2, 29, 14);
+         else if ((active0 & 0x40000000000000L) != 0L)
          {
-            jjmatchedKind = 48;
+            jjmatchedKind = 54;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_1(active0, 0x8000000008000000L, active1, 0x2L, active2, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x200000000L, active1, 0xa0L, active2, 0L);
       case 83:
       case 115:
-         return jjMoveStringLiteralDfa3_1(active0, 0x40026000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x1000980000000L, active1, 0L, active2, 0L);
       case 84:
       case 116:
-         if ((active1 & 0x100L) != 0L)
+         if ((active1 & 0x4000L) != 0L)
          {
-            jjmatchedKind = 72;
+            jjmatchedKind = 78;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_1(active0, 0x12800000000000L, active1, 0x200L, active2, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x4a0000000000000L, active1, 0x8000L, active2, 0L);
       case 85:
       case 117:
-         return jjMoveStringLiteralDfa3_1(active0, 0x100000000000000L, active1, 0x40L, active2, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x4000000000000000L, active1, 0x1000L, active2, 0L);
       case 87:
       case 119:
-         if ((active0 & 0x4000000000000L) != 0L)
-            return jjStartNfaWithStates_1(2, 50, 14);
+         if ((active0 & 0x100000000000000L) != 0L)
+            return jjStartNfaWithStates_1(2, 56, 14);
          break;
       default :
          break;
    }
    return jjStartNfa_1(1, active0, active1, active2);
 }
-static private final int jjMoveStringLiteralDfa3_1(long old0, long active0, long old1, long active1, long old2, long active2)
+private final int jjMoveStringLiteralDfa3_1(long old0, long active0, long old1, long active1, long old2, long active2)
 {
    if (((active0 &= old0) | (active1 &= old1) | (active2 &= old2)) == 0L)
       return jjStartNfa_1(1, old0, old1, old2); 
@@ -929,75 +1598,75 @@ static private final int jjMoveStringLiteralDfa3_1(long old0, long active0, long
    {
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa4_1(active0, 0x200018000000L, active1, 0x80L);
+         return jjMoveStringLiteralDfa4_1(active0, 0x8000600000000L, active1, 0x2000L);
       case 66:
       case 98:
-         return jjMoveStringLiteralDfa4_1(active0, 0x1000000000L, active1, 0x40L);
+         return jjMoveStringLiteralDfa4_1(active0, 0x40000000000L, active1, 0x1000L);
       case 67:
       case 99:
-         return jjMoveStringLiteralDfa4_1(active0, 0x400000L, active1, 0L);
+         return jjMoveStringLiteralDfa4_1(active0, 0x10000000L, active1, 0L);
       case 69:
       case 101:
-         if ((active0 & 0x4000000L) != 0L)
+         if ((active0 & 0x100000000L) != 0L)
          {
-            jjmatchedKind = 26;
+            jjmatchedKind = 32;
             jjmatchedPos = 3;
          }
-         else if ((active0 & 0x40000000000L) != 0L)
-            return jjStartNfaWithStates_1(3, 42, 14);
-         else if ((active0 & 0x100000000000000L) != 0L)
-            return jjStartNfaWithStates_1(3, 56, 14);
-         return jjMoveStringLiteralDfa4_1(active0, 0x8020800002000000L, active1, 0x204L);
+         else if ((active0 & 0x1000000000000L) != 0L)
+            return jjStartNfaWithStates_1(3, 48, 14);
+         else if ((active0 & 0x4000000000000000L) != 0L)
+            return jjStartNfaWithStates_1(3, 62, 14);
+         return jjMoveStringLiteralDfa4_1(active0, 0x820000080000000L, active1, 0x8120L);
       case 70:
       case 102:
-         return jjMoveStringLiteralDfa4_1(active0, 0x4000000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa4_1(active0, 0L, active1, 0x10L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa4_1(active0, 0x2000002000000000L, active1, 0x2L);
+         return jjMoveStringLiteralDfa4_1(active0, 0x80000000000L, active1, 0x88L);
       case 76:
       case 108:
-         if ((active0 & 0x8000000000000L) != 0L)
-            return jjStartNfaWithStates_1(3, 51, 14);
-         else if ((active1 & 0x8L) != 0L)
+         if ((active0 & 0x200000000000000L) != 0L)
+            return jjStartNfaWithStates_1(3, 57, 14);
+         else if ((active1 & 0x200L) != 0L)
          {
-            jjmatchedKind = 67;
+            jjmatchedKind = 73;
             jjmatchedPos = 3;
          }
-         else if ((active1 & 0x20L) != 0L)
-            return jjStartNfaWithStates_1(3, 69, 14);
-         return jjMoveStringLiteralDfa4_1(active0, 0x400000500000000L, active1, 0x10L);
+         else if ((active1 & 0x800L) != 0L)
+            return jjStartNfaWithStates_1(3, 75, 14);
+         return jjMoveStringLiteralDfa4_1(active0, 0x14000000000L, active1, 0x401L);
       case 78:
       case 110:
-         return jjMoveStringLiteralDfa4_1(active0, 0x40000000L, active1, 0L);
+         return jjMoveStringLiteralDfa4_1(active0, 0x1000000000L, active1, 0L);
       case 79:
       case 111:
-         if ((active0 & 0x80000000L) != 0L)
-            return jjStartNfaWithStates_1(3, 31, 14);
-         else if ((active0 & 0x2000000000000L) != 0L)
-            return jjStartNfaWithStates_1(3, 49, 14);
+         if ((active0 & 0x2000000000L) != 0L)
+            return jjStartNfaWithStates_1(3, 37, 14);
+         else if ((active0 & 0x80000000000000L) != 0L)
+            return jjStartNfaWithStates_1(3, 55, 14);
          break;
       case 83:
       case 115:
-         if ((active0 & 0x80000000000000L) != 0L)
-            return jjStartNfaWithStates_1(3, 55, 14);
-         return jjMoveStringLiteralDfa4_1(active0, 0x1200080000200000L, active1, 0L);
+         if ((active0 & 0x2000000000000000L) != 0L)
+            return jjStartNfaWithStates_1(3, 61, 14);
+         return jjMoveStringLiteralDfa4_1(active0, 0x8002000008000000L, active1, 0x4L);
       case 84:
       case 116:
-         if ((active0 & 0x20000000L) != 0L)
-            return jjStartNfaWithStates_1(3, 29, 14);
-         return jjMoveStringLiteralDfa4_1(active0, 0x40104000000000L, active1, 0L);
+         if ((active0 & 0x800000000L) != 0L)
+            return jjStartNfaWithStates_1(3, 35, 14);
+         return jjMoveStringLiteralDfa4_1(active0, 0x1004100000000000L, active1, 0L);
       case 85:
       case 117:
-         return jjMoveStringLiteralDfa4_1(active0, 0x10000a00000000L, active1, 0L);
+         return jjMoveStringLiteralDfa4_1(active0, 0x400028000000000L, active1, 0L);
       case 87:
       case 119:
-         return jjMoveStringLiteralDfa4_1(active0, 0x800000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa4_1(active0, 0L, active1, 0x2L);
       default :
          break;
    }
    return jjStartNfa_1(2, active0, active1, 0L);
 }
-static private final int jjMoveStringLiteralDfa4_1(long old0, long active0, long old1, long active1)
+private final int jjMoveStringLiteralDfa4_1(long old0, long active0, long old1, long active1)
 {
    if (((active0 &= old0) | (active1 &= old1)) == 0L)
       return jjStartNfa_1(2, old0, old1, 0L);
@@ -1010,81 +1679,81 @@ static private final int jjMoveStringLiteralDfa4_1(long old0, long active0, long
    {
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa5_1(active0, 0x8000001000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa5_1(active0, 0x40000000000L, active1, 0x20L);
       case 67:
       case 99:
-         return jjMoveStringLiteralDfa5_1(active0, 0x40000000000000L, active1, 0x4L);
+         return jjMoveStringLiteralDfa5_1(active0, 0x1000000000000000L, active1, 0x100L);
       case 69:
       case 101:
-         if ((active0 & 0x200000000000000L) != 0L)
-            return jjStartNfaWithStates_1(4, 57, 14);
-         else if ((active0 & 0x400000000000000L) != 0L)
-            return jjStartNfaWithStates_1(4, 58, 14);
-         return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x10L);
+         if ((active0 & 0x8000000000000000L) != 0L)
+            return jjStartNfaWithStates_1(4, 63, 14);
+         else if ((active1 & 0x1L) != 0L)
+            return jjStartNfaWithStates_1(4, 64, 14);
+         return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x400L);
       case 70:
       case 102:
-         if ((active0 & 0x2000000000000000L) != 0L)
-            return jjStartNfaWithStates_1(4, 61, 14);
+         if ((active1 & 0x8L) != 0L)
+            return jjStartNfaWithStates_1(4, 67, 14);
          break;
       case 71:
       case 103:
-         return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x200L);
+         return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x8000L);
       case 72:
       case 104:
-         return jjMoveStringLiteralDfa5_1(active0, 0x800000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x2L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa5_1(active0, 0x104a02000000L, active1, 0L);
+         return jjMoveStringLiteralDfa5_1(active0, 0x4128080000000L, active1, 0L);
       case 75:
       case 107:
-         if ((active0 & 0x10000000L) != 0L)
-            return jjStartNfaWithStates_1(4, 28, 14);
+         if ((active0 & 0x400000000L) != 0L)
+            return jjStartNfaWithStates_1(4, 34, 14);
          break;
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x40L);
+         return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x1000L);
       case 78:
       case 110:
-         return jjMoveStringLiteralDfa5_1(active0, 0x802000000000L, active1, 0x2L);
+         return jjMoveStringLiteralDfa5_1(active0, 0x20080000000000L, active1, 0x80L);
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa5_1(active0, 0x4000000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x10L);
       case 82:
       case 114:
-         if ((active0 & 0x20000000000000L) != 0L)
-            return jjStartNfaWithStates_1(4, 53, 14);
-         return jjMoveStringLiteralDfa5_1(active0, 0x10000000000000L, active1, 0L);
+         if ((active0 & 0x800000000000000L) != 0L)
+            return jjStartNfaWithStates_1(4, 59, 14);
+         return jjMoveStringLiteralDfa5_1(active0, 0x400000000000000L, active1, 0L);
       case 83:
       case 115:
-         if ((active0 & 0x200000L) != 0L)
-            return jjStartNfaWithStates_1(4, 21, 14);
+         if ((active0 & 0x8000000L) != 0L)
+            return jjStartNfaWithStates_1(4, 27, 14);
          break;
       case 84:
       case 116:
-         if ((active0 & 0x40000000L) != 0L)
-            return jjStartNfaWithStates_1(4, 30, 14);
-         else if ((active0 & 0x80000000000L) != 0L)
-            return jjStartNfaWithStates_1(4, 43, 14);
-         else if ((active1 & 0x80L) != 0L)
-            return jjStartNfaWithStates_1(4, 71, 14);
-         return jjMoveStringLiteralDfa5_1(active0, 0x400000L, active1, 0L);
+         if ((active0 & 0x1000000000L) != 0L)
+            return jjStartNfaWithStates_1(4, 36, 14);
+         else if ((active0 & 0x2000000000000L) != 0L)
+            return jjStartNfaWithStates_1(4, 49, 14);
+         else if ((active1 & 0x2000L) != 0L)
+            return jjStartNfaWithStates_1(4, 77, 14);
+         return jjMoveStringLiteralDfa5_1(active0, 0x10000000L, active1, 0L);
       case 85:
       case 117:
-         return jjMoveStringLiteralDfa5_1(active0, 0x200500000000L, active1, 0L);
+         return jjMoveStringLiteralDfa5_1(active0, 0x8014000000000L, active1, 0L);
       case 87:
       case 119:
-         return jjMoveStringLiteralDfa5_1(active0, 0x1000000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x4L);
       case 89:
       case 121:
-         if ((active0 & 0x8000000L) != 0L)
-            return jjStartNfaWithStates_1(4, 27, 14);
+         if ((active0 & 0x200000000L) != 0L)
+            return jjStartNfaWithStates_1(4, 33, 14);
          break;
       default :
          break;
    }
    return jjStartNfa_1(3, active0, active1, 0L);
 }
-static private final int jjMoveStringLiteralDfa5_1(long old0, long active0, long old1, long active1)
+private final int jjMoveStringLiteralDfa5_1(long old0, long active0, long old1, long active1)
 {
    if (((active0 &= old0) | (active1 &= old1)) == 0L)
       return jjStartNfa_1(3, old0, old1, 0L);
@@ -1097,66 +1766,66 @@ static private final int jjMoveStringLiteralDfa5_1(long old0, long active0, long
    {
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa6_1(active0, 0L, active1, 0x10L);
+         return jjMoveStringLiteralDfa6_1(active0, 0L, active1, 0x400L);
       case 67:
       case 99:
-         if ((active0 & 0x4000000000L) != 0L)
-            return jjStartNfaWithStates_1(5, 38, 14);
-         return jjMoveStringLiteralDfa6_1(active0, 0x8000000000000000L, active1, 0L);
+         if ((active0 & 0x100000000000L) != 0L)
+            return jjStartNfaWithStates_1(5, 44, 14);
+         return jjMoveStringLiteralDfa6_1(active0, 0L, active1, 0x20L);
       case 68:
       case 100:
-         return jjMoveStringLiteralDfa6_1(active0, 0x800500000000L, active1, 0L);
+         return jjMoveStringLiteralDfa6_1(active0, 0x20014000000000L, active1, 0L);
       case 69:
       case 101:
-         if ((active0 & 0x2000000000L) != 0L)
-            return jjStartNfaWithStates_1(5, 37, 14);
-         else if ((active1 & 0x40L) != 0L)
-            return jjStartNfaWithStates_1(5, 70, 14);
-         return jjMoveStringLiteralDfa6_1(active0, 0L, active1, 0x200L);
+         if ((active0 & 0x80000000000L) != 0L)
+            return jjStartNfaWithStates_1(5, 43, 14);
+         else if ((active1 & 0x1000L) != 0L)
+            return jjStartNfaWithStates_1(5, 76, 14);
+         return jjMoveStringLiteralDfa6_1(active0, 0L, active1, 0x8000L);
       case 70:
       case 102:
-         if ((active0 & 0x2000000L) != 0L)
-            return jjStartNfaWithStates_1(5, 25, 14);
+         if ((active0 & 0x80000000L) != 0L)
+            return jjStartNfaWithStates_1(5, 31, 14);
          break;
       case 71:
       case 103:
-         if ((active1 & 0x2L) != 0L)
-            return jjStartNfaWithStates_1(5, 65, 14);
+         if ((active1 & 0x80L) != 0L)
+            return jjStartNfaWithStates_1(5, 71, 14);
          break;
       case 72:
       case 104:
-         if ((active0 & 0x40000000000000L) != 0L)
-            return jjStartNfaWithStates_1(5, 54, 14);
+         if ((active0 & 0x1000000000000000L) != 0L)
+            return jjStartNfaWithStates_1(5, 60, 14);
          break;
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa6_1(active0, 0x1800000000400000L, active1, 0L);
+         return jjMoveStringLiteralDfa6_1(active0, 0x10000000L, active1, 0x6L);
       case 76:
       case 108:
-         if ((active0 & 0x1000000000L) != 0L)
-            return jjStartNfaWithStates_1(5, 36, 14);
-         return jjMoveStringLiteralDfa6_1(active0, 0x200000000000L, active1, 0L);
+         if ((active0 & 0x40000000000L) != 0L)
+            return jjStartNfaWithStates_1(5, 42, 14);
+         return jjMoveStringLiteralDfa6_1(active0, 0x8000000000000L, active1, 0L);
       case 78:
       case 110:
-         if ((active0 & 0x10000000000000L) != 0L)
-            return jjStartNfaWithStates_1(5, 52, 14);
-         return jjMoveStringLiteralDfa6_1(active0, 0x100000000000L, active1, 0L);
+         if ((active0 & 0x400000000000000L) != 0L)
+            return jjStartNfaWithStates_1(5, 58, 14);
+         return jjMoveStringLiteralDfa6_1(active0, 0x4000000000000L, active1, 0L);
       case 82:
       case 114:
-         if ((active0 & 0x4000000000000000L) != 0L)
-            return jjStartNfaWithStates_1(5, 62, 14);
-         return jjMoveStringLiteralDfa6_1(active0, 0xa00000000L, active1, 0L);
+         if ((active1 & 0x10L) != 0L)
+            return jjStartNfaWithStates_1(5, 68, 14);
+         return jjMoveStringLiteralDfa6_1(active0, 0x28000000000L, active1, 0L);
       case 84:
       case 116:
-         if ((active1 & 0x4L) != 0L)
-            return jjStartNfaWithStates_1(5, 66, 14);
+         if ((active1 & 0x100L) != 0L)
+            return jjStartNfaWithStates_1(5, 72, 14);
          break;
       default :
          break;
    }
    return jjStartNfa_1(4, active0, active1, 0L);
 }
-static private final int jjMoveStringLiteralDfa6_1(long old0, long active0, long old1, long active1)
+private final int jjMoveStringLiteralDfa6_1(long old0, long active0, long old1, long active1)
 {
    if (((active0 &= old0) | (active1 &= old1)) == 0L)
       return jjStartNfa_1(4, old0, old1, 0L);
@@ -1169,117 +1838,117 @@ static private final int jjMoveStringLiteralDfa6_1(long old0, long active0, long
    {
       case 69:
       case 101:
-         if ((active0 & 0x100000000L) != 0L)
+         if ((active0 & 0x4000000000L) != 0L)
          {
-            jjmatchedKind = 32;
+            jjmatchedKind = 38;
             jjmatchedPos = 6;
          }
-         else if ((active0 & 0x200000000L) != 0L)
+         else if ((active0 & 0x8000000000L) != 0L)
          {
-            jjmatchedKind = 33;
+            jjmatchedKind = 39;
             jjmatchedPos = 6;
          }
-         return jjMoveStringLiteralDfa7_1(active0, 0xc00000000L, active1, 0L);
+         return jjMoveStringLiteralDfa7_1(active0, 0x30000000000L, active1, 0L);
       case 72:
       case 104:
-         if ((active0 & 0x8000000000000000L) != 0L)
-            return jjStartNfaWithStates_1(6, 63, 14);
+         if ((active1 & 0x20L) != 0L)
+            return jjStartNfaWithStates_1(6, 69, 14);
          break;
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa7_1(active0, 0x800000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa7_1(active0, 0L, active1, 0x2L);
       case 78:
       case 110:
-         if ((active1 & 0x10L) != 0L)
-            return jjStartNfaWithStates_1(6, 68, 14);
+         if ((active1 & 0x400L) != 0L)
+            return jjStartNfaWithStates_1(6, 74, 14);
          break;
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa7_1(active0, 0x400000L, active1, 0L);
+         return jjMoveStringLiteralDfa7_1(active0, 0x10000000L, active1, 0L);
       case 82:
       case 114:
-         if ((active1 & 0x200L) != 0L)
-            return jjStartNfaWithStates_1(6, 73, 14);
+         if ((active1 & 0x8000L) != 0L)
+            return jjStartNfaWithStates_1(6, 79, 14);
          break;
       case 83:
       case 115:
-         if ((active0 & 0x800000000000L) != 0L)
-            return jjStartNfaWithStates_1(6, 47, 14);
+         if ((active0 & 0x20000000000000L) != 0L)
+            return jjStartNfaWithStates_1(6, 53, 14);
          break;
       case 84:
       case 116:
-         if ((active0 & 0x200000000000L) != 0L)
-            return jjStartNfaWithStates_1(6, 45, 14);
-         return jjMoveStringLiteralDfa7_1(active0, 0x1000000000000000L, active1, 0L);
+         if ((active0 & 0x8000000000000L) != 0L)
+            return jjStartNfaWithStates_1(6, 51, 14);
+         return jjMoveStringLiteralDfa7_1(active0, 0L, active1, 0x4L);
       case 85:
       case 117:
-         return jjMoveStringLiteralDfa7_1(active0, 0x100000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa7_1(active0, 0x4000000000000L, active1, 0L);
       default :
          break;
    }
    return jjStartNfa_1(5, active0, active1, 0L);
 }
-static private final int jjMoveStringLiteralDfa7_1(long old0, long active0, long old1, long active1)
+private final int jjMoveStringLiteralDfa7_1(long old0, long active0, long old1, long active1)
 {
    if (((active0 &= old0) | (active1 &= old1)) == 0L)
       return jjStartNfa_1(5, old0, old1, 0L);
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
-      jjStopStringLiteralDfa_1(6, active0, 0L, 0L);
+      jjStopStringLiteralDfa_1(6, active0, active1, 0L);
       return 7;
    }
    switch(curChar)
    {
       case 95:
-         return jjMoveStringLiteralDfa8_1(active0, 0xc00000000L);
+         return jjMoveStringLiteralDfa8_1(active0, 0x30000000000L, active1, 0L);
       case 67:
       case 99:
-         return jjMoveStringLiteralDfa8_1(active0, 0x1000000000000000L);
+         return jjMoveStringLiteralDfa8_1(active0, 0L, active1, 0x4L);
       case 69:
       case 101:
-         if ((active0 & 0x100000000000L) != 0L)
-            return jjStartNfaWithStates_1(7, 44, 14);
-         else if ((active0 & 0x800000000000000L) != 0L)
-            return jjStartNfaWithStates_1(7, 59, 14);
+         if ((active0 & 0x4000000000000L) != 0L)
+            return jjStartNfaWithStates_1(7, 50, 14);
+         else if ((active1 & 0x2L) != 0L)
+            return jjStartNfaWithStates_1(7, 65, 14);
          break;
       case 78:
       case 110:
-         if ((active0 & 0x400000L) != 0L)
-            return jjStartNfaWithStates_1(7, 22, 14);
+         if ((active0 & 0x10000000L) != 0L)
+            return jjStartNfaWithStates_1(7, 28, 14);
          break;
       default :
          break;
    }
-   return jjStartNfa_1(6, active0, 0L, 0L);
+   return jjStartNfa_1(6, active0, active1, 0L);
 }
-static private final int jjMoveStringLiteralDfa8_1(long old0, long active0)
+private final int jjMoveStringLiteralDfa8_1(long old0, long active0, long old1, long active1)
 {
-   if (((active0 &= old0)) == 0L)
-      return jjStartNfa_1(6, old0, 0L, 0L);
+   if (((active0 &= old0) | (active1 &= old1)) == 0L)
+      return jjStartNfa_1(6, old0, old1, 0L);
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
-      jjStopStringLiteralDfa_1(7, active0, 0L, 0L);
+      jjStopStringLiteralDfa_1(7, active0, active1, 0L);
       return 8;
    }
    switch(curChar)
    {
       case 72:
       case 104:
-         if ((active0 & 0x1000000000000000L) != 0L)
-            return jjStartNfaWithStates_1(8, 60, 14);
+         if ((active1 & 0x4L) != 0L)
+            return jjStartNfaWithStates_1(8, 66, 14);
          break;
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa9_1(active0, 0xc00000000L);
+         return jjMoveStringLiteralDfa9_1(active0, 0x30000000000L, active1, 0L);
       default :
          break;
    }
-   return jjStartNfa_1(7, active0, 0L, 0L);
+   return jjStartNfa_1(7, active0, active1, 0L);
 }
-static private final int jjMoveStringLiteralDfa9_1(long old0, long active0)
+private final int jjMoveStringLiteralDfa9_1(long old0, long active0, long old1, long active1)
 {
-   if (((active0 &= old0)) == 0L)
-      return jjStartNfa_1(7, old0, 0L, 0L);
+   if (((active0 &= old0) | (active1 &= old1)) == 0L)
+      return jjStartNfa_1(7, old0, old1, 0L);
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
       jjStopStringLiteralDfa_1(8, active0, 0L, 0L);
@@ -1289,13 +1958,13 @@ static private final int jjMoveStringLiteralDfa9_1(long old0, long active0)
    {
       case 78:
       case 110:
-         return jjMoveStringLiteralDfa10_1(active0, 0xc00000000L);
+         return jjMoveStringLiteralDfa10_1(active0, 0x30000000000L);
       default :
          break;
    }
    return jjStartNfa_1(8, active0, 0L, 0L);
 }
-static private final int jjMoveStringLiteralDfa10_1(long old0, long active0)
+private final int jjMoveStringLiteralDfa10_1(long old0, long active0)
 {
    if (((active0 &= old0)) == 0L)
       return jjStartNfa_1(8, old0, 0L, 0L);
@@ -1308,13 +1977,13 @@ static private final int jjMoveStringLiteralDfa10_1(long old0, long active0)
    {
       case 67:
       case 99:
-         return jjMoveStringLiteralDfa11_1(active0, 0xc00000000L);
+         return jjMoveStringLiteralDfa11_1(active0, 0x30000000000L);
       default :
          break;
    }
    return jjStartNfa_1(9, active0, 0L, 0L);
 }
-static private final int jjMoveStringLiteralDfa11_1(long old0, long active0)
+private final int jjMoveStringLiteralDfa11_1(long old0, long active0)
 {
    if (((active0 &= old0)) == 0L)
       return jjStartNfa_1(9, old0, 0L, 0L);
@@ -1327,24 +1996,21 @@ static private final int jjMoveStringLiteralDfa11_1(long old0, long active0)
    {
       case 69:
       case 101:
-         if ((active0 & 0x400000000L) != 0L)
-            return jjStartNfaWithStates_1(11, 34, 14);
-         else if ((active0 & 0x800000000L) != 0L)
-            return jjStartNfaWithStates_1(11, 35, 14);
+         if ((active0 & 0x10000000000L) != 0L)
+            return jjStartNfaWithStates_1(11, 40, 14);
+         else if ((active0 & 0x20000000000L) != 0L)
+            return jjStartNfaWithStates_1(11, 41, 14);
          break;
       default :
          break;
    }
    return jjStartNfa_1(10, active0, 0L, 0L);
 }
-static final long[] jjbitVec0 = {
-   0x0L, 0x0L, 0xffffffffffffffffL, 0xffffffffffffffffL
-};
-static private final int jjMoveNfa_1(int startState, int curPos)
+private final int jjMoveNfa_1(int startState, int curPos)
 {
    int[] nextStates;
    int startsAt = 0;
-   jjnewStateCnt = 64;
+   jjnewStateCnt = 52;
    int i = 1;
    jjstateSet[0] = startState;
    int j, kind = 0x7fffffff;
@@ -1364,25 +2030,21 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                      jjCheckNAddStates(0, 6);
                   else if (curChar == 39)
                      jjCheckNAddStates(7, 12);
-                  else if (curChar == 34)
-                     jjCheckNAddStates(13, 18);
-                  else if (curChar == 36)
-                     jjstateSet[jjnewStateCnt++] = 16;
                   else if (curChar == 46)
                      jjCheckNAdd(8);
                   else if (curChar == 47)
                      jjstateSet[jjnewStateCnt++] = 2;
                   if ((0x3fe000000000000L & l) != 0L)
                   {
-                     if (kind > 97)
-                        kind = 97;
+                     if (kind > 102)
+                        kind = 102;
                      jjCheckNAddTwoStates(5, 6);
                   }
                   else if (curChar == 48)
                   {
-                     if (kind > 97)
-                        kind = 97;
-                     jjCheckNAddStates(19, 21);
+                     if (kind > 102)
+                        kind = 102;
+                     jjCheckNAddStates(13, 15);
                   }
                   break;
                case 0:
@@ -1390,8 +2052,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                      jjstateSet[jjnewStateCnt++] = 1;
                   break;
                case 1:
-                  if ((0xffff7fffffffffffL & l) != 0L && kind > 13)
-                     kind = 13;
+                  if ((0xffff7fffffffffffL & l) != 0L && kind > 18)
+                     kind = 18;
                   break;
                case 2:
                   if (curChar == 42)
@@ -1400,15 +2062,15 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 4:
                   if ((0x3fe000000000000L & l) == 0L)
                      break;
-                  if (kind > 97)
-                     kind = 97;
+                  if (kind > 102)
+                     kind = 102;
                   jjCheckNAddTwoStates(5, 6);
                   break;
                case 5:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 97)
-                     kind = 97;
+                  if (kind > 102)
+                     kind = 102;
                   jjCheckNAddTwoStates(5, 6);
                   break;
                case 7:
@@ -1418,9 +2080,9 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 8:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 101)
-                     kind = 101;
-                  jjCheckNAddStates(22, 24);
+                  if (kind > 106)
+                     kind = 106;
+                  jjCheckNAddStates(16, 18);
                   break;
                case 10:
                   if ((0x280000000000L & l) != 0L)
@@ -1429,170 +2091,131 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 11:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 101)
-                     kind = 101;
+                  if (kind > 106)
+                     kind = 106;
                   jjCheckNAddTwoStates(11, 12);
                   break;
                case 14:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 107)
-                     kind = 107;
+                  if (kind > 124)
+                     kind = 124;
                   jjstateSet[jjnewStateCnt++] = 14;
                   break;
                case 15:
-                  if (curChar == 36)
-                     jjstateSet[jjnewStateCnt++] = 16;
-                  break;
-               case 17:
-                  if ((0x3ff000000000000L & l) == 0L)
-                     break;
-                  if (kind > 142)
-                     kind = 142;
-                  jjstateSet[jjnewStateCnt++] = 17;
-                  break;
-               case 18:
                   if ((0x3ff000000000000L & l) != 0L)
                      jjCheckNAddStates(0, 6);
                   break;
-               case 19:
+               case 16:
                   if ((0x3ff000000000000L & l) != 0L)
-                     jjCheckNAddTwoStates(19, 20);
+                     jjCheckNAddTwoStates(16, 17);
                   break;
-               case 20:
+               case 17:
                   if (curChar != 46)
                      break;
-                  if (kind > 101)
-                     kind = 101;
-                  jjCheckNAddStates(25, 27);
+                  if (kind > 106)
+                     kind = 106;
+                  jjCheckNAddStates(19, 21);
                   break;
-               case 21:
+               case 18:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 101)
-                     kind = 101;
-                  jjCheckNAddStates(25, 27);
+                  if (kind > 106)
+                     kind = 106;
+                  jjCheckNAddStates(19, 21);
                   break;
-               case 23:
+               case 20:
                   if ((0x280000000000L & l) != 0L)
-                     jjCheckNAdd(24);
+                     jjCheckNAdd(21);
                   break;
-               case 24:
+               case 21:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 101)
-                     kind = 101;
-                  jjCheckNAddTwoStates(24, 12);
+                  if (kind > 106)
+                     kind = 106;
+                  jjCheckNAddTwoStates(21, 12);
                   break;
-               case 25:
+               case 22:
                   if ((0x3ff000000000000L & l) != 0L)
-                     jjCheckNAddTwoStates(25, 26);
+                     jjCheckNAddTwoStates(22, 23);
                   break;
-               case 27:
+               case 24:
                   if ((0x280000000000L & l) != 0L)
-                     jjCheckNAdd(28);
+                     jjCheckNAdd(25);
                   break;
-               case 28:
+               case 25:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 101)
-                     kind = 101;
-                  jjCheckNAddTwoStates(28, 12);
+                  if (kind > 106)
+                     kind = 106;
+                  jjCheckNAddTwoStates(25, 12);
                   break;
-               case 29:
+               case 26:
                   if ((0x3ff000000000000L & l) != 0L)
-                     jjCheckNAddStates(28, 30);
+                     jjCheckNAddStates(22, 24);
                   break;
-               case 31:
+               case 28:
                   if ((0x280000000000L & l) != 0L)
-                     jjCheckNAdd(32);
+                     jjCheckNAdd(29);
                   break;
-               case 32:
+               case 29:
                   if ((0x3ff000000000000L & l) != 0L)
-                     jjCheckNAddTwoStates(32, 12);
+                     jjCheckNAddTwoStates(29, 12);
                   break;
-               case 33:
+               case 30:
                   if (curChar != 48)
                      break;
-                  if (kind > 97)
-                     kind = 97;
-                  jjCheckNAddStates(19, 21);
+                  if (kind > 102)
+                     kind = 102;
+                  jjCheckNAddStates(13, 15);
                   break;
-               case 35:
+               case 32:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 97)
-                     kind = 97;
-                  jjCheckNAddTwoStates(35, 6);
+                  if (kind > 102)
+                     kind = 102;
+                  jjCheckNAddTwoStates(32, 6);
                   break;
-               case 36:
+               case 33:
                   if ((0xff000000000000L & l) == 0L)
                      break;
-                  if (kind > 97)
-                     kind = 97;
-                  jjCheckNAddTwoStates(36, 6);
+                  if (kind > 102)
+                     kind = 102;
+                  jjCheckNAddTwoStates(33, 6);
+                  break;
+               case 34:
+                  if (curChar == 39)
+                     jjCheckNAddStates(7, 12);
+                  break;
+               case 35:
+                  if ((0xffffff7fffffffffL & l) != 0L)
+                     jjCheckNAddStates(25, 27);
                   break;
                case 37:
-                  if (curChar == 34)
-                     jjCheckNAddStates(13, 18);
+                  jjCheckNAddStates(25, 27);
                   break;
                case 38:
-                  if ((0xfffffffbffffffffL & l) != 0L)
-                     jjCheckNAddStates(31, 33);
+                  if (curChar == 39 && kind > 108)
+                     kind = 108;
                   break;
-               case 40:
-                  if (curChar == 34)
-                     jjCheckNAddStates(31, 33);
+               case 39:
+                  if ((0xffffff7fffffffffL & l) != 0L)
+                     jjCheckNAddStates(28, 30);
                   break;
                case 41:
-                  if (curChar == 34 && kind > 103)
-                     kind = 103;
+                  jjCheckNAddStates(28, 30);
                   break;
                case 42:
-                  if ((0xfffffffbffffffffL & l) != 0L)
-                     jjCheckNAddStates(34, 36);
+                  if (curChar == 39 && kind > 109)
+                     kind = 109;
                   break;
                case 44:
-                  if (curChar == 34)
-                     jjCheckNAddStates(34, 36);
-                  break;
-               case 45:
-                  if (curChar == 34 && kind > 104)
-                     kind = 104;
-                  break;
                case 46:
-                  if (curChar == 39)
-                     jjCheckNAddStates(7, 12);
-                  break;
-               case 47:
-                  if ((0xffffff7fffffffffL & l) != 0L)
-                     jjCheckNAddStates(37, 39);
-                  break;
-               case 49:
-                  if (curChar == 39)
-                     jjCheckNAddStates(37, 39);
+                  jjCheckNAddStates(31, 33);
                   break;
+               case 48:
                case 50:
-                  if (curChar == 39 && kind > 103)
-                     kind = 103;
-                  break;
-               case 51:
-                  if ((0xffffff7fffffffffL & l) != 0L)
-                     jjCheckNAddStates(40, 42);
-                  break;
-               case 53:
-                  if (curChar == 39)
-                     jjCheckNAddStates(40, 42);
-                  break;
-               case 54:
-                  if (curChar == 39 && kind > 105)
-                     kind = 105;
-                  break;
-               case 56:
-                  jjAddStates(43, 45);
-                  break;
-               case 60:
-                  jjAddStates(46, 48);
+                  jjCheckNAddStates(34, 36);
                   break;
                default : break;
             }
@@ -1608,151 +2231,115 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 3:
                   if ((0x87fffffe87fffffeL & l) != 0L)
                   {
-                     if (kind > 107)
-                        kind = 107;
+                     if (kind > 124)
+                        kind = 124;
                      jjCheckNAdd(14);
                   }
                   else if (curChar == 96)
-                     jjCheckNAddStates(49, 54);
+                     jjCheckNAddStates(37, 42);
                   break;
                case 1:
-                  if (kind > 13)
-                     kind = 13;
+                  if (kind > 18)
+                     kind = 18;
                   break;
                case 6:
-                  if ((0x100000001000L & l) != 0L && kind > 97)
-                     kind = 97;
+                  if ((0x100000001000L & l) != 0L && kind > 102)
+                     kind = 102;
                   break;
                case 9:
                   if ((0x2000000020L & l) != 0L)
-                     jjAddStates(55, 56);
+                     jjAddStates(43, 44);
                   break;
                case 12:
-                  if ((0x5000000050L & l) != 0L && kind > 101)
-                     kind = 101;
+                  if ((0x5000000050L & l) != 0L && kind > 106)
+                     kind = 106;
                   break;
                case 13:
                case 14:
                   if ((0x87fffffe87fffffeL & l) == 0L)
                      break;
-                  if (kind > 107)
-                     kind = 107;
+                  if (kind > 124)
+                     kind = 124;
                   jjCheckNAdd(14);
                   break;
-               case 16:
-               case 17:
-                  if ((0x87fffffe87fffffeL & l) == 0L)
-                     break;
-                  if (kind > 142)
-                     kind = 142;
-                  jjCheckNAdd(17);
-                  break;
-               case 22:
+               case 19:
                   if ((0x2000000020L & l) != 0L)
-                     jjAddStates(57, 58);
+                     jjAddStates(45, 46);
                   break;
-               case 26:
+               case 23:
                   if ((0x2000000020L & l) != 0L)
-                     jjAddStates(59, 60);
+                     jjAddStates(47, 48);
                   break;
-               case 30:
+               case 27:
                   if ((0x2000000020L & l) != 0L)
-                     jjAddStates(61, 62);
+                     jjAddStates(49, 50);
                   break;
-               case 34:
+               case 31:
                   if ((0x100000001000000L & l) != 0L)
-                     jjCheckNAdd(35);
+                     jjCheckNAdd(32);
                   break;
-               case 35:
+               case 32:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 97)
-                     kind = 97;
-                  jjCheckNAddTwoStates(35, 6);
-                  break;
-               case 38:
-                  if ((0xffffffffefffffffL & l) != 0L)
-                     jjCheckNAddStates(31, 33);
-                  break;
-               case 39:
-                  if (curChar == 92)
-                     jjstateSet[jjnewStateCnt++] = 40;
-                  break;
-               case 40:
-                  if (curChar == 92)
-                     jjCheckNAddStates(31, 33);
-                  break;
-               case 42:
-                  if ((0xffffffffefffffffL & l) != 0L)
-                     jjCheckNAddStates(34, 36);
-                  break;
-               case 43:
-                  if (curChar == 92)
-                     jjstateSet[jjnewStateCnt++] = 44;
+                  if (kind > 102)
+                     kind = 102;
+                  jjCheckNAddTwoStates(32, 6);
                   break;
-               case 44:
-                  if (curChar == 92)
-                     jjCheckNAddStates(34, 36);
-                  break;
-               case 47:
+               case 35:
                   if ((0xffffffffefffffffL & l) != 0L)
-                     jjCheckNAddStates(37, 39);
+                     jjCheckNAddStates(25, 27);
                   break;
-               case 48:
+               case 36:
                   if (curChar == 92)
-                     jjstateSet[jjnewStateCnt++] = 49;
+                     jjstateSet[jjnewStateCnt++] = 37;
                   break;
-               case 49:
-                  if (curChar == 92)
-                     jjCheckNAddStates(37, 39);
+               case 37:
+                  jjCheckNAddStates(25, 27);
                   break;
-               case 51:
+               case 39:
                   if ((0xffffffffefffffffL & l) != 0L)
-                     jjCheckNAddStates(40, 42);
+                     jjCheckNAddStates(28, 30);
                   break;
-               case 52:
+               case 40:
                   if (curChar == 92)
-                     jjstateSet[jjnewStateCnt++] = 53;
+                     jjstateSet[jjnewStateCnt++] = 41;
                   break;
-               case 53:
-                  if (curChar == 92)
-                     jjCheckNAddStates(40, 42);
+               case 41:
+                  jjCheckNAddStates(28, 30);
                   break;
-               case 55:
+               case 43:
                   if (curChar == 96)
-                     jjCheckNAddStates(49, 54);
+                     jjCheckNAddStates(37, 42);
                   break;
-               case 56:
+               case 44:
                   if ((0xfffffffeefffffffL & l) != 0L)
-                     jjCheckNAddStates(43, 45);
+                     jjCheckNAddStates(31, 33);
                   break;
-               case 57:
+               case 45:
                   if (curChar == 92)
-                     jjstateSet[jjnewStateCnt++] = 58;
+                     jjstateSet[jjnewStateCnt++] = 46;
                   break;
-               case 58:
-                  if ((0x110000000L & l) != 0L)
-                     jjCheckNAddStates(43, 45);
+               case 46:
+                  jjCheckNAddStates(31, 33);
                   break;
-               case 59:
-                  if (curChar == 96 && kind > 103)
-                     kind = 103;
+               case 47:
+                  if (curChar == 96 && kind > 108)
+                     kind = 108;
                   break;
-               case 60:
+               case 48:
                   if ((0xfffffffeefffffffL & l) != 0L)
-                     jjCheckNAddStates(46, 48);
+                     jjCheckNAddStates(34, 36);
                   break;
-               case 61:
+               case 49:
                   if (curChar == 92)
-                     jjstateSet[jjnewStateCnt++] = 62;
+                     jjstateSet[jjnewStateCnt++] = 50;
                   break;
-               case 62:
-                  if ((0x110000000L & l) != 0L)
-                     jjCheckNAddStates(46, 48);
+               case 50:
+                  jjCheckNAddStates(34, 36);
                   break;
-               case 63:
-                  if (curChar == 96 && kind > 106)
-                     kind = 106;
+               case 51:
+                  if (curChar == 96 && kind > 110)
+                     kind = 110;
                   break;
                default : break;
             }
@@ -1770,45 +2357,33 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 14:
                   if ((jjbitVec0[i2] & l2) == 0L)
                      break;
-                  if (kind > 107)
-                     kind = 107;
+                  if (kind > 124)
+                     kind = 124;
                   jjCheckNAdd(14);
                   break;
                case 1:
-                  if ((jjbitVec0[i2] & l2) != 0L && kind > 13)
-                     kind = 13;
+                  if ((jjbitVec0[i2] & l2) != 0L && kind > 18)
+                     kind = 18;
                   break;
-               case 16:
-               case 17:
-                  if ((jjbitVec0[i2] & l2) == 0L)
-                     break;
-                  if (kind > 142)
-                     kind = 142;
-                  jjCheckNAdd(17);
-                  break;
-               case 38:
-                  if ((jjbitVec0[i2] & l2) != 0L)
-                     jjAddStates(31, 33);
-                  break;
-               case 42:
-                  if ((jjbitVec0[i2] & l2) != 0L)
-                     jjAddStates(34, 36);
-                  break;
-               case 47:
+               case 35:
+               case 37:
                   if ((jjbitVec0[i2] & l2) != 0L)
-                     jjAddStates(37, 39);
+                     jjCheckNAddStates(25, 27);
                   break;
-               case 51:
+               case 39:
+               case 41:
                   if ((jjbitVec0[i2] & l2) != 0L)
-                     jjAddStates(40, 42);
+                     jjCheckNAddStates(28, 30);
                   break;
-               case 56:
+               case 44:
+               case 46:
                   if ((jjbitVec0[i2] & l2) != 0L)
-                     jjAddStates(43, 45);
+                     jjCheckNAddStates(31, 33);
                   break;
-               case 60:
+               case 48:
+               case 50:
                   if ((jjbitVec0[i2] & l2) != 0L)
-                     jjAddStates(46, 48);
+                     jjCheckNAddStates(34, 36);
                   break;
                default : break;
             }
@@ -1821,140 +2396,213 @@ static private final int jjMoveNfa_1(int startState, int curPos)
          kind = 0x7fffffff;
       }
       ++curPos;
-      if ((i = jjnewStateCnt) == (startsAt = 64 - (jjnewStateCnt = startsAt)))
+      if ((i = jjnewStateCnt) == (startsAt = 52 - (jjnewStateCnt = startsAt)))
          return curPos;
       try { curChar = input_stream.readChar(); }
       catch(java.io.IOException e) { return curPos; }
    }
 }
-static private final int jjMoveStringLiteralDfa0_3()
+private final int jjStopStringLiteralDfa_7(int pos, long active0, long active1)
 {
-   switch(curChar)
+   switch (pos)
    {
-      case 42:
-         return jjMoveStringLiteralDfa1_3(0x40000L);
-      case 84:
-      case 116:
-         return jjMoveStringLiteralDfa1_3(0x20000L);
       default :
-         return 1;
+         return -1;
    }
 }
-static private final int jjMoveStringLiteralDfa1_3(long active0)
+private final int jjStartNfa_7(int pos, long active0, long active1)
 {
-   try { curChar = input_stream.readChar(); }
-   catch(java.io.IOException e) {
-      return 1;
-   }
-   switch(curChar)
-   {
-      case 47:
-         if ((active0 & 0x40000L) != 0L)
-            return jjStopAtPos(1, 18);
-         break;
-      case 79:
-      case 111:
-         return jjMoveStringLiteralDfa2_3(active0, 0x20000L);
-      default :
-         return 2;
-   }
-   return 2;
+   return jjMoveNfa_7(jjStopStringLiteralDfa_7(pos, active0, active1), pos + 1);
 }
-static private final int jjMoveStringLiteralDfa2_3(long old0, long active0)
+private final int jjStartNfaWithStates_7(int pos, int kind, int state)
 {
-   if (((active0 &= old0)) == 0L)
-      return 2;
+   jjmatchedKind = kind;
+   jjmatchedPos = pos;
    try { curChar = input_stream.readChar(); }
-   catch(java.io.IOException e) {
-      return 2;
-   }
+   catch(java.io.IOException e) { return pos + 1; }
+   return jjMoveNfa_7(state, pos + 1);
+}
+private final int jjMoveStringLiteralDfa0_7()
+{
    switch(curChar)
    {
-      case 68:
-      case 100:
-         return jjMoveStringLiteralDfa3_3(active0, 0x20000L);
+      case 34:
+         return jjStopAtPos(0, 114);
+      case 123:
+         return jjStopAtPos(0, 115);
       default :
-         return 3;
+         return jjMoveNfa_7(0, 0);
    }
 }
-static private final int jjMoveStringLiteralDfa3_3(long old0, long active0)
+private final int jjMoveNfa_7(int startState, int curPos)
 {
-   if (((active0 &= old0)) == 0L)
-      return 3;
-   try { curChar = input_stream.readChar(); }
-   catch(java.io.IOException e) {
-      return 3;
-   }
-   switch(curChar)
+   int[] nextStates;
+   int startsAt = 0;
+   jjnewStateCnt = 4;
+   int i = 1;
+   jjstateSet[0] = startState;
+   int j, kind = 0x7fffffff;
+   for (;;)
    {
-      case 79:
-      case 111:
-         if ((active0 & 0x20000L) != 0L)
-            return jjStopAtPos(3, 17);
-         break;
-      default :
-         return 4;
+      if (++jjround == 0x7fffffff)
+         ReInitRounds();
+      if (curChar < 64)
+      {
+         long l = 1L << curChar;
+         MatchLoop: do
+         {
+            switch(jjstateSet[--i])
+            {
+               case 1:
+                  if (kind > 111)
+                     kind = 111;
+                  break;
+               case 3:
+                  if ((0x3ff000000000000L & l) == 0L)
+                     break;
+                  if (kind > 124)
+                     kind = 124;
+                  jjstateSet[jjnewStateCnt++] = 3;
+                  break;
+               default : break;
+            }
+         } while(i != startsAt);
+      }
+      else if (curChar < 128)
+      {
+         long l = 1L << (curChar & 077);
+         MatchLoop: do
+         {
+            switch(jjstateSet[--i])
+            {
+               case 0:
+                  if ((0x87fffffe87fffffeL & l) != 0L)
+                  {
+                     if (kind > 124)
+                        kind = 124;
+                     jjCheckNAdd(3);
+                  }
+                  else if (curChar == 92)
+                     jjstateSet[jjnewStateCnt++] = 1;
+                  break;
+               case 1:
+                  if (kind > 111)
+                     kind = 111;
+                  break;
+               case 2:
+               case 3:
+                  if ((0x87fffffe87fffffeL & l) == 0L)
+                     break;
+                  if (kind > 124)
+                     kind = 124;
+                  jjCheckNAdd(3);
+                  break;
+               default : break;
+            }
+         } while(i != startsAt);
+      }
+      else
+      {
+         int i2 = (curChar & 0xff) >> 6;
+         long l2 = 1L << (curChar & 077);
+         MatchLoop: do
+         {
+            switch(jjstateSet[--i])
+            {
+               case 0:
+               case 3:
+                  if ((jjbitVec0[i2] & l2) == 0L)
+                     break;
+                  if (kind > 124)
+                     kind = 124;
+                  jjCheckNAdd(3);
+                  break;
+               case 1:
+                  if ((jjbitVec0[i2] & l2) != 0L && kind > 111)
+                     kind = 111;
+                  break;
+               default : break;
+            }
+         } while(i != startsAt);
+      }
+      if (kind != 0x7fffffff)
+      {
+         jjmatchedKind = kind;
+         jjmatchedPos = curPos;
+         kind = 0x7fffffff;
+      }
+      ++curPos;
+      if ((i = jjnewStateCnt) == (startsAt = 4 - (jjnewStateCnt = startsAt)))
+         return curPos;
+      try { curChar = input_stream.readChar(); }
+      catch(java.io.IOException e) { return curPos; }
    }
-   return 4;
 }
 static final int[] jjnextStates = {
-   19, 20, 25, 26, 29, 30, 12, 47, 48, 50, 51, 52, 54, 38, 39, 41, 
-   42, 43, 45, 34, 36, 6, 8, 9, 12, 21, 22, 12, 29, 30, 12, 38, 
-   39, 41, 42, 43, 45, 47, 48, 50, 51, 52, 54, 56, 57, 59, 60, 61, 
-   63, 56, 57, 59, 60, 61, 63, 10, 11, 23, 24, 27, 28, 31, 32, 
+   16, 17, 22, 23, 26, 27, 12, 35, 36, 38, 39, 40, 42, 31, 33, 6, 
+   8, 9, 12, 18, 19, 12, 26, 27, 12, 35, 36, 38, 39, 40, 42, 44, 
+   45, 47, 48, 49, 51, 44, 45, 47, 48, 49, 51, 10, 11, 20, 21, 24, 
+   25, 28, 29, 
 };
 public static final String[] jjstrLiteralImages = {
 "", "\74\77", null, "\74\77\75", "\77\76", 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, null, 
-"\55\76", "\72\72", "\75\76", null, null, null, null, null, null, null, null, null, null, 
+null, null, null, null, null, null, "\55\76", "\72\72", "\75\76", 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, null, null, null, null, null, null, "\100", "\44", "\41", "\176", "\77", 
-"\72", "\174\174", "\46\46", "\53\53", "\55\55", "\53", "\55", "\52", "\57", "\46", 
-"\174", "\136", "\45", "\74\74", "\76\76", "\76\76\76", null, null, null, null, null, 
-null, null, null, null, null, null, null, null, null, null, null, "\50", "\51", 
-"\173", "\175", "\133", "\135", "\73", "\54", "\56", "\76", "\74", "\75\75", "\74\75", 
-"\76\75", "\41\75", "\74\76", "\41\75\75", "\75\75\75", "\75", "\53\75", "\55\75", 
-"\52\75", "\57\75", "\46\75", "\174\75", "\136\75", "\56\75", "\45\75", "\176\75", 
-"\74\74\75", "\76\76\75", null, };
+null, "\100", "\41", "\176", "\77", "\72", "\174\174", "\46\46", "\53\53", "\55\55", 
+"\53", "\55", "\52", "\57", "\46", "\174", "\136", "\45", "\74\74", "\76\76", 
+"\76\76\76", null, null, null, null, null, null, null, null, null, null, null, null, "\42", 
+"\44", "\42", "\173", null, null, null, "\175", null, null, null, "\44", null, null, 
+null, null, null, "\50", "\51", "\173", "\175", "\133", "\135", "\73", "\54", "\56", 
+"\76", "\74", "\75\75", "\74\75", "\76\75", "\41\75", "\74\76", "\41\75\75", 
+"\75\75\75", "\75", "\53\75", "\55\75", "\52\75", "\57\75", "\46\75", "\174\75", "\136\75", 
+"\56\75", "\45\75", "\176\75", "\74\74\75", "\76\76\75", };
 public static final String[] lexStateNames = {
    "DEFAULT", 
    "PHPPARSING", 
    "IN_SINGLE_LINE_COMMENT", 
+   "IN_VARIABLE", 
    "IN_FORMAL_COMMENT", 
    "IN_MULTI_LINE_COMMENT", 
+   "IN_STRING", 
+   "DOLLAR_IN_STRING", 
+   "SKIPSTRING", 
+   "DOLLAR_IN_STRING_EXPR", 
 };
 public static final int[] jjnewLexState = {
-   -1, 1, 1, 1, 0, -1, -1, -1, -1, -1, -1, 2, 2, 3, 4, 1, 0, -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, -1, -1, -1, -1, -1, -1, -1, -1, 
+   -1, 1, 1, 1, 0, -1, -1, -1, -1, -1, -1, 1, 1, 1, 1, 1, 2, 2, 4, 5, 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, -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, -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, 6, 6, 7, 1, 9, 8, 6, -1, 7, -1, -1, -1, 3, -1, 
+   -1, -1, -1, 6, 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, 
 };
 static final long[] jjtoToken = {
-   0xffffffffffe0001fL, 0xffff8fa3ffffffffL, 0x7fffL, 
+   0xfffffffff880001fL, 0x198f747fffffffffL, 0xfffffffeL, 
 };
 static final long[] jjtoSkip = {
-   0xfffe0L, 0x0L, 0x0L, 
+   0x37fffe0L, 0x670800000000000L, 0x1L, 
 };
 static final long[] jjtoSpecial = {
-   0xff800L, 0x0L, 0x0L, 
+   0x37ff800L, 0x30000000000000L, 0x1L, 
 };
 static final long[] jjtoMore = {
-   0x100000L, 0x0L, 0x0L, 
+   0x4000000L, 0x0L, 0x0L, 
 };
-static protected SimpleCharStream input_stream;
-static private final int[] jjrounds = new int[64];
-static private final int[] jjstateSet = new int[128];
-static StringBuffer image;
-static int jjimageLen;
-static int lengthOfMatch;
-static protected char curChar;
+protected SimpleCharStream input_stream;
+private final int[] jjrounds = new int[52];
+private final int[] jjstateSet = new int[104];
+StringBuffer image;
+int jjimageLen;
+int lengthOfMatch;
+protected char curChar;
 public PHPParserTokenManager(SimpleCharStream stream)
 {
-   if (input_stream != null)
-      throw new TokenMgrError("ERROR: Second call to constructor of static lexer. You must use ReInit() to initialize the static variables.", TokenMgrError.STATIC_LEXER_ERROR);
+   if (SimpleCharStream.staticFlag)
+      throw new Error("ERROR: Cannot use a static CharStream class with a non-static lexical analyzer.");
    input_stream = stream;
 }
 public PHPParserTokenManager(SimpleCharStream stream, int lexState)
@@ -1962,54 +2610,63 @@ public PHPParserTokenManager(SimpleCharStream stream, int lexState)
    this(stream);
    SwitchTo(lexState);
 }
-static public void ReInit(SimpleCharStream stream)
+public void ReInit(SimpleCharStream stream)
 {
    jjmatchedPos = jjnewStateCnt = 0;
    curLexState = defaultLexState;
    input_stream = stream;
    ReInitRounds();
 }
-static private final void ReInitRounds()
+private final void ReInitRounds()
 {
    int i;
    jjround = 0x80000001;
-   for (i = 64; i-- > 0;)
+   for (i = 52; i-- > 0;)
       jjrounds[i] = 0x80000000;
 }
-static public void ReInit(SimpleCharStream stream, int lexState)
+public void ReInit(SimpleCharStream stream, int lexState)
 {
    ReInit(stream);
    SwitchTo(lexState);
 }
-static public void SwitchTo(int lexState)
+public void SwitchTo(int lexState)
 {
-   if (lexState >= 5 || lexState < 0)
+   if (lexState >= 10 || lexState < 0)
       throw new TokenMgrError("Error: Ignoring invalid lexical state : " + lexState + ". State unchanged.", TokenMgrError.INVALID_LEXICAL_STATE);
    else
       curLexState = lexState;
 }
 
-static protected Token jjFillToken()
+protected Token jjFillToken()
 {
    Token t = Token.newToken(jjmatchedKind);
    t.kind = jjmatchedKind;
-   String im = jjstrLiteralImages[jjmatchedKind];
-   t.image = (im == null) ? input_stream.GetImage() : im;
-   t.beginLine = input_stream.getBeginLine();
-   t.beginColumn = input_stream.getBeginColumn();
-   t.endLine = input_stream.getEndLine();
-   t.endColumn = input_stream.getEndColumn();
+   if (jjmatchedPos < 0)
+   {
+      t.image = "";
+      t.beginLine = t.endLine = input_stream.getBeginLine();
+      t.beginColumn = t.endColumn = input_stream.getBeginColumn();
+   }
+   else
+   {
+      String im = jjstrLiteralImages[jjmatchedKind];
+      t.image = (im == null) ? input_stream.GetImage() : im;
+      t.beginLine = input_stream.getBeginLine();
+      t.beginColumn = input_stream.getBeginColumn();
+      t.endLine = input_stream.getEndLine();
+      t.endColumn = input_stream.getEndColumn();
+   }
    return t;
 }
 
-static int curLexState = 0;
-static int defaultLexState = 0;
-static int jjnewStateCnt;
-static int jjround;
-static int jjmatchedPos;
-static int jjmatchedKind;
+int curLexState = 0;
+int defaultLexState = 0;
+int jjnewStateCnt;
+int jjround;
+int jjmatchedPos;
+int jjmatchedKind;
 
-public static Token getNextToken() 
+public Token getNextToken() 
 {
   int kind;
   Token specialToken = null;
@@ -2028,6 +2685,7 @@ public static Token getNextToken()
       jjmatchedKind = 0;
       matchedToken = jjFillToken();
       matchedToken.specialToken = specialToken;
+      CommonTokenAction(matchedToken);
       return matchedToken;
    }
    image = null;
@@ -2060,27 +2718,70 @@ public static Token getNextToken()
          jjmatchedKind = 0x7fffffff;
          jjmatchedPos = 0;
          curPos = jjMoveStringLiteralDfa0_2();
-         if (jjmatchedPos == 0 && jjmatchedKind > 20)
+         if (jjmatchedPos == 0 && jjmatchedKind > 21)
          {
-            jjmatchedKind = 20;
+            jjmatchedKind = 21;
          }
          break;
        case 3:
          jjmatchedKind = 0x7fffffff;
          jjmatchedPos = 0;
          curPos = jjMoveStringLiteralDfa0_3();
-         if (jjmatchedPos == 0 && jjmatchedKind > 20)
-         {
-            jjmatchedKind = 20;
-         }
          break;
        case 4:
          jjmatchedKind = 0x7fffffff;
          jjmatchedPos = 0;
          curPos = jjMoveStringLiteralDfa0_4();
-         if (jjmatchedPos == 0 && jjmatchedKind > 20)
+         if (jjmatchedPos == 0 && jjmatchedKind > 26)
+         {
+            jjmatchedKind = 26;
+         }
+         break;
+       case 5:
+         jjmatchedKind = 0x7fffffff;
+         jjmatchedPos = 0;
+         curPos = jjMoveStringLiteralDfa0_5();
+         if (jjmatchedPos == 0 && jjmatchedKind > 26)
+         {
+            jjmatchedKind = 26;
+         }
+         break;
+       case 6:
+         jjmatchedKind = 0x7fffffff;
+         jjmatchedPos = 0;
+         curPos = jjMoveStringLiteralDfa0_6();
+         if (jjmatchedPos == 0 && jjmatchedKind > 121)
+         {
+            jjmatchedKind = 121;
+         }
+         break;
+       case 7:
+         jjmatchedKind = 0x7fffffff;
+         jjmatchedPos = 0;
+         curPos = jjMoveStringLiteralDfa0_7();
+         if (jjmatchedPos == 0 && jjmatchedKind > 128)
+         {
+            jjmatchedKind = 128;
+         }
+         break;
+       case 8:
+         jjmatchedKind = 0x7fffffff;
+         jjmatchedPos = 0;
+         curPos = jjMoveStringLiteralDfa0_8();
+         if (jjmatchedPos == 0 && jjmatchedKind > 118)
+         {
+            jjmatchedKind = 118;
+         }
+         break;
+       case 9:
+         jjmatchedKind = 120;
+         jjmatchedPos = -1;
+         curPos = 0;
+         curPos = jjMoveStringLiteralDfa0_9();
+         if (jjmatchedPos < 0 || (jjmatchedPos == 0 && jjmatchedKind > 122))
          {
-            jjmatchedKind = 20;
+            jjmatchedKind = 122;
+            jjmatchedPos = 0;
          }
          break;
      }
@@ -2095,6 +2796,7 @@ public static Token getNextToken()
            TokenLexicalActions(matchedToken);
        if (jjnewLexState[jjmatchedKind] != -1)
          curLexState = jjnewLexState[jjmatchedKind];
+           CommonTokenAction(matchedToken);
            return matchedToken;
         }
         else if ((jjtoSkip[jjmatchedKind >> 6] & (1L << (jjmatchedKind & 077))) != 0L)
@@ -2152,60 +2854,25 @@ public static Token getNextToken()
   }
 }
 
-static void SkipLexicalActions(Token matchedToken)
+void SkipLexicalActions(Token matchedToken)
 {
    switch(jjmatchedKind)
    {
-      case 13 :
+      case 18 :
          if (image == null)
             image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
          else
             image.append(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
                    input_stream.backup(1);
          break;
-      case 17 :
-         if (image == null)
-            image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
-         else
-            image.append(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
-         PHPParser.createNewTask();
-         break;
       default :
          break;
    }
 }
-static void TokenLexicalActions(Token matchedToken)
+void TokenLexicalActions(Token matchedToken)
 {
    switch(jjmatchedKind)
    {
-      case 1 :
-        if (image == null)
-            image = new StringBuffer(jjstrLiteralImages[1]);
-         else
-            image.append(jjstrLiteralImages[1]);
-                             PHPParser.createNewHTMLCode();
-         break;
-      case 2 :
-        if (image == null)
-            image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
-         else
-            image.append(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
-                             PHPParser.createNewHTMLCode();
-         break;
-      case 3 :
-        if (image == null)
-            image = new StringBuffer(jjstrLiteralImages[3]);
-         else
-            image.append(jjstrLiteralImages[3]);
-                             PHPParser.createNewHTMLCode();
-         break;
-      case 4 :
-        if (image == null)
-            image = new StringBuffer(jjstrLiteralImages[4]);
-         else
-            image.append(jjstrLiteralImages[4]);
-                  PHPParser.htmlStart = SimpleCharStream.getPosition();
-         break;
       default : 
          break;
    }