X-Git-Url: http://secure.phpeclipse.com

diff --git a/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java b/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java
index f207bee..5555d08 100644
--- a/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java
+++ b/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java
@@ -52,7 +52,7 @@ static private final int jjMoveStringLiteralDfa0_0()
    switch(curChar)
    {
       case 63:
-         return jjMoveStringLiteralDfa1_0(0x10L);
+         return jjMoveStringLiteralDfa1_0(0x80L);
       default :
          return jjMoveNfa_0(0, 0);
    }
@@ -67,8 +67,8 @@ static private final int jjMoveStringLiteralDfa1_0(long active2)
    switch(curChar)
    {
       case 62:
-         if ((active2 & 0x10L) != 0L)
-            return jjStopAtPos(1, 132);
+         if ((active2 & 0x80L) != 0L)
+            return jjStopAtPos(1, 135);
          break;
       default :
          break;
@@ -344,106 +344,106 @@ private static final int jjStopStringLiteralDfa_1(int pos, long active0, long ac
    switch (pos)
    {
       case 0:
-         if ((active0 & 0xfffffff8fffe0000L) != 0L || (active1 & 0x7L) != 0L)
-         {
-            jjmatchedKind = 77;
-            return 14;
-         }
-         if ((active0 & 0xa00L) != 0L || (active1 & 0x100200000000000L) != 0L)
+         if ((active0 & 0xa00L) != 0L || (active1 & 0x801000000000000L) != 0L)
             return 2;
-         if ((active1 & 0x8000000L) != 0L)
+         if ((active1 & 0x20000000L) != 0L)
             return 16;
-         if ((active1 & 0x1000000002000000L) != 0L)
+         if ((active1 & 0x8000000008000000L) != 0L)
             return 8;
+         if ((active0 & 0xfffffff8fffe0000L) != 0L || (active1 & 0x1fL) != 0L)
+         {
+            jjmatchedKind = 79;
+            return 14;
+         }
          return -1;
       case 1:
          if ((active0 & 0x800L) != 0L)
             return 0;
-         if ((active0 & 0x2080010000100000L) != 0L || (active1 & 0x2L) != 0L)
-            return 14;
-         if ((active0 & 0xdf7ffef8ffee0000L) != 0L || (active1 & 0x5L) != 0L)
+         if ((active0 & 0x7dfffef8ffee0000L) != 0L || (active1 & 0x17L) != 0L)
          {
             if (jjmatchedPos != 1)
             {
-               jjmatchedKind = 77;
+               jjmatchedKind = 79;
                jjmatchedPos = 1;
             }
             return 14;
          }
+         if ((active0 & 0x8200010000100000L) != 0L || (active1 & 0x8L) != 0L)
+            return 14;
          return -1;
       case 2:
-         if ((active0 & 0x8040280000080000L) != 0L || (active1 & 0x5L) != 0L)
+         if ((active0 & 0x100280000080000L) != 0L || (active1 & 0x16L) != 0L)
             return 14;
-         if ((active0 & 0x7f3fd6f8ffe60000L) != 0L)
+         if ((active0 & 0xfcffd6f8ffe60000L) != 0L || (active1 & 0x1L) != 0L)
          {
             if (jjmatchedPos != 2)
             {
-               jjmatchedKind = 77;
+               jjmatchedKind = 79;
                jjmatchedPos = 2;
             }
             return 14;
          }
          return -1;
       case 3:
-         if ((active0 & 0x1c0c501002600000L) != 0L)
+         if ((active0 & 0x700c501002600000L) != 0L)
             return 14;
-         if ((active0 & 0x637386e8fd860000L) != 0L || (active1 & 0x1L) != 0L)
+         if ((active0 & 0x8df386e8fd860000L) != 0L || (active1 & 0x5L) != 0L)
          {
             if (jjmatchedPos != 3)
             {
-               jjmatchedKind = 77;
+               jjmatchedKind = 79;
                jjmatchedPos = 3;
             }
             return 14;
          }
          return -1;
       case 4:
-         if ((active0 & 0x2b6282c0fc240000L) != 0L || (active1 & 0x1L) != 0L)
+         if ((active0 & 0xada282c0fc240000L) != 0L || (active1 & 0x4L) != 0L)
          {
-            jjmatchedKind = 77;
+            jjmatchedKind = 79;
             jjmatchedPos = 4;
             return 14;
          }
-         if ((active0 & 0x4011042801820000L) != 0L)
+         if ((active0 & 0x51042801820000L) != 0L || (active1 & 0x1L) != 0L)
             return 14;
          return -1;
       case 5:
-         if ((active0 & 0x23028000c0200000L) != 0L)
+         if ((active0 & 0x8c828000c0200000L) != 0L)
             return 14;
-         if ((active0 & 0x86002c03c040000L) != 0L || (active1 & 0x1L) != 0L)
+         if ((active0 & 0x212002c03c040000L) != 0L || (active1 & 0x4L) != 0L)
          {
-            jjmatchedKind = 77;
+            jjmatchedKind = 79;
             jjmatchedPos = 5;
             return 14;
          }
          return -1;
       case 6:
-         if ((active0 & 0x84002803c000000L) != 0L || (active1 & 0x1L) != 0L)
+         if ((active0 & 0x210002803c000000L) != 0L || (active1 & 0x4L) != 0L)
             return 14;
          if ((active0 & 0x20004000040000L) != 0L)
          {
             if (jjmatchedPos != 6)
             {
-               jjmatchedKind = 77;
+               jjmatchedKind = 79;
                jjmatchedPos = 6;
             }
             return 14;
          }
          return -1;
       case 7:
+         if ((active0 & 0x20004000040000L) != 0L)
+            return 14;
          if ((active0 & 0x30000000L) != 0L)
          {
-            jjmatchedKind = 77;
+            jjmatchedKind = 79;
             jjmatchedPos = 7;
             return 14;
          }
-         if ((active0 & 0x20004000040000L) != 0L)
-            return 14;
          return -1;
       case 8:
          if ((active0 & 0x30000000L) != 0L)
          {
-            jjmatchedKind = 77;
+            jjmatchedKind = 79;
             jjmatchedPos = 8;
             return 14;
          }
@@ -451,7 +451,7 @@ private static final int jjStopStringLiteralDfa_1(int pos, long active0, long ac
       case 9:
          if ((active0 & 0x30000000L) != 0L)
          {
-            jjmatchedKind = 77;
+            jjmatchedKind = 79;
             jjmatchedPos = 9;
             return 14;
          }
@@ -459,7 +459,7 @@ private static final int jjStopStringLiteralDfa_1(int pos, long active0, long ac
       case 10:
          if ((active0 & 0x30000000L) != 0L)
          {
-            jjmatchedKind = 77;
+            jjmatchedKind = 79;
             jjmatchedPos = 10;
             return 14;
          }
@@ -485,102 +485,102 @@ static private final int jjMoveStringLiteralDfa0_1()
    switch(curChar)
    {
       case 33:
-         jjmatchedKind = 95;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x2000000000L, 0x1L);
+         jjmatchedKind = 97;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x8000000000L, 0x8L);
       case 36:
-         return jjStartNfaWithStates_1(0, 91, 16);
+         return jjStartNfaWithStates_1(0, 93, 16);
       case 37:
-         jjmatchedKind = 113;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x2000000000000000L, 0x0L);
+         jjmatchedKind = 116;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x1L);
       case 38:
-         jjmatchedKind = 110;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x200008000000000L, 0x0L);
+         jjmatchedKind = 113;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x1000040000000000L, 0x0L);
       case 40:
