Added PHPDoc Scanner and Code Completion Processor
[phpeclipse.git] / net.sourceforge.phpeclipse / src / test / PHPParserTokenManager.java
index e6b45da..a5546f7 100644 (file)
@@ -34,7 +34,7 @@ static private final int jjMoveStringLiteralDfa0_0()
       case 60:
          return jjMoveStringLiteralDfa1_0(0xeL, 0x0L);
       case 63:
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x200L);
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x400L);
       default :
          return 1;
    }
@@ -48,8 +48,8 @@ static private final int jjMoveStringLiteralDfa1_0(long active0, long active2)
    switch(curChar)
    {
       case 62:
-         if ((active2 & 0x200L) != 0L)
-            return jjStopAtPos(1, 137);
+         if ((active2 & 0x400L) != 0L)
+            return jjStopAtPos(1, 138);
          break;
       case 63:
          if ((active0 & 0x2L) != 0L)
@@ -308,87 +308,87 @@ private static final int jjStopStringLiteralDfa_1(int pos, long active0, long ac
    switch (pos)
    {
       case 0:
-         if ((active0 & 0x2800L) != 0L || (active1 & 0x4000080000000000L) != 0L)
+         if ((active0 & 0x2800L) != 0L || (active1 & 0x8000100000000000L) != 0L)
             return 2;
-         if ((active1 & 0x8000000000000L) != 0L)
+         if ((active1 & 0x10000000000000L) != 0L)
             return 16;
-         if ((active1 & 0x800020000000L) != 0L)
+         if ((active1 & 0x1000040000000L) != 0L)
             return 8;
-         if ((active0 & 0xffffffc7fff80000L) != 0L || (active1 & 0x7fL) != 0L)
+         if ((active0 & 0xffffffc7fff80000L) != 0L || (active1 & 0xffL) != 0L)
          {
-            jjmatchedKind = 81;
+            jjmatchedKind = 82;
             return 14;
          }
          return -1;
       case 1:
          if ((active0 & 0x2000L) != 0L)
             return 0;
-         if ((active0 & 0x800040000400000L) != 0L || (active1 & 0x22L) != 0L)
+         if ((active0 & 0x1000080000400000L) != 0L || (active1 & 0x44L) != 0L)
             return 14;
-         if ((active0 & 0xf7fffbc7ffb80000L) != 0L || (active1 & 0x5dL) != 0L)
+         if ((active0 & 0xeffff7c7ffb80000L) != 0L || (active1 & 0xbbL) != 0L)
          {
             if (jjmatchedPos != 1)
             {
-               jjmatchedKind = 81;
+               jjmatchedKind = 82;
                jjmatchedPos = 1;
             }
             return 14;
          }
          return -1;
       case 2:
-         if ((active0 & 0x400500000200000L) != 0L || (active1 & 0x58L) != 0L)
+         if ((active0 & 0x800a00000200000L) != 0L || (active1 & 0xb0L) != 0L)
             return 14;
-         if ((active0 & 0xf3ffabc7ff980000L) != 0L || (active1 & 0x7L) != 0L)
+         if ((active0 & 0xe7ff57c7ff980000L) != 0L || (active1 & 0xfL) != 0L)
          {
             if (jjmatchedPos != 2)
             {
-               jjmatchedKind = 81;
+               jjmatchedKind = 82;
                jjmatchedPos = 2;
             }
             return 14;
          }
          return -1;
       case 3:
-         if ((active0 & 0xc018a04011800000L) != 0L || (active1 & 0x1L) != 0L)
+         if ((active0 & 0x803140c011800000L) != 0L || (active1 & 0x3L) != 0L)
             return 14;
-         if ((active0 & 0x37e70b87ee180000L) != 0L || (active1 & 0x16L) != 0L)
+         if ((active0 & 0x6fce1707ee180000L) != 0L || (active1 & 0x2cL) != 0L)
          {
             if (jjmatchedPos != 3)
             {
-               jjmatchedKind = 81;
+               jjmatchedKind = 82;
                jjmatchedPos = 3;
             }
             return 14;
          }
          return -1;
       case 4:
-         if ((active0 & 0xb6850b07e0900000L) != 0L || (active1 & 0x12L) != 0L)
+         if ((active0 & 0x6d0a1607e0900000L) != 0L || (active1 & 0x25L) != 0L)
          {
-            jjmatchedKind = 81;
+            jjmatchedKind = 82;
             jjmatchedPos = 4;
             return 14;
          }
-         if ((active0 & 0x16200800e080000L) != 0L || (active1 & 0x4L) != 0L)
+         if ((active0 & 0x2c401000e080000L) != 0L || (active1 & 0x8L) != 0L)
             return 14;
          return -1;
       case 5:
-         if ((active0 & 0x3205000600800000L) != 0L || (active1 & 0x2L) != 0L)
+         if ((active0 & 0x640a000600800000L) != 0L || (active1 & 0x4L) != 0L)
             return 14;
-         if ((active0 & 0x84800b01e0100000L) != 0L || (active1 & 0x10L) != 0L)
+         if ((active0 & 0x9001601e0100000L) != 0L || (active1 & 0x21L) != 0L)
          {
-            jjmatchedKind = 81;
+            jjmatchedKind = 82;
             jjmatchedPos = 5;
             return 14;
          }
          return -1;
       case 6:
-         if ((active0 & 0x84000a01e0000000L) != 0L || (active1 & 0x10L) != 0L)
+         if ((active0 & 0x8001401e0000000L) != 0L || (active1 & 0x21L) != 0L)
             return 14;
-         if ((active0 & 0x80010000100000L) != 0L)
+         if ((active0 & 0x100020000100000L) != 0L)
          {
             if (jjmatchedPos != 6)
             {
-               jjmatchedKind = 81;
+               jjmatchedKind = 82;
                jjmatchedPos = 6;
             }
             return 14;
@@ -397,17 +397,17 @@ private static final int jjStopStringLiteralDfa_1(int pos, long active0, long ac
       case 7:
          if ((active0 & 0x180000000L) != 0L)
          {
-            jjmatchedKind = 81;
+            jjmatchedKind = 82;
             jjmatchedPos = 7;
             return 14;
          }
-         if ((active0 & 0x80010000100000L) != 0L)
+         if ((active0 & 0x100020000100000L) != 0L)
             return 14;
          return -1;
       case 8:
          if ((active0 & 0x180000000L) != 0L)
          {
-            jjmatchedKind = 81;
+            jjmatchedKind = 82;
             jjmatchedPos = 8;
             return 14;
          }
@@ -415,7 +415,7 @@ private static final int jjStopStringLiteralDfa_1(int pos, long active0, long ac
       case 9:
          if ((active0 & 0x180000000L) != 0L)
          {
-            jjmatchedKind = 81;
+            jjmatchedKind = 82;
             jjmatchedPos = 9;
             return 14;
          }
@@ -423,7 +423,7 @@ private static final int jjStopStringLiteralDfa_1(int pos, long active0, long ac
       case 10:
          if ((active0 & 0x180000000L) != 0L)
          {
-            jjmatchedKind = 81;
+            jjmatchedKind = 82;
             jjmatchedPos = 10;
             return 14;
          }
@@ -449,120 +449,123 @@ static private final int jjMoveStringLiteralDfa0_1()
    switch(curChar)
    {
       case 33:
-         jjmatchedKind = 116;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x2800000000L, 0x0L);
+         jjmatchedKind = 117;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x5000000000L, 0x0L);
       case 36:
-         return jjStartNfaWithStates_1(0, 115, 16);
+         return jjStartNfaWithStates_1(0, 116, 16);
       case 37:
-         jjmatchedKind = 130;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x1000000000000L, 0x0L);
+         jjmatchedKind = 131;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x2000000000000L, 0x0L);
       case 38:
-         jjmatchedKind = 127;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x100100000000000L, 0x0L);
+         jjmatchedKind = 128;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x200200000000000L, 0x0L);
       case 40:
-         return jjStopAtPos(0, 85);
-      case 41:
          return jjStopAtPos(0, 86);
+      case 41:
+         return jjStopAtPos(0, 87);
       case 42:
-         jjmatchedKind = 125;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x40000000000L, 0x0L);
+         jjmatchedKind = 126;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x80000000000L, 0x0L);
       case 43:
