some bugfixes
[phpeclipse.git] / net.sourceforge.phpeclipse / src / test / PHPParserTokenManager.java
index ad97563..9dd366b 100644 (file)
@@ -6,74 +6,287 @@ 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.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.Outlineable;
 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;
+import net.sourceforge.phpdt.internal.corext.Assert;
 
 public class PHPParserTokenManager implements PHPParserConstants
 {
+  // CommonTokenAction: use the begins/ends fields added to the Jack
+  // CharStream class to set corresponding fields in each Token (which was
+  // also extended with new fields). By default Jack doesn't supply absolute
+  // offsets, just line/column offsets
+  static void CommonTokenAction(Token t) {
+    t.sourceStart = input_stream.beginOffset;
+    t.sourceEnd = input_stream.endOffset;
+  }
   public static  java.io.PrintStream debugStream = System.out;
   public static  void setDebugStream(java.io.PrintStream ds) { debugStream = ds; }
-private static final int jjStopStringLiteralDfa_0(int pos, long active0, long active1, long active2)
+static private final int jjStopAtPos(int pos, int kind)
 {
-   switch (pos)
+   jjmatchedKind = kind;
+   jjmatchedPos = pos;
+   return pos + 1;
+}
+static private final int jjMoveStringLiteralDfa0_0()
+{
+   switch(curChar)
    {
+      case 60:
+         return jjMoveStringLiteralDfa1_0(0xeL);
       default :
-         return -1;
+         return 1;
    }
 }
-private static final int jjStartNfa_0(int pos, long active0, long active1, long active2)
+static private final int jjMoveStringLiteralDfa1_0(long active0)
 {
-   return jjMoveNfa_0(jjStopStringLiteralDfa_0(pos, active0, active1, active2), pos + 1);
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+      return 1;
+   }
+   switch(curChar)
+   {
+      case 63:
+         if ((active0 & 0x2L) != 0L)
+         {
+            jjmatchedKind = 1;
+            jjmatchedPos = 1;
+         }
+         return jjMoveStringLiteralDfa2_0(active0, 0xcL);
+      default :
+         return 2;
+   }
 }
-static private final int jjStopAtPos(int pos, int kind)
+static private final int jjMoveStringLiteralDfa2_0(long old0, long active0)
 {
-   jjmatchedKind = kind;
-   jjmatchedPos = pos;
-   return pos + 1;
+   if (((active0 &= old0)) == 0L)
+      return 2;
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+      return 2;
+   }
+   switch(curChar)
+   {
+      case 61:
+         if ((active0 & 0x8L) != 0L)
+            return jjStopAtPos(2, 3);
+         break;
+      case 80:
+      case 112:
+         return jjMoveStringLiteralDfa3_0(active0, 0x4L);
+      default :
+         return 3;
+   }
+   return 3;
+}
+static private final int jjMoveStringLiteralDfa3_0(long old0, long active0)
+{
+   if (((active0 &= old0)) == 0L)
+      return 3;
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+      return 3;
+   }
+   switch(curChar)
+   {
+      case 72:
+      case 104:
+         return jjMoveStringLiteralDfa4_0(active0, 0x4L);
+      default :
+         return 4;
+   }
+}
+static private final int jjMoveStringLiteralDfa4_0(long old0, long active0)
+{
+   if (((active0 &= old0)) == 0L)
+      return 4;
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+      return 4;
+   }
+   switch(curChar)
+   {
+      case 80:
+      case 112:
+         if ((active0 & 0x4L) != 0L)
+            return jjStopAtPos(4, 2);
+         break;
+      default :
+         return 5;
+   }
+   return 5;
+}
+static private final int jjMoveStringLiteralDfa0_4()
+{
+   switch(curChar)
+   {
+      case 42:
+         return jjMoveStringLiteralDfa1_4(0x80000L);
+      case 84:
+      case 116:
+         return jjMoveStringLiteralDfa1_4(0x20000L);
+      default :
+         return 1;
+   }
+}
+static private final int jjMoveStringLiteralDfa1_4(long active0)
+{
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+      return 1;
+   }
+   switch(curChar)
+   {
+      case 47:
+         if ((active0 & 0x80000L) != 0L)
+            return jjStopAtPos(1, 19);
+         break;
+      case 79:
+      case 111:
+         return jjMoveStringLiteralDfa2_4(active0, 0x20000L);
+      default :
+         return 2;
+   }
+   return 2;
+}
+static private final int jjMoveStringLiteralDfa2_4(long old0, long active0)
+{
+   if (((active0 &= old0)) == 0L)
+      return 2;
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+      return 2;
+   }
+   switch(curChar)
+   {
+      case 68:
+      case 100:
+         return jjMoveStringLiteralDfa3_4(active0, 0x20000L);
+      default :
+         return 3;
+   }
+}
+static private final int jjMoveStringLiteralDfa3_4(long old0, long active0)
+{
+   if (((active0 &= old0)) == 0L)
+      return 3;
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+      return 3;
+   }
+   switch(curChar)
+   {
+      case 79:
+      case 111:
+         if ((active0 & 0x20000L) != 0L)
+            return jjStopAtPos(3, 17);
+         break;
+      default :
+         return 4;
+   }
+   return 4;
+}
+private static final int jjStopStringLiteralDfa_2(int pos, long active0)
+{
+   switch (pos)
+   {
+      default :
+         return -1;
+   }
 }
-static private final int jjStartNfaWithStates_0(int pos, int kind, int state)
+private static final int jjStartNfa_2(int pos, long active0)
+{
+   return jjMoveNfa_2(jjStopStringLiteralDfa_2(pos, active0), pos + 1);
+}
+static private final int jjStartNfaWithStates_2(int pos, int kind, int state)
 {
    jjmatchedKind = kind;
    jjmatchedPos = pos;
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) { return pos + 1; }
-   return jjMoveNfa_0(state, pos + 1);
+   return jjMoveNfa_2(state, pos + 1);
 }
-static private final int jjMoveStringLiteralDfa0_0()
+static private final int jjMoveStringLiteralDfa0_2()
 {
    switch(curChar)
    {
       case 63:
-         return jjMoveStringLiteralDfa1_0(0x8000000000000000L);
+         return jjMoveStringLiteralDfa1_2(0x10L);
+      case 84:
+      case 116:
+         return jjMoveStringLiteralDfa1_2(0x20000L);
       default :
-         return jjMoveNfa_0(0, 0);
+         return jjMoveNfa_2(0, 0);
    }
 }
-static private final int jjMoveStringLiteralDfa1_0(long active1)
+static private final int jjMoveStringLiteralDfa1_2(long active0)
 {
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
-      jjStopStringLiteralDfa_0(0, 0L, active1, 0L);
+      jjStopStringLiteralDfa_2(0, active0);
       return 1;
    }
    switch(curChar)
    {
       case 62:
-         if ((active1 & 0x8000000000000000L) != 0L)
-            return jjStopAtPos(1, 127);
+         if ((active0 & 0x10L) != 0L)
+            return jjStopAtPos(1, 4);
+         break;
+      case 79:
+      case 111:
+         return jjMoveStringLiteralDfa2_2(active0, 0x20000L);
+      default :
+         break;
+   }
+   return jjStartNfa_2(0, active0);
+}
+static private final int jjMoveStringLiteralDfa2_2(long old0, long active0)
+{
+   if (((active0 &= old0)) == 0L)
+      return jjStartNfa_2(0, old0); 
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+      jjStopStringLiteralDfa_2(1, active0);
+      return 2;
+   }
+   switch(curChar)
+   {
+      case 68:
+      case 100:
+         return jjMoveStringLiteralDfa3_2(active0, 0x20000L);
+      default :
+         break;
+   }
+   return jjStartNfa_2(1, active0);
+}
+static private final int jjMoveStringLiteralDfa3_2(long old0, long active0)
+{
+   if (((active0 &= old0)) == 0L)
+      return jjStartNfa_2(1, old0); 
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+      jjStopStringLiteralDfa_2(2, active0);
+      return 3;
+   }
+   switch(curChar)
+   {
+      case 79:
+      case 111:
+         if ((active0 & 0x20000L) != 0L)
+            return jjStopAtPos(3, 17);
          break;
       default :
          break;
    }
-   return jjStartNfa_0(0, 0L, active1, 0L);
+   return jjStartNfa_2(2, active0);
 }
 static private final void jjCheckNAdd(int state)
 {
@@ -105,125 +318,11 @@ static private final void jjCheckNAddStates(int start)
    jjCheckNAdd(jjnextStates[start]);
    jjCheckNAdd(jjnextStates[start + 1]);
 }
-static private final int jjMoveNfa_0(int startState, int curPos)
-{
-   int[] nextStates;
-   int startsAt = 0;
-   jjnewStateCnt = 6;
-   int i = 1;
-   jjstateSet[0] = startState;
-   int j, kind = 0x7fffffff;
-   for (;;)
-   {
-      if (++jjround == 0x7fffffff)
-         ReInitRounds();
-      if (curChar < 64)
-      {
-         long l = 1L << curChar;
-         MatchLoop: do
-         {
-            switch(jjstateSet[--i])
-            {
-               case 0:
-                  if (curChar == 60)
-                     jjAddStates(0, 1);
-                  break;
-               case 4:
-                  if (curChar == 63)
-                     jjstateSet[jjnewStateCnt++] = 3;
-                  break;
-               case 5:
-                  if (curChar == 63 && kind > 1)
-                     kind = 1;
-                  break;
-               default : break;
-            }
-         } while(i != startsAt);
-      }
-      else if (curChar < 128)
-      {
-         long l = 1L << (curChar & 077);
-         MatchLoop: do
-         {
-            switch(jjstateSet[--i])
-            {
-               case 1:
-                  if ((0x1000000010000L & l) != 0L && kind > 1)
-                     kind = 1;
-                  break;
-               case 2:
-                  if ((0x10000000100L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 1;
-                  break;
-               case 3:
-                  if ((0x1000000010000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 2;
-                  break;
-               default : break;
-            }
-         } while(i != startsAt);
-      }
-      else
-      {
-         int i2 = (curChar & 0xff) >> 6;
-         long l2 = 1L << (curChar & 077);
-         MatchLoop: do
-         {
-            switch(jjstateSet[--i])
-            {
-               default : break;
-            }
-         } while(i != startsAt);
-      }
-      if (kind != 0x7fffffff)
-      {
-         jjmatchedKind = kind;
-         jjmatchedPos = curPos;
-         kind = 0x7fffffff;
-      }
-      ++curPos;
-      if ((i = jjnewStateCnt) == (startsAt = 6 - (jjnewStateCnt = startsAt)))
-         return curPos;
-      try { curChar = input_stream.readChar(); }
-      catch(java.io.IOException e) { return curPos; }
-   }
-}
-static private final int jjMoveStringLiteralDfa0_4()
-{
-   switch(curChar)
-   {
-      case 42:
-         return jjMoveStringLiteralDfa1_4(0x4000L);
-      default :
-         return 1;
-   }
-}
-static private final int jjMoveStringLiteralDfa1_4(long active0)
-{
-   try { curChar = input_stream.readChar(); }
-   catch(java.io.IOException e) {
-      return 1;
-   }
-   switch(curChar)
-   {
-      case 47:
-         if ((active0 & 0x4000L) != 0L)
-            return jjStopAtPos(1, 14);
-         break;
-      default :
-         return 2;
-   }
-   return 2;
-}
-static private final int jjMoveStringLiteralDfa0_2()
-{
-   return jjMoveNfa_2(0, 0);
-}
 static private final int jjMoveNfa_2(int startState, int curPos)
 {
    int[] nextStates;
    int startsAt = 0;
-   jjnewStateCnt = 5;
+   jjnewStateCnt = 3;
    int i = 1;
    jjstateSet[0] = startState;
    int j, kind = 0x7fffffff;
@@ -241,30 +340,20 @@ static private final int jjMoveNfa_2(int startState, int curPos)
                case 0:
                   if ((0x2400L & l) != 0L)
                   {
-                     if (kind > 12)
-                        kind = 12;
+                     if (kind > 15)
+                        kind = 15;
                   }
-                  else if (curChar == 63)
-                     jjstateSet[jjnewStateCnt++] = 3;
                   if (curChar == 13)
                      jjstateSet[jjnewStateCnt++] = 1;
                   break;
                case 1:
-                  if (curChar == 10 && kind > 12)
-                     kind = 12;
+                  if (curChar == 10 && kind > 15)
+                     kind = 15;
                   break;
                case 2:
                   if (curChar == 13)
                      jjstateSet[jjnewStateCnt++] = 1;
                   break;
-               case 3:
-                  if (curChar == 62)
-                     kind = 12;
-                  break;
-               case 4:
-                  if (curChar == 63)
-                     jjstateSet[jjnewStateCnt++] = 3;
-                  break;
                default : break;
             }
          } while(i != startsAt);
@@ -299,133 +388,135 @@ static private final int jjMoveNfa_2(int startState, int curPos)
          kind = 0x7fffffff;
       }
       ++curPos;
-      if ((i = jjnewStateCnt) == (startsAt = 5 - (jjnewStateCnt = startsAt)))
+      if ((i = jjnewStateCnt) == (startsAt = 3 - (jjnewStateCnt = startsAt)))
          return curPos;
       try { curChar = input_stream.readChar(); }
       catch(java.io.IOException e) { return curPos; }
    }
 }