-         return jjStopAtPos(0, 81);
+         return jjStopAtPos(0, 83);
       case 41:
-         return jjStopAtPos(0, 82);
+         return jjStopAtPos(0, 84);
       case 42:
-         jjmatchedKind = 108;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x80000000000000L, 0x0L);
+         jjmatchedKind = 111;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x400000000000000L, 0x0L);
       case 43:
-         jjmatchedKind = 106;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x20010000000000L, 0x0L);
+         jjmatchedKind = 109;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x100080000000000L, 0x0L);
       case 44:
-         return jjStopAtPos(0, 88);
+         return jjStopAtPos(0, 90);
       case 45:
-         jjmatchedKind = 107;
-         return jjMoveStringLiteralDfa1_1(0x100000000L, 0x40020000000000L, 0x0L);
+         jjmatchedKind = 110;
+         return jjMoveStringLiteralDfa1_1(0x100000000L, 0x200100000000000L, 0x0L);
       case 46:
-         jjmatchedKind = 89;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x1000000000000000L, 0x0L);
+         jjmatchedKind = 91;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x8000000000000000L, 0x0L);
       case 47:
-         jjmatchedKind = 109;
-         return jjMoveStringLiteralDfa1_1(0xa00L, 0x100000000000000L, 0x0L);
+         jjmatchedKind = 112;
+         return jjMoveStringLiteralDfa1_1(0xa00L, 0x800000000000000L, 0x0L);
       case 58:
-         jjmatchedKind = 97;
+         jjmatchedKind = 99;
          return jjMoveStringLiteralDfa1_1(0x200000000L, 0x0L, 0x0L);
       case 59:
-         return jjStopAtPos(0, 87);
+         return jjStopAtPos(0, 89);
       case 60:
-         jjmatchedKind = 94;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x4004000800000000L, 0x0L);
+         jjmatchedKind = 96;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x20012000000000L, 0x2L);
       case 61:
-         jjmatchedKind = 92;
-         return jjMoveStringLiteralDfa1_1(0x400000000L, 0x400000000L, 0x2L);
+         jjmatchedKind = 94;
+         return jjMoveStringLiteralDfa1_1(0x400000000L, 0x1000000000L, 0x10L);
       case 62:
-         jjmatchedKind = 93;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x8018001000000000L, 0x0L);
+         jjmatchedKind = 95;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0xc0004000000000L, 0x4L);
       case 63:
-         jjmatchedKind = 96;
+         jjmatchedKind = 98;
          return jjMoveStringLiteralDfa1_1(0x4L, 0x0L, 0x0L);
       case 64:
-         return jjStopAtPos(0, 90);
+         return jjStopAtPos(0, 92);
       case 91:
-         return jjStopAtPos(0, 85);
+         return jjStopAtPos(0, 87);
       case 93:
-         return jjStopAtPos(0, 86);
+         return jjStopAtPos(0, 88);
       case 94:
-         jjmatchedKind = 112;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x800000000000000L, 0x0L);
+         jjmatchedKind = 115;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x4000000000000000L, 0x0L);
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa1_1(0x80000000800000L, 0x4L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x200000000800000L, 0x10L, 0x0L);
       case 66:
       case 98:
-         return jjMoveStringLiteralDfa1_1(0xc00000800000000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x3000000800000000L, 0x0L, 0x0L);
       case 67:
       case 99:
          return jjMoveStringLiteralDfa1_1(0x7000020000L, 0x0L, 0x0L);
       case 68:
       case 100:
-         return jjMoveStringLiteralDfa1_1(0x2000018000000000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x8000018000000000L, 0x0L, 0x0L);
       case 69:
       case 101:
-         return jjMoveStringLiteralDfa1_1(0x20020002600000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0xe0020002600000L, 0x0L, 0x0L);
       case 70:
       case 102:
-         return jjMoveStringLiteralDfa1_1(0x40400c0000040000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x1000c0000040000L, 0x1L, 0x0L);
       case 71:
       case 103:
          return jjMoveStringLiteralDfa1_1(0x100040000000L, 0x0L, 0x0L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa1_1(0x8000000014100000L, 0x1L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x14100000L, 0x6L, 0x0L);
       case 78:
       case 110:
          return jjMoveStringLiteralDfa1_1(0x600000000000L, 0x0L, 0x0L);
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa1_1(0x200000000000000L, 0x2L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x800000000000000L, 0x8L, 0x0L);
       case 80:
       case 112:
          return jjMoveStringLiteralDfa1_1(0x1000000L, 0x0L, 0x0L);
       case 82:
       case 114:
-         return jjMoveStringLiteralDfa1_1(0x1000800028000000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x4000800028000000L, 0x0L, 0x0L);
       case 83:
       case 115:
-         return jjMoveStringLiteralDfa1_1(0x103000080000000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x403000080000000L, 0x0L, 0x0L);
       case 84:
       case 116:
          return jjMoveStringLiteralDfa1_1(0xc000000000000L, 0x0L, 0x0L);
@@ -591,14 +591,14 @@ static private final int jjMoveStringLiteralDfa0_1()
       case 119:
          return jjMoveStringLiteralDfa1_1(0x10000000000000L, 0x0L, 0x0L);
       case 123:
-         return jjStopAtPos(0, 83);
+         return jjStopAtPos(0, 85);
       case 124:
-         jjmatchedKind = 111;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x400004000000000L, 0x0L);
+         jjmatchedKind = 114;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x2000020000000000L, 0x0L);
       case 125:
-         return jjStopAtPos(0, 84);
+         return jjStopAtPos(0, 86);
       case 126:
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x4L);
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x20L);
       default :
          return jjMoveNfa_1(3, 0);
    }