-         jjmatchedKind = 123;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x200010000000000L, 0x0L);
+         jjmatchedKind = 124;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x400020000000000L, 0x0L);
       case 44:
-         return jjStopAtPos(0, 92);
+         return jjStopAtPos(0, 93);
       case 45:
-         jjmatchedKind = 124;
-         return jjMoveStringLiteralDfa1_1(0x800000000L, 0x400020000000000L, 0x0L);
+         jjmatchedKind = 125;
+         return jjMoveStringLiteralDfa1_1(0x800000000L, 0x800040000000000L, 0x0L);
       case 46:
-         jjmatchedKind = 93;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x800000000000L, 0x0L);
+         jjmatchedKind = 94;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x1000000000000L, 0x0L);
       case 47:
-         jjmatchedKind = 126;
-         return jjMoveStringLiteralDfa1_1(0x2800L, 0x80000000000L, 0x0L);
+         jjmatchedKind = 127;
+         return jjMoveStringLiteralDfa1_1(0x2800L, 0x100000000000L, 0x0L);
       case 58:
-         jjmatchedKind = 118;
+         jjmatchedKind = 119;
          return jjMoveStringLiteralDfa1_1(0x1000000000L, 0x0L, 0x0L);
       case 59:
-         return jjStopAtPos(0, 91);
+         return jjStopAtPos(0, 92);
       case 60:
-         jjmatchedKind = 95;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x1200000000L, 0x48L);
+         jjmatchedKind = 96;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x2400000000L, 0x90L);
       case 61:
-         jjmatchedKind = 103;
-         return jjMoveStringLiteralDfa1_1(0x2000000000L, 0x4100000000L, 0x0L);
+         jjmatchedKind = 104;
+         return jjMoveStringLiteralDfa1_1(0x2000000000L, 0x8200000000L, 0x0L);
       case 62:
-         jjmatchedKind = 94;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x400000000L, 0xb0L);
+         jjmatchedKind = 95;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x800000000L, 0x160L);
       case 63:
-         jjmatchedKind = 117;
+         jjmatchedKind = 118;
          return jjMoveStringLiteralDfa1_1(0x10L, 0x0L, 0x0L);
       case 64:
-         return jjStopAtPos(0, 114);
+         return jjStopAtPos(0, 115);
       case 91:
-         return jjStopAtPos(0, 89);
-      case 93:
          return jjStopAtPos(0, 90);
+      case 93:
+         return jjStopAtPos(0, 91);
       case 94:
-         jjmatchedKind = 129;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x400000000000L, 0x0L);
+         jjmatchedKind = 130;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x800000000000L, 0x0L);
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa1_1(0x800000002000000L, 0x40L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x1000000002000000L, 0x80L, 0x0L);
       case 66:
       case 98:
-         return jjMoveStringLiteralDfa1_1(0xc000000004000000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x8000000004000000L, 0x1L, 0x0L);
       case 67:
       case 99:
-         return jjMoveStringLiteralDfa1_1(0x1c000080000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x38000080000L, 0x0L, 0x0L);
       case 68:
       case 100:
-         return jjMoveStringLiteralDfa1_1(0x60000000000L, 0x2L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0xc0000000000L, 0x4L, 0x0L);
       case 69:
       case 101:
-         return jjMoveStringLiteralDfa1_1(0x380080011800000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x700100011800000L, 0x0L, 0x0L);
       case 70:
       case 102:
-         return jjMoveStringLiteralDfa1_1(0x420100000100000L, 0x4L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x840200000100000L, 0x8L, 0x0L);
       case 71:
       case 103:
-         return jjMoveStringLiteralDfa1_1(0x200200000000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x400200000000L, 0x0L, 0x0L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa1_1(0xa0400000L, 0x18L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0xa0400000L, 0x30L, 0x0L);
+      case 76:
+      case 108:
+         return jjMoveStringLiteralDfa1_1(0x4000000000L, 0x0L, 0x0L);
       case 78:
       case 110:
-         return jjMoveStringLiteralDfa1_1(0xc00000000000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x1800000000000L, 0x0L, 0x0L);
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa1_1(0x2000000000000000L, 0x20L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x4000000000000000L, 0x40L, 0x0L);
       case 80:
       case 112:
          return jjMoveStringLiteralDfa1_1(0x8000000L, 0x0L, 0x0L);
       case 82:
       case 114:
-         return jjMoveStringLiteralDfa1_1(0x1000140000000L, 0x1L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x2000140000000L, 0x2L, 0x0L);
       case 83:
       case 115:
-         return jjMoveStringLiteralDfa1_1(0x1006000400000000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x200c000400000000L, 0x0L, 0x0L);
       case 84:
       case 116:
-         return jjMoveStringLiteralDfa1_1(0x18000000000000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x30000000000000L, 0x0L, 0x0L);
       case 86:
       case 118:
          return jjMoveStringLiteralDfa1_1(0x200000L, 0x0L, 0x0L);
       case 87:
       case 119:
-         return jjMoveStringLiteralDfa1_1(0x40000000000000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x80000000000000L, 0x0L, 0x0L);
       case 123:
-         return jjStopAtPos(0, 87);
+         return jjStopAtPos(0, 88);
       case 124:
-         jjmatchedKind = 128;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x80200000000000L, 0x0L);
+         jjmatchedKind = 129;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x100400000000000L, 0x0L);
       case 125:
-         return jjStopAtPos(0, 88);
+         return jjStopAtPos(0, 89);
       case 126:
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x2000000000000L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x4000000000000L, 0x0L);
       default :
          return jjMoveNfa_1(3, 0);
    }