-private static final int jjStopStringLiteralDfa_1(int pos, long active0, long active1)
+private static final int jjStopStringLiteralDfa_1(int pos, long active0, long active1, long active2)
 {
    switch (pos)
    {
       case 0:
-         if ((active0 & 0xfffffffc7fff0000L) != 0L)
-         {
-            jjmatchedKind = 74;
-            return 14;
-         }
-         if ((active0 & 0xa00L) != 0L || (active1 & 0x20040000000000L) != 0L)
+         if ((active0 & 0x4800L) != 0L || (active1 & 0x800000L) != 0L || (active2 & 0x20L) != 0L)
             return 2;
-         if ((active1 & 0x1000000L) != 0L)
+         if ((active1 & 0x800L) != 0L)
             return 16;
-         if ((active1 & 0x200000000400000L) != 0L)
+         if ((active1 & 0x80000000000000L) != 0L || (active2 & 0x200L) != 0L)
             return 8;
+         if ((active0 & 0xfffffc7fffe00000L) != 0L || (active1 & 0x1800003ffL) != 0L)
+         {
+            jjmatchedKind = 107;
+            return 14;
+         }
          return -1;
       case 1:
-         if ((active0 & 0x800L) != 0L)
+         if ((active0 & 0x4000L) != 0L)
             return 0;
-         if ((active0 & 0x4400008000080000L) != 0L)
+         if ((active0 & 0x400001000000L) != 0L || (active1 & 0x80000041L) != 0L)
             return 14;
-         if ((active0 & 0xbbffff7c7ff70000L) != 0L)
+         if ((active0 & 0xffffbc7ffee00000L) != 0L || (active1 & 0x1000003beL) != 0L)
          {
             if (jjmatchedPos != 1)
             {
-               jjmatchedKind = 74;
+               jjmatchedKind = 107;
                jjmatchedPos = 1;
             }
             return 14;
          }
          return -1;
       case 2:
-         if ((active0 & 0xb000140000040000L) != 0L)
+         if ((active0 & 0x8005000000800000L) != 0L || (active1 & 0x100000300L) != 0L)
             return 14;
-         if ((active0 & 0xfffeb7c7ff30000L) != 0L)
+         if ((active0 & 0x7ffabc7ffe600000L) != 0L || (active1 & 0xfeL) != 0L)
          {
             if (jjmatchedPos != 2)
             {
-               jjmatchedKind = 74;
+               jjmatchedKind = 107;
                jjmatchedPos = 2;
             }
             return 14;
          }
          return -1;
       case 3:
-         if ((active0 & 0x2c79c3747ec30000L) != 0L)
+         if ((active0 & 0x18a0400a6000000L) != 0L || (active1 & 0x38L) != 0L)
+            return 14;
+         if ((active0 & 0xfe70b87f58600000L) != 0L || (active1 & 0x2c6L) != 0L)
          {
             if (jjmatchedPos != 3)
             {
-               jjmatchedKind = 74;
+               jjmatchedKind = 107;
                jjmatchedPos = 3;
             }
             return 14;
          }
-         if ((active0 & 0x386280801300000L) != 0L)
-            return 14;
          return -1;
       case 4:
-         if ((active0 & 0x808821400c10000L) != 0L)
+         if ((active0 & 0x2620080058200000L) != 0L || (active1 & 0x80L) != 0L)
             return 14;
-         if ((active0 & 0x257141607e120000L) != 0L)
+         if ((active0 & 0xd850b07f02400000L) != 0L || (active1 & 0x256L) != 0L)
          {
-            jjmatchedKind = 74;
+            jjmatchedKind = 107;
             jjmatchedPos = 4;
             return 14;
          }
          return -1;
       case 5:
-         if ((active0 & 0x461400060100000L) != 0L)
+         if ((active0 & 0x4050007002000000L) != 0L || (active1 & 0x46L) != 0L)
             return 14;
-         if ((active0 & 0x211001601e020000L) != 0L)
+         if ((active0 & 0x9800b00f00400000L) != 0L || (active1 & 0x210L) != 0L)
          {
-            jjmatchedKind = 74;
+            jjmatchedKind = 107;
             jjmatchedPos = 5;
             return 14;
          }
          return -1;
       case 6:
-         if ((active0 & 0x210001401e000000L) != 0L)
+         if ((active0 & 0x8000a00f00000000L) != 0L || (active1 & 0x210L) != 0L)
             return 14;
-         if ((active0 & 0x10002000020000L) != 0L)
+         if ((active0 & 0x1800100000400000L) != 0L)
          {
             if (jjmatchedPos != 6)
             {
-               jjmatchedKind = 74;
+               jjmatchedKind = 107;
                jjmatchedPos = 6;
             }
             return 14;
          }
          return -1;
       case 7:
-         if ((active0 & 0x10002000020000L) != 0L)
+         if ((active0 & 0x800100000400000L) != 0L)
             return 14;
-         if ((active0 & 0x18000000L) != 0L)
+         if ((active0 & 0x1000000c00000000L) != 0L)
          {
-            jjmatchedKind = 74;
+            jjmatchedKind = 107;
             jjmatchedPos = 7;
             return 14;
          }
          return -1;
       case 8:
-         if ((active0 & 0x18000000L) != 0L)
+         if ((active0 & 0xc00000000L) != 0L)
          {
-            jjmatchedKind = 74;
+            jjmatchedKind = 107;
             jjmatchedPos = 8;
             return 14;
          }
+         if ((active0 & 0x1000000000000000L) != 0L)
+            return 14;
          return -1;
       case 9:
-         if ((active0 & 0x18000000L) != 0L)
+         if ((active0 & 0xc00000000L) != 0L)
          {
-            jjmatchedKind = 74;
+            jjmatchedKind = 107;
             jjmatchedPos = 9;
             return 14;
          }
          return -1;
       case 10:
-         if ((active0 & 0x18000000L) != 0L)
+         if ((active0 & 0xc00000000L) != 0L)
          {
-            jjmatchedKind = 74;
+            jjmatchedKind = 107;
             jjmatchedPos = 10;
             return 14;
          }
@@ -434,9 +525,9 @@ private static final int jjStopStringLiteralDfa_1(int pos, long active0, long ac
          return -1;
    }
 }
-private static final int jjStartNfa_1(int pos, long active0, long active1)
+private static final int jjStartNfa_1(int pos, long active0, long active1, long active2)
 {
-   return jjMoveNfa_1(jjStopStringLiteralDfa_1(pos, active0, active1), pos + 1);
+   return jjMoveNfa_1(jjStopStringLiteralDfa_1(pos, active0, active1, active2), pos + 1);
 }
 static private final int jjStartNfaWithStates_1(int pos, int kind, int state)
 {
@@ -451,750 +542,809 @@ static private final int jjMoveStringLiteralDfa0_1()
    switch(curChar)
    {
       case 33:
-         jjmatchedKind = 92;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x400000000L);
+         jjmatchedKind = 76;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0xa000000000000000L, 0x0L);
+      case 35:
+         return jjStopAtPos(0, 12);
       case 36:
-         return jjStartNfaWithStates_1(0, 88, 16);
+         return jjStartNfaWithStates_1(0, 75, 16);
       case 37:
-         jjmatchedKind = 110;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x400000000000000L);
+         jjmatchedKind = 91;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x400L);
       case 38:
-         jjmatchedKind = 107;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x40001000000000L);
+         jjmatchedKind = 88;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x20000L, 0x40L);
       case 40:
-         return jjStopAtPos(0, 78);
+         return jjStopAtPos(0, 111);
       case 41:
-         return jjStopAtPos(0, 79);
+         return jjStopAtPos(0, 112);
       case 42:
-         jjmatchedKind = 105;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x10000000000000L);
+         jjmatchedKind = 86;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x10L);
       case 43:
-         jjmatchedKind = 103;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x4002000000000L);
+         jjmatchedKind = 84;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x40000L, 0x4L);
       case 44:
-         return jjStopAtPos(0, 85);
+         return jjStopAtPos(0, 118);
       case 45:
-         jjmatchedKind = 104;
-         return jjMoveStringLiteralDfa1_1(0x80000000L, 0x8004000000000L);
+         jjmatchedKind = 85;
+         return jjMoveStringLiteralDfa1_1(0x8000000000L, 0x80000L, 0x8L);
       case 46:
-         jjmatchedKind = 86;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x200000000000000L);
+         jjmatchedKind = 119;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x200L);
       case 47:
-         jjmatchedKind = 106;
-         return jjMoveStringLiteralDfa1_1(0xa00L, 0x20000000000000L);
+         jjmatchedKind = 87;
+         return jjMoveStringLiteralDfa1_1(0x4800L, 0x0L, 0x20L);
       case 58:
-         jjmatchedKind = 94;
-         return jjMoveStringLiteralDfa1_1(0x100000000L, 0x0L);
+         jjmatchedKind = 79;
+         return jjMoveStringLiteralDfa1_1(0x10000000000L, 0x0L, 0x0L);
       case 59:
-         return jjStopAtPos(0, 84);
+         return jjStopAtPos(0, 117);
       case 60:
-         jjmatchedKind = 91;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x800800100000000L);
+         jjmatchedKind = 121;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x4800000010000000L, 0x1000L);
       case 61:
-         jjmatchedKind = 89;
-         return jjMoveStringLiteralDfa1_1(0x200000000L, 0x80000000L);
+         jjmatchedKind = 129;
+         return jjMoveStringLiteralDfa1_1(0x20000000000L, 0x400000000000000L, 0x1L);
       case 62:
-         jjmatchedKind = 90;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x3003000200000000L);
+         jjmatchedKind = 120;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x1000000060000000L, 0x2000L);
       case 63:
-         jjmatchedKind = 93;
-         return jjMoveStringLiteralDfa1_1(0x4L, 0x0L);
+         jjmatchedKind = 78;
+         return jjMoveStringLiteralDfa1_1(0x10L, 0x0L, 0x0L);
       case 64:
-         return jjStopAtPos(0, 87);
+         return jjStopAtPos(0, 74);
       case 91:
-         return jjStopAtPos(0, 82);
+         return jjStopAtPos(0, 115);
       case 93:
-         return jjStopAtPos(0, 83);
+         return jjStopAtPos(0, 116);
       case 94:
-         jjmatchedKind = 109;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x100000000000000L);
+         jjmatchedKind = 90;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x100L);
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa1_1(0x8000000000400000L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x8000000L, 0x100000001L, 0x0L);
       case 66:
       case 98:
-         return jjMoveStringLiteralDfa1_1(0x180000400000000L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x10000000L, 0x18L, 0x0L);
       case 67:
       case 99:
-         return jjMoveStringLiteralDfa1_1(0x3800010000L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x1c0000200000L, 0x0L, 0x0L);
       case 68:
       case 100:
-         return jjMoveStringLiteralDfa1_1(0x40000c000000000L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x602000000000L, 0x40L, 0x0L);
       case 69:
       case 101:
-         return jjMoveStringLiteralDfa1_1(0x10010001300000L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x7800800086000000L, 0x0L, 0x0L);
       case 70:
       case 102:
-         return jjMoveStringLiteralDfa1_1(0x800060000020000L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x8201000000400000L, 0x80L, 0x0L);
       case 71:
       case 103:
-         return jjMoveStringLiteralDfa1_1(0x80020000000L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x2001000000000L, 0x0L, 0x0L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa1_1(0x300000000a080000L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x501000000L, 0x300L, 0x0L);
+      case 76:
+      case 108:
+         return jjMoveStringLiteralDfa1_1(0x20000000L, 0x0L, 0x0L);
       case 78:
       case 110:
-         return jjMoveStringLiteralDfa1_1(0x300000000000L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0xc000000000000L, 0x0L, 0x0L);
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa1_1(0x4040000000000000L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x80000004L, 0x0L);
       case 80:
       case 112:
-         return jjMoveStringLiteralDfa1_1(0x800000L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x40000000L, 0x0L, 0x0L);
       case 82:
       case 114:
-         return jjMoveStringLiteralDfa1_1(0x200400014000000L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x10000a00000000L, 0x20L, 0x0L);
       case 83:
       case 115:
-         return jjMoveStringLiteralDfa1_1(0x21800040000000L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x60004000000000L, 0x2L, 0x0L);
       case 84:
       case 116:
-         return jjMoveStringLiteralDfa1_1(0x6000000000000L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x180000000000000L, 0x0L, 0x0L);
       case 86:
       case 118:
-         return jjMoveStringLiteralDfa1_1(0x40000L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x800000L, 0x0L, 0x0L);
       case 87:
       case 119:
-         return jjMoveStringLiteralDfa1_1(0x8000000000000L, 0x0L);
+         return jjMoveStringLiteralDfa1_1(0x400000000000000L, 0x0L, 0x0L);
       case 123:
-         return jjStopAtPos(0, 80);
+         return jjStopAtPos(0, 113);
       case 124:
-         jjmatchedKind = 108;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x80000800000000L);
+         jjmatchedKind = 89;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x10000L, 0x80L);
       case 125:
-         return jjStopAtPos(0, 81);
+         return jjStopAtPos(0, 114);
+      case 126:
+         jjmatchedKind = 77;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x800L);
       default :
          return jjMoveNfa_1(3, 0);
    }
 }
-static private final int jjMoveStringLiteralDfa1_1(long active0, long active1)
+static private final int jjMoveStringLiteralDfa1_1(long active0, long active1, long active2)
 {
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
-      jjStopStringLiteralDfa_1(0, active0, active1);
+      jjStopStringLiteralDfa_1(0, active0, active1, active2);
       return 1;
    }
    switch(curChar)
    {
       case 38:
-         if ((active1 & 0x1000000000L) != 0L)
-            return jjStopAtPos(1, 100);
+         if ((active1 & 0x20000L) != 0L)
+            return jjStopAtPos(1, 81);
          break;
       case 42:
-         if ((active0 & 0x800L) != 0L)
-            return jjStartNfaWithStates_1(1, 11, 0);
+         if ((active0 & 0x4000L) != 0L)
+            return jjStartNfaWithStates_1(1, 14, 0);
          break;
       case 43:
-         if ((active1 & 0x2000000000L) != 0L)
-            return jjStopAtPos(1, 101);
+         if ((active1 & 0x40000L) != 0L)
+            return jjStopAtPos(1, 82);
          break;
       case 45:
-         if ((active1 & 0x4000000000L) != 0L)
-            return jjStopAtPos(1, 102);
+         if ((active1 & 0x80000L) != 0L)
+            return jjStopAtPos(1, 83);
          break;
       case 47:
-         if ((active0 & 0x200L) != 0L)
-            return jjStopAtPos(1, 9);
+         if ((active0 & 0x800L) != 0L)
+            return jjStopAtPos(1, 11);
          break;
       case 58:
-         if ((active0 & 0x100000000L) != 0L)
-            return jjStopAtPos(1, 32);
+         if ((active0 & 0x10000000000L) != 0L)
+            return jjStopAtPos(1, 40);
          break;
       case 60:
-         if ((active1 & 0x800000000000L) != 0L)
+         if ((active1 & 0x10000000L) != 0L)
          {
-            jjmatchedKind = 111;
+            jjmatchedKind = 92;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x800000000000000L);
+         return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0L, active2, 0x1000L);
       case 61:
-         if ((active1 & 0x80000000L) != 0L)
-            return jjStopAtPos(1, 95);
-         else if ((active1 & 0x100000000L) != 0L)
-            return jjStopAtPos(1, 96);
-         else if ((active1 & 0x200000000L) != 0L)
-            return jjStopAtPos(1, 97);
-         else if ((active1 & 0x400000000L) != 0L)
-            return jjStopAtPos(1, 98);
-         else if ((active1 & 0x4000000000000L) != 0L)
-            return jjStopAtPos(1, 114);
-         else if ((active1 & 0x8000000000000L) != 0L)
-            return jjStopAtPos(1, 115);
-         else if ((active1 & 0x10000000000000L) != 0L)
-            return jjStopAtPos(1, 116);
-         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)
-            return jjStopAtPos(1, 121);
-         else if ((active1 & 0x400000000000000L) != 0L)
-            return jjStopAtPos(1, 122);
-         break;
+         if ((active1 & 0x400000000000000L) != 0L)
+         {
+            jjmatchedKind = 122;
+            jjmatchedPos = 1;
+         }
+         else if ((active1 & 0x800000000000000L) != 0L)
+            return jjStopAtPos(1, 123);
+         else if ((active1 & 0x1000000000000000L) != 0L)
+            return jjStopAtPos(1, 124);
+         else if ((active1 & 0x2000000000000000L) != 0L)
+         {
+            jjmatchedKind = 125;
+            jjmatchedPos = 1;
+         }
+         else if ((active2 & 0x4L) != 0L)
+            return jjStopAtPos(1, 130);
+         else if ((active2 & 0x8L) != 0L)
+            return jjStopAtPos(1, 131);
+         else if ((active2 & 0x10L) != 0L)
+            return jjStopAtPos(1, 132);
+         else if ((active2 & 0x20L) != 0L)
+            return jjStopAtPos(1, 133);
+         else if ((active2 & 0x40L) != 0L)
+            return jjStopAtPos(1, 134);
+         else if ((active2 & 0x80L) != 0L)
+            return jjStopAtPos(1, 135);
+         else if ((active2 & 0x100L) != 0L)
+            return jjStopAtPos(1, 136);
+         else if ((active2 & 0x200L) != 0L)
+            return jjStopAtPos(1, 137);
+         else if ((active2 & 0x400L) != 0L)
+            return jjStopAtPos(1, 138);
+         else if ((active2 & 0x800L) != 0L)
+            return jjStopAtPos(1, 139);
+         return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x8000000000000000L, active2, 0x1L);
       case 62:
-         if ((active0 & 0x4L) != 0L)
-            return jjStopAtPos(1, 2);
-         else if ((active0 & 0x80000000L) != 0L)
-            return jjStopAtPos(1, 31);
-         else if ((active0 & 0x200000000L) != 0L)
-            return jjStopAtPos(1, 33);
-         else if ((active1 & 0x1000000000000L) != 0L)
+         if ((active0 & 0x10L) != 0L)
+            return jjStopAtPos(1, 4);
+         else if ((active0 & 0x8000000000L) != 0L)
+            return jjStopAtPos(1, 39);
+         else if ((active0 & 0x20000000000L) != 0L)
+            return jjStopAtPos(1, 41);
+         else if ((active1 & 0x20000000L) != 0L)
          {
-            jjmatchedKind = 112;
+            jjmatchedKind = 93;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x3002000000000000L);
+         else if ((active1 & 0x4000000000000000L) != 0L)
+            return jjStopAtPos(1, 126);
+         return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x40000000L, active2, 0x2000L);
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa2_1(active0, 0x20800040000L, active1, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0x200040000800000L, active1, 0L, active2, 0L);
       case 66:
       case 98:
-         return jjMoveStringLiteralDfa2_1(active0, 0x40000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x4L, active2, 0L);
       case 67:
       case 99:
-         return jjMoveStringLiteralDfa2_1(active0, 0x1000000L, active1, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0x80000000L, active1, 0L, active2, 0L);
       case 69:
       case 101:
-         return jjMoveStringLiteralDfa2_1(active0, 0x200504014000000L, active1, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0x14202a00000000L, active1, 0x20L, active2, 0L);
       case 70:
       case 102:
-         if ((active0 & 0x80000L) != 0L)
-            return jjStartNfaWithStates_1(1, 19, 14);
+         if ((active0 & 0x1000000L) != 0L)
+            return jjStartNfaWithStates_1(1, 24, 14);
          break;
       case 72:
       case 104:
-         return jjMoveStringLiteralDfa2_1(active0, 0xa000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0x480000000000000L, active1, 0L, active2, 0L);
+      case 73:
+      case 105:
+         return jjMoveStringLiteralDfa2_1(active0, 0x20000000L, active1, 0L, active2, 0L);
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa2_1(active0, 0x800000020310000L, active1, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0x1006200000L, active1, 0x80L, active2, 0L);
       case 78:
       case 110:
-         return jjMoveStringLiteralDfa2_1(active0, 0xb01000000a000000L, active1, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0x7800000500000000L, active1, 0x100000300L, active2, 0L);
       case 79:
       case 111:
-         if ((active0 & 0x8000000000L) != 0L)
+         if ((active0 & 0x400000000000L) != 0L)
          {
-            jjmatchedKind = 39;
+            jjmatchedKind = 46;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_1(active0, 0x5800c3000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0x8003180000000000L, active1, 0x58L, active2, 0L);
       case 82:
       case 114:
-         if ((active0 & 0x4000000000000000L) != 0L)
-            return jjStartNfaWithStates_1(1, 62, 14);
-         return jjMoveStringLiteralDfa2_1(active0, 0x4000400c00000L, active1, 0L);
+         if ((active1 & 0x80000000L) != 0L)
+            return jjStartNfaWithStates_1(1, 95, 14);
+         return jjMoveStringLiteralDfa2_1(active0, 0x100000058000000L, active1, 0L, active2, 0L);
+      case 83:
+      case 115:
+         if ((active1 & 0x1L) != 0L)
+            return jjStartNfaWithStates_1(1, 64, 14);
+         break;
       case 84:
       case 116:
-         return jjMoveStringLiteralDfa2_1(active0, 0x20000040000000L, active1, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0x4000000000L, active1, 0x2L, active2, 0L);
       case 85:
       case 117:
-         return jjMoveStringLiteralDfa2_1(active0, 0xa00000020000L, active1, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0x28000000400000L, active1, 0L, active2, 0L);
       case 87:
       case 119:
-         return jjMoveStringLiteralDfa2_1(active0, 0x1000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0x40000000000000L, active1, 0L, active2, 0L);
       case 88:
       case 120:
-         return jjMoveStringLiteralDfa2_1(active0, 0x10000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa2_1(active0, 0x800000000000L, active1, 0L, active2, 0L);
       case 124:
-         if ((active1 & 0x800000000L) != 0L)
-            return jjStopAtPos(1, 99);
+         if ((active1 & 0x10000L) != 0L)
+            return jjStopAtPos(1, 80);
          break;
       default :
          break;
    }
-   return jjStartNfa_1(0, active0, active1);
+   return jjStartNfa_1(0, active0, active1, active2);
 }
