fixed problem with TokenNameDOLLAR_LBRACE token in outlineinfo
[phpeclipse.git] / net.sourceforge.phpeclipse / src / test / PHPParserTokenManager.java
index e6ffa41..be6ded1 100644 (file)
@@ -6,17 +6,16 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.ui.texteditor.MarkerUtilities;
 import org.eclipse.jface.preference.IPreferenceStore;
 import java.util.Hashtable;
+import java.util.Enumeration;
+import java.util.ArrayList;
 import java.io.StringReader;
 import java.io.*;
 import java.text.MessageFormat;
 import net.sourceforge.phpeclipse.actions.PHPStartApacheAction;
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
+import net.sourceforge.phpdt.internal.compiler.ast.*;
+import net.sourceforge.phpdt.internal.compiler.parser.OutlineableWithChildren;
 import net.sourceforge.phpdt.internal.compiler.parser.PHPOutlineInfo;
-import net.sourceforge.phpdt.internal.compiler.parser.PHPSegmentWithChildren;
-import net.sourceforge.phpdt.internal.compiler.parser.PHPFunctionDeclaration;
-import net.sourceforge.phpdt.internal.compiler.parser.PHPClassDeclaration;
-import net.sourceforge.phpdt.internal.compiler.parser.PHPVarDeclaration;
-import net.sourceforge.phpdt.internal.compiler.parser.PHPReqIncDeclaration;
 
 public class PHPParserTokenManager implements PHPParserConstants
 {
@@ -302,87 +301,87 @@ private static final int jjStopStringLiteralDfa_1(int pos, long active0, long ac
    switch (pos)
    {
       case 0:
-         if ((active0 & 0x4800L) != 0L || (active1 & 0x200000000000L) != 0L || (active2 & 0x1L) != 0L)
+         if ((active0 & 0x4800L) != 0L || (active1 & 0x200000L) != 0L || (active2 & 0x8L) != 0L)
             return 2;
-         if ((active1 & 0x20000000000000L) != 0L)
+         if ((active1 & 0x200L) != 0L)
             return 16;
-         if ((active1 & 0x2000080000000L) != 0L)
+         if ((active1 & 0x20000000000000L) != 0L || (active2 & 0x80L) != 0L)
             return 8;
-         if ((active0 & 0xffffff8ffff00000L) != 0L || (active1 & 0x1ffL) != 0L)
+         if ((active0 & 0xffffff1ffff00000L) != 0L || (active1 & 0x600000ffL) != 0L)
          {
-            jjmatchedKind = 83;
+            jjmatchedKind = 105;
             return 14;
          }
          return -1;
       case 1:
-         if ((active0 & 0xdfffef8fff700000L) != 0L || (active1 & 0x177L) != 0L)
+         if ((active0 & 0x4000L) != 0L)
+            return 0;
+         if ((active0 & 0xbfffef1fff700000L) != 0L || (active1 & 0x400000efL) != 0L)
          {
             if (jjmatchedPos != 1)
             {
-               jjmatchedKind = 83;
+               jjmatchedKind = 105;
                jjmatchedPos = 1;
             }
             return 14;
          }
-         if ((active0 & 0x4000L) != 0L)
-            return 0;
-         if ((active0 & 0x2000100000800000L) != 0L || (active1 & 0x88L) != 0L)
+         if ((active0 & 0x4000100000800000L) != 0L || (active1 & 0x20000010L) != 0L)
             return 14;
          return -1;
       case 2:
-         if ((active0 & 0x1001400000400000L) != 0L || (active1 & 0x160L) != 0L)
+         if ((active0 & 0x2001400000400000L) != 0L || (active1 & 0x400000c0L) != 0L)
             return 14;
-         if ((active0 & 0xcffeaf8fff300000L) != 0L || (active1 & 0x1fL) != 0L)
+         if ((active0 & 0x9ffeaf1fff300000L) != 0L || (active1 & 0x3fL) != 0L)
          {
             if (jjmatchedPos != 2)
             {
-               jjmatchedKind = 83;
+               jjmatchedKind = 105;
                jjmatchedPos = 2;
             }
             return 14;
          }
          return -1;
       case 3:
-         if ((active0 & 0x62818023000000L) != 0L || (active1 & 0x7L) != 0L)
+         if ((active0 & 0x62810053000000L) != 0L || (active1 & 0xeL) != 0L)
             return 14;
-         if ((active0 & 0xdf9c2e0fdc300000L) != 0L || (active1 & 0x58L) != 0L)
+         if ((active0 & 0xbf9c2e1fac300000L) != 0L || (active1 & 0xb1L) != 0L)
          {
             if (jjmatchedPos != 3)
             {
-               jjmatchedKind = 83;
+               jjmatchedKind = 105;
                jjmatchedPos = 3;
             }
             return 14;
          }
          return -1;
       case 4:
-         if ((active0 & 0xda142c0fc1200000L) != 0L || (active1 & 0x4aL) != 0L)
+         if ((active0 & 0x98802002c100000L) != 0L || (active1 & 0x20L) != 0L)
+            return 14;
+         if ((active0 & 0xb6142c1f81200000L) != 0L || (active1 & 0x95L) != 0L)
          {
-            jjmatchedKind = 83;
+            jjmatchedKind = 105;
             jjmatchedPos = 4;
             return 14;
          }
-         if ((active0 & 0x58802001c100000L) != 0L || (active1 & 0x10L) != 0L)
-            return 14;
          return -1;
       case 5:
-         if ((active0 & 0xc814000c01000000L) != 0L || (active1 & 0x8L) != 0L)
+         if ((active0 & 0x9014001801000000L) != 0L || (active1 & 0x11L) != 0L)
             return 14;
-         if ((active0 & 0x12002c03c0200000L) != 0L || (active1 & 0x42L) != 0L)
+         if ((active0 & 0x26002c0780200000L) != 0L || (active1 & 0x84L) != 0L)
          {
-            jjmatchedKind = 83;
+            jjmatchedKind = 105;
             jjmatchedPos = 5;
             return 14;
          }
          return -1;
       case 6:
-         if ((active0 & 0x10002803c0000000L) != 0L || (active1 & 0x42L) != 0L)
+         if ((active0 & 0x2000280780000000L) != 0L || (active1 & 0x84L) != 0L)
             return 14;
-         if ((active0 & 0x200040000200000L) != 0L)
+         if ((active0 & 0x600040000200000L) != 0L)
          {
             if (jjmatchedPos != 6)
             {
-               jjmatchedKind = 83;
+               jjmatchedKind = 105;
                jjmatchedPos = 6;
             }
             return 14;
@@ -391,33 +390,35 @@ private static final int jjStopStringLiteralDfa_1(int pos, long active0, long ac
       case 7:
          if ((active0 & 0x200040000200000L) != 0L)
             return 14;
-         if ((active0 & 0x300000000L) != 0L)
+         if ((active0 & 0x400000600000000L) != 0L)
          {
-            jjmatchedKind = 83;
+            jjmatchedKind = 105;
             jjmatchedPos = 7;
             return 14;
          }
          return -1;
       case 8:
-         if ((active0 & 0x300000000L) != 0L)
+         if ((active0 & 0x400000000000000L) != 0L)
+            return 14;
+         if ((active0 & 0x600000000L) != 0L)
          {
-            jjmatchedKind = 83;
+            jjmatchedKind = 105;
             jjmatchedPos = 8;
             return 14;
          }
          return -1;
       case 9:
-         if ((active0 & 0x300000000L) != 0L)
+         if ((active0 & 0x600000000L) != 0L)
          {
-            jjmatchedKind = 83;
+            jjmatchedKind = 105;
             jjmatchedPos = 9;
             return 14;
          }
          return -1;
       case 10:
-         if ((active0 & 0x300000000L) != 0L)
+         if ((active0 & 0x600000000L) != 0L)
          {
-            jjmatchedKind = 83;
+            jjmatchedKind = 105;
             jjmatchedPos = 10;
             return 14;
          }
@@ -443,107 +444,107 @@ static private final int jjMoveStringLiteralDfa0_1()
    switch(curChar)
    {
       case 33:
-         jjmatchedKind = 118;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0xa000000000L, 0x0L);
+         jjmatchedKind = 74;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x2800000000000000L, 0x0L);
       case 35:
          return jjStopAtPos(0, 12);
       case 36:
-         return jjStartNfaWithStates_1(0, 117, 16);
+         return jjStartNfaWithStates_1(0, 73, 16);
       case 37:
-         jjmatchedKind = 132;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x4000000000000L, 0x0L);
+         jjmatchedKind = 89;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x100L);
       case 38:
-         jjmatchedKind = 129;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x400400000000000L, 0x0L);
+         jjmatchedKind = 86;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x8000L, 0x10L);
       case 40:
-         return jjStopAtPos(0, 87);
+         return jjStopAtPos(0, 109);
       case 41:
-         return jjStopAtPos(0, 88);
+         return jjStopAtPos(0, 110);
       case 42:
-         jjmatchedKind = 127;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x100000000000L, 0x0L);
+         jjmatchedKind = 84;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x4L);
       case 43:
-         jjmatchedKind = 125;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x800040000000000L, 0x0L);
+         jjmatchedKind = 82;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x10000L, 0x1L);
       case 44:
-         return jjStopAtPos(0, 94);
+         return jjStopAtPos(0, 116);
       case 45:
-         jjmatchedKind = 126;
-         return jjMoveStringLiteralDfa1_1(0x1000000000L, 0x1000080000000000L, 0x0L);
+         jjmatchedKind = 83;
+         return jjMoveStringLiteralDfa1_1(0x2000000000L, 0x20000L, 0x2L);
       case 46:
-         jjmatchedKind = 95;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x2000000000000L, 0x0L);
+         jjmatchedKind = 117;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x80L);
       case 47:
-         jjmatchedKind = 128;
-         return jjMoveStringLiteralDfa1_1(0x4800L, 0x200000000000L, 0x0L);
+         jjmatchedKind = 85;
+         return jjMoveStringLiteralDfa1_1(0x4800L, 0x0L, 0x8L);
       case 58:
-         jjmatchedKind = 120;
-         return jjMoveStringLiteralDfa1_1(0x2000000000L, 0x0L, 0x0L);
+         jjmatchedKind = 77;
+         return jjMoveStringLiteralDfa1_1(0x4000000000L, 0x0L, 0x0L);
       case 59:
-         return jjStopAtPos(0, 93);
+         return jjStopAtPos(0, 115);
       case 60:
-         jjmatchedKind = 97;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x4800000000L, 0x120L);
+         jjmatchedKind = 119;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x1200000004000000L, 0x400L);
       case 61:
-         jjmatchedKind = 105;
-         return jjMoveStringLiteralDfa1_1(0x4000000000L, 0x10400000000L, 0x0L);
+         jjmatchedKind = 127;
+         return jjMoveStringLiteralDfa1_1(0x8000000000L, 0x4100000000000000L, 0x0L);
       case 62:
-         jjmatchedKind = 96;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x1000000000L, 0x2c0L);
+         jjmatchedKind = 118;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x400000018000000L, 0x800L);
       case 63:
-         jjmatchedKind = 119;
+         jjmatchedKind = 76;
          return jjMoveStringLiteralDfa1_1(0x10L, 0x0L, 0x0L);
       case 64:
-         return jjStopAtPos(0, 116);
+         return jjStopAtPos(0, 72);
       case 91:
-         return jjStopAtPos(0, 91);
+         return jjStopAtPos(0, 113);
       case 93:
-         return jjStopAtPos(0, 92);
+         return jjStopAtPos(0, 114);
       case 94:
-         jjmatchedKind = 131;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x1000000000000L, 0x0L);
+         jjmatchedKind = 88;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x40L);
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa1_1(0x2000000004000000L, 0x100L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x4000000004000000L, 0x40000000L, 0x0L);
       case 66:
       case 98:
-         return jjMoveStringLiteralDfa1_1(0x8000000L, 0x3L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x8000000L, 0x6L, 0x0L);
       case 67:
       case 99:
          return jjMoveStringLiteralDfa1_1(0x70000100000L, 0x0L, 0x0L);
       case 68:
       case 100:
-         return jjMoveStringLiteralDfa1_1(0x180000000000L, 0x8L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x180000000000L, 0x10L, 0x0L);
       case 69:
       case 101:
-         return jjMoveStringLiteralDfa1_1(0xe00200023000000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x1e00200043000000L, 0x0L, 0x0L);
       case 70:
       case 102:
-         return jjMoveStringLiteralDfa1_1(0x1080400000200000L, 0x10L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x2080400000200000L, 0x20L, 0x0L);
       case 71:
       case 103:
-         return jjMoveStringLiteralDfa1_1(0x800400000000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x800800000000L, 0x0L, 0x0L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa1_1(0x140800000L, 0x60L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x280800000L, 0xc0L, 0x0L);
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa1_1(0x8000000000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x10000000L, 0x0L, 0x0L);
       case 78:
       case 110:
          return jjMoveStringLiteralDfa1_1(0x3000000000000L, 0x0L, 0x0L);
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa1_1(0x8000000000000000L, 0x80L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x20000001L, 0x0L);
       case 80:
       case 112:
-         return jjMoveStringLiteralDfa1_1(0x10000000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x20000000L, 0x0L, 0x0L);
       case 82:
       case 114:
-         return jjMoveStringLiteralDfa1_1(0x4000280000000L, 0x4L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x4000500000000L, 0x8L, 0x0L);
       case 83:
       case 115:
-         return jjMoveStringLiteralDfa1_1(0x4018000800000000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x8018001000000000L, 0x0L, 0x0L);
       case 84:
       case 116:
          return jjMoveStringLiteralDfa1_1(0x60000000000000L, 0x0L, 0x0L);
@@ -554,14 +555,15 @@ static private final int jjMoveStringLiteralDfa0_1()
       case 119:
          return jjMoveStringLiteralDfa1_1(0x100000000000000L, 0x0L, 0x0L);
       case 123:
-         return jjStopAtPos(0, 89);
+         return jjStopAtPos(0, 111);
       case 124:
-         jjmatchedKind = 130;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x200800000000000L, 0x0L);
+         jjmatchedKind = 87;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x4000L, 0x20L);
       case 125:
-         return jjStopAtPos(0, 90);
+         return jjStopAtPos(0, 112);
       case 126:
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x8000000000000L, 0x0L);
+         jjmatchedKind = 75;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x200L);
       default :
          return jjMoveNfa_1(3, 0);
    }
@@ -576,99 +578,99 @@ static private final int jjMoveStringLiteralDfa1_1(long active0, long active1, l
    switch(curChar)
    {
       case 38:
-         if ((active1 & 0x400000000000000L) != 0L)
-            return jjStopAtPos(1, 122);
+         if ((active1 & 0x8000L) != 0L)
+            return jjStopAtPos(1, 79);
          break;
       case 42:
          if ((active0 & 0x4000L) != 0L)
             return jjStartNfaWithStates_1(1, 14, 0);
          break;
       case 43:
-         if ((active1 & 0x800000000000000L) != 0L)
-            return jjStopAtPos(1, 123);
+         if ((active1 & 0x10000L) != 0L)
+            return jjStopAtPos(1, 80);
          break;
       case 45:
-         if ((active1 & 0x1000000000000000L) != 0L)
-            return jjStopAtPos(1, 124);
+         if ((active1 & 0x20000L) != 0L)
+            return jjStopAtPos(1, 81);
          break;
       case 47:
          if ((active0 & 0x800L) != 0L)
             return jjStopAtPos(1, 11);
          break;
       case 58:
-         if ((active0 & 0x2000000000L) != 0L)
-            return jjStopAtPos(1, 37);
+         if ((active0 & 0x4000000000L) != 0L)
+            return jjStopAtPos(1, 38);
          break;
       case 60:
-         if ((active2 & 0x20L) != 0L)
+         if ((active1 & 0x4000000L) != 0L)
          {
-            jjmatchedKind = 133;
+            jjmatchedKind = 90;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0L, active2, 0x100L);
+         return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0L, active2, 0x400L);
       case 61:
-         if ((active1 & 0x400000000L) != 0L)
+         if ((active1 & 0x100000000000000L) != 0L)
          {
-            jjmatchedKind = 98;
+            jjmatchedKind = 120;
             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)
+         else if ((active1 & 0x200000000000000L) != 0L)
+            return jjStopAtPos(1, 121);
+         else if ((active1 & 0x400000000000000L) != 0L)
+            return jjStopAtPos(1, 122);
+         else if ((active1 & 0x800000000000000L) != 0L)
          {
-            jjmatchedKind = 101;
+            jjmatchedKind = 123;
             jjmatchedPos = 1;
          }
-         else if ((active1 & 0x40000000000L) != 0L)
-            return jjStopAtPos(1, 106);
-         else if ((active1 & 0x80000000000L) != 0L)
-            return jjStopAtPos(1, 107);
-         else if ((active1 & 0x100000000000L) != 0L)
-            return jjStopAtPos(1, 108);
-         else if ((active1 & 0x200000000000L) != 0L)
-            return jjStopAtPos(1, 109);
-         else if ((active1 & 0x400000000000L) != 0L)
-            return jjStopAtPos(1, 110);
-         else if ((active1 & 0x800000000000L) != 0L)
-            return jjStopAtPos(1, 111);
-         else if ((active1 & 0x1000000000000L) != 0L)
-            return jjStopAtPos(1, 112);
-         else if ((active1 & 0x2000000000000L) != 0L)
-            return jjStopAtPos(1, 113);
-         else if ((active1 & 0x4000000000000L) != 0L)
-            return jjStopAtPos(1, 114);
-         else if ((active1 & 0x8000000000000L) != 0L)
-            return jjStopAtPos(1, 115);
-         return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x18000000000L, active2, 0L);
+         else if ((active2 & 0x1L) != 0L)
+            return jjStopAtPos(1, 128);
+         else if ((active2 & 0x2L) != 0L)
+            return jjStopAtPos(1, 129);
+         else if ((active2 & 0x4L) != 0L)
+            return jjStopAtPos(1, 130);
+         else if ((active2 & 0x8L) != 0L)
+            return jjStopAtPos(1, 131);
+         else if ((active2 & 0x10L) != 0L)
+            return jjStopAtPos(1, 132);
+         else if ((active2 & 0x20L) != 0L)
+            return jjStopAtPos(1, 133);
+         else if ((active2 & 0x40L) != 0L)
+            return jjStopAtPos(1, 134);
+         else if ((active2 & 0x80L) != 0L)
+            return jjStopAtPos(1, 135);
+         else if ((active2 & 0x100L) != 0L)
+            return jjStopAtPos(1, 136);
+         else if ((active2 & 0x200L) != 0L)
+            return jjStopAtPos(1, 137);
+         return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x6000000000000000L, active2, 0L);
       case 62:
          if ((active0 & 0x10L) != 0L)
             return jjStopAtPos(1, 4);
-         else if ((active0 & 0x1000000000L) != 0L)
-            return jjStopAtPos(1, 36);
-         else if ((active0 & 0x4000000000L) != 0L)
-            return jjStopAtPos(1, 38);
-         else if ((active1 & 0x4000000000L) != 0L)
-            return jjStopAtPos(1, 102);
-         else if ((active2 & 0x40L) != 0L)
+         else if ((active0 & 0x2000000000L) != 0L)
+            return jjStopAtPos(1, 37);
+         else if ((active0 & 0x8000000000L) != 0L)
+            return jjStopAtPos(1, 39);
+         else if ((active1 & 0x8000000L) != 0L)
          {
-            jjmatchedKind = 134;
+            jjmatchedKind = 91;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0L, active2, 0x280L);
+         else if ((active1 & 0x1000000000000000L) != 0L)
+            return jjStopAtPos(1, 124);
+         return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x10000000L, active2, 0x800L);
       case 65:
       case 97:
          return jjMoveStringLiteralDfa2_1(active0, 0x80010000400000L, active1, 0L, active2, 0L);
       case 66:
       case 98:
-         return jjMoveStringLiteralDfa2_1(active0, 0x8000000000000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x1L, active2, 0L);
       case 67:
       case 99:
-         return jjMoveStringLiteralDfa2_1(active0, 0x20000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0x40000000L, active1, 0L, active2, 0L);
       case 69:
       case 101:
-         return jjMoveStringLiteralDfa2_1(active0, 0x5080280000000L, active1, 0x4L, active2, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0x5080500000000L, active1, 0x8L, active2, 0L);
       case 70:
       case 102:
          if ((active0 & 0x800000L) != 0L)