@@ -577,21 +580,21 @@ static private final int jjMoveStringLiteralDfa1_1(long active0, long active1, l
    switch(curChar)
    {
       case 38:
-         if ((active1 & 0x100000000000000L) != 0L)
-            return jjStopAtPos(1, 120);
+         if ((active1 & 0x200000000000000L) != 0L)
+            return jjStopAtPos(1, 121);
          break;
       case 42:
          if ((active0 & 0x2000L) != 0L)
             return jjStartNfaWithStates_1(1, 13, 0);
          break;
       case 43:
-         if ((active1 & 0x200000000000000L) != 0L)
-            return jjStopAtPos(1, 121);
-         break;
-      case 45:
          if ((active1 & 0x400000000000000L) != 0L)
             return jjStopAtPos(1, 122);
          break;
+      case 45:
+         if ((active1 & 0x800000000000000L) != 0L)
+            return jjStopAtPos(1, 123);
+         break;
       case 47:
          if ((active0 & 0x800L) != 0L)
             return jjStopAtPos(1, 11);
@@ -601,29 +604,27 @@ static private final int jjMoveStringLiteralDfa1_1(long active0, long active1, l
             return jjStopAtPos(1, 36);
          break;
       case 60:
-         if ((active2 & 0x8L) != 0L)
+         if ((active2 & 0x10L) != 0L)
          {
-            jjmatchedKind = 131;
+            jjmatchedKind = 132;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0L, active2, 0x40L);
+         return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0L, active2, 0x80L);
       case 61:
-         if ((active1 & 0x100000000L) != 0L)
+         if ((active1 & 0x200000000L) != 0L)
          {
-            jjmatchedKind = 96;
+            jjmatchedKind = 97;
             jjmatchedPos = 1;
          }
-         else if ((active1 & 0x200000000L) != 0L)
-            return jjStopAtPos(1, 97);
          else if ((active1 & 0x400000000L) != 0L)
             return jjStopAtPos(1, 98);
          else if ((active1 & 0x800000000L) != 0L)
+            return jjStopAtPos(1, 99);
+         else if ((active1 & 0x1000000000L) != 0L)
          {
-            jjmatchedKind = 99;
+            jjmatchedKind = 100;
             jjmatchedPos = 1;
          }
-         else if ((active1 & 0x10000000000L) != 0L)
-            return jjStopAtPos(1, 104);
          else if ((active1 & 0x20000000000L) != 0L)
             return jjStopAtPos(1, 105);
          else if ((active1 & 0x40000000000L) != 0L)
@@ -642,7 +643,9 @@ static private final int jjMoveStringLiteralDfa1_1(long active0, long active1, l
             return jjStopAtPos(1, 112);
          else if ((active1 & 0x2000000000000L) != 0L)
             return jjStopAtPos(1, 113);
-         return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x6000000000L, active2, 0L);
+         else if ((active1 & 0x4000000000000L) != 0L)
+            return jjStopAtPos(1, 114);
+         return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0xc000000000L, active2, 0L);
       case 62:
          if ((active0 & 0x10L) != 0L)
             return jjStopAtPos(1, 4);
@@ -650,26 +653,26 @@ static private final int jjMoveStringLiteralDfa1_1(long active0, long active1, l
             return jjStopAtPos(1, 35);
          else if ((active0 & 0x2000000000L) != 0L)
             return jjStopAtPos(1, 37);
-         else if ((active1 & 0x1000000000L) != 0L)
-            return jjStopAtPos(1, 100);
-         else if ((active2 & 0x10L) != 0L)
+         else if ((active1 & 0x2000000000L) != 0L)
+            return jjStopAtPos(1, 101);
+         else if ((active2 & 0x20L) != 0L)
          {
-            jjmatchedKind = 132;
+            jjmatchedKind = 133;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0L, active2, 0xa0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0L, active2, 0x140L);
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa2_1(active0, 0x20004000200000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0x40008000200000L, active1, 0L, active2, 0L);
       case 66:
       case 98:
-         return jjMoveStringLiteralDfa2_1(active0, 0x2000000000000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0x4000000000000000L, active1, 0L, active2, 0L);
       case 67:
       case 99:
          return jjMoveStringLiteralDfa2_1(active0, 0x10000000L, active1, 0L, active2, 0L);
       case 69:
       case 101:
-         return jjMoveStringLiteralDfa2_1(active0, 0x1420140000000L, active1, 0x1L, active2, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0x2840140000000L, active1, 0x2L, active2, 0L);
       case 70:
       case 102:
          if ((active0 & 0x400000L) != 0L)
@@ -677,46 +680,49 @@ static private final int jjMoveStringLiteralDfa1_1(long active0, long active1, l
          break;
       case 72:
       case 104:
-         return jjMoveStringLiteralDfa2_1(active0, 0x48000000000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0x90000000000000L, active1, 0L, active2, 0L);
+      case 73:
+      case 105:
+         return jjMoveStringLiteralDfa2_1(active0, 0x4000000000L, active1, 0L, active2, 0L);
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa2_1(active0, 0x201880000L, active1, 0x4L, active2, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0x201880000L, active1, 0x8L, active2, 0L);
       case 78:
       case 110:
-         return jjMoveStringLiteralDfa2_1(active0, 0x3800000a0000000L, active1, 0x58L, active2, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0x7000000a0000000L, active1, 0xb0L, active2, 0L);
       case 79:
       case 111:
-         if ((active0 & 0x40000000000L) != 0L)
+         if ((active0 & 0x80000000000L) != 0L)
          {
-            jjmatchedKind = 42;
+            jjmatchedKind = 43;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_1(active0, 0xc400318000000000L, active1, 0x2L, active2, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0x8800630000000000L, active1, 0x5L, active2, 0L);
       case 82:
       case 114:
-         if ((active1 & 0x20L) != 0L)
-            return jjStartNfaWithStates_1(1, 69, 14);
-         return jjMoveStringLiteralDfa2_1(active0, 0x1000000e000000L, active1, 0L, active2, 0L);
+         if ((active1 & 0x40L) != 0L)
+            return jjStartNfaWithStates_1(1, 70, 14);
+         return jjMoveStringLiteralDfa2_1(active0, 0x2000000e000000L, active1, 0L, active2, 0L);
       case 83:
       case 115:
-         if ((active0 & 0x800000000000000L) != 0L)
-            return jjStartNfaWithStates_1(1, 59, 14);
+         if ((active0 & 0x1000000000000000L) != 0L)
+            return jjStartNfaWithStates_1(1, 60, 14);
          break;
       case 84:
       case 116:
-         return jjMoveStringLiteralDfa2_1(active0, 0x1000000400000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0x2000000400000000L, active1, 0L, active2, 0L);
       case 85:
       case 117:
-         return jjMoveStringLiteralDfa2_1(active0, 0x2800000100000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0x5000000100000L, active1, 0L, active2, 0L);
       case 87:
       case 119:
-         return jjMoveStringLiteralDfa2_1(active0, 0x4000000000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0x8000000000000L, active1, 0L, active2, 0L);
       case 88:
       case 120:
-         return jjMoveStringLiteralDfa2_1(active0, 0x80000000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0x100000000000L, active1, 0L, active2, 0L);
       case 124:
-         if ((active1 & 0x80000000000000L) != 0L)
-            return jjStopAtPos(1, 119);
+         if ((active1 & 0x100000000000000L) != 0L)
+            return jjStopAtPos(1, 120);
          break;
       default :
          break;
@@ -735,57 +741,57 @@ static private final int jjMoveStringLiteralDfa2_1(long old0, long active0, long
    switch(curChar)
    {
       case 61:
-         if ((active1 & 0x2000000000L) != 0L)
-            return jjStopAtPos(2, 101);
-         else if ((active1 & 0x4000000000L) != 0L)
+         if ((active1 & 0x4000000000L) != 0L)
             return jjStopAtPos(2, 102);
-         else if ((active2 & 0x40L) != 0L)
-            return jjStopAtPos(2, 134);
+         else if ((active1 & 0x8000000000L) != 0L)
+            return jjStopAtPos(2, 103);
          else if ((active2 & 0x80L) != 0L)
             return jjStopAtPos(2, 135);
+         else if ((active2 & 0x100L) != 0L)
+            return jjStopAtPos(2, 136);
          break;
       case 62:
-         if ((active2 & 0x20L) != 0L)
-            return jjStopAtPos(2, 133);
+         if ((active2 & 0x40L) != 0L)
+            return jjStopAtPos(2, 134);
          break;
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa3_1(active0, 0x400080000L, active1, 0x1L, active2, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x400080000L, active1, 0x2L, active2, 0L);
       case 67:
       case 99:
          return jjMoveStringLiteralDfa3_1(active0, 0xa0000000L, active1, 0L, active2, 0L);
       case 68:
       case 100:
-         if ((active1 & 0x40L) != 0L)
-            return jjStartNfaWithStates_1(2, 70, 14);
-         return jjMoveStringLiteralDfa3_1(active0, 0x380000000000000L, active1, 0L, active2, 0L);
+         if ((active1 & 0x80L) != 0L)
+            return jjStartNfaWithStates_1(2, 71, 14);
+         return jjMoveStringLiteralDfa3_1(active0, 0x700000000000000L, active1, 0L, active2, 0L);
       case 69:
       case 101:
          return jjMoveStringLiteralDfa3_1(active0, 0x4000000L, active1, 0L, active2, 0L);
       case 70:
       case 102:
-         return jjMoveStringLiteralDfa3_1(active0, 0x20000000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x40000000000L, active1, 0L, active2, 0L);
       case 72:
       case 104:
          return jjMoveStringLiteralDfa3_1(active0, 0x10000000L, active1, 0L, active2, 0L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa3_1(active0, 0x4c000008000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x98000008000000L, active1, 0L, active2, 0L);
       case 74:
       case 106:
-         return jjMoveStringLiteralDfa3_1(active0, 0x2000000000000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x4000000000000000L, active1, 0L, active2, 0L);
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa3_1(active0, 0x20800000000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x41000000000000L, active1, 0L, active2, 0L);
       case 78:
       case 110:
-         return jjMoveStringLiteralDfa3_1(active0, 0x18000100000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x30000100000L, active1, 0L, active2, 0L);
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa3_1(active0, 0xc000000200000000L, active1, 0x4L, active2, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x8000000200000000L, active1, 0x9L, active2, 0L);
       case 80:
       case 112:
-         return jjMoveStringLiteralDfa3_1(active0, 0x2000000000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x4000000000000L, active1, 0L, active2, 0L);
       case 81:
       case 113:
          return jjMoveStringLiteralDfa3_1(active0, 0x140000000L, active1, 0L, active2, 0L);
@@ -793,30 +799,30 @@ static private final int jjMoveStringLiteralDfa2_1(long old0, long active0, long
       case 114:
          if ((active0 & 0x200000L) != 0L)
             return jjStartNfaWithStates_1(2, 21, 14);
-         else if ((active0 & 0x100000000000L) != 0L)
+         else if ((active0 & 0x200000000000L) != 0L)
          {
-            jjmatchedKind = 44;
+            jjmatchedKind = 45;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_1(active0, 0x1400000002000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x2800000002000000L, active1, 0L, active2, 0L);
       case 83:
       case 115:
-         return jjMoveStringLiteralDfa3_1(active0, 0x4001800000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0xc001800000L, active1, 0L, active2, 0L);
       case 84:
       case 116:
-         if ((active1 & 0x8L) != 0L)
+         if ((active1 & 0x10L) != 0L)
          {
-            jjmatchedKind = 67;
+            jjmatchedKind = 68;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_1(active0, 0x1280000000000L, active1, 0x10L, active2, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x2500000000000L, active1, 0x20L, active2, 0L);
       case 85:
       case 117:
-         return jjMoveStringLiteralDfa3_1(active0, 0x10000000000000L, active1, 0x2L, active2, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x20000000000000L, active1, 0x4L, active2, 0L);
       case 87:
       case 119:
-         if ((active0 & 0x400000000000L) != 0L)
-            return jjStartNfaWithStates_1(2, 46, 14);
+         if ((active0 & 0x800000000000L) != 0L)
+            return jjStartNfaWithStates_1(2, 47, 14);
          break;
       default :
          break;
@@ -836,10 +842,10 @@ static private final int jjMoveStringLiteralDfa3_1(long old0, long active0, long
    {
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa4_1(active0, 0x20006000000L, active1, 0x4L);
+         return jjMoveStringLiteralDfa4_1(active0, 0x40006000000L, active1, 0x8L);
       case 66:
       case 98:
-         return jjMoveStringLiteralDfa4_1(active0, 0x200000000L, active1, 0x2L);
+         return jjMoveStringLiteralDfa4_1(active0, 0x200000000L, active1, 0x4L);
       case 67:
       case 99:
          return jjMoveStringLiteralDfa4_1(active0, 0x100000L, active1, 0L);
@@ -850,29 +856,29 @@ static private final int jjMoveStringLiteralDfa3_1(long old0, long active0, long
             jjmatchedKind = 24;
             jjmatchedPos = 3;
          }
-         else if ((active0 & 0x4000000000L) != 0L)
-            return jjStartNfaWithStates_1(3, 38, 14);
-         else if ((active0 & 0x10000000000000L) != 0L)
-            return jjStartNfaWithStates_1(3, 52, 14);
-         return jjMoveStringLiteralDfa4_1(active0, 0x2402080000800000L, active1, 0x10L);
+         else if ((active0 & 0x8000000000L) != 0L)
+            return jjStartNfaWithStates_1(3, 39, 14);
+         else if ((active0 & 0x20000000000000L) != 0L)
+            return jjStartNfaWithStates_1(3, 53, 14);
+         return jjMoveStringLiteralDfa4_1(active0, 0x4804100000800000L, active1, 0x20L);
       case 70:
       case 102:
-         return jjMoveStringLiteralDfa4_1(active0, 0x200000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa4_1(active0, 0x400000000000000L, active1, 0L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa4_1(active0, 0x1100000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa4_1(active0, 0x2200000000000000L, active1, 0L);
       case 76:
       case 108:
-         if ((active0 & 0x800000000000L) != 0L)
-            return jjStartNfaWithStates_1(3, 47, 14);
-         else if ((active0 & 0x4000000000000000L) != 0L)
+         if ((active0 & 0x1000000000000L) != 0L)
+            return jjStartNfaWithStates_1(3, 48, 14);
+         else if ((active0 & 0x8000000000000000L) != 0L)
          {
-            jjmatchedKind = 62;
+            jjmatchedKind = 63;
             jjmatchedPos = 3;
          }
-         else if ((active1 & 0x1L) != 0L)
-            return jjStartNfaWithStates_1(3, 64, 14);
-         return jjMoveStringLiteralDfa4_1(active0, 0x80400000a0000000L, active1, 0L);
+         else if ((active1 & 0x2L) != 0L)
+            return jjStartNfaWithStates_1(3, 65, 14);
+         return jjMoveStringLiteralDfa4_1(active0, 0x800000a0000000L, active1, 0x1L);
       case 78:
       case 110:
          return jjMoveStringLiteralDfa4_1(active0, 0x8000000L, active1, 0L);
@@ -880,23 +886,25 @@ static private final int jjMoveStringLiteralDfa3_1(long old0, long active0, long
       case 111:
          if ((active0 & 0x10000000L) != 0L)
             return jjStartNfaWithStates_1(3, 28, 14);
-         else if ((active0 & 0x200000000000L) != 0L)
-            return jjStartNfaWithStates_1(3, 45, 14);
+         else if ((active0 & 0x400000000000L) != 0L)
+            return jjStartNfaWithStates_1(3, 46, 14);
          break;
       case 83:
       case 115:
-         if ((active0 & 0x8000000000000L) != 0L)
-            return jjStartNfaWithStates_1(3, 51, 14);
-         return jjMoveStringLiteralDfa4_1(active0, 0x20008000080000L, active1, 0L);
+         if ((active0 & 0x10000000000000L) != 0L)
+            return jjStartNfaWithStates_1(3, 52, 14);
+         return jjMoveStringLiteralDfa4_1(active0, 0x40010000080000L, active1, 0L);
       case 84:
       case 116:
-         return jjMoveStringLiteralDfa4_1(active0, 0x4010400000000L, active1, 0L);
+         if ((active0 & 0x4000000000L) != 0L)
+            return jjStartNfaWithStates_1(3, 38, 14);
+         return jjMoveStringLiteralDfa4_1(active0, 0x8020400000000L, active1, 0L);
       case 85:
       case 117:
-         return jjMoveStringLiteralDfa4_1(active0, 0x1000140000000L, active1, 0L);
+         return jjMoveStringLiteralDfa4_1(active0, 0x2000140000000L, active1, 0L);
       case 87:
       case 119:
-         return jjMoveStringLiteralDfa4_1(active0, 0x80000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa4_1(active0, 0x100000000000000L, active1, 0L);
       default :
          break;
    }
@@ -915,31 +923,31 @@ static private final int jjMoveStringLiteralDfa4_1(long old0, long active0, long
    {
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa5_1(active0, 0x400000200000000L, active1, 0L);
+         return jjMoveStringLiteralDfa5_1(active0, 0x800000200000000L, active1, 0L);
       case 67:
       case 99:
-         return jjMoveStringLiteralDfa5_1(active0, 0x2004000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa5_1(active0, 0x4008000000000000L, active1, 0L);
       case 69:
       case 101:
-         if ((active0 & 0x20000000000000L) != 0L)
-            return jjStartNfaWithStates_1(4, 53, 14);
-         else if ((active0 & 0x40000000000000L) != 0L)
+         if ((active0 & 0x40000000000000L) != 0L)
             return jjStartNfaWithStates_1(4, 54, 14);
-         return jjMoveStringLiteralDfa5_1(active0, 0x8000000000000000L, active1, 0L);
+         else if ((active0 & 0x80000000000000L) != 0L)
+            return jjStartNfaWithStates_1(4, 55, 14);
+         return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x1L);
       case 70:
       case 102:
-         if ((active0 & 0x100000000000000L) != 0L)
-            return jjStartNfaWithStates_1(4, 56, 14);
+         if ((active0 & 0x200000000000000L) != 0L)
+            return jjStartNfaWithStates_1(4, 57, 14);
          break;
       case 71:
       case 103:
-         return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x10L);
+         return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x20L);
       case 72:
       case 104:
-         return jjMoveStringLiteralDfa5_1(active0, 0x80000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa5_1(active0, 0x100000000000000L, active1, 0L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa5_1(active0, 0x10540800000L, active1, 0L);
+         return jjMoveStringLiteralDfa5_1(active0, 0x20540800000L, active1, 0L);
       case 75:
       case 107:
          if ((active0 & 0x4000000L) != 0L)
@@ -947,18 +955,18 @@ static private final int jjMoveStringLiteralDfa4_1(long old0, long active0, long
          break;
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x2L);
+         return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x4L);
       case 78:
       case 110:
-         return jjMoveStringLiteralDfa5_1(active0, 0x1000080000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa5_1(active0, 0x2000100000000000L, active1, 0L);
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa5_1(active0, 0x200000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa5_1(active0, 0x400000000000000L, active1, 0L);
       case 82:
       case 114:
-         if ((active0 & 0x2000000000000L) != 0L)
-            return jjStartNfaWithStates_1(4, 49, 14);
-         return jjMoveStringLiteralDfa5_1(active0, 0x1000000000000L, active1, 0L);
+         if ((active0 & 0x4000000000000L) != 0L)
+            return jjStartNfaWithStates_1(4, 50, 14);
+         return jjMoveStringLiteralDfa5_1(active0, 0x2000000000000L, active1, 0L);
       case 83:
       case 115:
          if ((active0 & 0x80000L) != 0L)
@@ -968,14 +976,14 @@ static private final int jjMoveStringLiteralDfa4_1(long old0, long active0, long
       case 116:
          if ((active0 & 0x8000000L) != 0L)
             return jjStartNfaWithStates_1(4, 27, 14);
-         else if ((active0 & 0x8000000000L) != 0L)
-            return jjStartNfaWithStates_1(4, 39, 14);
-         else if ((active1 & 0x4L) != 0L)
-            return jjStartNfaWithStates_1(4, 66, 14);
+         else if ((active0 & 0x10000000000L) != 0L)
+            return jjStartNfaWithStates_1(4, 40, 14);
+         else if ((active1 & 0x8L) != 0L)
+            return jjStartNfaWithStates_1(4, 67, 14);
          return jjMoveStringLiteralDfa5_1(active0, 0x100000L, active1, 0L);
       case 85:
       case 117:
-         return jjMoveStringLiteralDfa5_1(active0, 0x200a0000000L, active1, 0L);
+         return jjMoveStringLiteralDfa5_1(active0, 0x400a0000000L, active1, 0L);
       case 89:
       case 121:
          if ((active0 & 0x2000000L) != 0L)
@@ -999,20 +1007,20 @@ static private final int jjMoveStringLiteralDfa5_1(long old0, long active0, long
    {
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa6_1(active0, 0x8000000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa6_1(active0, 0L, active1, 0x1L);
       case 67:
       case 99:
          if ((active0 & 0x400000000L) != 0L)
             return jjStartNfaWithStates_1(5, 34, 14);
-         return jjMoveStringLiteralDfa6_1(active0, 0x400000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa6_1(active0, 0x800000000000000L, active1, 0L);
       case 68:
       case 100:
-         return jjMoveStringLiteralDfa6_1(active0, 0x800a0000000L, active1, 0L);
+         return jjMoveStringLiteralDfa6_1(active0, 0x1000a0000000L, active1, 0L);
       case 69:
       case 101:
-         if ((active1 & 0x2L) != 0L)
-            return jjStartNfaWithStates_1(5, 65, 14);
-         return jjMoveStringLiteralDfa6_1(active0, 0L, active1, 0x10L);
+         if ((active1 & 0x4L) != 0L)
+            return jjStartNfaWithStates_1(5, 66, 14);
+         return jjMoveStringLiteralDfa6_1(active0, 0L, active1, 0x20L);
       case 70:
       case 102:
          if ((active0 & 0x800000L) != 0L)
@@ -1020,36 +1028,36 @@ static private final int jjMoveStringLiteralDfa5_1(long old0, long active0, long
          break;
       case 71:
       case 103:
-         if ((active0 & 0x1000000000000000L) != 0L)
-            return jjStartNfaWithStates_1(5, 60, 14);
+         if ((active0 & 0x2000000000000000L) != 0L)
+            return jjStartNfaWithStates_1(5, 61, 14);
          break;
       case 72:
       case 104:
-         if ((active0 & 0x4000000000000L) != 0L)
-            return jjStartNfaWithStates_1(5, 50, 14);
+         if ((active0 & 0x8000000000000L) != 0L)
+            return jjStartNfaWithStates_1(5, 51, 14);
          break;
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa6_1(active0, 0x80000000100000L, active1, 0L);
+         return jjMoveStringLiteralDfa6_1(active0, 0x100000000100000L, active1, 0L);
       case 76:
       case 108:
          if ((active0 & 0x200000000L) != 0L)
             return jjStartNfaWithStates_1(5, 33, 14);
-         return jjMoveStringLiteralDfa6_1(active0, 0x20000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa6_1(active0, 0x40000000000L, active1, 0L);
       case 78:
       case 110:
-         if ((active0 & 0x1000000000000L) != 0L)
-            return jjStartNfaWithStates_1(5, 48, 14);
-         return jjMoveStringLiteralDfa6_1(active0, 0x10000000000L, active1, 0L);
+         if ((active0 & 0x2000000000000L) != 0L)
+            return jjStartNfaWithStates_1(5, 49, 14);
+         return jjMoveStringLiteralDfa6_1(active0, 0x20000000000L, active1, 0L);
       case 82:
       case 114:
-         if ((active0 & 0x200000000000000L) != 0L)
-            return jjStartNfaWithStates_1(5, 57, 14);
+         if ((active0 & 0x400000000000000L) != 0L)
+            return jjStartNfaWithStates_1(5, 58, 14);
          return jjMoveStringLiteralDfa6_1(active0, 0x140000000L, active1, 0L);
       case 84:
       case 116:
-         if ((active0 & 0x2000000000000000L) != 0L)
-            return jjStartNfaWithStates_1(5, 61, 14);
+         if ((active0 & 0x4000000000000000L) != 0L)
+            return jjStartNfaWithStates_1(5, 62, 14);
          break;
       default :
          break;
@@ -1082,38 +1090,38 @@ static private final int jjMoveStringLiteralDfa6_1(long old0, long active0, long
          return jjMoveStringLiteralDfa7_1(active0, 0x180000000L, active1, 0L);
       case 72:
       case 104:
-         if ((active0 & 0x400000000000000L) != 0L)
-            return jjStartNfaWithStates_1(6, 58, 14);
+         if ((active0 & 0x800000000000000L) != 0L)
+            return jjStartNfaWithStates_1(6, 59, 14);
          break;
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa7_1(active0, 0x80000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa7_1(active0, 0x100000000000000L, active1, 0L);
       case 78:
       case 110:
-         if ((active0 & 0x8000000000000000L) != 0L)
-            return jjStartNfaWithStates_1(6, 63, 14);
+         if ((active1 & 0x1L) != 0L)
+            return jjStartNfaWithStates_1(6, 64, 14);
          break;
       case 79:
       case 111:
          return jjMoveStringLiteralDfa7_1(active0, 0x100000L, active1, 0L);
       case 82:
       case 114:
-         if ((active1 & 0x10L) != 0L)
-            return jjStartNfaWithStates_1(6, 68, 14);
+         if ((active1 & 0x20L) != 0L)
+            return jjStartNfaWithStates_1(6, 69, 14);
          break;
       case 83:
       case 115:
-         if ((active0 & 0x80000000000L) != 0L)
-            return jjStartNfaWithStates_1(6, 43, 14);
+         if ((active0 & 0x100000000000L) != 0L)
+            return jjStartNfaWithStates_1(6, 44, 14);
          break;
       case 84:
       case 116:
-         if ((active0 & 0x20000000000L) != 0L)
-            return jjStartNfaWithStates_1(6, 41, 14);
+         if ((active0 & 0x40000000000L) != 0L)
+            return jjStartNfaWithStates_1(6, 42, 14);
          break;
       case 85:
       case 117:
-         return jjMoveStringLiteralDfa7_1(active0, 0x10000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa7_1(active0, 0x20000000000L, active1, 0L);
       default :
          break;
    }
@@ -1134,10 +1142,10 @@ static private final int jjMoveStringLiteralDfa7_1(long old0, long active0, long
          return jjMoveStringLiteralDfa8_1(active0, 0x180000000L);
       case 69:
       case 101:
-         if ((active0 & 0x10000000000L) != 0L)
-            return jjStartNfaWithStates_1(7, 40, 14);
-         else if ((active0 & 0x80000000000000L) != 0L)
-            return jjStartNfaWithStates_1(7, 55, 14);
+         if ((active0 & 0x20000000000L) != 0L)
+            return jjStartNfaWithStates_1(7, 41, 14);
+         else if ((active0 & 0x100000000000000L) != 0L)
+            return jjStartNfaWithStates_1(7, 56, 14);
          break;
       case 78:
       case 110:
@@ -1266,14 +1274,14 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                      jjstateSet[jjnewStateCnt++] = 2;
                   if ((0x3fe000000000000L & l) != 0L)
                   {
-                     if (kind > 71)
-                        kind = 71;
+                     if (kind > 72)
+                        kind = 72;
                      jjCheckNAddTwoStates(5, 6);
                   }
                   else if (curChar == 48)
                   {
-                     if (kind > 71)
-                        kind = 71;
+                     if (kind > 72)
+                        kind = 72;
                      jjCheckNAddStates(19, 21);
                   }
                   break;
@@ -1292,15 +1300,15 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 4:
                   if ((0x3fe000000000000L & l) == 0L)
                      break;
-                  if (kind > 71)
-                     kind = 71;
+                  if (kind > 72)
+                     kind = 72;
                   jjCheckNAddTwoStates(5, 6);
                   break;
                case 5:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 71)
-                     kind = 71;
+                  if (kind > 72)
+                     kind = 72;
                   jjCheckNAddTwoStates(5, 6);
                   break;
                case 7:
@@ -1310,8 +1318,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 8:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 75)
-                     kind = 75;
+                  if (kind > 76)
+                     kind = 76;
                   jjCheckNAddStates(22, 24);
                   break;
                case 10:
@@ -1321,15 +1329,15 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 11:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 75)
-                     kind = 75;
+                  if (kind > 76)
+                     kind = 76;
                   jjCheckNAddTwoStates(11, 12);
                   break;
                case 14:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 81)
-                     kind = 81;
+                  if (kind > 82)
+                     kind = 82;
                   jjstateSet[jjnewStateCnt++] = 14;
                   break;
                case 15:
@@ -1339,8 +1347,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 17:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 136)
-                     kind = 136;
+                  if (kind > 137)
+                     kind = 137;
                   jjstateSet[jjnewStateCnt++] = 17;
                   break;
                case 18:
@@ -1354,15 +1362,15 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 20:
                   if (curChar != 46)
                      break;
-                  if (kind > 75)
-                     kind = 75;
+                  if (kind > 76)
+                     kind = 76;
                   jjCheckNAddStates(25, 27);
                   break;
                case 21:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 75)
-                     kind = 75;
+                  if (kind > 76)
+                     kind = 76;
                   jjCheckNAddStates(25, 27);
                   break;
                case 23:
@@ -1372,8 +1380,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 24:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 75)
-                     kind = 75;
+                  if (kind > 76)
+                     kind = 76;
                   jjCheckNAddTwoStates(24, 12);
                   break;
                case 25:
@@ -1387,8 +1395,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 28:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 75)
-                     kind = 75;
+                  if (kind > 76)
+                     kind = 76;
                   jjCheckNAddTwoStates(28, 12);
                   break;
                case 29:
@@ -1406,22 +1414,22 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 33:
                   if (curChar != 48)
                      break;
-                  if (kind > 71)
-                     kind = 71;
+                  if (kind > 72)
+                     kind = 72;
                   jjCheckNAddStates(19, 21);
                   break;
                case 35:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 71)
-                     kind = 71;
+                  if (kind > 72)
+                     kind = 72;
                   jjCheckNAddTwoStates(35, 6);
                   break;
                case 36:
                   if ((0xff000000000000L & l) == 0L)
                      break;
-                  if (kind > 71)
-                     kind = 71;
+                  if (kind > 72)
+                     kind = 72;
                   jjCheckNAddTwoStates(36, 6);
                   break;
                case 37:
@@ -1437,8 +1445,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                      jjCheckNAddStates(31, 33);
                   break;
                case 41:
-                  if (curChar == 34 && kind > 77)
-                     kind = 77;
+                  if (curChar == 34 && kind > 78)
+                     kind = 78;
                   break;
                case 42:
                   if ((0xfffffffbffffffffL & l) != 0L)
@@ -1449,8 +1457,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                      jjCheckNAddStates(34, 36);
                   break;
                case 45:
-                  if (curChar == 34 && kind > 78)
-                     kind = 78;
+                  if (curChar == 34 && kind > 79)
+                     kind = 79;
                   break;
                case 46:
                   if (curChar == 39)
@@ -1465,8 +1473,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                      jjCheckNAddStates(37, 39);
                   break;
                case 50:
-                  if (curChar == 39 && kind > 77)
-                     kind = 77;
+                  if (curChar == 39 && kind > 78)
+                     kind = 78;
                   break;
                case 51:
                   if ((0xffffff7fffffffffL & l) != 0L)
@@ -1477,8 +1485,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                      jjCheckNAddStates(40, 42);
                   break;
                case 54:
-                  if (curChar == 39 && kind > 79)
-                     kind = 79;
+                  if (curChar == 39 && kind > 80)
+                     kind = 80;
                   break;
                case 56:
                   jjAddStates(43, 45);
@@ -1500,8 +1508,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 3:
                   if ((0x87fffffe87fffffeL & l) != 0L)
                   {
-                     if (kind > 81)
-                        kind = 81;
+                     if (kind > 82)
+                        kind = 82;
                      jjCheckNAdd(14);
                   }
                   else if (curChar == 96)
@@ -1512,31 +1520,31 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                      kind = 12;
                   break;
                case 6:
-                  if ((0x100000001000L & l) != 0L && kind > 71)
-                     kind = 71;
+                  if ((0x100000001000L & l) != 0L && kind > 72)
+                     kind = 72;
                   break;
                case 9:
                   if ((0x2000000020L & l) != 0L)
                      jjAddStates(55, 56);
                   break;
                case 12:
-                  if ((0x5000000050L & l) != 0L && kind > 75)
-                     kind = 75;
+                  if ((0x5000000050L & l) != 0L && kind > 76)
+                     kind = 76;
                   break;
                case 13:
                case 14:
                   if ((0x87fffffe87fffffeL & l) == 0L)
                      break;
-                  if (kind > 81)
-                     kind = 81;
+                  if (kind > 82)
+                     kind = 82;
                   jjCheckNAdd(14);
                   break;
                case 16:
                case 17:
                   if ((0x87fffffe87fffffeL & l) == 0L)
                      break;
-                  if (kind > 136)
-                     kind = 136;
+                  if (kind > 137)
+                     kind = 137;
                   jjCheckNAdd(17);
                   break;
                case 22:
@@ -1558,8 +1566,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 35:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 71)
-                     kind = 71;
+                  if (kind > 72)
+                     kind = 72;
                   jjCheckNAddTwoStates(35, 6);
                   break;
                case 38:
@@ -1607,8 +1615,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                      jjstateSet[jjnewStateCnt++] = 57;
                   break;
                case 59:
-                  if (curChar == 96 && kind > 77)
-                     kind = 77;
+                  if (curChar == 96 && kind > 78)
+                     kind = 78;
                   break;
                case 60:
                   if ((0xfffffffeffffffffL & l) != 0L)
@@ -1623,8 +1631,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                      jjstateSet[jjnewStateCnt++] = 61;
                   break;
                case 63:
-                  if (curChar == 96 && kind > 80)
-                     kind = 80;
+                  if (curChar == 96 && kind > 81)
+                     kind = 81;
                   break;
                default : break;
             }
@@ -1642,8 +1650,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 14:
                   if ((jjbitVec0[i2] & l2) == 0L)
                      break;
-                  if (kind > 81)
-                     kind = 81;
+                  if (kind > 82)
+                     kind = 82;
                   jjCheckNAdd(14);
                   break;
                case 1:
@@ -1654,8 +1662,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 17:
                   if ((jjbitVec0[i2] & l2) == 0L)
                      break;
-                  if (kind > 136)
-                     kind = 136;
+                  if (kind > 137)
+                     kind = 137;
                   jjCheckNAdd(17);
                   break;
                case 38:
@@ -1739,13 +1747,13 @@ 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, 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", "\100", "\44", "\41", "\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", "\74\74\75", "\76\76\75", null, 
-"\77\76", };
+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", "\100", "\44", "\41", 
+"\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", "\74\74\75", 
+"\76\76\75", null, "\77\76", };
 public static final String[] lexStateNames = {
    "DEFAULT", 
    "PHPPARSING", 
@@ -1759,10 +1767,10 @@ public static final int[] jjnewLexState = {
    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
    -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, 
 };
 static final long[] jjtoToken = {
-   0xfffffffffff8001fL, 0xffffffffffe3e8ffL, 0x3ffL, 
+   0xfffffffffff8001fL, 0xffffffffffc7d1ffL, 0x7ffL, 
 };
 static final long[] jjtoSkip = {
    0x3ffe0L, 0x0L, 0x0L,