-static private final int jjMoveStringLiteralDfa2_1(long old0, long active0, long old1, long active1)
+static private final int jjMoveStringLiteralDfa2_1(long old0, long active0, long old1, long active1, long old2, long active2)
 {
-   if (((active0 &= old0) | (active1 &= old1)) == 0L)
-      return jjStartNfa_1(0, old0, old1); 
+   if (((active0 &= old0) | (active1 &= old1) | (active2 &= old2)) == 0L)
+      return jjStartNfa_1(0, old0, old1, old2); 
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
-      jjStopStringLiteralDfa_1(1, active0, active1);
+      jjStopStringLiteralDfa_1(1, active0, active1, active2);
       return 2;
    }
    switch(curChar)
    {
       case 61:
-         if ((active1 & 0x800000000000000L) != 0L)
-            return jjStopAtPos(2, 123);
-         else if ((active1 & 0x1000000000000000L) != 0L)
-            return jjStopAtPos(2, 124);
+         if ((active1 & 0x8000000000000000L) != 0L)
+            return jjStopAtPos(2, 127);
+         else if ((active2 & 0x1L) != 0L)
+            return jjStopAtPos(2, 128);
+         else if ((active2 & 0x1000L) != 0L)
+            return jjStopAtPos(2, 140);
+         else if ((active2 & 0x2000L) != 0L)
+            return jjStopAtPos(2, 141);
          break;
       case 62:
-         if ((active1 & 0x2000000000000L) != 0L)
-         {
-            jjmatchedKind = 113;
-            jjmatchedPos = 2;
-         }
-         return jjMoveStringLiteralDfa3_1(active0, 0L, active1, 0x2000000000000000L);
+         if ((active1 & 0x40000000L) != 0L)
+            return jjStopAtPos(2, 94);
+         break;
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa3_1(active0, 0x200000040010000L, active1, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x4000200000L, active1, 0x20L, active2, 0L);
       case 67:
       case 99:
-         return jjMoveStringLiteralDfa3_1(active0, 0xa000000L, active1, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x500000000L, active1, 0L, active2, 0L);
       case 68:
       case 100:
-         if ((active0 & 0x8000000000000000L) != 0L)
-            return jjStartNfaWithStates_1(2, 63, 14);
-         return jjMoveStringLiteralDfa3_1(active0, 0x10000000000000L, active1, 0L);
+         if ((active1 & 0x100000000L) != 0L)
+            return jjStartNfaWithStates_1(2, 96, 14);
+         return jjMoveStringLiteralDfa3_1(active0, 0x7800000000000000L, active1, 0L, active2, 0L);
       case 69:
       case 101:
-         return jjMoveStringLiteralDfa3_1(active0, 0x400000000L, active1, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x10000000L, active1, 0L, active2, 0L);
       case 70:
       case 102:
-         return jjMoveStringLiteralDfa3_1(active0, 0x4000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x202000000000L, active1, 0L, active2, 0L);
       case 72:
       case 104:
-         return jjMoveStringLiteralDfa3_1(active0, 0x1000000L, active1, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x80000000L, active1, 0L, active2, 0L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa3_1(active0, 0xb000000800000L, active1, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x4c0000040000000L, active1, 0L, active2, 0L);
       case 74:
       case 106:
-         return jjMoveStringLiteralDfa3_1(active0, 0x40000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0L, active1, 0x4L, active2, 0L);
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa3_1(active0, 0x220000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x208000000000000L, active1, 0L, active2, 0L);
       case 78:
       case 110:
-         return jjMoveStringLiteralDfa3_1(active0, 0x3000020000L, active1, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x180000400000L, active1, 0L, active2, 0L);
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa3_1(active0, 0x980000020000000L, active1, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x1000000000L, active1, 0x98L, active2, 0L);
       case 80:
       case 112:
-         return jjMoveStringLiteralDfa3_1(active0, 0x800000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x20000000000000L, active1, 0L, active2, 0L);
       case 81:
       case 113:
-         return jjMoveStringLiteralDfa3_1(active0, 0x14000000L, active1, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0xa00000000L, active1, 0L, active2, 0L);
       case 82:
       case 114:
-         if ((active0 & 0x40000L) != 0L)
-            return jjStartNfaWithStates_1(2, 18, 14);
-         else if ((active0 & 0x40000000000L) != 0L)
-            return jjStartNfaWithStates_1(2, 42, 14);
-         return jjMoveStringLiteralDfa3_1(active0, 0x20000000400000L, active1, 0L);
+         if ((active0 & 0x800000L) != 0L)
+            return jjStartNfaWithStates_1(2, 23, 14);
+         else if ((active0 & 0x1000000000000L) != 0L)
+         {
+            jjmatchedKind = 48;
+            jjmatchedPos = 2;
+         }
+         return jjMoveStringLiteralDfa3_1(active0, 0x8000000008000000L, active1, 0x2L, active2, 0L);
       case 83:
       case 115:
-         return jjMoveStringLiteralDfa3_1(active0, 0x800300000L, active1, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x40026000000L, active1, 0L, active2, 0L);
       case 84:
       case 116:
-         if ((active0 & 0x1000000000000000L) != 0L)
+         if ((active1 & 0x100L) != 0L)
          {
-            jjmatchedKind = 60;
+            jjmatchedKind = 72;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_1(active0, 0x2000490000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x12800000000000L, active1, 0x200L, active2, 0L);
       case 85:
       case 117:
-         return jjMoveStringLiteralDfa3_1(active0, 0x404000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa3_1(active0, 0x100000000000000L, active1, 0x40L, active2, 0L);
       case 87:
       case 119:
-         if ((active0 & 0x100000000000L) != 0L)
-            return jjStartNfaWithStates_1(2, 44, 14);
+         if ((active0 & 0x4000000000000L) != 0L)
+            return jjStartNfaWithStates_1(2, 50, 14);
          break;
       default :
          break;
    }
-   return jjStartNfa_1(1, active0, active1);
+   return jjStartNfa_1(1, active0, active1, active2);
 }
-static private final int jjMoveStringLiteralDfa3_1(long old0, long active0, long old1, long active1)
+static private final int jjMoveStringLiteralDfa3_1(long old0, long active0, long old1, long active1, long old2, long active2)
 {
-   if (((active0 &= old0) | (active1 &= old1)) == 0L)
-      return jjStartNfa_1(1, old0, old1); 
+   if (((active0 &= old0) | (active1 &= old1) | (active2 &= old2)) == 0L)
+      return jjStartNfa_1(1, old0, old1, old2); 
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
-      jjStopStringLiteralDfa_1(2, active0, active1);
+      jjStopStringLiteralDfa_1(2, active0, active1, 0L);
       return 3;
    }
    switch(curChar)
    {
-      case 61:
-         if ((active1 & 0x2000000000000000L) != 0L)
-            return jjStopAtPos(3, 125);
-         break;
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa4_1(active0, 0x800004400400000L, active1, 0L);
+         return jjMoveStringLiteralDfa4_1(active0, 0x200018000000L, active1, 0x80L);
       case 66:
       case 98:
-         return jjMoveStringLiteralDfa4_1(active0, 0x400000020000000L, active1, 0L);
+         return jjMoveStringLiteralDfa4_1(active0, 0x1000000000L, active1, 0x40L);
       case 67:
       case 99:
-         return jjMoveStringLiteralDfa4_1(active0, 0x20000L, active1, 0L);
+         return jjMoveStringLiteralDfa4_1(active0, 0x400000L, active1, 0L);
       case 69:
       case 101:
-         if ((active0 & 0x200000L) != 0L)
+         if ((active0 & 0x4000000L) != 0L)
          {
-            jjmatchedKind = 21;
+            jjmatchedKind = 26;
             jjmatchedPos = 3;
          }
-         else if ((active0 & 0x800000000L) != 0L)
-            return jjStartNfaWithStates_1(3, 35, 14);
-         else if ((active0 & 0x4000000000000L) != 0L)
-            return jjStartNfaWithStates_1(3, 50, 14);
-         return jjMoveStringLiteralDfa4_1(active0, 0x2040810000100000L, active1, 0L);
+         else if ((active0 & 0x40000000000L) != 0L)
+            return jjStartNfaWithStates_1(3, 42, 14);
+         else if ((active0 & 0x100000000000000L) != 0L)
+            return jjStartNfaWithStates_1(3, 56, 14);
+         return jjMoveStringLiteralDfa4_1(active0, 0x8020800002000000L, active1, 0x204L);
+      case 70:
+      case 102:
+         return jjMoveStringLiteralDfa4_1(active0, 0x4000000000000000L, active1, 0L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa4_1(active0, 0x20000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa4_1(active0, 0x2000002000000000L, active1, 0x2L);
       case 76:
       case 108:
-         if ((active0 & 0x200000000000L) != 0L)
-            return jjStartNfaWithStates_1(3, 45, 14);
-         else if ((active0 & 0x80000000000000L) != 0L)
+         if ((active0 & 0x8000000000000L) != 0L)
+            return jjStartNfaWithStates_1(3, 51, 14);
+         else if ((active1 & 0x8L) != 0L)
          {
-            jjmatchedKind = 55;
+            jjmatchedKind = 67;
             jjmatchedPos = 3;
          }
-         else if ((active0 & 0x200000000000000L) != 0L)
-            return jjStartNfaWithStates_1(3, 57, 14);
-         return jjMoveStringLiteralDfa4_1(active0, 0x10800000a000000L, active1, 0L);
+         else if ((active1 & 0x20L) != 0L)
+            return jjStartNfaWithStates_1(3, 69, 14);
+         return jjMoveStringLiteralDfa4_1(active0, 0x400000500000000L, active1, 0x10L);
       case 78:
       case 110:
-         return jjMoveStringLiteralDfa4_1(active0, 0x800000L, active1, 0L);
+         return jjMoveStringLiteralDfa4_1(active0, 0x40000000L, active1, 0L);
       case 79:
       case 111:
-         if ((active0 & 0x1000000L) != 0L)
-            return jjStartNfaWithStates_1(3, 24, 14);
-         else if ((active0 & 0x80000000000L) != 0L)
-            return jjStartNfaWithStates_1(3, 43, 14);
+         if ((active0 & 0x80000000L) != 0L)
+            return jjStartNfaWithStates_1(3, 31, 14);
+         else if ((active0 & 0x2000000000000L) != 0L)
+            return jjStartNfaWithStates_1(3, 49, 14);
          break;
       case 83:
       case 115:
-         if ((active0 & 0x2000000000000L) != 0L)
-            return jjStartNfaWithStates_1(3, 49, 14);
-         return jjMoveStringLiteralDfa4_1(active0, 0x21000010000L, active1, 0L);
+         if ((active0 & 0x80000000000000L) != 0L)
+            return jjStartNfaWithStates_1(3, 55, 14);
+         return jjMoveStringLiteralDfa4_1(active0, 0x1200080000200000L, active1, 0L);
       case 84:
       case 116:
-         return jjMoveStringLiteralDfa4_1(active0, 0x1002040000000L, active1, 0L);
+         if ((active0 & 0x20000000L) != 0L)
+            return jjStartNfaWithStates_1(3, 29, 14);
+         return jjMoveStringLiteralDfa4_1(active0, 0x40104000000000L, active1, 0L);
       case 85:
       case 117:
-         return jjMoveStringLiteralDfa4_1(active0, 0x400014000000L, active1, 0L);
+         return jjMoveStringLiteralDfa4_1(active0, 0x10000a00000000L, active1, 0L);
       case 87:
       case 119:
-         return jjMoveStringLiteralDfa4_1(active0, 0x10000000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa4_1(active0, 0x800000000000000L, active1, 0L);
       default :
          break;
    }
-   return jjStartNfa_1(2, active0, active1);
+   return jjStartNfa_1(2, active0, active1, 0L);
 }
 static private final int jjMoveStringLiteralDfa4_1(long old0, long active0, long old1, long active1)
 {
    if (((active0 &= old0) | (active1 &= old1)) == 0L)
-      return jjStartNfa_1(2, old0, old1); 
+      return jjStartNfa_1(2, old0, old1, 0L);
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
-      jjStopStringLiteralDfa_1(3, active0, 0L);
+      jjStopStringLiteralDfa_1(3, active0, active1, 0L);
       return 4;
    }
    switch(curChar)
    {
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa5_1(active0, 0x20000000L);
+         return jjMoveStringLiteralDfa5_1(active0, 0x8000001000000000L, active1, 0L);
       case 67:
       case 99:
-         return jjMoveStringLiteralDfa5_1(active0, 0x41000000000000L);
+         return jjMoveStringLiteralDfa5_1(active0, 0x40000000000000L, active1, 0x4L);
       case 69:
       case 101:
-         if ((active0 & 0x20000000000L) != 0L)
-            return jjStartNfaWithStates_1(4, 41, 14);
-         else if ((active0 & 0x8000000000000L) != 0L)
-            return jjStartNfaWithStates_1(4, 51, 14);
-         return jjMoveStringLiteralDfa5_1(active0, 0x100000000000000L);
+         if ((active0 & 0x200000000000000L) != 0L)
+            return jjStartNfaWithStates_1(4, 57, 14);
+         else if ((active0 & 0x400000000000000L) != 0L)
+            return jjStartNfaWithStates_1(4, 58, 14);
+         return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x10L);
+      case 70:
+      case 102:
+         if ((active0 & 0x2000000000000000L) != 0L)
+            return jjStartNfaWithStates_1(4, 61, 14);
+         break;
       case 71:
       case 103:
-         return jjMoveStringLiteralDfa5_1(active0, 0x2000000000000000L);
+         return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x200L);
       case 72:
       case 104:
-         return jjMoveStringLiteralDfa5_1(active0, 0x10000000000000L);
+         return jjMoveStringLiteralDfa5_1(active0, 0x800000000000000L, active1, 0L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa5_1(active0, 0x2054100000L);
+         return jjMoveStringLiteralDfa5_1(active0, 0x104a02000000L, active1, 0L);
       case 75:
       case 107:
-         if ((active0 & 0x400000000L) != 0L)
-            return jjStartNfaWithStates_1(4, 34, 14);
+         if ((active0 & 0x10000000L) != 0L)
+            return jjStartNfaWithStates_1(4, 28, 14);
          break;
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa5_1(active0, 0x400000000000000L);
+         return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x40L);
       case 78:
       case 110:
-         return jjMoveStringLiteralDfa5_1(active0, 0x20010000000000L);
+         return jjMoveStringLiteralDfa5_1(active0, 0x802000000000L, active1, 0x2L);
+      case 79:
+      case 111:
+         return jjMoveStringLiteralDfa5_1(active0, 0x4000000000000000L, active1, 0L);
       case 82:
       case 114:
-         if ((active0 & 0x800000000000L) != 0L)
-            return jjStartNfaWithStates_1(4, 47, 14);
-         return jjMoveStringLiteralDfa5_1(active0, 0x400000000000L);
+         if ((active0 & 0x20000000000000L) != 0L)
+            return jjStartNfaWithStates_1(4, 53, 14);
+         return jjMoveStringLiteralDfa5_1(active0, 0x10000000000000L, active1, 0L);
       case 83:
       case 115:
-         if ((active0 & 0x10000L) != 0L)
-            return jjStartNfaWithStates_1(4, 16, 14);
+         if ((active0 & 0x200000L) != 0L)
+            return jjStartNfaWithStates_1(4, 21, 14);
          break;
       case 84:
       case 116:
-         if ((active0 & 0x800000L) != 0L)
-            return jjStartNfaWithStates_1(4, 23, 14);
-         else if ((active0 & 0x1000000000L) != 0L)
-            return jjStartNfaWithStates_1(4, 36, 14);
-         else if ((active0 & 0x800000000000000L) != 0L)
-            return jjStartNfaWithStates_1(4, 59, 14);
-         return jjMoveStringLiteralDfa5_1(active0, 0x20000L);
+         if ((active0 & 0x40000000L) != 0L)
+            return jjStartNfaWithStates_1(4, 30, 14);
+         else if ((active0 & 0x80000000000L) != 0L)
+            return jjStartNfaWithStates_1(4, 43, 14);
+         else if ((active1 & 0x80L) != 0L)
+            return jjStartNfaWithStates_1(4, 71, 14);
+         return jjMoveStringLiteralDfa5_1(active0, 0x400000L, active1, 0L);
       case 85:
       case 117:
-         return jjMoveStringLiteralDfa5_1(active0, 0x400a000000L);
+         return jjMoveStringLiteralDfa5_1(active0, 0x200500000000L, active1, 0L);
+      case 87:
+      case 119:
+         return jjMoveStringLiteralDfa5_1(active0, 0x1000000000000000L, active1, 0L);
       case 89:
       case 121:
-         if ((active0 & 0x400000L) != 0L)
-            return jjStartNfaWithStates_1(4, 22, 14);
+         if ((active0 & 0x8000000L) != 0L)
+            return jjStartNfaWithStates_1(4, 27, 14);
          break;
       default :
          break;
    }
-   return jjStartNfa_1(3, active0, 0L);
+   return jjStartNfa_1(3, active0, active1, 0L);
 }
-static private final int jjMoveStringLiteralDfa5_1(long old0, long active0)
+static private final int jjMoveStringLiteralDfa5_1(long old0, long active0, long old1, long active1)
 {
-   if (((active0 &= old0)) == 0L)
-      return jjStartNfa_1(3, old0, 0L);
+   if (((active0 &= old0) | (active1 &= old1)) == 0L)
+      return jjStartNfa_1(3, old0, old1, 0L);
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
-      jjStopStringLiteralDfa_1(4, active0, 0L);
+      jjStopStringLiteralDfa_1(4, active0, active1, 0L);
       return 5;
    }
    switch(curChar)
    {
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa6_1(active0, 0x100000000000000L);
+         return jjMoveStringLiteralDfa6_1(active0, 0L, active1, 0x10L);
       case 67:
       case 99:
-         if ((active0 & 0x40000000L) != 0L)
-            return jjStartNfaWithStates_1(5, 30, 14);
-         break;
+         if ((active0 & 0x4000000000L) != 0L)
+            return jjStartNfaWithStates_1(5, 38, 14);
+         return jjMoveStringLiteralDfa6_1(active0, 0x8000000000000000L, active1, 0L);
       case 68:
       case 100:
-         return jjMoveStringLiteralDfa6_1(active0, 0x1000a000000L);
+         return jjMoveStringLiteralDfa6_1(active0, 0x800500000000L, active1, 0L);
       case 69:
       case 101:
-         if ((active0 & 0x400000000000000L) != 0L)
-            return jjStartNfaWithStates_1(5, 58, 14);
-         return jjMoveStringLiteralDfa6_1(active0, 0x2000000000000000L);
+         if ((active0 & 0x2000000000L) != 0L)
+            return jjStartNfaWithStates_1(5, 37, 14);
+         else if ((active1 & 0x40L) != 0L)
+            return jjStartNfaWithStates_1(5, 70, 14);
+         return jjMoveStringLiteralDfa6_1(active0, 0L, active1, 0x200L);
       case 70:
       case 102:
-         if ((active0 & 0x100000L) != 0L)
-            return jjStartNfaWithStates_1(5, 20, 14);
+         if ((active0 & 0x2000000L) != 0L)
+            return jjStartNfaWithStates_1(5, 25, 14);
          break;
       case 71:
       case 103:
-         if ((active0 & 0x20000000000000L) != 0L)
-            return jjStartNfaWithStates_1(5, 53, 14);
+         if ((active1 & 0x2L) != 0L)
+            return jjStartNfaWithStates_1(5, 65, 14);
          break;
       case 72:
       case 104:
-         if ((active0 & 0x1000000000000L) != 0L)
-            return jjStartNfaWithStates_1(5, 48, 14);
+         if ((active0 & 0x40000000000000L) != 0L)
+            return jjStartNfaWithStates_1(5, 54, 14);
          break;
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa6_1(active0, 0x10000000020000L);
+         return jjMoveStringLiteralDfa6_1(active0, 0x1800000000400000L, active1, 0L);
       case 76:
       case 108:
-         if ((active0 & 0x20000000L) != 0L)
-            return jjStartNfaWithStates_1(5, 29, 14);
-         return jjMoveStringLiteralDfa6_1(active0, 0x4000000000L);
+         if ((active0 & 0x1000000000L) != 0L)
+            return jjStartNfaWithStates_1(5, 36, 14);
+         return jjMoveStringLiteralDfa6_1(active0, 0x200000000000L, active1, 0L);
       case 78:
       case 110:
-         if ((active0 & 0x400000000000L) != 0L)
-            return jjStartNfaWithStates_1(5, 46, 14);
-         return jjMoveStringLiteralDfa6_1(active0, 0x2000000000L);
+         if ((active0 & 0x10000000000000L) != 0L)
+            return jjStartNfaWithStates_1(5, 52, 14);
+         return jjMoveStringLiteralDfa6_1(active0, 0x100000000000L, active1, 0L);
       case 82:
       case 114:
-         return jjMoveStringLiteralDfa6_1(active0, 0x14000000L);
+         if ((active0 & 0x4000000000000000L) != 0L)
+            return jjStartNfaWithStates_1(5, 62, 14);
+         return jjMoveStringLiteralDfa6_1(active0, 0xa00000000L, active1, 0L);
       case 84:
       case 116:
-         if ((active0 & 0x40000000000000L) != 0L)
-            return jjStartNfaWithStates_1(5, 54, 14);
+         if ((active1 & 0x4L) != 0L)
+            return jjStartNfaWithStates_1(5, 66, 14);
          break;
       default :
          break;
    }
-   return jjStartNfa_1(4, active0, 0L);
+   return jjStartNfa_1(4, active0, active1, 0L);
 }