@@ -679,13 +681,13 @@ static private final int jjMoveStringLiteralDfa1_1(long active0, long active1, l
          return jjMoveStringLiteralDfa2_1(active0, 0x120000000000000L, active1, 0L, active2, 0L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa2_1(active0, 0x8000000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0x10000000L, active1, 0L, active2, 0L);
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa2_1(active0, 0x403100000L, active1, 0x10L, active2, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0x803100000L, active1, 0x20L, active2, 0L);
       case 78:
       case 110:
-         return jjMoveStringLiteralDfa2_1(active0, 0xe00000140000000L, active1, 0x160L, active2, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0x1e00000280000000L, active1, 0x400000c0L, active2, 0L);
       case 79:
       case 111:
          if ((active0 & 0x100000000000L) != 0L)
@@ -693,20 +695,20 @@ static private final int jjMoveStringLiteralDfa1_1(long active0, long active1, l
             jjmatchedKind = 44;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_1(active0, 0x1000c60000000000L, active1, 0xbL, active2, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0x2000c60000000000L, active1, 0x16L, active2, 0L);
       case 82:
       case 114:
-         if ((active1 & 0x80L) != 0L)
-            return jjStartNfaWithStates_1(1, 71, 14);
-         return jjMoveStringLiteralDfa2_1(active0, 0x4000001c000000L, active1, 0L, active2, 0L);
+         if ((active1 & 0x20000000L) != 0L)
+            return jjStartNfaWithStates_1(1, 93, 14);
+         return jjMoveStringLiteralDfa2_1(active0, 0x4000002c000000L, active1, 0L, active2, 0L);
       case 83:
       case 115:
-         if ((active0 & 0x2000000000000000L) != 0L)
-            return jjStartNfaWithStates_1(1, 61, 14);
+         if ((active0 & 0x4000000000000000L) != 0L)
+            return jjStartNfaWithStates_1(1, 62, 14);
          break;
       case 84:
       case 116:
-         return jjMoveStringLiteralDfa2_1(active0, 0x4000000800000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0x8000001000000000L, active1, 0L, active2, 0L);
       case 85:
       case 117:
          return jjMoveStringLiteralDfa2_1(active0, 0xa000000200000L, active1, 0L, active2, 0L);
@@ -717,8 +719,8 @@ static private final int jjMoveStringLiteralDfa1_1(long active0, long active1, l
       case 120:
          return jjMoveStringLiteralDfa2_1(active0, 0x200000000000L, active1, 0L, active2, 0L);
       case 124:
-         if ((active1 & 0x200000000000000L) != 0L)
-            return jjStopAtPos(1, 121);
+         if ((active1 & 0x4000L) != 0L)
+            return jjStopAtPos(1, 78);
          break;
       default :
          break;
@@ -737,30 +739,30 @@ static private final int jjMoveStringLiteralDfa2_1(long old0, long active0, long
    switch(curChar)
    {
       case 61:
-         if ((active1 & 0x8000000000L) != 0L)
-            return jjStopAtPos(2, 103);
-         else if ((active1 & 0x10000000000L) != 0L)
-            return jjStopAtPos(2, 104);
-         else if ((active2 & 0x100L) != 0L)
-            return jjStopAtPos(2, 136);
-         else if ((active2 & 0x200L) != 0L)
-            return jjStopAtPos(2, 137);
+         if ((active1 & 0x2000000000000000L) != 0L)
+            return jjStopAtPos(2, 125);
+         else if ((active1 & 0x4000000000000000L) != 0L)
+            return jjStopAtPos(2, 126);
+         else if ((active2 & 0x400L) != 0L)
+            return jjStopAtPos(2, 138);
+         else if ((active2 & 0x800L) != 0L)
+            return jjStopAtPos(2, 139);
          break;
       case 62:
-         if ((active2 & 0x80L) != 0L)
-            return jjStopAtPos(2, 135);
+         if ((active1 & 0x10000000L) != 0L)
+            return jjStopAtPos(2, 92);
          break;
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa3_1(active0, 0x800100000L, active1, 0x4L, active2, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x1000100000L, active1, 0x8L, active2, 0L);
       case 67:
       case 99:
-         return jjMoveStringLiteralDfa3_1(active0, 0x140000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x280000000L, active1, 0L, active2, 0L);
       case 68:
       case 100:
-         if ((active1 & 0x100L) != 0L)
-            return jjStartNfaWithStates_1(2, 72, 14);
-         return jjMoveStringLiteralDfa3_1(active0, 0xe00000000000000L, active1, 0L, active2, 0L);
+         if ((active1 & 0x40000000L) != 0L)
+            return jjStartNfaWithStates_1(2, 94, 14);
+         return jjMoveStringLiteralDfa3_1(active0, 0x1e00000000000000L, active1, 0L, active2, 0L);
       case 69:
       case 101:
          return jjMoveStringLiteralDfa3_1(active0, 0x8000000L, active1, 0L, active2, 0L);
@@ -769,13 +771,13 @@ static private final int jjMoveStringLiteralDfa2_1(long old0, long active0, long
          return jjMoveStringLiteralDfa3_1(active0, 0x80000000000L, active1, 0L, active2, 0L);
       case 72:
       case 104:
-         return jjMoveStringLiteralDfa3_1(active0, 0x20000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x40000000L, active1, 0L, active2, 0L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa3_1(active0, 0x130000010000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x130000020000000L, active1, 0L, active2, 0L);
       case 74:
       case 106:
-         return jjMoveStringLiteralDfa3_1(active0, 0x8000000000000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0L, active1, 0x1L, active2, 0L);
       case 76:
       case 108:
          return jjMoveStringLiteralDfa3_1(active0, 0x82000000000000L, active1, 0L, active2, 0L);
@@ -784,13 +786,13 @@ static private final int jjMoveStringLiteralDfa2_1(long old0, long active0, long
          return jjMoveStringLiteralDfa3_1(active0, 0x60000200000L, active1, 0L, active2, 0L);
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa3_1(active0, 0x400000000L, active1, 0x13L, active2, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x800000000L, active1, 0x26L, active2, 0L);
       case 80:
       case 112:
          return jjMoveStringLiteralDfa3_1(active0, 0x8000000000000L, active1, 0L, active2, 0L);
       case 81:
       case 113:
-         return jjMoveStringLiteralDfa3_1(active0, 0x280000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x500000000L, active1, 0L, active2, 0L);
       case 82:
       case 114:
          if ((active0 & 0x400000L) != 0L)
@@ -800,21 +802,21 @@ static private final int jjMoveStringLiteralDfa2_1(long old0, long active0, long
             jjmatchedKind = 46;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_1(active0, 0x5000000004000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0xa000000004000000L, active1, 0L, active2, 0L);
       case 83:
       case 115:
-         return jjMoveStringLiteralDfa3_1(active0, 0x18003000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x10013000000L, active1, 0L, active2, 0L);
       case 84:
       case 116:
-         if ((active1 & 0x20L) != 0L)
+         if ((active1 & 0x40L) != 0L)
          {
-            jjmatchedKind = 69;
+            jjmatchedKind = 70;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_1(active0, 0x4a00000000000L, active1, 0x40L, active2, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x4a00000000000L, active1, 0x80L, active2, 0L);
       case 85:
       case 117:
-         return jjMoveStringLiteralDfa3_1(active0, 0x40000000000000L, active1, 0x8L, active2, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x40000000000000L, active1, 0x10L, active2, 0L);
       case 87:
       case 119:
          if ((active0 & 0x1000000000000L) != 0L)
@@ -838,10 +840,10 @@ static private final int jjMoveStringLiteralDfa3_1(long old0, long active0, long
    {
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa4_1(active0, 0x8000c000000L, active1, 0x10L);
+         return jjMoveStringLiteralDfa4_1(active0, 0x8000c000000L, active1, 0x20L);
       case 66:
       case 98:
-         return jjMoveStringLiteralDfa4_1(active0, 0x400000000L, active1, 0x8L);
+         return jjMoveStringLiteralDfa4_1(active0, 0x800000000L, active1, 0x10L);
       case 67:
       case 99:
          return jjMoveStringLiteralDfa4_1(active0, 0x200000L, active1, 0L);
@@ -856,32 +858,32 @@ static private final int jjMoveStringLiteralDfa3_1(long old0, long active0, long
             return jjStartNfaWithStates_1(3, 40, 14);
          else if ((active0 & 0x40000000000000L) != 0L)
             return jjStartNfaWithStates_1(3, 54, 14);
-         return jjMoveStringLiteralDfa4_1(active0, 0x9008200001000000L, active1, 0x40L);
+         return jjMoveStringLiteralDfa4_1(active0, 0x2008200001000000L, active1, 0x81L);
       case 70:
       case 102:
-         return jjMoveStringLiteralDfa4_1(active0, 0x800000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa4_1(active0, 0x1000000000000000L, active1, 0L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa4_1(active0, 0x4400000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa4_1(active0, 0x8800000000000000L, active1, 0L);
       case 76:
       case 108:
          if ((active0 & 0x2000000000000L) != 0L)
             return jjStartNfaWithStates_1(3, 49, 14);
-         else if ((active1 & 0x1L) != 0L)
+         else if ((active1 & 0x2L) != 0L)
          {
-            jjmatchedKind = 64;
+            jjmatchedKind = 65;
             jjmatchedPos = 3;
          }
-         else if ((active1 & 0x4L) != 0L)
-            return jjStartNfaWithStates_1(3, 66, 14);
-         return jjMoveStringLiteralDfa4_1(active0, 0x100000140000000L, active1, 0x2L);
+         else if ((active1 & 0x8L) != 0L)
+            return jjStartNfaWithStates_1(3, 67, 14);
+         return jjMoveStringLiteralDfa4_1(active0, 0x100000280000000L, active1, 0x4L);
       case 78:
       case 110:
-         return jjMoveStringLiteralDfa4_1(active0, 0x10000000L, active1, 0L);
+         return jjMoveStringLiteralDfa4_1(active0, 0x20000000L, active1, 0L);
       case 79:
       case 111:
-         if ((active0 & 0x20000000L) != 0L)
-            return jjStartNfaWithStates_1(3, 29, 14);
+         if ((active0 & 0x40000000L) != 0L)
+            return jjStartNfaWithStates_1(3, 30, 14);
          else if ((active0 & 0x800000000000L) != 0L)
             return jjStartNfaWithStates_1(3, 47, 14);
          break;
@@ -889,15 +891,15 @@ static private final int jjMoveStringLiteralDfa3_1(long old0, long active0, long
       case 115:
          if ((active0 & 0x20000000000000L) != 0L)
             return jjStartNfaWithStates_1(3, 53, 14);
-         return jjMoveStringLiteralDfa4_1(active0, 0x80020000100000L, active1, 0L);
+         return jjMoveStringLiteralDfa4_1(active0, 0x480020000100000L, active1, 0L);
       case 84:
       case 116:
-         if ((active0 & 0x8000000000L) != 0L)
-            return jjStartNfaWithStates_1(3, 39, 14);
-         return jjMoveStringLiteralDfa4_1(active0, 0x10040800000000L, active1, 0L);
+         if ((active0 & 0x10000000L) != 0L)
+            return jjStartNfaWithStates_1(3, 28, 14);
+         return jjMoveStringLiteralDfa4_1(active0, 0x10041000000000L, active1, 0L);
       case 85:
       case 117:
-         return jjMoveStringLiteralDfa4_1(active0, 0x4000280000000L, active1, 0L);
+         return jjMoveStringLiteralDfa4_1(active0, 0x4000500000000L, active1, 0L);
       case 87:
       case 119:
          return jjMoveStringLiteralDfa4_1(active0, 0x200000000000000L, active1, 0L);
@@ -919,31 +921,31 @@ static private final int jjMoveStringLiteralDfa4_1(long old0, long active0, long
    {
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa5_1(active0, 0x1000000400000000L, active1, 0L);
+         return jjMoveStringLiteralDfa5_1(active0, 0x2000000800000000L, active1, 0L);
       case 67:
       case 99:
-         return jjMoveStringLiteralDfa5_1(active0, 0x8010000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa5_1(active0, 0x10000000000000L, active1, 0x1L);
       case 69:
       case 101:
          if ((active0 & 0x80000000000000L) != 0L)
             return jjStartNfaWithStates_1(4, 55, 14);
          else if ((active0 & 0x100000000000000L) != 0L)
             return jjStartNfaWithStates_1(4, 56, 14);
-         return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x2L);
+         return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x4L);
       case 70:
       case 102:
-         if ((active0 & 0x400000000000000L) != 0L)
-            return jjStartNfaWithStates_1(4, 58, 14);
+         if ((active0 & 0x800000000000000L) != 0L)
+            return jjStartNfaWithStates_1(4, 59, 14);
          break;
       case 71:
       case 103:
-         return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x40L);
+         return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x80L);
       case 72:
       case 104:
          return jjMoveStringLiteralDfa5_1(active0, 0x200000000000000L, active1, 0L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa5_1(active0, 0x40a81000000L, active1, 0L);
+         return jjMoveStringLiteralDfa5_1(active0, 0x41501000000L, active1, 0L);
       case 75:
       case 107:
          if ((active0 & 0x8000000L) != 0L)
@@ -951,13 +953,13 @@ static private final int jjMoveStringLiteralDfa4_1(long old0, long active0, long
          break;
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x8L);
+         return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x10L);
       case 78:
       case 110:
-         return jjMoveStringLiteralDfa5_1(active0, 0x4000200000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa5_1(active0, 0x8000200000000000L, active1, 0L);
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa5_1(active0, 0x800000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa5_1(active0, 0x1000000000000000L, active1, 0L);
       case 82:
       case 114:
          if ((active0 & 0x8000000000000L) != 0L)
@@ -970,16 +972,19 @@ static private final int jjMoveStringLiteralDfa4_1(long old0, long active0, long
          break;
       case 84:
       case 116:
-         if ((active0 & 0x10000000L) != 0L)
-            return jjStartNfaWithStates_1(4, 28, 14);
+         if ((active0 & 0x20000000L) != 0L)
+            return jjStartNfaWithStates_1(4, 29, 14);
          else if ((active0 & 0x20000000000L) != 0L)
             return jjStartNfaWithStates_1(4, 41, 14);
-         else if ((active1 & 0x10L) != 0L)
-            return jjStartNfaWithStates_1(4, 68, 14);
+         else if ((active1 & 0x20L) != 0L)
+            return jjStartNfaWithStates_1(4, 69, 14);
          return jjMoveStringLiteralDfa5_1(active0, 0x200000L, active1, 0L);
       case 85:
       case 117:
-         return jjMoveStringLiteralDfa5_1(active0, 0x80140000000L, active1, 0L);
+         return jjMoveStringLiteralDfa5_1(active0, 0x80280000000L, active1, 0L);
+      case 87:
+      case 119:
+         return jjMoveStringLiteralDfa5_1(active0, 0x400000000000000L, active1, 0L);
       case 89:
       case 121:
          if ((active0 & 0x4000000L) != 0L)
@@ -1003,20 +1008,20 @@ static private final int jjMoveStringLiteralDfa5_1(long old0, long active0, long
    {
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa6_1(active0, 0L, active1, 0x2L);
+         return jjMoveStringLiteralDfa6_1(active0, 0L, active1, 0x4L);
       case 67:
       case 99:
-         if ((active0 & 0x800000000L) != 0L)
-            return jjStartNfaWithStates_1(5, 35, 14);
-         return jjMoveStringLiteralDfa6_1(active0, 0x1000000000000000L, active1, 0L);
+         if ((active0 & 0x1000000000L) != 0L)
+            return jjStartNfaWithStates_1(5, 36, 14);
+         return jjMoveStringLiteralDfa6_1(active0, 0x2000000000000000L, active1, 0L);
       case 68:
       case 100:
-         return jjMoveStringLiteralDfa6_1(active0, 0x200140000000L, active1, 0L);
+         return jjMoveStringLiteralDfa6_1(active0, 0x200280000000L, active1, 0L);
       case 69:
       case 101:
-         if ((active1 & 0x8L) != 0L)
-            return jjStartNfaWithStates_1(5, 67, 14);
-         return jjMoveStringLiteralDfa6_1(active0, 0L, active1, 0x40L);
+         if ((active1 & 0x10L) != 0L)
+            return jjStartNfaWithStates_1(5, 68, 14);
+         return jjMoveStringLiteralDfa6_1(active0, 0L, active1, 0x80L);
       case 70:
       case 102:
          if ((active0 & 0x1000000L) != 0L)
@@ -1024,8 +1029,8 @@ static private final int jjMoveStringLiteralDfa5_1(long old0, long active0, long
          break;
       case 71:
       case 103:
-         if ((active0 & 0x4000000000000000L) != 0L)
-            return jjStartNfaWithStates_1(5, 62, 14);
+         if ((active0 & 0x8000000000000000L) != 0L)
+            return jjStartNfaWithStates_1(5, 63, 14);
          break;
       case 72:
       case 104:
@@ -1034,11 +1039,11 @@ static private final int jjMoveStringLiteralDfa5_1(long old0, long active0, long
          break;
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa6_1(active0, 0x200000000200000L, active1, 0L);
+         return jjMoveStringLiteralDfa6_1(active0, 0x600000000200000L, active1, 0L);
       case 76:
       case 108:
-         if ((active0 & 0x400000000L) != 0L)
-            return jjStartNfaWithStates_1(5, 34, 14);
+         if ((active0 & 0x800000000L) != 0L)
+            return jjStartNfaWithStates_1(5, 35, 14);
          return jjMoveStringLiteralDfa6_1(active0, 0x80000000000L, active1, 0L);
       case 78:
       case 110:
@@ -1047,13 +1052,13 @@ static private final int jjMoveStringLiteralDfa5_1(long old0, long active0, long
          return jjMoveStringLiteralDfa6_1(active0, 0x40000000000L, active1, 0L);
       case 82:
       case 114:
-         if ((active0 & 0x800000000000000L) != 0L)
-            return jjStartNfaWithStates_1(5, 59, 14);
-         return jjMoveStringLiteralDfa6_1(active0, 0x280000000L, active1, 0L);
+         if ((active0 & 0x1000000000000000L) != 0L)
+            return jjStartNfaWithStates_1(5, 60, 14);
+         return jjMoveStringLiteralDfa6_1(active0, 0x500000000L, active1, 0L);
       case 84:
       case 116:
-         if ((active0 & 0x8000000000000000L) != 0L)
-            return jjStartNfaWithStates_1(5, 63, 14);
+         if ((active1 & 0x1L) != 0L)
+            return jjStartNfaWithStates_1(5, 64, 14);
          break;
       default :
          break;
@@ -1073,37 +1078,37 @@ static private final int jjMoveStringLiteralDfa6_1(long old0, long active0, long
    {
       case 69:
       case 101:
-         if ((active0 & 0x40000000L) != 0L)
+         if ((active0 & 0x80000000L) != 0L)
          {
-            jjmatchedKind = 30;
+            jjmatchedKind = 31;
             jjmatchedPos = 6;
          }
-         else if ((active0 & 0x80000000L) != 0L)
+         else if ((active0 & 0x100000000L) != 0L)
          {
-            jjmatchedKind = 31;
+            jjmatchedKind = 32;
             jjmatchedPos = 6;
          }
-         return jjMoveStringLiteralDfa7_1(active0, 0x300000000L, active1, 0L);
+         return jjMoveStringLiteralDfa7_1(active0, 0x600000000L, active1, 0L);
       case 72:
       case 104:
-         if ((active0 & 0x1000000000000000L) != 0L)
-            return jjStartNfaWithStates_1(6, 60, 14);
+         if ((active0 & 0x2000000000000000L) != 0L)
+            return jjStartNfaWithStates_1(6, 61, 14);
          break;
       case 76:
       case 108:
          return jjMoveStringLiteralDfa7_1(active0, 0x200000000000000L, active1, 0L);
       case 78:
       case 110:
-         if ((active1 & 0x2L) != 0L)
-            return jjStartNfaWithStates_1(6, 65, 14);
+         if ((active1 & 0x4L) != 0L)
+            return jjStartNfaWithStates_1(6, 66, 14);
          break;
       case 79:
       case 111:
          return jjMoveStringLiteralDfa7_1(active0, 0x200000L, active1, 0L);
       case 82:
       case 114:
-         if ((active1 & 0x40L) != 0L)
-            return jjStartNfaWithStates_1(6, 70, 14);
+         if ((active1 & 0x80L) != 0L)
+            return jjStartNfaWithStates_1(6, 71, 14);
          break;
       case 83:
       case 115:
@@ -1114,7 +1119,7 @@ static private final int jjMoveStringLiteralDfa6_1(long old0, long active0, long
       case 116:
          if ((active0 & 0x80000000000L) != 0L)
             return jjStartNfaWithStates_1(6, 43, 14);
-         break;
+         return jjMoveStringLiteralDfa7_1(active0, 0x400000000000000L, active1, 0L);
       case 85:
       case 117:
          return jjMoveStringLiteralDfa7_1(active0, 0x40000000000L, active1, 0L);
@@ -1135,7 +1140,10 @@ static private final int jjMoveStringLiteralDfa7_1(long old0, long active0, long
    switch(curChar)
    {
       case 95:
-         return jjMoveStringLiteralDfa8_1(active0, 0x300000000L);
+         return jjMoveStringLiteralDfa8_1(active0, 0x600000000L);
+      case 67:
+      case 99:
+         return jjMoveStringLiteralDfa8_1(active0, 0x400000000000000L);
       case 69:
       case 101:
          if ((active0 & 0x40000000000L) != 0L)
@@ -1164,9 +1172,14 @@ static private final int jjMoveStringLiteralDfa8_1(long old0, long active0)
    }
    switch(curChar)
    {
+      case 72:
+      case 104:
+         if ((active0 & 0x400000000000000L) != 0L)
+            return jjStartNfaWithStates_1(8, 58, 14);
+         break;
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa9_1(active0, 0x300000000L);
+         return jjMoveStringLiteralDfa9_1(active0, 0x600000000L);
       default :
          break;
    }
@@ -1185,7 +1198,7 @@ static private final int jjMoveStringLiteralDfa9_1(long old0, long active0)
    {
       case 78:
       case 110:
-         return jjMoveStringLiteralDfa10_1(active0, 0x300000000L);
+         return jjMoveStringLiteralDfa10_1(active0, 0x600000000L);
       default :
          break;
    }
@@ -1204,7 +1217,7 @@ static private final int jjMoveStringLiteralDfa10_1(long old0, long active0)
    {
       case 67:
       case 99:
-         return jjMoveStringLiteralDfa11_1(active0, 0x300000000L);
+         return jjMoveStringLiteralDfa11_1(active0, 0x600000000L);
       default :
          break;
    }
@@ -1223,10 +1236,10 @@ static private final int jjMoveStringLiteralDfa11_1(long old0, long active0)
    {
       case 69:
       case 101:
-         if ((active0 & 0x100000000L) != 0L)
-            return jjStartNfaWithStates_1(11, 32, 14);
-         else if ((active0 & 0x200000000L) != 0L)
+         if ((active0 & 0x200000000L) != 0L)
             return jjStartNfaWithStates_1(11, 33, 14);
+         else if ((active0 & 0x400000000L) != 0L)
+            return jjStartNfaWithStates_1(11, 34, 14);
          break;
       default :
          break;
@@ -1270,14 +1283,14 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                      jjstateSet[jjnewStateCnt++] = 2;
                   if ((0x3fe000000000000L & l) != 0L)
                   {
-                     if (kind > 73)
-                        kind = 73;
+                     if (kind > 95)
+                        kind = 95;
                      jjCheckNAddTwoStates(5, 6);
                   }
                   else if (curChar == 48)
                   {
-                     if (kind > 73)
-                        kind = 73;
+                     if (kind > 95)
+                        kind = 95;
                      jjCheckNAddStates(19, 21);
                   }
                   break;
@@ -1296,15 +1309,15 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 4:
                   if ((0x3fe000000000000L & l) == 0L)
                      break;
-                  if (kind > 73)
-                     kind = 73;
+                  if (kind > 95)
+                     kind = 95;
                   jjCheckNAddTwoStates(5, 6);
                   break;
                case 5:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 73)
-                     kind = 73;
+                  if (kind > 95)
+                     kind = 95;
                   jjCheckNAddTwoStates(5, 6);
                   break;
                case 7:
@@ -1314,8 +1327,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 8:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 77)
-                     kind = 77;
+                  if (kind > 99)
+                     kind = 99;
                   jjCheckNAddStates(22, 24);
                   break;
                case 10:
@@ -1325,15 +1338,15 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 11:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 77)
-                     kind = 77;
+                  if (kind > 99)
+                     kind = 99;
                   jjCheckNAddTwoStates(11, 12);
                   break;
                case 14:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 83)
-                     kind = 83;
+                  if (kind > 105)
+                     kind = 105;
                   jjstateSet[jjnewStateCnt++] = 14;
                   break;
                case 15:
@@ -1343,8 +1356,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 17:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 138)
-                     kind = 138;
+                  if (kind > 140)
+                     kind = 140;
                   jjstateSet[jjnewStateCnt++] = 17;
                   break;
                case 18:
@@ -1358,15 +1371,15 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 20:
                   if (curChar != 46)
                      break;
-                  if (kind > 77)
-                     kind = 77;
+                  if (kind > 99)
+                     kind = 99;
                   jjCheckNAddStates(25, 27);
                   break;
                case 21:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 77)
-                     kind = 77;
+                  if (kind > 99)
+                     kind = 99;
                   jjCheckNAddStates(25, 27);
                   break;
                case 23:
@@ -1376,8 +1389,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 24:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 77)
-                     kind = 77;
+                  if (kind > 99)
+                     kind = 99;
                   jjCheckNAddTwoStates(24, 12);
                   break;
                case 25:
@@ -1391,8 +1404,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 28:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 77)
-                     kind = 77;
+                  if (kind > 99)
+                     kind = 99;
                   jjCheckNAddTwoStates(28, 12);
                   break;
                case 29:
@@ -1410,22 +1423,22 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 33:
                   if (curChar != 48)
                      break;
-                  if (kind > 73)
-                     kind = 73;
+                  if (kind > 95)
+                     kind = 95;
                   jjCheckNAddStates(19, 21);
                   break;
                case 35:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 73)
-                     kind = 73;
+                  if (kind > 95)
+                     kind = 95;
                   jjCheckNAddTwoStates(35, 6);
                   break;
                case 36:
                   if ((0xff000000000000L & l) == 0L)
                      break;
-                  if (kind > 73)
-                     kind = 73;
+                  if (kind > 95)
+                     kind = 95;
                   jjCheckNAddTwoStates(36, 6);
                   break;
                case 37:
@@ -1441,8 +1454,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                      jjCheckNAddStates(31, 33);
                   break;
                case 41:
-                  if (curChar == 34 && kind > 79)
-                     kind = 79;
+                  if (curChar == 34 && kind > 101)
+                     kind = 101;
                   break;
                case 42:
                   if ((0xfffffffbffffffffL & l) != 0L)
@@ -1453,8 +1466,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                      jjCheckNAddStates(34, 36);
                   break;
                case 45:
-                  if (curChar == 34 && kind > 80)
-                     kind = 80;
+                  if (curChar == 34 && kind > 102)
+                     kind = 102;
                   break;
                case 46:
                   if (curChar == 39)
@@ -1469,8 +1482,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                      jjCheckNAddStates(37, 39);
                   break;
                case 50:
-                  if (curChar == 39 && kind > 79)
-                     kind = 79;
+                  if (curChar == 39 && kind > 101)
+                     kind = 101;
                   break;
                case 51:
                   if ((0xffffff7fffffffffL & l) != 0L)
@@ -1481,8 +1494,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                      jjCheckNAddStates(40, 42);
                   break;
                case 54:
-                  if (curChar == 39 && kind > 81)
-                     kind = 81;
+                  if (curChar == 39 && kind > 103)
+                     kind = 103;
                   break;
                case 56:
                   jjAddStates(43, 45);
@@ -1504,8 +1517,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 3:
                   if ((0x87fffffe87fffffeL & l) != 0L)
                   {
-                     if (kind > 83)
-                        kind = 83;
+                     if (kind > 105)
+                        kind = 105;
                      jjCheckNAdd(14);
                   }
                   else if (curChar == 96)
@@ -1516,31 +1529,31 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                      kind = 13;
                   break;
                case 6:
-                  if ((0x100000001000L & l) != 0L && kind > 73)
-                     kind = 73;
+                  if ((0x100000001000L & l) != 0L && kind > 95)
+                     kind = 95;
                   break;
                case 9:
                   if ((0x2000000020L & l) != 0L)
                      jjAddStates(55, 56);
                   break;
                case 12:
-                  if ((0x5000000050L & l) != 0L && kind > 77)
-                     kind = 77;
+                  if ((0x5000000050L & l) != 0L && kind > 99)
+                     kind = 99;
                   break;
                case 13:
                case 14:
                   if ((0x87fffffe87fffffeL & l) == 0L)
                      break;
-                  if (kind > 83)
-                     kind = 83;
+                  if (kind > 105)
+                     kind = 105;
                   jjCheckNAdd(14);
                   break;
                case 16:
                case 17:
                   if ((0x87fffffe87fffffeL & l) == 0L)
                      break;
-                  if (kind > 138)
-                     kind = 138;
+                  if (kind > 140)
+                     kind = 140;
                   jjCheckNAdd(17);
                   break;
                case 22:
@@ -1562,8 +1575,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 35:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 73)
-                     kind = 73;
+                  if (kind > 95)
+                     kind = 95;
                   jjCheckNAddTwoStates(35, 6);
                   break;
                case 38:
@@ -1611,8 +1624,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                      jjstateSet[jjnewStateCnt++] = 57;
                   break;
                case 59:
-                  if (curChar == 96 && kind > 79)
-                     kind = 79;
+                  if (curChar == 96 && kind > 101)
+                     kind = 101;
                   break;
                case 60:
                   if ((0xfffffffeffffffffL & l) != 0L)
@@ -1627,8 +1640,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                      jjstateSet[jjnewStateCnt++] = 61;
                   break;
                case 63:
-                  if (curChar == 96 && kind > 82)
-                     kind = 82;
+                  if (curChar == 96 && kind > 104)
+                     kind = 104;
                   break;
                default : break;
             }
@@ -1646,8 +1659,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 14:
                   if ((jjbitVec0[i2] & l2) == 0L)
                      break;
-                  if (kind > 83)
-                     kind = 83;
+                  if (kind > 105)
+                     kind = 105;
                   jjCheckNAdd(14);
                   break;
                case 1:
@@ -1658,8 +1671,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 17:
                   if ((jjbitVec0[i2] & l2) == 0L)
                      break;
-                  if (kind > 138)
-                     kind = 138;
+                  if (kind > 140)
+                     kind = 140;
                   jjCheckNAdd(17);
                   break;
                case 38:
@@ -1739,17 +1752,17 @@ static final int[] jjnextStates = {
 public static final String[] jjstrLiteralImages = {
 "", "\74\77", null, "\74\77\75", "\77\76", null, null, null, null, null, null, 
 null, null, null, null, null, null, null, null, null, null, null, null, null, null, 
-null, null, null, null, null, null, null, null, null, null, null, "\55\76", 
+null, null, null, null, null, null, null, null, null, null, null, null, "\55\76", 
 "\72\72", "\75\76", null, null, null, null, null, null, null, null, null, null, null, 
 null, null, null, null, null, null, null, null, null, null, null, null, null, null, 
-null, null, null, null, null, null, null, null, null, null, null, null, null, null, 
-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, };
+null, null, null, null, null, null, null, "\100", "\44", "\41", "\176", "\77", 
+"\72", "\174\174", "\46\46", "\53\53", "\55\55", "\53", "\55", "\52", "\57", "\46", 
+"\174", "\136", "\45", "\74\74", "\76\76", "\76\76\76", null, null, null, null, null, 
+null, null, null, null, null, null, null, null, null, null, null, "\50", "\51", 
+"\173", "\175", "\133", "\135", "\73", "\54", "\56", "\76", "\74", "\75\75", "\74\75", 
+"\76\75", "\41\75", "\74\76", "\41\75\75", "\75\75\75", "\75", "\53\75", "\55\75", 
+"\52\75", "\57\75", "\46\75", "\174\75", "\136\75", "\56\75", "\45\75", "\176\75", 
+"\74\74\75", "\76\76\75", null, };
 public static final String[] lexStateNames = {
    "DEFAULT", 
    "PHPPARSING", 
@@ -1763,10 +1776,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, -1, -1, -1, 
 };
 static final long[] jjtoToken = {
-   0xfffffffffff0001fL, 0xffffffffff8fa3ffL, 0x7ffL, 
+   0xfffffffffff0001fL, 0xffffe3e8ffffffffL, 0x1fffL, 
 };
 static final long[] jjtoSkip = {
    0x7ffe0L, 0x0L, 0x0L, 
@@ -1925,6 +1938,7 @@ public static Token getNextToken()
         {
            matchedToken = jjFillToken();
            matchedToken.specialToken = specialToken;
+           TokenLexicalActions(matchedToken);
        if (jjnewLexState[jjmatchedKind] != -1)
          curLexState = jjnewLexState[jjmatchedKind];
            return matchedToken;
@@ -1999,4 +2013,40 @@ static void SkipLexicalActions(Token matchedToken)
          break;
    }
 }
+static void TokenLexicalActions(Token matchedToken)
+{
+   switch(jjmatchedKind)
+   {
+      case 1 :
+        if (image == null)
+            image = new StringBuffer(jjstrLiteralImages[1]);
+         else
+            image.append(jjstrLiteralImages[1]);
+                             PHPParser.createNewHTMLCode();
+         break;
+      case 2 :
+        if (image == null)
+            image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
+         else
+            image.append(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
+                             PHPParser.createNewHTMLCode();
+         break;
+      case 3 :
+        if (image == null)
+            image = new StringBuffer(jjstrLiteralImages[3]);
+         else
+            image.append(jjstrLiteralImages[3]);
+                             PHPParser.createNewHTMLCode();
+         break;
+      case 4 :
+        if (image == null)
+            image = new StringBuffer(jjstrLiteralImages[4]);
+         else
+            image.append(jjstrLiteralImages[4]);
+                  PHPParser.htmlStart = SimpleCharStream.getPosition();
+         break;
+      default : 
+         break;
+   }
+}
 }