@@ -613,20 +613,20 @@ static private final int jjMoveStringLiteralDfa1_1(long active0, long active1, l
    switch(curChar)
    {
       case 38:
-         if ((active1 & 0x8000000000L) != 0L)
-            return jjStopAtPos(1, 103);
+         if ((active1 & 0x40000000000L) != 0L)
+            return jjStopAtPos(1, 106);
          break;
       case 42:
          if ((active0 & 0x800L) != 0L)
             return jjStartNfaWithStates_1(1, 11, 0);
          break;
       case 43:
-         if ((active1 & 0x10000000000L) != 0L)
-            return jjStopAtPos(1, 104);
+         if ((active1 & 0x80000000000L) != 0L)
+            return jjStopAtPos(1, 107);
          break;
       case 45:
-         if ((active1 & 0x20000000000L) != 0L)
-            return jjStopAtPos(1, 105);
+         if ((active1 & 0x100000000000L) != 0L)
+            return jjStopAtPos(1, 108);
          break;
       case 47:
          if ((active0 & 0x200L) != 0L)
@@ -637,33 +637,27 @@ static private final int jjMoveStringLiteralDfa1_1(long active0, long active1, l
             return jjStopAtPos(1, 33);
          break;
       case 60:
-         if ((active1 & 0x4000000000000L) != 0L)
+         if ((active1 & 0x20000000000000L) != 0L)
          {
-            jjmatchedKind = 114;
+            jjmatchedKind = 117;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x4000000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0L, active2, 0x2L);
       case 61:
-         if ((active1 & 0x400000000L) != 0L)
+         if ((active1 & 0x1000000000L) != 0L)
          {
-            jjmatchedKind = 98;
+            jjmatchedKind = 100;
             jjmatchedPos = 1;
          }
-         else if ((active1 & 0x800000000L) != 0L)
-            return jjStopAtPos(1, 99);
-         else if ((active1 & 0x1000000000L) != 0L)
-            return jjStopAtPos(1, 100);
          else if ((active1 & 0x2000000000L) != 0L)
+            return jjStopAtPos(1, 101);
+         else if ((active1 & 0x4000000000L) != 0L)
+            return jjStopAtPos(1, 102);
+         else if ((active1 & 0x8000000000L) != 0L)
          {
-            jjmatchedKind = 101;
+            jjmatchedKind = 103;
             jjmatchedPos = 1;
          }
-         else if ((active1 & 0x20000000000000L) != 0L)
-            return jjStopAtPos(1, 117);
-         else if ((active1 & 0x40000000000000L) != 0L)
-            return jjStopAtPos(1, 118);
-         else if ((active1 & 0x80000000000000L) != 0L)
-            return jjStopAtPos(1, 119);
          else if ((active1 & 0x100000000000000L) != 0L)
             return jjStopAtPos(1, 120);
          else if ((active1 & 0x200000000000000L) != 0L)
@@ -676,9 +670,15 @@ static private final int jjMoveStringLiteralDfa1_1(long active0, long active1, l
             return jjStopAtPos(1, 124);
          else if ((active1 & 0x2000000000000000L) != 0L)
             return jjStopAtPos(1, 125);
-         else if ((active2 & 0x4L) != 0L)
-            return jjStopAtPos(1, 130);
-         return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0L, active2, 0x3L);
+         else if ((active1 & 0x4000000000000000L) != 0L)
+            return jjStopAtPos(1, 126);
+         else if ((active1 & 0x8000000000000000L) != 0L)
+            return jjStopAtPos(1, 127);
+         else if ((active2 & 0x1L) != 0L)
+            return jjStopAtPos(1, 128);
+         else if ((active2 & 0x20L) != 0L)
+            return jjStopAtPos(1, 133);
+         return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0L, active2, 0x18L);
       case 62:
          if ((active0 & 0x4L) != 0L)
             return jjStopAtPos(1, 2);
@@ -686,24 +686,26 @@ static private final int jjMoveStringLiteralDfa1_1(long active0, long active1, l
             return jjStopAtPos(1, 32);
          else if ((active0 & 0x400000000L) != 0L)
             return jjStopAtPos(1, 34);
-         else if ((active1 & 0x8000000000000L) != 0L)
+         else if ((active1 & 0x10000000000L) != 0L)
+            return jjStopAtPos(1, 104);
+         else if ((active1 & 0x40000000000000L) != 0L)
          {
-            jjmatchedKind = 115;
+            jjmatchedKind = 118;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x8010000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x80000000000000L, active2, 0x4L);
       case 65:
       case 97:
          return jjMoveStringLiteralDfa2_1(active0, 0x41000080000L, active1, 0L, active2, 0L);
       case 66:
       case 98:
-         return jjMoveStringLiteralDfa2_1(active0, 0x200000000000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0x800000000000000L, active1, 0L, active2, 0L);
       case 67:
       case 99:
          return jjMoveStringLiteralDfa2_1(active0, 0x2000000L, active1, 0L, active2, 0L);
       case 69:
       case 101:
-         return jjMoveStringLiteralDfa2_1(active0, 0x1000a08028000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0x4000a08028000000L, active1, 0L, active2, 0L);
       case 70:
       case 102:
          if ((active0 & 0x100000L) != 0L)
@@ -714,10 +716,10 @@ static private final int jjMoveStringLiteralDfa1_1(long active0, long active1, l
          return jjMoveStringLiteralDfa2_1(active0, 0x14000000000000L, active1, 0L, active2, 0L);
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa2_1(active0, 0x4000000040620000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0x40620000L, active1, 0x1L, active2, 0L);
       case 78:
       case 110:
-         return jjMoveStringLiteralDfa2_1(active0, 0x8020000014000000L, active1, 0x5L, active2, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0xe0000014000000L, active1, 0x16L, active2, 0L);
       case 79:
       case 111:
          if ((active0 & 0x10000000000L) != 0L)
@@ -725,20 +727,20 @@ static private final int jjMoveStringLiteralDfa1_1(long active0, long active1, l
             jjmatchedKind = 40;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_1(active0, 0x2c40186000000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0xb100186000000000L, active1, 0L, active2, 0L);
       case 82:
       case 114:
-         if ((active1 & 0x2L) != 0L)
-            return jjStartNfaWithStates_1(1, 65, 14);
+         if ((active1 & 0x8L) != 0L)
+            return jjStartNfaWithStates_1(1, 67, 14);
          return jjMoveStringLiteralDfa2_1(active0, 0x8000801800000L, active1, 0L, active2, 0L);
       case 83:
       case 115:
-         if ((active0 & 0x80000000000000L) != 0L)
-            return jjStartNfaWithStates_1(1, 55, 14);
+         if ((active0 & 0x200000000000000L) != 0L)
+            return jjStartNfaWithStates_1(1, 57, 14);
          break;
       case 84:
       case 116:
-         return jjMoveStringLiteralDfa2_1(active0, 0x100000080000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0x400000080000000L, active1, 0L, active2, 0L);
       case 85:
       case 117:
          return jjMoveStringLiteralDfa2_1(active0, 0x1400000040000L, active1, 0L, active2, 0L);
@@ -749,8 +751,8 @@ static private final int jjMoveStringLiteralDfa1_1(long active0, long active1, l
       case 120:
          return jjMoveStringLiteralDfa2_1(active0, 0x20000000000L, active1, 0L, active2, 0L);
       case 124:
-         if ((active1 & 0x4000000000L) != 0L)
-            return jjStopAtPos(1, 102);
+         if ((active1 & 0x20000000000L) != 0L)
+            return jjStopAtPos(1, 105);
          break;
       default :
          break;
@@ -769,30 +771,30 @@ static private final int jjMoveStringLiteralDfa2_1(long old0, long active0, long
    switch(curChar)
    {
       case 61:
-         if ((active1 & 0x4000000000000000L) != 0L)
-            return jjStopAtPos(2, 126);
-         else if ((active1 & 0x8000000000000000L) != 0L)
-            return jjStopAtPos(2, 127);
-         else if ((active2 & 0x1L) != 0L)
-            return jjStopAtPos(2, 128);
-         else if ((active2 & 0x2L) != 0L)
+         if ((active2 & 0x2L) != 0L)
             return jjStopAtPos(2, 129);
+         else if ((active2 & 0x4L) != 0L)
+            return jjStopAtPos(2, 130);
+         else if ((active2 & 0x8L) != 0L)
+            return jjStopAtPos(2, 131);
+         else if ((active2 & 0x10L) != 0L)
+            return jjStopAtPos(2, 132);
          break;
       case 62:
-         if ((active1 & 0x10000000000000L) != 0L)
-            return jjStopAtPos(2, 116);
+         if ((active1 & 0x80000000000000L) != 0L)
+            return jjStopAtPos(2, 119);
          break;
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa3_1(active0, 0x1000000080020000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x4000000080020000L, active1, 0L, active2, 0L);
       case 67:
       case 99:
          return jjMoveStringLiteralDfa3_1(active0, 0x14000000L, active1, 0L, active2, 0L);
       case 68:
       case 100:
-         if ((active1 & 0x4L) != 0L)
-            return jjStartNfaWithStates_1(2, 66, 14);
-         return jjMoveStringLiteralDfa3_1(active0, 0x20000000000000L, active1, 0L, active2, 0L);
+         if ((active1 & 0x10L) != 0L)
+            return jjStartNfaWithStates_1(2, 68, 14);
+         return jjMoveStringLiteralDfa3_1(active0, 0xe0000000000000L, active1, 0L, active2, 0L);
       case 69:
       case 101:
          return jjMoveStringLiteralDfa3_1(active0, 0x800000000L, active1, 0L, active2, 0L);
@@ -807,7 +809,7 @@ static private final int jjMoveStringLiteralDfa2_1(long old0, long active0, long
          return jjMoveStringLiteralDfa3_1(active0, 0x16000001000000L, active1, 0L, active2, 0L);
       case 74:
       case 106:
-         return jjMoveStringLiteralDfa3_1(active0, 0x200000000000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x800000000000000L, active1, 0L, active2, 0L);
       case 76:
       case 108:
          return jjMoveStringLiteralDfa3_1(active0, 0x440000000000L, active1, 0L, active2, 0L);
@@ -816,7 +818,7 @@ static private final int jjMoveStringLiteralDfa2_1(long old0, long active0, long
          return jjMoveStringLiteralDfa3_1(active0, 0x6000040000L, active1, 0L, active2, 0L);
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa3_1(active0, 0x4c00000040000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x3000000040000000L, active1, 0x1L, active2, 0L);
       case 80:
       case 112:
          return jjMoveStringLiteralDfa3_1(active0, 0x1000000000000L, active1, 0L, active2, 0L);
@@ -832,21 +834,21 @@ static private final int jjMoveStringLiteralDfa2_1(long old0, long active0, long
             jjmatchedKind = 43;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_1(active0, 0x140000000800000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x500000000800000L, active1, 0L, active2, 0L);
       case 83:
       case 115:
          return jjMoveStringLiteralDfa3_1(active0, 0x1000600000L, active1, 0L, active2, 0L);
       case 84:
       case 116:
-         if ((active0 & 0x8000000000000000L) != 0L)
+         if ((active1 & 0x2L) != 0L)
          {
-            jjmatchedKind = 63;
+            jjmatchedKind = 65;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_1(active0, 0x920000000000L, active1, 0x1L, active2, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x920000000000L, active1, 0x4L, active2, 0L);
       case 85:
       case 117:
-         return jjMoveStringLiteralDfa3_1(active0, 0x2008000000000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x8008000000000000L, active1, 0L, active2, 0L);
       case 87:
       case 119:
          if ((active0 & 0x200000000000L) != 0L)
@@ -870,10 +872,10 @@ static private final int jjMoveStringLiteralDfa3_1(long old0, long active0, long
    {
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa4_1(active0, 0x4000008800800000L, active1, 0L);
+         return jjMoveStringLiteralDfa4_1(active0, 0x8800800000L, active1, 0x1L);
       case 66:
       case 98:
-         return jjMoveStringLiteralDfa4_1(active0, 0x2000000040000000L, active1, 0L);
+         return jjMoveStringLiteralDfa4_1(active0, 0x8000000040000000L, active1, 0L);
       case 67:
       case 99:
          return jjMoveStringLiteralDfa4_1(active0, 0x40000L, active1, 0L);
@@ -888,22 +890,25 @@ static private final int jjMoveStringLiteralDfa3_1(long old0, long active0, long
             return jjStartNfaWithStates_1(3, 36, 14);
          else if ((active0 & 0x8000000000000L) != 0L)
             return jjStartNfaWithStates_1(3, 51, 14);
-         return jjMoveStringLiteralDfa4_1(active0, 0x241020000200000L, active1, 0x1L);
+         return jjMoveStringLiteralDfa4_1(active0, 0x901020000200000L, active1, 0x4L);
+      case 70:
+      case 102:
+         return jjMoveStringLiteralDfa4_1(active0, 0x80000000000000L, active1, 0L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa4_1(active0, 0x100000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa4_1(active0, 0x440000000000000L, active1, 0L);
       case 76:
       case 108:
          if ((active0 & 0x400000000000L) != 0L)
             return jjStartNfaWithStates_1(3, 46, 14);
-         else if ((active0 & 0x400000000000000L) != 0L)
+         else if ((active0 & 0x1000000000000000L) != 0L)
          {
-            jjmatchedKind = 58;
+            jjmatchedKind = 60;
             jjmatchedPos = 3;
          }
-         else if ((active0 & 0x1000000000000000L) != 0L)
-            return jjStartNfaWithStates_1(3, 60, 14);
-         return jjMoveStringLiteralDfa4_1(active0, 0x810000014000000L, active1, 0L);
+         else if ((active0 & 0x4000000000000000L) != 0L)
+            return jjStartNfaWithStates_1(3, 62, 14);
+         return jjMoveStringLiteralDfa4_1(active0, 0x2010000014000000L, active1, 0L);
       case 78:
       case 110:
          return jjMoveStringLiteralDfa4_1(active0, 0x1000000L, active1, 0L);
@@ -946,20 +951,25 @@ static private final int jjMoveStringLiteralDfa4_1(long old0, long active0, long
    {
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa5_1(active0, 0x40000040000000L, active1, 0L);
+         return jjMoveStringLiteralDfa5_1(active0, 0x100000040000000L, active1, 0L);
       case 67:
       case 99:
-         return jjMoveStringLiteralDfa5_1(active0, 0x202000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa5_1(active0, 0x802000000000000L, active1, 0L);
       case 69:
       case 101:
          if ((active0 & 0x40000000000L) != 0L)
             return jjStartNfaWithStates_1(4, 42, 14);
          else if ((active0 & 0x10000000000000L) != 0L)
             return jjStartNfaWithStates_1(4, 52, 14);
-         return jjMoveStringLiteralDfa5_1(active0, 0x800000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa5_1(active0, 0x2000000000000000L, active1, 0L);
+      case 70:
+      case 102:
+         if ((active0 & 0x40000000000000L) != 0L)
+            return jjStartNfaWithStates_1(4, 54, 14);
+         break;
       case 71:
       case 103:
-         return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x1L);
+         return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x4L);
       case 72:
       case 104:
          return jjMoveStringLiteralDfa5_1(active0, 0x20000000000000L, active1, 0L);
@@ -973,10 +983,13 @@ static private final int jjMoveStringLiteralDfa4_1(long old0, long active0, long
          break;
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa5_1(active0, 0x2000000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa5_1(active0, 0x8000000000000000L, active1, 0L);
       case 78:
       case 110:
-         return jjMoveStringLiteralDfa5_1(active0, 0x100020000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa5_1(active0, 0x400020000000000L, active1, 0L);
+      case 79:
+      case 111:
+         return jjMoveStringLiteralDfa5_1(active0, 0x80000000000000L, active1, 0L);
       case 82:
       case 114:
          if ((active0 & 0x1000000000000L) != 0L)
@@ -993,8 +1006,8 @@ static private final int jjMoveStringLiteralDfa4_1(long old0, long active0, long
             return jjStartNfaWithStates_1(4, 24, 14);
          else if ((active0 & 0x2000000000L) != 0L)
             return jjStartNfaWithStates_1(4, 37, 14);
-         else if ((active0 & 0x4000000000000000L) != 0L)
-            return jjStartNfaWithStates_1(4, 62, 14);
+         else if ((active1 & 0x1L) != 0L)
+            return jjStartNfaWithStates_1(4, 64, 14);
          return jjMoveStringLiteralDfa5_1(active0, 0x40000L, active1, 0L);
       case 85:
       case 117:
@@ -1022,20 +1035,20 @@ static private final int jjMoveStringLiteralDfa5_1(long old0, long active0, long
    {
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa6_1(active0, 0x800000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa6_1(active0, 0x2000000000000000L, active1, 0L);
       case 67:
       case 99:
          if ((active0 & 0x80000000L) != 0L)
             return jjStartNfaWithStates_1(5, 31, 14);
-         return jjMoveStringLiteralDfa6_1(active0, 0x40000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa6_1(active0, 0x100000000000000L, active1, 0L);
       case 68:
       case 100:
          return jjMoveStringLiteralDfa6_1(active0, 0x20014000000L, active1, 0L);
       case 69:
       case 101:
-         if ((active0 & 0x2000000000000000L) != 0L)
-            return jjStartNfaWithStates_1(5, 61, 14);
-         return jjMoveStringLiteralDfa6_1(active0, 0L, active1, 0x1L);
+         if ((active0 & 0x8000000000000000L) != 0L)
+            return jjStartNfaWithStates_1(5, 63, 14);
+         return jjMoveStringLiteralDfa6_1(active0, 0L, active1, 0x4L);
       case 70:
       case 102:
          if ((active0 & 0x200000L) != 0L)
@@ -1043,8 +1056,8 @@ static private final int jjMoveStringLiteralDfa5_1(long old0, long active0, long
          break;
       case 71:
       case 103:
-         if ((active0 & 0x100000000000000L) != 0L)
-            return jjStartNfaWithStates_1(5, 56, 14);
+         if ((active0 & 0x400000000000000L) != 0L)
+            return jjStartNfaWithStates_1(5, 58, 14);
          break;
       case 72:
       case 104:
@@ -1066,11 +1079,13 @@ static private final int jjMoveStringLiteralDfa5_1(long old0, long active0, long
          return jjMoveStringLiteralDfa6_1(active0, 0x4000000000L, active1, 0L);
       case 82:
       case 114:
+         if ((active0 & 0x80000000000000L) != 0L)
+            return jjStartNfaWithStates_1(5, 55, 14);
          return jjMoveStringLiteralDfa6_1(active0, 0x28000000L, active1, 0L);
       case 84:
       case 116:
-         if ((active0 & 0x200000000000000L) != 0L)
-            return jjStartNfaWithStates_1(5, 57, 14);
+         if ((active0 & 0x800000000000000L) != 0L)
+            return jjStartNfaWithStates_1(5, 59, 14);
          break;
       default :
          break;
@@ -1103,24 +1118,24 @@ static private final int jjMoveStringLiteralDfa6_1(long old0, long active0, long
          return jjMoveStringLiteralDfa7_1(active0, 0x30000000L, active1, 0L);
       case 72:
       case 104:
-         if ((active0 & 0x40000000000000L) != 0L)
-            return jjStartNfaWithStates_1(6, 54, 14);
+         if ((active0 & 0x100000000000000L) != 0L)
+            return jjStartNfaWithStates_1(6, 56, 14);
          break;
       case 76:
       case 108:
          return jjMoveStringLiteralDfa7_1(active0, 0x20000000000000L, active1, 0L);
       case 78:
       case 110:
-         if ((active0 & 0x800000000000000L) != 0L)
-            return jjStartNfaWithStates_1(6, 59, 14);
+         if ((active0 & 0x2000000000000000L) != 0L)
+            return jjStartNfaWithStates_1(6, 61, 14);
          break;
       case 79:
       case 111:
          return jjMoveStringLiteralDfa7_1(active0, 0x40000L, active1, 0L);
       case 82:
       case 114:
-         if ((active1 & 0x1L) != 0L)
-            return jjStartNfaWithStates_1(6, 64, 14);
+         if ((active1 & 0x4L) != 0L)
+            return jjStartNfaWithStates_1(6, 66, 14);
          break;
       case 83:
       case 115:
@@ -1287,14 +1302,14 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                      jjstateSet[jjnewStateCnt++] = 2;
                   if ((0x3fe000000000000L & l) != 0L)
                   {
-                     if (kind > 67)
-                        kind = 67;
+                     if (kind > 69)
+                        kind = 69;
                      jjCheckNAddTwoStates(5, 6);
                   }
                   else if (curChar == 48)
                   {
-                     if (kind > 67)
-                        kind = 67;
+                     if (kind > 69)
+                        kind = 69;
                      jjCheckNAddStates(21, 23);
                   }
                   break;
@@ -1313,15 +1328,15 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 4:
                   if ((0x3fe000000000000L & l) == 0L)
                      break;
-                  if (kind > 67)
-                     kind = 67;
+                  if (kind > 69)
+                     kind = 69;
                   jjCheckNAddTwoStates(5, 6);
                   break;
                case 5:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 67)
-                     kind = 67;
+                  if (kind > 69)
+                     kind = 69;
                   jjCheckNAddTwoStates(5, 6);
                   break;
                case 7:
@@ -1331,8 +1346,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 8:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 71)
-                     kind = 71;
+                  if (kind > 73)
+                     kind = 73;
                   jjCheckNAddStates(24, 26);
                   break;
                case 10:
@@ -1342,15 +1357,15 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 11:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 71)
-                     kind = 71;
+                  if (kind > 73)
+                     kind = 73;
                   jjCheckNAddTwoStates(11, 12);
                   break;
                case 14:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 77)
-                     kind = 77;
+                  if (kind > 79)
+                     kind = 79;
                   jjstateSet[jjnewStateCnt++] = 14;
                   break;
                case 15:
@@ -1360,8 +1375,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 17:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 131)
-                     kind = 131;
+                  if (kind > 134)
+                     kind = 134;
                   jjstateSet[jjnewStateCnt++] = 17;
                   break;
                case 18:
@@ -1375,15 +1390,15 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 20:
                   if (curChar != 46)
                      break;
-                  if (kind > 71)
-                     kind = 71;
+                  if (kind > 73)
+                     kind = 73;
                   jjCheckNAddStates(27, 29);
                   break;
                case 21:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 71)
-                     kind = 71;
+                  if (kind > 73)
+                     kind = 73;
                   jjCheckNAddStates(27, 29);
                   break;
                case 23:
@@ -1393,8 +1408,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 24:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 71)
-                     kind = 71;
+                  if (kind > 73)
+                     kind = 73;
                   jjCheckNAddTwoStates(24, 12);
                   break;
                case 25:
@@ -1408,8 +1423,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 28:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 71)
-                     kind = 71;
+                  if (kind > 73)
+                     kind = 73;
                   jjCheckNAddTwoStates(28, 12);
                   break;
                case 29:
@@ -1427,22 +1442,22 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 33:
                   if (curChar != 48)
                      break;
-                  if (kind > 67)
-                     kind = 67;
+                  if (kind > 69)
+                     kind = 69;
                   jjCheckNAddStates(21, 23);
                   break;
                case 35:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 67)
-                     kind = 67;
+                  if (kind > 69)
+                     kind = 69;
                   jjCheckNAddTwoStates(35, 6);
                   break;
                case 36:
                   if ((0xff000000000000L & l) == 0L)
                      break;
-                  if (kind > 67)
-                     kind = 67;
+                  if (kind > 69)
+                     kind = 69;
                   jjCheckNAddTwoStates(36, 6);
                   break;
                case 37:
@@ -1458,8 +1473,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                      jjCheckNAddStates(33, 35);
                   break;
                case 41:
-                  if (curChar == 34 && kind > 73)
-                     kind = 73;
+                  if (curChar == 34 && kind > 75)
+                     kind = 75;
                   break;
                case 42:
                   if ((0xfffffffbffffffffL & l) != 0L)
@@ -1470,8 +1485,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                      jjCheckNAddStates(36, 38);
                   break;
                case 45:
-                  if (curChar == 34 && kind > 74)
-                     kind = 74;
+                  if (curChar == 34 && kind > 76)
+                     kind = 76;
                   break;
                case 46:
                   if (curChar == 39)
@@ -1486,8 +1501,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                      jjCheckNAddStates(39, 41);
                   break;
                case 50:
-                  if (curChar == 39 && kind > 73)
-                     kind = 73;
+                  if (curChar == 39 && kind > 75)
+                     kind = 75;
                   break;
                case 51:
                   if ((0xffffff7fffffffffL & l) != 0L)
@@ -1498,8 +1513,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                      jjCheckNAddStates(42, 44);
                   break;
                case 54:
-                  if (curChar == 39 && kind > 75)
-                     kind = 75;
+                  if (curChar == 39 && kind > 77)
+                     kind = 77;
                   break;
                case 56:
                   jjAddStates(45, 47);
@@ -1521,8 +1536,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 3:
                   if ((0x87fffffe87fffffeL & l) != 0L)
                   {
-                     if (kind > 77)
-                        kind = 77;
+                     if (kind > 79)
+                        kind = 79;
                      jjCheckNAdd(14);
                   }
                   else if (curChar == 96)
@@ -1533,31 +1548,31 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                      kind = 10;
                   break;
                case 6:
-                  if ((0x100000001000L & l) != 0L && kind > 67)
-                     kind = 67;
+                  if ((0x100000001000L & l) != 0L && kind > 69)
+                     kind = 69;
                   break;
                case 9:
                   if ((0x2000000020L & l) != 0L)
                      jjAddStates(57, 58);
                   break;
                case 12:
-                  if ((0x5000000050L & l) != 0L && kind > 71)
-                     kind = 71;
+                  if ((0x5000000050L & l) != 0L && kind > 73)
+                     kind = 73;
                   break;
                case 13:
                case 14:
                   if ((0x87fffffe87fffffeL & l) == 0L)
                      break;
-                  if (kind > 77)
-                     kind = 77;
+                  if (kind > 79)
+                     kind = 79;
                   jjCheckNAdd(14);
                   break;
                case 16:
                case 17:
                   if ((0x87fffffe87fffffeL & l) == 0L)
                      break;
-                  if (kind > 131)
-                     kind = 131;
+                  if (kind > 134)
+                     kind = 134;
                   jjCheckNAdd(17);
                   break;
                case 22:
@@ -1579,8 +1594,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 35:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 67)
-                     kind = 67;
+                  if (kind > 69)
+                     kind = 69;
                   jjCheckNAddTwoStates(35, 6);
                   break;
                case 38:
@@ -1628,8 +1643,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                      jjstateSet[jjnewStateCnt++] = 57;
                   break;
                case 59:
-                  if (curChar == 96 && kind > 73)
-                     kind = 73;
+                  if (curChar == 96 && kind > 75)
+                     kind = 75;
                   break;
                case 60:
                   if ((0xfffffffeffffffffL & l) != 0L)
@@ -1644,8 +1659,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                      jjstateSet[jjnewStateCnt++] = 61;
                   break;
                case 63:
-                  if (curChar == 96 && kind > 76)
-                     kind = 76;
+                  if (curChar == 96 && kind > 78)
+                     kind = 78;
                   break;
                default : break;
             }
@@ -1663,8 +1678,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 14:
                   if ((jjbitVec0[i2] & l2) == 0L)
                      break;
-                  if (kind > 77)
-                     kind = 77;
+                  if (kind > 79)
+                     kind = 79;
                   jjCheckNAdd(14);
                   break;
                case 1:
@@ -1675,8 +1690,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 17:
                   if ((jjbitVec0[i2] & l2) == 0L)
                      break;
-                  if (kind > 131)
-                     kind = 131;
+                  if (kind > 134)
+                     kind = 134;
                   jjCheckNAdd(17);
                   break;
                case 38:
@@ -1761,12 +1776,12 @@ null, null, null, null, null, "\55\76", "\72\72", "\75\76", null, null, null, nu
 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", "\100", "\44", 
-"\75", "\76", "\74", "\41", "\77", "\72", "\75\75", "\74\75", "\76\75", "\41\75", 
-"\174\174", "\46\46", "\53\53", "\55\55", "\53", "\55", "\52", "\57", "\46", "\174", 
-"\136", "\45", "\74\74", "\76\76", "\76\76\76", "\53\75", "\55\75", "\52\75", 
-"\57\75", "\46\75", "\174\75", "\136\75", "\56\75", "\45\75", "\74\74\75", "\76\76\75", 
-"\41\75\75", "\75\75\75", "\176\75", null, "\77\76", };
+null, null, "\50", "\51", "\173", "\175", "\133", "\135", "\73", "\54", "\56", 
+"\100", "\44", "\75", "\76", "\74", "\41", "\77", "\72", "\75\75", "\74\75", "\76\75", 
+"\41\75", "\74\76", "\174\174", "\46\46", "\53\53", "\55\55", "\53", "\55", "\52", 
+"\57", "\46", "\174", "\136", "\45", "\74\74", "\76\76", "\76\76\76", "\53\75", 
+"\55\75", "\52\75", "\57\75", "\46\75", "\174\75", "\136\75", "\56\75", "\45\75", 
+"\74\74\75", "\76\76\75", "\41\75\75", "\75\75\75", "\176\75", null, "\77\76", };
 public static final String[] lexStateNames = {
    "DEFAULT", 
    "PHPPARSING", 
@@ -1780,10 +1795,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, 
 };
 static final long[] jjtoToken = {
-   0xfffffffffffe2007L, 0xfffffffffffe3e8fL, 0x1fL, 
+   0xfffffffffffe2007L, 0xfffffffffff8fa3fL, 0xffL, 
 };
 static final long[] jjtoSkip = {
    0xd1f8L, 0x0L, 0x0L,