-static private final int jjMoveStringLiteralDfa6_1(long old0, long active0)
+static private final int jjMoveStringLiteralDfa6_1(long old0, long active0, long old1, long active1)
 {
-   if (((active0 &= old0)) == 0L)
-      return jjStartNfa_1(4, old0, 0L);
+   if (((active0 &= old0) | (active1 &= old1)) == 0L)
+      return jjStartNfa_1(4, old0, old1, 0L);
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
-      jjStopStringLiteralDfa_1(5, active0, 0L);
+      jjStopStringLiteralDfa_1(5, active0, active1, 0L);
       return 6;
    }
    switch(curChar)
    {
       case 69:
       case 101:
-         if ((active0 & 0x2000000L) != 0L)
+         if ((active0 & 0x100000000L) != 0L)
          {
-            jjmatchedKind = 25;
+            jjmatchedKind = 32;
             jjmatchedPos = 6;
          }
-         else if ((active0 & 0x4000000L) != 0L)
+         else if ((active0 & 0x200000000L) != 0L)
          {
-            jjmatchedKind = 26;
+            jjmatchedKind = 33;
             jjmatchedPos = 6;
          }
-         return jjMoveStringLiteralDfa7_1(active0, 0x18000000L);
+         return jjMoveStringLiteralDfa7_1(active0, 0xc00000000L, active1, 0L);
+      case 72:
+      case 104:
+         if ((active0 & 0x8000000000000000L) != 0L)
+            return jjStartNfaWithStates_1(6, 63, 14);
+         break;
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa7_1(active0, 0x10000000000000L);
+         return jjMoveStringLiteralDfa7_1(active0, 0x800000000000000L, active1, 0L);
       case 78:
       case 110:
-         if ((active0 & 0x100000000000000L) != 0L)
-            return jjStartNfaWithStates_1(6, 56, 14);
+         if ((active1 & 0x10L) != 0L)
+            return jjStartNfaWithStates_1(6, 68, 14);
          break;
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa7_1(active0, 0x20000L);
+         return jjMoveStringLiteralDfa7_1(active0, 0x400000L, active1, 0L);
       case 82:
       case 114:
-         if ((active0 & 0x2000000000000000L) != 0L)
-            return jjStartNfaWithStates_1(6, 61, 14);
+         if ((active1 & 0x200L) != 0L)
+            return jjStartNfaWithStates_1(6, 73, 14);
          break;
       case 83:
       case 115:
-         if ((active0 & 0x10000000000L) != 0L)
-            return jjStartNfaWithStates_1(6, 40, 14);
+         if ((active0 & 0x800000000000L) != 0L)
+            return jjStartNfaWithStates_1(6, 47, 14);
          break;
       case 84:
       case 116:
-         if ((active0 & 0x4000000000L) != 0L)
-            return jjStartNfaWithStates_1(6, 38, 14);
-         break;
+         if ((active0 & 0x200000000000L) != 0L)
+            return jjStartNfaWithStates_1(6, 45, 14);
+         return jjMoveStringLiteralDfa7_1(active0, 0x1000000000000000L, active1, 0L);
       case 85:
       case 117:
-         return jjMoveStringLiteralDfa7_1(active0, 0x2000000000L);
+         return jjMoveStringLiteralDfa7_1(active0, 0x100000000000L, active1, 0L);
       default :
          break;
    }
-   return jjStartNfa_1(5, active0, 0L);
+   return jjStartNfa_1(5, active0, active1, 0L);
 }
-static private final int jjMoveStringLiteralDfa7_1(long old0, long active0)
+static private final int jjMoveStringLiteralDfa7_1(long old0, long active0, long old1, long active1)
 {
-   if (((active0 &= old0)) == 0L)
-      return jjStartNfa_1(5, old0, 0L);
+   if (((active0 &= old0) | (active1 &= old1)) == 0L)
+      return jjStartNfa_1(5, old0, old1, 0L);
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
-      jjStopStringLiteralDfa_1(6, active0, 0L);
+      jjStopStringLiteralDfa_1(6, active0, 0L, 0L);
       return 7;
    }
    switch(curChar)
    {
       case 95:
-         return jjMoveStringLiteralDfa8_1(active0, 0x18000000L);
+         return jjMoveStringLiteralDfa8_1(active0, 0xc00000000L);
+      case 67:
+      case 99:
+         return jjMoveStringLiteralDfa8_1(active0, 0x1000000000000000L);
       case 69:
       case 101:
-         if ((active0 & 0x2000000000L) != 0L)
-            return jjStartNfaWithStates_1(7, 37, 14);
-         else if ((active0 & 0x10000000000000L) != 0L)
-            return jjStartNfaWithStates_1(7, 52, 14);
+         if ((active0 & 0x100000000000L) != 0L)
+            return jjStartNfaWithStates_1(7, 44, 14);
+         else if ((active0 & 0x800000000000000L) != 0L)
+            return jjStartNfaWithStates_1(7, 59, 14);
          break;
       case 78:
       case 110:
-         if ((active0 & 0x20000L) != 0L)
-            return jjStartNfaWithStates_1(7, 17, 14);
+         if ((active0 & 0x400000L) != 0L)
+            return jjStartNfaWithStates_1(7, 22, 14);
          break;
       default :
          break;
    }
-   return jjStartNfa_1(6, active0, 0L);
+   return jjStartNfa_1(6, active0, 0L, 0L);
 }
 static private final int jjMoveStringLiteralDfa8_1(long old0, long active0)
 {
    if (((active0 &= old0)) == 0L)
-      return jjStartNfa_1(6, old0, 0L);
+      return jjStartNfa_1(6, old0, 0L, 0L);
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
-      jjStopStringLiteralDfa_1(7, active0, 0L);
+      jjStopStringLiteralDfa_1(7, active0, 0L, 0L);
       return 8;
    }
    switch(curChar)
    {
+      case 72:
+      case 104:
+         if ((active0 & 0x1000000000000000L) != 0L)
+            return jjStartNfaWithStates_1(8, 60, 14);
+         break;
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa9_1(active0, 0x18000000L);
+         return jjMoveStringLiteralDfa9_1(active0, 0xc00000000L);
       default :
          break;
    }
-   return jjStartNfa_1(7, active0, 0L);
+   return jjStartNfa_1(7, active0, 0L, 0L);
 }
 static private final int jjMoveStringLiteralDfa9_1(long old0, long active0)
 {
    if (((active0 &= old0)) == 0L)
-      return jjStartNfa_1(7, old0, 0L);
+      return jjStartNfa_1(7, old0, 0L, 0L);
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
-      jjStopStringLiteralDfa_1(8, active0, 0L);
+      jjStopStringLiteralDfa_1(8, active0, 0L, 0L);
       return 9;
    }
    switch(curChar)
    {
       case 78:
       case 110:
-         return jjMoveStringLiteralDfa10_1(active0, 0x18000000L);
+         return jjMoveStringLiteralDfa10_1(active0, 0xc00000000L);
       default :
          break;
    }
-   return jjStartNfa_1(8, active0, 0L);
+   return jjStartNfa_1(8, active0, 0L, 0L);
 }
 static private final int jjMoveStringLiteralDfa10_1(long old0, long active0)
 {
    if (((active0 &= old0)) == 0L)
-      return jjStartNfa_1(8, old0, 0L);
+      return jjStartNfa_1(8, old0, 0L, 0L);
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
-      jjStopStringLiteralDfa_1(9, active0, 0L);
+      jjStopStringLiteralDfa_1(9, active0, 0L, 0L);
       return 10;
    }
    switch(curChar)
    {
       case 67:
       case 99:
-         return jjMoveStringLiteralDfa11_1(active0, 0x18000000L);
+         return jjMoveStringLiteralDfa11_1(active0, 0xc00000000L);
       default :
          break;
    }
-   return jjStartNfa_1(9, active0, 0L);
+   return jjStartNfa_1(9, active0, 0L, 0L);
 }
 static private final int jjMoveStringLiteralDfa11_1(long old0, long active0)
 {
    if (((active0 &= old0)) == 0L)
-      return jjStartNfa_1(9, old0, 0L);
+      return jjStartNfa_1(9, old0, 0L, 0L);
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
-      jjStopStringLiteralDfa_1(10, active0, 0L);
+      jjStopStringLiteralDfa_1(10, active0, 0L, 0L);
       return 11;
    }
    switch(curChar)
    {
       case 69:
       case 101:
-         if ((active0 & 0x8000000L) != 0L)
-            return jjStartNfaWithStates_1(11, 27, 14);
-         else if ((active0 & 0x10000000L) != 0L)
-            return jjStartNfaWithStates_1(11, 28, 14);
+         if ((active0 & 0x400000000L) != 0L)
+            return jjStartNfaWithStates_1(11, 34, 14);
+         else if ((active0 & 0x800000000L) != 0L)
+            return jjStartNfaWithStates_1(11, 35, 14);
          break;
       default :
          break;
    }
-   return jjStartNfa_1(10, active0, 0L);
+   return jjStartNfa_1(10, active0, 0L, 0L);
 }
 static final long[] jjbitVec0 = {
    0x0L, 0x0L, 0xffffffffffffffffL, 0xffffffffffffffffL
@@ -1203,7 +1353,7 @@ static private final int jjMoveNfa_1(int startState, int curPos)
 {
    int[] nextStates;
    int startsAt = 0;
-   jjnewStateCnt = 56;
+   jjnewStateCnt = 64;
    int i = 1;
    jjstateSet[0] = startState;
    int j, kind = 0x7fffffff;
@@ -1220,9 +1370,9 @@ static private final int jjMoveNfa_1(int startState, int curPos)
             {
                case 3:
                   if ((0x3ff000000000000L & l) != 0L)
-                     jjCheckNAddStates(2, 8);
+                     jjCheckNAddStates(0, 6);
                   else if (curChar == 39)
-                     jjCheckNAddStates(9, 12);
+                     jjCheckNAddStates(7, 12);
                   else if (curChar == 34)
                      jjCheckNAddStates(13, 18);
                   else if (curChar == 36)
@@ -1233,14 +1383,14 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                      jjstateSet[jjnewStateCnt++] = 2;
                   if ((0x3fe000000000000L & l) != 0L)
                   {
-                     if (kind > 64)
-                        kind = 64;
+                     if (kind > 97)
+                        kind = 97;
                      jjCheckNAddTwoStates(5, 6);
                   }
                   else if (curChar == 48)
                   {
-                     if (kind > 64)
-                        kind = 64;
+                     if (kind > 97)
+                        kind = 97;
                      jjCheckNAddStates(19, 21);
                   }
                   break;
@@ -1249,8 +1399,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                      jjstateSet[jjnewStateCnt++] = 1;
                   break;
                case 1:
-                  if ((0xffff7fffffffffffL & l) != 0L && kind > 10)
-                     kind = 10;
+                  if ((0xffff7fffffffffffL & l) != 0L && kind > 13)
+                     kind = 13;
                   break;
                case 2:
                   if (curChar == 42)
@@ -1259,15 +1409,15 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 4:
                   if ((0x3fe000000000000L & l) == 0L)
                      break;
-                  if (kind > 64)
-                     kind = 64;
+                  if (kind > 97)
+                     kind = 97;
                   jjCheckNAddTwoStates(5, 6);
                   break;
                case 5:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 64)
-                     kind = 64;
+                  if (kind > 97)
+                     kind = 97;
                   jjCheckNAddTwoStates(5, 6);
                   break;
                case 7:
@@ -1277,8 +1427,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 8:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 68)
-                     kind = 68;
+                  if (kind > 101)
+                     kind = 101;
                   jjCheckNAddStates(22, 24);
                   break;
                case 10:
@@ -1288,15 +1438,15 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 11:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 68)
-                     kind = 68;
+                  if (kind > 101)
+                     kind = 101;
                   jjCheckNAddTwoStates(11, 12);
                   break;
                case 14:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 74)
-                     kind = 74;
+                  if (kind > 107)
+                     kind = 107;
                   jjstateSet[jjnewStateCnt++] = 14;
                   break;
                case 15:
@@ -1306,13 +1456,13 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 17:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 126)
-                     kind = 126;
+                  if (kind > 142)
+                     kind = 142;
                   jjstateSet[jjnewStateCnt++] = 17;
                   break;
                case 18:
                   if ((0x3ff000000000000L & l) != 0L)
-                     jjCheckNAddStates(2, 8);
+                     jjCheckNAddStates(0, 6);
                   break;
                case 19:
                   if ((0x3ff000000000000L & l) != 0L)
@@ -1321,15 +1471,15 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 20:
                   if (curChar != 46)
                      break;
-                  if (kind > 68)
-                     kind = 68;
+                  if (kind > 101)
+                     kind = 101;
                   jjCheckNAddStates(25, 27);
                   break;
                case 21:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 68)
-                     kind = 68;
+                  if (kind > 101)
+                     kind = 101;
                   jjCheckNAddStates(25, 27);
                   break;
                case 23:
@@ -1339,8 +1489,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 24:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 68)
-                     kind = 68;
+                  if (kind > 101)
+                     kind = 101;
                   jjCheckNAddTwoStates(24, 12);
                   break;
                case 25:
@@ -1354,8 +1504,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 28:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 68)
-                     kind = 68;
+                  if (kind > 101)
+                     kind = 101;
                   jjCheckNAddTwoStates(28, 12);
                   break;
                case 29:
@@ -1373,22 +1523,22 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 33:
                   if (curChar != 48)
                      break;
-                  if (kind > 64)
-                     kind = 64;
+                  if (kind > 97)
+                     kind = 97;
                   jjCheckNAddStates(19, 21);
                   break;
                case 35:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 64)
-                     kind = 64;
+                  if (kind > 97)
+                     kind = 97;
                   jjCheckNAddTwoStates(35, 6);
                   break;
                case 36:
                   if ((0xff000000000000L & l) == 0L)
                      break;
-                  if (kind > 64)
-                     kind = 64;
+                  if (kind > 97)
+                     kind = 97;
                   jjCheckNAddTwoStates(36, 6);
                   break;
                case 37:
@@ -1399,51 +1549,57 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                   if ((0xfffffffbffffffffL & l) != 0L)
                      jjCheckNAddStates(31, 33);
                   break;
-               case 39:
-                  if (curChar == 34)
-                     jjCheckNAddStates(31, 33);
+               case 40:
+                  jjCheckNAddStates(31, 33);
                   break;
                case 41:
-                  if (curChar == 34 && kind > 70)
-                     kind = 70;
+                  if (curChar == 34 && kind > 103)
+                     kind = 103;
                   break;
                case 42:
                   if ((0xfffffffbffffffffL & l) != 0L)
                      jjCheckNAddStates(34, 36);
                   break;
-               case 43:
-                  if (curChar == 34)
-                     jjCheckNAddStates(34, 36);
+               case 44:
+                  jjCheckNAddStates(34, 36);
                   break;
                case 45:
-                  if (curChar == 34 && kind > 71)
-                     kind = 71;
+                  if (curChar == 34 && kind > 104)
+                     kind = 104;
                   break;
                case 46:
                   if (curChar == 39)
-                     jjCheckNAddStates(9, 12);
+                     jjCheckNAddStates(7, 12);
                   break;
                case 47:
                   if ((0xffffff7fffffffffL & l) != 0L)
-                     jjCheckNAddTwoStates(47, 48);
-                  break;
-               case 48:
-                  if (curChar == 39 && kind > 70)
-                     kind = 70;
+                     jjCheckNAddStates(37, 39);
                   break;
                case 49:
-                  if ((0xffffff7fffffffffL & l) != 0L)
-                     jjCheckNAddTwoStates(49, 50);
+                  jjCheckNAddStates(37, 39);
                   break;
                case 50:
-                  if (curChar == 39 && kind > 72)
-                     kind = 72;
+                  if (curChar == 39 && kind > 103)
+                     kind = 103;
                   break;
-               case 52:
-                  jjAddStates(37, 38);
+               case 51:
+                  if ((0xffffff7fffffffffL & l) != 0L)
+                     jjCheckNAddStates(40, 42);
+                  break;
+               case 53:
+                  jjCheckNAddStates(40, 42);
                   break;
                case 54:
-                  jjAddStates(39, 40);
+                  if (curChar == 39 && kind > 105)
+                     kind = 105;
+                  break;
+               case 56:
+               case 58:
+                  jjCheckNAddStates(43, 45);
+                  break;
+               case 60:
+               case 62:
+                  jjCheckNAddStates(46, 48);
                   break;
                default : break;
             }
@@ -1457,58 +1613,58 @@ static private final int jjMoveNfa_1(int startState, int curPos)
             switch(jjstateSet[--i])
             {
                case 3:
-                  if ((0x7fffffe87fffffeL & l) != 0L)
+                  if ((0x87fffffe87fffffeL & l) != 0L)
                   {
-                     if (kind > 74)
-                        kind = 74;
+                     if (kind > 107)
+                        kind = 107;
                      jjCheckNAdd(14);
                   }
                   else if (curChar == 96)
-                     jjCheckNAddStates(41, 44);
+                     jjCheckNAddStates(49, 54);
                   break;
                case 1:
-                  if (kind > 10)
-                     kind = 10;
+                  if (kind > 13)
+                     kind = 13;
                   break;
                case 6:
-                  if ((0x100000001000L & l) != 0L && kind > 64)
-                     kind = 64;
+                  if ((0x100000001000L & l) != 0L && kind > 97)
+                     kind = 97;
                   break;
                case 9:
                   if ((0x2000000020L & l) != 0L)
-                     jjAddStates(45, 46);
+                     jjAddStates(55, 56);
                   break;
                case 12:
-                  if ((0x5000000050L & l) != 0L && kind > 68)
-                     kind = 68;
+                  if ((0x5000000050L & l) != 0L && kind > 101)
+                     kind = 101;
                   break;
                case 13:
                case 14:
-                  if ((0x7fffffe87fffffeL & l) == 0L)
+                  if ((0x87fffffe87fffffeL & l) == 0L)
                      break;
-                  if (kind > 74)
-                     kind = 74;
+                  if (kind > 107)
+                     kind = 107;
                   jjCheckNAdd(14);
                   break;
                case 16:
                case 17:
-                  if ((0x7fffffe87fffffeL & l) == 0L)
+                  if ((0x87fffffe87fffffeL & l) == 0L)
                      break;
-                  if (kind > 126)
-                     kind = 126;
+                  if (kind > 142)
+                     kind = 142;
                   jjCheckNAdd(17);
                   break;
                case 22:
                   if ((0x2000000020L & l) != 0L)
-                     jjAddStates(47, 48);
+                     jjAddStates(57, 58);
                   break;
                case 26:
                   if ((0x2000000020L & l) != 0L)
-                     jjAddStates(49, 50);
+                     jjAddStates(59, 60);
                   break;
                case 30:
                   if ((0x2000000020L & l) != 0L)
-                     jjAddStates(51, 52);
+                     jjAddStates(61, 62);
                   break;
                case 34:
                   if ((0x100000001000000L & l) != 0L)
@@ -1517,49 +1673,87 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 35:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 64)
-                     kind = 64;
+                  if (kind > 97)
+                     kind = 97;
                   jjCheckNAddTwoStates(35, 6);
                   break;
                case 38:
-                  jjAddStates(31, 33);
+                  if ((0xffffffffefffffffL & l) != 0L)
+                     jjCheckNAddStates(31, 33);
                   break;
-               case 40:
+               case 39:
                   if (curChar == 92)
-                     jjstateSet[jjnewStateCnt++] = 39;
+                     jjstateSet[jjnewStateCnt++] = 40;
+                  break;
+               case 40:
+                  jjCheckNAddStates(31, 33);
                   break;
                case 42:
-                  jjAddStates(34, 36);
+                  if ((0xffffffffefffffffL & l) != 0L)
+                     jjCheckNAddStates(34, 36);
                   break;
-               case 44:
+               case 43:
                   if (curChar == 92)
-                     jjstateSet[jjnewStateCnt++] = 43;
+                     jjstateSet[jjnewStateCnt++] = 44;
+                  break;
+               case 44:
+                  jjCheckNAddStates(34, 36);
                   break;
                case 47:
-                  jjAddStates(53, 54);
+                  if ((0xffffffffefffffffL & l) != 0L)
+                     jjCheckNAddStates(37, 39);
+                  break;
+               case 48:
+                  if (curChar == 92)
+                     jjstateSet[jjnewStateCnt++] = 49;
                   break;
                case 49:
-                  jjAddStates(55, 56);
+                  jjCheckNAddStates(37, 39);
                   break;
                case 51:
-                  if (curChar == 96)
-                     jjCheckNAddStates(41, 44);
+                  if ((0xffffffffefffffffL & l) != 0L)
+                     jjCheckNAddStates(40, 42);
                   break;
                case 52:
-                  if ((0xfffffffeffffffffL & l) != 0L)
-                     jjCheckNAddTwoStates(52, 53);
+                  if (curChar == 92)
+                     jjstateSet[jjnewStateCnt++] = 53;
                   break;
                case 53:
-                  if (curChar == 96 && kind > 70)
-                     kind = 70;
-                  break;
-               case 54:
-                  if ((0xfffffffeffffffffL & l) != 0L)
-                     jjCheckNAddTwoStates(54, 55);
+                  jjCheckNAddStates(40, 42);
                   break;
                case 55:
-                  if (curChar == 96 && kind > 73)
-                     kind = 73;
+                  if (curChar == 96)
+                     jjCheckNAddStates(49, 54);
+                  break;
+               case 56:
+                  if ((0xfffffffeefffffffL & l) != 0L)
+                     jjCheckNAddStates(43, 45);
+                  break;
+               case 57:
+                  if (curChar == 92)
+                     jjstateSet[jjnewStateCnt++] = 58;
+                  break;
+               case 58:
+                  jjCheckNAddStates(43, 45);
+                  break;
+               case 59:
+                  if (curChar == 96 && kind > 103)
+                     kind = 103;
+                  break;
+               case 60:
+                  if ((0xfffffffeefffffffL & l) != 0L)
+                     jjCheckNAddStates(46, 48);
+                  break;
+               case 61:
+                  if (curChar == 92)
+                     jjstateSet[jjnewStateCnt++] = 62;
+                  break;
+               case 62:
+                  jjCheckNAddStates(46, 48);
+                  break;
+               case 63:
+                  if (curChar == 96 && kind > 106)
+                     kind = 106;
                   break;
                default : break;
             }
@@ -1573,33 +1767,55 @@ static private final int jjMoveNfa_1(int startState, int curPos)
          {
             switch(jjstateSet[--i])
             {
+               case 3:
+               case 14:
+                  if ((jjbitVec0[i2] & l2) == 0L)
+                     break;
+                  if (kind > 107)
+                     kind = 107;
+                  jjCheckNAdd(14);
+                  break;
                case 1:
-                  if ((jjbitVec0[i2] & l2) != 0L && kind > 10)
-                     kind = 10;
+                  if ((jjbitVec0[i2] & l2) != 0L && kind > 13)
+                     kind = 13;
+                  break;
+               case 16:
+               case 17:
+                  if ((jjbitVec0[i2] & l2) == 0L)
+                     break;
+                  if (kind > 142)
+                     kind = 142;
+                  jjCheckNAdd(17);
                   break;
                case 38:
+               case 40:
                   if ((jjbitVec0[i2] & l2) != 0L)
-                     jjAddStates(31, 33);
+                     jjCheckNAddStates(31, 33);
                   break;
                case 42:
+               case 44:
                   if ((jjbitVec0[i2] & l2) != 0L)
-                     jjAddStates(34, 36);
+                     jjCheckNAddStates(34, 36);
                   break;
                case 47:
+               case 49:
                   if ((jjbitVec0[i2] & l2) != 0L)
-                     jjAddStates(53, 54);
+                     jjCheckNAddStates(37, 39);
                   break;
-               case 49:
+               case 51:
+               case 53:
                   if ((jjbitVec0[i2] & l2) != 0L)
-                     jjAddStates(55, 56);
+                     jjCheckNAddStates(40, 42);
                   break;
-               case 52:
+               case 56:
+               case 58:
                   if ((jjbitVec0[i2] & l2) != 0L)
-                     jjAddStates(37, 38);
+                     jjCheckNAddStates(43, 45);
                   break;
-               case 54:
+               case 60:
+               case 62:
                   if ((jjbitVec0[i2] & l2) != 0L)
-                     jjAddStates(39, 40);
+                     jjCheckNAddStates(46, 48);
                   break;
                default : break;
             }
@@ -1612,7 +1828,7 @@ static private final int jjMoveNfa_1(int startState, int curPos)
          kind = 0x7fffffff;
       }
       ++curPos;
-      if ((i = jjnewStateCnt) == (startsAt = 56 - (jjnewStateCnt = startsAt)))
+      if ((i = jjnewStateCnt) == (startsAt = 64 - (jjnewStateCnt = startsAt)))
          return curPos;
       try { curChar = input_stream.readChar(); }
       catch(java.io.IOException e) { return curPos; }
@@ -1623,7 +1839,10 @@ static private final int jjMoveStringLiteralDfa0_3()
    switch(curChar)
    {
       case 42:
-         return jjMoveStringLiteralDfa1_3(0x2000L);
+         return jjMoveStringLiteralDfa1_3(0x40000L);
+      case 84:
+      case 116:
+         return jjMoveStringLiteralDfa1_3(0x20000L);
       default :
          return 1;
    }
@@ -1637,33 +1856,74 @@ static private final int jjMoveStringLiteralDfa1_3(long active0)
    switch(curChar)
    {
       case 47:
-         if ((active0 & 0x2000L) != 0L)
-            return jjStopAtPos(1, 13);
+         if ((active0 & 0x40000L) != 0L)
+            return jjStopAtPos(1, 18);
          break;
+      case 79:
+      case 111:
+         return jjMoveStringLiteralDfa2_3(active0, 0x20000L);
       default :
          return 2;
    }
    return 2;
 }
+static private final int jjMoveStringLiteralDfa2_3(long old0, long active0)
+{
+   if (((active0 &= old0)) == 0L)
+      return 2;
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+      return 2;
+   }
+   switch(curChar)
+   {
+      case 68:
+      case 100:
+         return jjMoveStringLiteralDfa3_3(active0, 0x20000L);
+      default :
+         return 3;
+   }
+}
+static private final int jjMoveStringLiteralDfa3_3(long old0, long active0)
+{
+   if (((active0 &= old0)) == 0L)
+      return 3;
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+      return 3;
+   }
+   switch(curChar)
+   {
+      case 79:
+      case 111:
+         if ((active0 & 0x20000L) != 0L)
+            return jjStopAtPos(3, 17);
+         break;
+      default :
+         return 4;
+   }
+   return 4;
+}
 static final int[] jjnextStates = {
-   4, 5, 19, 20, 25, 26, 29, 30, 12, 47, 48, 49, 50, 38, 40, 41, 
-   42, 44, 45, 34, 36, 6, 8, 9, 12, 21, 22, 12, 29, 30, 12, 38, 
-   40, 41, 42, 44, 45, 52, 53, 54, 55, 52, 53, 54, 55, 10, 11, 23, 
-   24, 27, 28, 31, 32, 47, 48, 49, 50, 
+   19, 20, 25, 26, 29, 30, 12, 47, 48, 50, 51, 52, 54, 38, 39, 41, 
+   42, 43, 45, 34, 36, 6, 8, 9, 12, 21, 22, 12, 29, 30, 12, 38, 
+   39, 41, 42, 43, 45, 47, 48, 50, 51, 52, 54, 56, 57, 59, 60, 61, 
+   63, 56, 57, 59, 60, 61, 63, 10, 11, 23, 24, 27, 28, 31, 32, 
 };
 public static final String[] jjstrLiteralImages = {
-"", null, "\77\76", null, null, null, null, null, null, null, null, null, null, 
+"", "\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, "\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, 
+"\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, "\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", "\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", "\76\76\76\75", null, 
-"\77\76", };
+"\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", 
@@ -1672,28 +1932,28 @@ public static final String[] lexStateNames = {
    "IN_MULTI_LINE_COMMENT", 
 };
 public static final int[] jjnewLexState = {
-   -1, 1, 0, -1, -1, -1, -1, -1, -1, 2, 3, 4, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+   -1, 1, 1, 1, 0, -1, -1, -1, -1, -1, -1, 2, 2, 3, 4, 1, -1, -1, 1, 1, -1, -1, -1, -1, -1, 
    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -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 = {
-   0xffffffffffff0007L, 0xffffffffffffc7d1L, 0x0L, 
+   0xffffffffffe0001fL, 0xffff8fa3ffffffffL, 0x7fffL, 
 };
 static final long[] jjtoSkip = {
-   0x71f8L, 0x0L, 0x0L, 
+   0xfffe0L, 0x0L, 0x0L, 
 };
 static final long[] jjtoSpecial = {
-   0x7000L, 0x0L, 0x0L, 
+   0xff800L, 0x0L, 0x0L, 
 };
 static final long[] jjtoMore = {
-   0x8e00L, 0x0L, 0x0L, 
+   0x100000L, 0x0L, 0x0L, 
 };
 static protected SimpleCharStream input_stream;
-static private final int[] jjrounds = new int[56];
-static private final int[] jjstateSet = new int[112];
+static private final int[] jjrounds = new int[64];
+static private final int[] jjstateSet = new int[128];
 static StringBuffer image;
 static int jjimageLen;
 static int lengthOfMatch;
@@ -1720,7 +1980,7 @@ static private final void ReInitRounds()
 {
    int i;
    jjround = 0x80000001;
-   for (i = 56; i-- > 0;)
+   for (i = 64; i-- > 0;)
       jjrounds[i] = 0x80000000;
 }
 static public void ReInit(SimpleCharStream stream, int lexState)
@@ -1775,6 +2035,7 @@ public static Token getNextToken()
       jjmatchedKind = 0;
       matchedToken = jjFillToken();
       matchedToken.specialToken = specialToken;
+      CommonTokenAction(matchedToken);
       return matchedToken;
    }
    image = null;
@@ -1788,9 +2049,9 @@ public static Token getNextToken()
          jjmatchedKind = 0x7fffffff;
          jjmatchedPos = 0;
          curPos = jjMoveStringLiteralDfa0_0();
-         if (jjmatchedPos == 0 && jjmatchedKind > 3)
+         if (jjmatchedPos == 0 && jjmatchedKind > 5)
          {
-            jjmatchedKind = 3;
+            jjmatchedKind = 5;
          }
          break;
        case 1:
@@ -1807,27 +2068,27 @@ public static Token getNextToken()
          jjmatchedKind = 0x7fffffff;
          jjmatchedPos = 0;
          curPos = jjMoveStringLiteralDfa0_2();
-         if (jjmatchedPos == 0 && jjmatchedKind > 15)
+         if (jjmatchedPos == 0 && jjmatchedKind > 16)
          {
-            jjmatchedKind = 15;
+            jjmatchedKind = 16;
          }
          break;
        case 3:
          jjmatchedKind = 0x7fffffff;
          jjmatchedPos = 0;
          curPos = jjMoveStringLiteralDfa0_3();
-         if (jjmatchedPos == 0 && jjmatchedKind > 15)
+         if (jjmatchedPos == 0 && jjmatchedKind > 20)
          {
-            jjmatchedKind = 15;
+            jjmatchedKind = 20;
          }
          break;
        case 4:
          jjmatchedKind = 0x7fffffff;
          jjmatchedPos = 0;
          curPos = jjMoveStringLiteralDfa0_4();
-         if (jjmatchedPos == 0 && jjmatchedKind > 15)
+         if (jjmatchedPos == 0 && jjmatchedKind > 20)
          {
-            jjmatchedKind = 15;
+            jjmatchedKind = 20;
          }
          break;
      }
@@ -1839,8 +2100,10 @@ public static Token getNextToken()
         {
            matchedToken = jjFillToken();
            matchedToken.specialToken = specialToken;
+           TokenLexicalActions(matchedToken);
        if (jjnewLexState[jjmatchedKind] != -1)
          curLexState = jjnewLexState[jjmatchedKind];
+           CommonTokenAction(matchedToken);
            return matchedToken;
         }
         else if ((jjtoSkip[jjmatchedKind >> 6] & (1L << (jjmatchedKind & 077))) != 0L)
@@ -1863,7 +2126,7 @@ public static Token getNextToken()
            curLexState = jjnewLexState[jjmatchedKind];
            continue EOFLoop;
         }
-        MoreLexicalActions();
+        jjimageLen += jjmatchedPos + 1;
       if (jjnewLexState[jjmatchedKind] != -1)
         curLexState = jjnewLexState[jjmatchedKind];
         curPos = 0;
@@ -1902,22 +2165,55 @@ static void SkipLexicalActions(Token matchedToken)
 {
    switch(jjmatchedKind)
    {
+      case 13 :
+         if (image == null)
+            image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
+         else
+            image.append(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
+                   input_stream.backup(1);
+         break;
+      case 17 :
+         if (image == null)
+            image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
+         else
+            image.append(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
+         PHPParser.createNewTask();
+         break;
       default :
          break;
    }
 }
-static void MoreLexicalActions()
+static void TokenLexicalActions(Token matchedToken)
 {
-   jjimageLen += (lengthOfMatch = jjmatchedPos + 1);
    switch(jjmatchedKind)
    {
-      case 10 :
-         if (image == null)
-              image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen)));
+      case 1 :
+        if (image == null)
+            image = new StringBuffer(jjstrLiteralImages[1]);
          else
-            image.append(new String(input_stream.GetSuffix(jjimageLen)));
-         jjimageLen = 0;
-                   input_stream.backup(1);
+            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;