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

diff --git a/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java b/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java
index 1b01b7c..bbdad0b 100644
--- a/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java
+++ b/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java
@@ -1,22 +1,5 @@
 /* Generated By:JavaCC: Do not edit this line. PHPParserTokenManager.java */
 package test;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-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.corext.Assert;
 
 public class PHPParserTokenManager implements PHPParserConstants
 {
@@ -36,6 +19,225 @@ static private final int jjStopAtPos(int pos, int kind)
    jjmatchedPos = pos;
    return pos + 1;
 }
+static private final int jjMoveStringLiteralDfa0_5()
+{
+   switch(curChar)
+   {
+      case 42:
+         return jjMoveStringLiteralDfa1_5(0x2000000L);
+      case 84:
+      case 116:
+         return jjMoveStringLiteralDfa1_5(0x400000L);
+      default :
+         return 1;
+   }
+}
+static private final int jjMoveStringLiteralDfa1_5(long active0)
+{
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+      return 1;
+   }
+   switch(curChar)
+   {
+      case 47:
+         if ((active0 & 0x2000000L) != 0L)
+            return jjStopAtPos(1, 25);
+         break;
+      case 79:
+      case 111:
+         return jjMoveStringLiteralDfa2_5(active0, 0x400000L);
+      default :
+         return 2;
+   }
+   return 2;
+}
+static private final int jjMoveStringLiteralDfa2_5(long old0, long active0)
+{
+   if (((active0 &= old0)) == 0L)
+      return 2;
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+      return 2;
+   }
+   switch(curChar)
+   {
+      case 68:
+      case 100:
+         return jjMoveStringLiteralDfa3_5(active0, 0x400000L);
+      default :
+         return 3;
+   }
+}
+static private final int jjMoveStringLiteralDfa3_5(long old0, long active0)
+{
+   if (((active0 &= old0)) == 0L)
+      return 3;
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+      return 3;
+   }
+   switch(curChar)
+   {
+      case 79:
+      case 111:
+         if ((active0 & 0x400000L) != 0L)
+            return jjStopAtPos(3, 22);
+         break;
+      default :
+         return 4;
+   }
+   return 4;
+}
+static private final int jjMoveStringLiteralDfa0_8()
+{
+   switch(curChar)
+   {
+      case 125:
+         return jjStopAtPos(0, 117);
+      default :
+         return 1;
+   }
+}
+private static final int jjStopStringLiteralDfa_9(int pos, long active0, long active1)
+{
+   switch (pos)
+   {
+      default :
+         return -1;
+   }
+}
+private static final int jjStartNfa_9(int pos, long active0, long active1)
+{
+   return jjMoveNfa_9(jjStopStringLiteralDfa_9(pos, active0, active1), pos + 1);
+}
+static private final int jjStartNfaWithStates_9(int pos, int kind, int state)
+{
+   jjmatchedKind = kind;
+   jjmatchedPos = pos;
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) { return pos + 1; }
+   return jjMoveNfa_9(state, pos + 1);
+}
+static private final int jjMoveStringLiteralDfa0_9()
+{
+   switch(curChar)
+   {
+      case 125:
+         return jjStopAtPos(0, 119);
+      default :
+         return jjMoveNfa_9(0, 0);
+   }
+}
+static private final void jjCheckNAdd(int state)
+{
+   if (jjrounds[state] != jjround)
+   {
+      jjstateSet[jjnewStateCnt++] = state;
+      jjrounds[state] = jjround;
+   }
+}
+static private final void jjAddStates(int start, int end)
+{
+   do {
+      jjstateSet[jjnewStateCnt++] = jjnextStates[start];
+   } while (start++ != end);
+}
+static private final void jjCheckNAddTwoStates(int state1, int state2)
+{
+   jjCheckNAdd(state1);
+   jjCheckNAdd(state2);
+}
+static private final void jjCheckNAddStates(int start, int end)
+{
+   do {
+      jjCheckNAdd(jjnextStates[start]);
+   } while (start++ != end);
+}
+static private final void jjCheckNAddStates(int start)
+{
+   jjCheckNAdd(jjnextStates[start]);
+   jjCheckNAdd(jjnextStates[start + 1]);
+}
+static final long[] jjbitVec0 = {
+   0x0L, 0x0L, 0xffffffffffffffffL, 0xffffffffffffffffL
+};
+static private final int jjMoveNfa_9(int startState, int curPos)
+{
+   int[] nextStates;
+   int startsAt = 0;
+   jjnewStateCnt = 1;
+   int i = 1;
+   jjstateSet[0] = startState;
+   int j, kind = 0x7fffffff;
+   for (;;)
+   {
+      if (++jjround == 0x7fffffff)
+         ReInitRounds();
+      if (curChar < 64)
+      {
+         long l = 1L << curChar;
+         MatchLoop: do
+         {
+            switch(jjstateSet[--i])
+            {
+               case 0:
+                  kind = 120;
+                  jjstateSet[jjnewStateCnt++] = 0;
+                  break;
+               default : break;
+            }
+         } while(i != startsAt);
+      }
+      else if (curChar < 128)
+      {
+         long l = 1L << (curChar & 077);
+         MatchLoop: do
+         {
+            switch(jjstateSet[--i])
+            {
+               case 0:
+                  if ((0xdfffffffffffffffL & l) == 0L)
+                     break;
+                  kind = 120;
+                  jjstateSet[jjnewStateCnt++] = 0;
+                  break;
+               default : break;
+            }
+         } while(i != startsAt);
+      }
+      else
+      {
+         int i2 = (curChar & 0xff) >> 6;
+         long l2 = 1L << (curChar & 077);
+         MatchLoop: do
+         {
+            switch(jjstateSet[--i])
+            {
+               case 0:
+                  if ((jjbitVec0[i2] & l2) == 0L)
+                     break;
+                  if (kind > 120)
+                     kind = 120;
+                  jjstateSet[jjnewStateCnt++] = 0;
+                  break;
+               default : break;
+            }
+         } while(i != startsAt);
+      }
+      if (kind != 0x7fffffff)
+      {
+         jjmatchedKind = kind;
+         jjmatchedPos = curPos;
+         kind = 0x7fffffff;
+      }
+      ++curPos;
+      if ((i = jjnewStateCnt) == (startsAt = 1 - (jjnewStateCnt = startsAt)))
+         return curPos;
+      try { curChar = input_stream.readChar(); }
+      catch(java.io.IOException e) { return curPos; }
+   }
+}
 static private final int jjMoveStringLiteralDfa0_0()
 {
    switch(curChar)
@@ -139,20 +341,20 @@ static private final int jjMoveStringLiteralDfa4_0(long old0, long active0)
    }
    return 5;
 }
-static private final int jjMoveStringLiteralDfa0_5()
+static private final int jjMoveStringLiteralDfa0_4()
 {
    switch(curChar)
    {
       case 42:
-         return jjMoveStringLiteralDfa1_5(0x2000000L);
+         return jjMoveStringLiteralDfa1_4(0x1000000L);
       case 84:
       case 116:
-         return jjMoveStringLiteralDfa1_5(0x400000L);
+         return jjMoveStringLiteralDfa1_4(0x400000L);
       default :
          return 1;
    }
 }
-static private final int jjMoveStringLiteralDfa1_5(long active0)
+static private final int jjMoveStringLiteralDfa1_4(long active0)
 {
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
@@ -161,18 +363,18 @@ static private final int jjMoveStringLiteralDfa1_5(long active0)
    switch(curChar)
    {
       case 47:
-         if ((active0 & 0x2000000L) != 0L)
-            return jjStopAtPos(1, 25);
+         if ((active0 & 0x1000000L) != 0L)
+            return jjStopAtPos(1, 24);
          break;
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa2_5(active0, 0x400000L);
+         return jjMoveStringLiteralDfa2_4(active0, 0x400000L);
       default :
          return 2;
    }
    return 2;
 }
-static private final int jjMoveStringLiteralDfa2_5(long old0, long active0)
+static private final int jjMoveStringLiteralDfa2_4(long old0, long active0)
 {
    if (((active0 &= old0)) == 0L)
       return 2;
@@ -184,12 +386,12 @@ static private final int jjMoveStringLiteralDfa2_5(long old0, long active0)
    {
       case 68:
       case 100:
-         return jjMoveStringLiteralDfa3_5(active0, 0x400000L);
+         return jjMoveStringLiteralDfa3_4(active0, 0x400000L);
       default :
          return 3;
    }
 }
-static private final int jjMoveStringLiteralDfa3_5(long old0, long active0)
+static private final int jjMoveStringLiteralDfa3_4(long old0, long active0)
 {
    if (((active0 &= old0)) == 0L)
       return 3;
@@ -209,6 +411,462 @@ static private final int jjMoveStringLiteralDfa3_5(long old0, long active0)
    }
    return 4;
 }
+private static final int jjStopStringLiteralDfa_3(int pos, long active0, long active1, long active2)
+{
+   switch (pos)
+   {
+      case 0:
+         if ((active1 & 0x3000000000L) != 0L)
+         {
+            jjmatchedKind = 124;
+            return 1;
+         }
+         return -1;
+      case 1:
+         if ((active1 & 0x1000000000L) != 0L)
+            return 1;
+         if ((active1 & 0x2000000000L) != 0L)
+         {
+            if (jjmatchedPos != 1)
+            {
+               jjmatchedKind = 124;
+               jjmatchedPos = 1;
+            }
+            return 1;
+         }
+         return -1;
+      default :
+         return -1;
+   }
+}
+private static final int jjStartNfa_3(int pos, long active0, long active1, long active2)
+{
+   return jjMoveNfa_3(jjStopStringLiteralDfa_3(pos, active0, active1, active2), pos + 1);
+}
+static private final int jjStartNfaWithStates_3(int pos, int kind, int state)
+{
+   jjmatchedKind = kind;
+   jjmatchedPos = pos;
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) { return pos + 1; }
+   return jjMoveNfa_3(state, pos + 1);
+}
+static private final int jjMoveStringLiteralDfa0_3()
+{
+   switch(curChar)
+   {
+      case 9:
+         return jjStopAtPos(0, 12);
+      case 10:
+         return jjStopAtPos(0, 13);
+      case 12:
+         return jjStopAtPos(0, 15);
+      case 13:
+         return jjStopAtPos(0, 14);
+      case 32:
+         return jjStopAtPos(0, 11);
+      case 33:
+         jjmatchedKind = 81;
+         return jjMoveStringLiteralDfa1_3(0x0L, 0x0L, 0x28000L);
+      case 36:
+         return jjStopAtPos(0, 123);
+      case 37:
+         jjmatchedKind = 96;
+         return jjMoveStringLiteralDfa1_3(0x0L, 0x0L, 0x10000000L);
+      case 38:
+         jjmatchedKind = 93;
+         return jjMoveStringLiteralDfa1_3(0x0L, 0x400000L, 0x1000000L);
+      case 40:
+         return jjStopAtPos(0, 129);
+      case 41:
+         return jjStopAtPos(0, 130);
+      case 42:
+         jjmatchedKind = 91;
+         return jjMoveStringLiteralDfa1_3(0x0L, 0x0L, 0x400000L);
+      case 43:
+         jjmatchedKind = 89;
+         return jjMoveStringLiteralDfa1_3(0x0L, 0x800000L, 0x100000L);
+      case 44:
+         return jjStopAtPos(0, 136);
+      case 45:
+         jjmatchedKind = 90;
+         return jjMoveStringLiteralDfa1_3(0x200000000000L, 0x1000000L, 0x200000L);
+      case 46:
+         jjmatchedKind = 137;
+         return jjMoveStringLiteralDfa1_3(0x0L, 0x0L, 0x8000000L);
+      case 47:
+         jjmatchedKind = 92;
+         return jjMoveStringLiteralDfa1_3(0x0L, 0x0L, 0x800000L);
+      case 58:
+         jjmatchedKind = 84;
+         return jjMoveStringLiteralDfa1_3(0x400000000000L, 0x0L, 0x0L);
+      case 59:
+         return jjStopAtPos(0, 135);
+      case 60:
+         jjmatchedKind = 139;
+         return jjMoveStringLiteralDfa1_3(0x0L, 0x200000000L, 0x40012000L);
+      case 61:
+         jjmatchedKind = 147;
+         return jjMoveStringLiteralDfa1_3(0x800000000000L, 0x0L, 0x41000L);
+      case 62:
+         jjmatchedKind = 138;
+         return jjMoveStringLiteralDfa1_3(0x0L, 0xc00000000L, 0x80004000L);
+      case 63:
+         jjmatchedKind = 83;
+         return jjMoveStringLiteralDfa1_3(0x10L, 0x0L, 0x0L);
+      case 64:
+         return jjStopAtPos(0, 80);
+      case 91:
+         return jjStopAtPos(0, 133);
+      case 93:
+         return jjStopAtPos(0, 134);
+      case 94:
+         jjmatchedKind = 95;
+         return jjMoveStringLiteralDfa1_3(0x0L, 0x0L, 0x4000000L);
+      case 65:
+      case 97:
+         return jjMoveStringLiteralDfa1_3(0x0L, 0x2000000000L, 0x0L);
+      case 79:
+      case 111:
+         return jjMoveStringLiteralDfa1_3(0x0L, 0x1000000000L, 0x0L);
+      case 123:
+         return jjStopAtPos(0, 131);
+      case 124:
+         jjmatchedKind = 94;
+         return jjMoveStringLiteralDfa1_3(0x0L, 0x200000L, 0x2000000L);
+      case 125:
+         return jjStopAtPos(0, 132);
+      case 126:
+         jjmatchedKind = 82;
+         return jjMoveStringLiteralDfa1_3(0x0L, 0x0L, 0x20000000L);
+      default :
+         return jjMoveNfa_3(0, 0);
+   }
+}
+static private final int jjMoveStringLiteralDfa1_3(long active0, long active1, long active2)
+{
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+      jjStopStringLiteralDfa_3(0, active0, active1, active2);
+      return 1;
+   }
+   switch(curChar)
+   {
+      case 38:
+         if ((active1 & 0x400000L) != 0L)
+            return jjStopAtPos(1, 86);
+         break;
+      case 43:
+         if ((active1 & 0x800000L) != 0L)
+            return jjStopAtPos(1, 87);
+         break;
+      case 45:
+         if ((active1 & 0x1000000L) != 0L)
+            return jjStopAtPos(1, 88);
+         break;
+      case 58:
+         if ((active0 & 0x400000000000L) != 0L)
+            return jjStopAtPos(1, 46);
+         break;
+      case 60:
+         if ((active1 & 0x200000000L) != 0L)
+         {
+            jjmatchedKind = 97;
+            jjmatchedPos = 1;
+         }
+         return jjMoveStringLiteralDfa2_3(active0, 0L, active1, 0L, active2, 0x40000000L);
+      case 61:
+         if ((active2 & 0x1000L) != 0L)
+         {
+            jjmatchedKind = 140;
+            jjmatchedPos = 1;
+         }
+         else if ((active2 & 0x2000L) != 0L)
+            return jjStopAtPos(1, 141);
+         else if ((active2 & 0x4000L) != 0L)
+            return jjStopAtPos(1, 142);
+         else if ((active2 & 0x8000L) != 0L)
+         {
+            jjmatchedKind = 143;
+            jjmatchedPos = 1;
+         }
+         else if ((active2 & 0x100000L) != 0L)
+            return jjStopAtPos(1, 148);
+         else if ((active2 & 0x200000L) != 0L)
+            return jjStopAtPos(1, 149);
+         else if ((active2 & 0x400000L) != 0L)
+            return jjStopAtPos(1, 150);
+         else if ((active2 & 0x800000L) != 0L)
+            return jjStopAtPos(1, 151);
+         else if ((active2 & 0x1000000L) != 0L)
+            return jjStopAtPos(1, 152);
+         else if ((active2 & 0x2000000L) != 0L)
+            return jjStopAtPos(1, 153);
+         else if ((active2 & 0x4000000L) != 0L)
+            return jjStopAtPos(1, 154);
+         else if ((active2 & 0x8000000L) != 0L)
+            return jjStopAtPos(1, 155);
+         else if ((active2 & 0x10000000L) != 0L)
+            return jjStopAtPos(1, 156);
+         else if ((active2 & 0x20000000L) != 0L)
+            return jjStopAtPos(1, 157);
+         return jjMoveStringLiteralDfa2_3(active0, 0L, active1, 0L, active2, 0x60000L);
+      case 62:
+         if ((active0 & 0x10L) != 0L)
+            return jjStopAtPos(1, 4);
+         else if ((active0 & 0x200000000000L) != 0L)
+            return jjStopAtPos(1, 45);
+         else if ((active0 & 0x800000000000L) != 0L)
+            return jjStopAtPos(1, 47);
+         else if ((active1 & 0x400000000L) != 0L)
+         {
+            jjmatchedKind = 98;
+            jjmatchedPos = 1;
+         }
+         else if ((active2 & 0x10000L) != 0L)
+            return jjStopAtPos(1, 144);
+         return jjMoveStringLiteralDfa2_3(active0, 0L, active1, 0x800000000L, active2, 0x80000000L);
+      case 78:
+      case 110:
+         return jjMoveStringLiteralDfa2_3(active0, 0L, active1, 0x2000000000L, active2, 0L);
+      case 82:
+      case 114:
+         if ((active1 & 0x1000000000L) != 0L)
+            return jjStartNfaWithStates_3(1, 100, 1);
+         break;
+      case 124:
+         if ((active1 & 0x200000L) != 0L)
+            return jjStopAtPos(1, 85);
+         break;
+      default :
+         break;
+   }
+   return jjStartNfa_3(0, active0, active1, active2);
+}
+static private final int jjMoveStringLiteralDfa2_3(long old0, long active0, long old1, long active1, long old2, long active2)
+{
+   if (((active0 &= old0) | (active1 &= old1) | (active2 &= old2)) == 0L)
+      return jjStartNfa_3(0, old0, old1, old2); 
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+      jjStopStringLiteralDfa_3(1, 0L, active1, active2);
+      return 2;
+   }
+   switch(curChar)
+   {
+      case 61:
+         if ((active2 & 0x20000L) != 0L)
+            return jjStopAtPos(2, 145);
+         else if ((active2 & 0x40000L) != 0L)
+            return jjStopAtPos(2, 146);
+         else if ((active2 & 0x40000000L) != 0L)
+            return jjStopAtPos(2, 158);
+         else if ((active2 & 0x80000000L) != 0L)
+            return jjStopAtPos(2, 159);
+         break;
+      case 62:
+         if ((active1 & 0x800000000L) != 0L)
+            return jjStopAtPos(2, 99);
+         break;
+      case 68:
+      case 100:
+         if ((active1 & 0x2000000000L) != 0L)
+            return jjStartNfaWithStates_3(2, 101, 1);
+         break;
+      default :
+         break;
+   }
+   return jjStartNfa_3(1, 0L, active1, active2);
+}
+static private final int jjMoveNfa_3(int startState, int curPos)
+{
+   int[] nextStates;
+   int startsAt = 0;
+   jjnewStateCnt = 2;
+   int i = 1;
+   jjstateSet[0] = startState;
+   int j, kind = 0x7fffffff;
+   for (;;)
+   {
+      if (++jjround == 0x7fffffff)
+         ReInitRounds();
+      if (curChar < 64)
+      {
+         long l = 1L << curChar;
+         MatchLoop: do
+         {
+            switch(jjstateSet[--i])
+            {
+               case 1:
+                  if ((0x3ff000000000000L & l) == 0L)
+                     break;
+                  kind = 124;
+                  jjstateSet[jjnewStateCnt++] = 1;
+                  break;
+               default : break;
+            }
+         } while(i != startsAt);
+      }
+      else if (curChar < 128)
+      {
+         long l = 1L << (curChar & 077);
+         MatchLoop: do
+         {
+            switch(jjstateSet[--i])
+            {
+               case 0:
+               case 1:
+                  if ((0x87fffffe87fffffeL & l) == 0L)
+                     break;
+                  if (kind > 124)
+                     kind = 124;
+                  jjCheckNAdd(1);
+                  break;
+               default : break;
+            }
+         } while(i != startsAt);
+      }
+      else
+      {
+         int i2 = (curChar & 0xff) >> 6;
+         long l2 = 1L << (curChar & 077);
+         MatchLoop: do
+         {
+            switch(jjstateSet[--i])
+            {
+               case 0:
+               case 1:
+                  if ((jjbitVec0[i2] & l2) == 0L)
+                     break;
+                  if (kind > 124)
+                     kind = 124;
+                  jjCheckNAdd(1);
+                  break;
+               default : break;
+            }
+         } while(i != startsAt);
+      }
+      if (kind != 0x7fffffff)
+      {
+         jjmatchedKind = kind;
+         jjmatchedPos = curPos;
+         kind = 0x7fffffff;
+      }
+      ++curPos;
+      if ((i = jjnewStateCnt) == (startsAt = 2 - (jjnewStateCnt = startsAt)))
+         return curPos;
+      try { curChar = input_stream.readChar(); }
+      catch(java.io.IOException e) { return curPos; }
+   }
+}
+private static final int jjStopStringLiteralDfa_6(int pos, long active0, long active1)
+{
+   switch (pos)
+   {
+      default :
+         return -1;
+   }
+}
+private static final int jjStartNfa_6(int pos, long active0, long active1)
+{
+   return jjMoveNfa_6(jjStopStringLiteralDfa_6(pos, active0, active1), pos + 1);
+}
+static private final int jjStartNfaWithStates_6(int pos, int kind, int state)
+{
+   jjmatchedKind = kind;
+   jjmatchedPos = pos;
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) { return pos + 1; }
+   return jjMoveNfa_6(state, pos + 1);
+}
+static private final int jjMoveStringLiteralDfa0_6()
+{
+   switch(curChar)
+   {
+      case 34:
+         return jjStopAtPos(0, 114);
+      case 36:
+         return jjStopAtPos(0, 113);
+      case 123:
+         return jjStopAtPos(0, 116);
+      default :
+         return jjMoveNfa_6(0, 0);
+   }
+}
+static private final int jjMoveNfa_6(int startState, int curPos)
+{
+   int[] nextStates;
+   int startsAt = 0;
+   jjnewStateCnt = 2;
+   int i = 1;
+   jjstateSet[0] = startState;
+   int j, kind = 0x7fffffff;
+   for (;;)
+   {
+      if (++jjround == 0x7fffffff)
+         ReInitRounds();
+      if (curChar < 64)
+      {
+         long l = 1L << curChar;
+         MatchLoop: do
+         {
+            switch(jjstateSet[--i])
+            {
+               case 1:
+                  kind = 111;
+                  break;
+               default : break;
+            }
+         } while(i != startsAt);
+      }
+      else if (curChar < 128)
+      {
+         long l = 1L << (curChar & 077);
+         MatchLoop: do
+         {
+            switch(jjstateSet[--i])
+            {
+               case 0:
+                  if (curChar == 92)
+                     jjstateSet[jjnewStateCnt++] = 1;
+                  break;
+               case 1:
+                  if (kind > 111)
+                     kind = 111;
+                  break;
+               default : break;
+            }
+         } while(i != startsAt);
+      }
+      else
+      {
+         int i2 = (curChar & 0xff) >> 6;
+         long l2 = 1L << (curChar & 077);
+         MatchLoop: do
+         {
+            switch(jjstateSet[--i])
+            {
+               case 1:
+                  if ((jjbitVec0[i2] & l2) != 0L && kind > 111)
+                     kind = 111;
+                  break;
+               default : break;
+            }
+         } while(i != startsAt);
+      }
+      if (kind != 0x7fffffff)
+      {
+         jjmatchedKind = kind;
+         jjmatchedPos = curPos;
+         kind = 0x7fffffff;
+      }
+      ++curPos;
+      if ((i = jjnewStateCnt) == (startsAt = 2 - (jjnewStateCnt = startsAt)))
+         return curPos;
+      try { curChar = input_stream.readChar(); }
+      catch(java.io.IOException e) { return curPos; }
+   }
+}
 private static final int jjStopStringLiteralDfa_2(int pos, long active0)
 {
    switch (pos)
@@ -303,36 +961,6 @@ static private final int jjMoveStringLiteralDfa3_2(long old0, long active0)
    }
    return jjStartNfa_2(2, active0);
 }
-static private final void jjCheckNAdd(int state)
-{
-   if (jjrounds[state] != jjround)
-   {
-      jjstateSet[jjnewStateCnt++] = state;
-      jjrounds[state] = jjround;
-   }
-}
-static private final void jjAddStates(int start, int end)
-{
-   do {
-      jjstateSet[jjnewStateCnt++] = jjnextStates[start];
-   } while (start++ != end);
-}
-static private final void jjCheckNAddTwoStates(int state1, int state2)
-{
-   jjCheckNAdd(state1);
-   jjCheckNAdd(state2);
-}
-static private final void jjCheckNAddStates(int start, int end)
-{
-   do {
-      jjCheckNAdd(jjnextStates[start]);
-   } while (start++ != end);
-}
-static private final void jjCheckNAddStates(int start)
-{
-   jjCheckNAdd(jjnextStates[start]);
-   jjCheckNAdd(jjnextStates[start + 1]);
-}
 static private final int jjMoveNfa_2(int startState, int curPos)
 {
    int[] nextStates;
@@ -414,15 +1042,15 @@ private static final int jjStopStringLiteralDfa_1(int pos, long active0, long ac
    switch (pos)
    {
       case 0:
-         if ((active0 & 0x90000L) != 0L || (active1 & 0x10000000L) != 0L || (active2 & 0x800L) != 0L)
-            return 2;
-         if ((active1 & 0x2000000000000000L) != 0L || (active2 & 0x8000L) != 0L)
-            return 8;
          if ((active0 & 0xffff1ffff8000000L) != 0L || (active1 & 0x300000ffffL) != 0L)
          {
-            jjmatchedKind = 113;
+            jjmatchedKind = 124;
             return 14;
          }
+         if ((active0 & 0x90000L) != 0L || (active1 & 0x10000000L) != 0L || (active2 & 0x800000L) != 0L)
+            return 2;
+         if ((active2 & 0x8000200L) != 0L)
+            return 8;
          return -1;
       case 1:
          if ((active0 & 0x80000L) != 0L)
@@ -433,57 +1061,57 @@ private static final int jjStopStringLiteralDfa_1(int pos, long active0, long ac
          {
             if (jjmatchedPos != 1)
             {
-               jjmatchedKind = 113;
+               jjmatchedKind = 124;
                jjmatchedPos = 1;
             }
             return 14;
          }
          return -1;
       case 2:
+         if ((active0 & 0x140000020000000L) != 0L || (active1 & 0x200000c020L) != 0L)
+            return 14;
          if ((active0 & 0xfeaf1fff98000000L) != 0L || (active1 & 0x3f9fL) != 0L)
          {
             if (jjmatchedPos != 2)
             {
-               jjmatchedKind = 113;
+               jjmatchedKind = 124;
                jjmatchedPos = 2;
             }
             return 14;
          }
-         if ((active0 & 0x140000020000000L) != 0L || (active1 & 0x200000c020L) != 0L)
-            return 14;
          return -1;
       case 3:
-         if ((active0 & 0x6281002980000000L) != 0L || (active1 & 0xe00L) != 0L)
-            return 14;
          if ((active0 & 0x9c2e1fd618000000L) != 0L || (active1 & 0xb1bfL) != 0L)
          {
             if (jjmatchedPos != 3)
             {
-               jjmatchedKind = 113;
+               jjmatchedKind = 124;
                jjmatchedPos = 3;
             }
             return 14;
          }
+         if ((active0 & 0x6281002980000000L) != 0L || (active1 & 0xe00L) != 0L)
+            return 14;
          return -1;
       case 4:
          if ((active0 & 0x8802001608000000L) != 0L || (active1 & 0x2009L) != 0L)
             return 14;
          if ((active0 & 0x142c1fc090000000L) != 0L || (active1 & 0x95b6L) != 0L)
          {
-            jjmatchedKind = 113;
+            jjmatchedKind = 124;
             jjmatchedPos = 4;
             return 14;
          }
          return -1;
       case 5:
+         if ((active0 & 0x14001c0080000000L) != 0L || (active1 & 0x1190L) != 0L)
+            return 14;
          if ((active0 & 0x2c03c010000000L) != 0L || (active1 & 0x8426L) != 0L)
          {
-            jjmatchedKind = 113;
+            jjmatchedKind = 124;
             jjmatchedPos = 5;
             return 14;
          }
-         if ((active0 & 0x14001c0080000000L) != 0L || (active1 & 0x1190L) != 0L)
-            return 14;
          return -1;
       case 6:
          if ((active0 & 0x2803c000000000L) != 0L || (active1 & 0x8420L) != 0L)
@@ -492,28 +1120,28 @@ private static final int jjStopStringLiteralDfa_1(int pos, long active0, long ac
          {
             if (jjmatchedPos != 6)
             {
-               jjmatchedKind = 113;
+               jjmatchedKind = 124;
                jjmatchedPos = 6;
             }
             return 14;
          }
          return -1;
       case 7:
-         if ((active0 & 0x4000010000000L) != 0L || (active1 & 0x2L) != 0L)
-            return 14;
          if ((active0 & 0x30000000000L) != 0L || (active1 & 0x4L) != 0L)
          {
-            jjmatchedKind = 113;
+            jjmatchedKind = 124;
             jjmatchedPos = 7;
             return 14;
          }
+         if ((active0 & 0x4000010000000L) != 0L || (active1 & 0x2L) != 0L)
+            return 14;
          return -1;
       case 8:
          if ((active1 & 0x4L) != 0L)
             return 14;
          if ((active0 & 0x30000000000L) != 0L)
          {
-            jjmatchedKind = 113;
+            jjmatchedKind = 124;
             jjmatchedPos = 8;
             return 14;
          }
@@ -521,7 +1149,7 @@ private static final int jjStopStringLiteralDfa_1(int pos, long active0, long ac
       case 9:
          if ((active0 & 0x30000000000L) != 0L)
          {
-            jjmatchedKind = 113;
+            jjmatchedKind = 124;
             jjmatchedPos = 9;
             return 14;
          }
@@ -529,7 +1157,7 @@ private static final int jjStopStringLiteralDfa_1(int pos, long active0, long ac
       case 10:
          if ((active0 & 0x30000000000L) != 0L)
          {
-            jjmatchedKind = 113;
+            jjmatchedKind = 124;
             jjmatchedPos = 10;
             return 14;
          }
@@ -556,64 +1184,66 @@ static private final int jjMoveStringLiteralDfa0_1()
    {
       case 33:
          jjmatchedKind = 81;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x28L);
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x28000L);
+      case 34:
+         return jjStopAtPos(0, 112);
       case 35:
          return jjStopAtPos(0, 17);
       case 36:
-         return jjStopAtPos(0, 112);
+         return jjStopAtPos(0, 123);
       case 37:
          jjmatchedKind = 96;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x10000L);
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x10000000L);
       case 38:
          jjmatchedKind = 93;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x400000L, 0x1000L);
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x400000L, 0x1000000L);
       case 40:
-         return jjStopAtPos(0, 117);
+         return jjStopAtPos(0, 129);
       case 41:
-         return jjStopAtPos(0, 118);
+         return jjStopAtPos(0, 130);
       case 42:
          jjmatchedKind = 91;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x400L);
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x400000L);
       case 43:
          jjmatchedKind = 89;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x800000L, 0x100L);
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x800000L, 0x100000L);
       case 44:
-         return jjStopAtPos(0, 124);
+         return jjStopAtPos(0, 136);
       case 45:
          jjmatchedKind = 90;
-         return jjMoveStringLiteralDfa1_1(0x200000000000L, 0x1000000L, 0x200L);
+         return jjMoveStringLiteralDfa1_1(0x200000000000L, 0x1000000L, 0x200000L);
       case 46:
-         jjmatchedKind = 125;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x8000L);
+         jjmatchedKind = 137;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x8000000L);
       case 47:
          jjmatchedKind = 92;
-         return jjMoveStringLiteralDfa1_1(0x90000L, 0x0L, 0x800L);
+         return jjMoveStringLiteralDfa1_1(0x90000L, 0x0L, 0x800000L);
       case 58:
          jjmatchedKind = 84;
          return jjMoveStringLiteralDfa1_1(0x400000000000L, 0x0L, 0x0L);
       case 59:
-         return jjStopAtPos(0, 123);
+         return jjStopAtPos(0, 135);
       case 60:
-         jjmatchedKind = 127;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x200000000L, 0x40012L);
+         jjmatchedKind = 139;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x200000000L, 0x40012000L);
       case 61:
-         jjmatchedKind = 135;
-         return jjMoveStringLiteralDfa1_1(0x800000000000L, 0x0L, 0x41L);
+         jjmatchedKind = 147;
+         return jjMoveStringLiteralDfa1_1(0x800000000000L, 0x0L, 0x41000L);
       case 62:
-         jjmatchedKind = 126;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0xc00000000L, 0x80004L);
+         jjmatchedKind = 138;
+         return jjMoveStringLiteralDfa1_1(0x0L, 0xc00000000L, 0x80004000L);
       case 63:
          jjmatchedKind = 83;
          return jjMoveStringLiteralDfa1_1(0x10L, 0x0L, 0x0L);
       case 64:
          return jjStopAtPos(0, 80);
       case 91:
-         return jjStopAtPos(0, 121);
+         return jjStopAtPos(0, 133);
       case 93:
-         return jjStopAtPos(0, 122);
+         return jjStopAtPos(0, 134);
       case 94:
          jjmatchedKind = 95;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x4000L);
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x4000000L);
       case 65:
       case 97:
          return jjMoveStringLiteralDfa1_1(0x200000000L, 0x2000000040L, 0x0L);
@@ -666,15 +1296,15 @@ static private final int jjMoveStringLiteralDfa0_1()
       case 119:
          return jjMoveStringLiteralDfa1_1(0x0L, 0x1L, 0x0L);
       case 123:
-         return jjStopAtPos(0, 119);
+         return jjStopAtPos(0, 131);
       case 124:
          jjmatchedKind = 94;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x200000L, 0x2000L);
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x200000L, 0x2000000L);
       case 125:
-         return jjStopAtPos(0, 120);
+         return jjStopAtPos(0, 132);
       case 126:
          jjmatchedKind = 82;
-         return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x20000L);
+         return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x20000000L);
       default :
          return jjMoveNfa_1(3, 0);
    }
@@ -718,43 +1348,43 @@ static private final int jjMoveStringLiteralDfa1_1(long active0, long active1, l
             jjmatchedKind = 97;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0L, active2, 0x40000L);
+         return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0L, active2, 0x40000000L);
       case 61:
-         if ((active2 & 0x1L) != 0L)
-         {
-            jjmatchedKind = 128;
-            jjmatchedPos = 1;
-         }
-         else if ((active2 & 0x2L) != 0L)
-            return jjStopAtPos(1, 129);
-         else if ((active2 & 0x4L) != 0L)
-            return jjStopAtPos(1, 130);
-         else if ((active2 & 0x8L) != 0L)
+         if ((active2 & 0x1000L) != 0L)
          {
-            jjmatchedKind = 131;
+            jjmatchedKind = 140;
             jjmatchedPos = 1;
          }
-         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);
-         else if ((active2 & 0x1000L) != 0L)
-            return jjStopAtPos(1, 140);
          else if ((active2 & 0x2000L) != 0L)
             return jjStopAtPos(1, 141);
          else if ((active2 & 0x4000L) != 0L)
             return jjStopAtPos(1, 142);
          else if ((active2 & 0x8000L) != 0L)
-            return jjStopAtPos(1, 143);
-         else if ((active2 & 0x10000L) != 0L)
-            return jjStopAtPos(1, 144);
-         else if ((active2 & 0x20000L) != 0L)
-            return jjStopAtPos(1, 145);
-         return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0L, active2, 0x60L);
+         {
+            jjmatchedKind = 143;
+            jjmatchedPos = 1;
+         }
+         else if ((active2 & 0x100000L) != 0L)
+            return jjStopAtPos(1, 148);
+         else if ((active2 & 0x200000L) != 0L)
+            return jjStopAtPos(1, 149);
+         else if ((active2 & 0x400000L) != 0L)
+            return jjStopAtPos(1, 150);
+         else if ((active2 & 0x800000L) != 0L)
+            return jjStopAtPos(1, 151);
+         else if ((active2 & 0x1000000L) != 0L)
+            return jjStopAtPos(1, 152);
+         else if ((active2 & 0x2000000L) != 0L)
+            return jjStopAtPos(1, 153);
+         else if ((active2 & 0x4000000L) != 0L)
+            return jjStopAtPos(1, 154);
+         else if ((active2 & 0x8000000L) != 0L)
+            return jjStopAtPos(1, 155);
+         else if ((active2 & 0x10000000L) != 0L)
+            return jjStopAtPos(1, 156);
+         else if ((active2 & 0x20000000L) != 0L)
+            return jjStopAtPos(1, 157);
+         return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0L, active2, 0x60000L);
       case 62:
          if ((active0 & 0x10L) != 0L)
             return jjStopAtPos(1, 4);
@@ -767,9 +1397,9 @@ static private final int jjMoveStringLiteralDfa1_1(long active0, long active1, l
             jjmatchedKind = 98;
             jjmatchedPos = 1;
          }
-         else if ((active2 & 0x10L) != 0L)
-            return jjStopAtPos(1, 132);
-         return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x800000000L, active2, 0x80000L);
+         else if ((active2 & 0x10000L) != 0L)
+            return jjStopAtPos(1, 144);
+         return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x800000000L, active2, 0x80000000L);
       case 65:
       case 97:
          return jjMoveStringLiteralDfa2_1(active0, 0x8001000020000000L, active1, 0L, active2, 0L);
@@ -850,14 +1480,14 @@ static private final int jjMoveStringLiteralDfa2_1(long old0, long active0, long
    switch(curChar)
    {
       case 61:
-         if ((active2 & 0x20L) != 0L)
-            return jjStopAtPos(2, 133);
-         else if ((active2 & 0x40L) != 0L)
-            return jjStopAtPos(2, 134);
+         if ((active2 & 0x20000L) != 0L)
+            return jjStopAtPos(2, 145);
          else if ((active2 & 0x40000L) != 0L)
             return jjStopAtPos(2, 146);
-         else if ((active2 & 0x80000L) != 0L)
-            return jjStopAtPos(2, 147);
+         else if ((active2 & 0x40000000L) != 0L)
+            return jjStopAtPos(2, 158);
+         else if ((active2 & 0x80000000L) != 0L)
+            return jjStopAtPos(2, 159);
          break;
       case 62:
          if ((active1 & 0x800000000L) != 0L)
@@ -1359,14 +1989,11 @@ static private final int jjMoveStringLiteralDfa11_1(long old0, long active0)
    }
    return jjStartNfa_1(10, active0, 0L, 0L);
 }
-static final long[] jjbitVec0 = {
-   0x0L, 0x0L, 0xffffffffffffffffL, 0xffffffffffffffffL
-};
 static private final int jjMoveNfa_1(int startState, int curPos)
 {
    int[] nextStates;
    int startsAt = 0;
-   jjnewStateCnt = 61;
+   jjnewStateCnt = 52;
    int i = 1;
    jjstateSet[0] = startState;
    int j, kind = 0x7fffffff;
@@ -1386,8 +2013,6 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                      jjCheckNAddStates(0, 6);
                   else if (curChar == 39)
                      jjCheckNAddStates(7, 12);
-                  else if (curChar == 34)
-                     jjCheckNAddStates(13, 18);
                   else if (curChar == 46)
                      jjCheckNAdd(8);
                   else if (curChar == 47)
@@ -1402,7 +2027,7 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                   {
                      if (kind > 102)
                         kind = 102;
-                     jjCheckNAddStates(19, 21);
+                     jjCheckNAddStates(13, 15);
                   }
                   break;
                case 0:
@@ -1440,7 +2065,7 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                      break;
                   if (kind > 106)
                      kind = 106;
-                  jjCheckNAddStates(22, 24);
+                  jjCheckNAddStates(16, 18);
                   break;
                case 10:
                   if ((0x280000000000L & l) != 0L)
@@ -1456,8 +2081,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 14:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 113)
-                     kind = 113;
+                  if (kind > 124)
+                     kind = 124;
                   jjstateSet[jjnewStateCnt++] = 14;
                   break;
                case 15:
@@ -1473,14 +2098,14 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                      break;
                   if (kind > 106)
                      kind = 106;
-                  jjCheckNAddStates(25, 27);
+                  jjCheckNAddStates(19, 21);
                   break;
                case 18:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 106)
                      kind = 106;
-                  jjCheckNAddStates(25, 27);
+                  jjCheckNAddStates(19, 21);
                   break;
                case 20:
                   if ((0x280000000000L & l) != 0L)
@@ -1510,7 +2135,7 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                   break;
                case 26:
                   if ((0x3ff000000000000L & l) != 0L)
-                     jjCheckNAddStates(28, 30);
+                     jjCheckNAddStates(22, 24);
                   break;
                case 28:
                   if ((0x280000000000L & l) != 0L)
@@ -1525,7 +2150,7 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                      break;
                   if (kind > 102)
                      kind = 102;
-                  jjCheckNAddStates(19, 21);
+                  jjCheckNAddStates(13, 15);
                   break;
                case 32:
                   if ((0x3ff000000000000L & l) == 0L)
@@ -1542,64 +2167,38 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                   jjCheckNAddTwoStates(33, 6);
                   break;
                case 34:
-                  if (curChar == 34)
-                     jjCheckNAddStates(13, 18);
+                  if (curChar == 39)
+                     jjCheckNAddStates(7, 12);
                   break;
                case 35:
-                  if ((0xfffffffbffffffffL & l) != 0L)
-                     jjCheckNAddStates(31, 33);
+                  if ((0xffffff7fffffffffL & l) != 0L)
+                     jjCheckNAddStates(25, 27);
                   break;
                case 37:
-                  jjCheckNAddStates(31, 33);
+                  jjCheckNAddStates(25, 27);
                   break;
                case 38:
-                  if (curChar == 34 && kind > 108)
+                  if (curChar == 39 && kind > 108)
                      kind = 108;
                   break;
                case 39:
-                  if ((0xfffffffbffffffffL & l) != 0L)
-                     jjCheckNAddStates(34, 36);
+                  if ((0xffffff7fffffffffL & l) != 0L)
+                     jjCheckNAddStates(28, 30);
                   break;
                case 41:
-                  jjCheckNAddStates(34, 36);
+                  jjCheckNAddStates(28, 30);
                   break;
                case 42:
-                  if (curChar == 34 && kind > 109)
+                  if (curChar == 39 && kind > 109)
                      kind = 109;
                   break;
-               case 43:
-                  if (curChar == 39)
-                     jjCheckNAddStates(7, 12);
-                  break;
                case 44:
-                  if ((0xffffff7fffffffffL & l) != 0L)
-                     jjCheckNAddStates(37, 39);
-                  break;
                case 46:
-                  jjCheckNAddStates(37, 39);
-                  break;
-               case 47:
-                  if (curChar == 39 && kind > 108)
-                     kind = 108;
+                  jjCheckNAddStates(31, 33);
                   break;
                case 48:
-                  if ((0xffffff7fffffffffL & l) != 0L)
-                     jjCheckNAddStates(40, 42);
-                  break;
                case 50:
-                  jjCheckNAddStates(40, 42);
-                  break;
-               case 51:
-                  if (curChar == 39 && kind > 110)
-                     kind = 110;
-                  break;
-               case 53:
-               case 55:
-                  jjCheckNAddStates(43, 45);
-                  break;
-               case 57:
-               case 59:
-                  jjCheckNAddStates(46, 48);
+                  jjCheckNAddStates(34, 36);
                   break;
                default : break;
             }
@@ -1615,12 +2214,12 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 3:
                   if ((0x87fffffe87fffffeL & l) != 0L)
                   {
-                     if (kind > 113)
-                        kind = 113;
+                     if (kind > 124)
+                        kind = 124;
                      jjCheckNAdd(14);
                   }
                   else if (curChar == 96)
-                     jjCheckNAddStates(49, 54);
+                     jjCheckNAddStates(37, 42);
                   break;
                case 1:
                   if (kind > 18)
@@ -1632,7 +2231,7 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                   break;
                case 9:
                   if ((0x2000000020L & l) != 0L)
-                     jjAddStates(55, 56);
+                     jjAddStates(43, 44);
                   break;
                case 12:
                   if ((0x5000000050L & l) != 0L && kind > 106)
@@ -1642,21 +2241,21 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 14:
                   if ((0x87fffffe87fffffeL & l) == 0L)
                      break;
-                  if (kind > 113)
-                     kind = 113;
+                  if (kind > 124)
+                     kind = 124;
                   jjCheckNAdd(14);
                   break;
                case 19:
                   if ((0x2000000020L & l) != 0L)
-                     jjAddStates(57, 58);
+                     jjAddStates(45, 46);
                   break;
                case 23:
                   if ((0x2000000020L & l) != 0L)
-                     jjAddStates(59, 60);
+                     jjAddStates(47, 48);
                   break;
                case 27:
                   if ((0x2000000020L & l) != 0L)
-                     jjAddStates(61, 62);
+                     jjAddStates(49, 50);
                   break;
                case 31:
                   if ((0x100000001000000L & l) != 0L)
@@ -1671,81 +2270,59 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                   break;
                case 35:
                   if ((0xffffffffefffffffL & l) != 0L)
-                     jjCheckNAddStates(31, 33);
+                     jjCheckNAddStates(25, 27);
                   break;
                case 36:
                   if (curChar == 92)
                      jjstateSet[jjnewStateCnt++] = 37;
                   break;
                case 37:
-                  jjCheckNAddStates(31, 33);
+                  jjCheckNAddStates(25, 27);
                   break;
                case 39:
                   if ((0xffffffffefffffffL & l) != 0L)
-                     jjCheckNAddStates(34, 36);
+                     jjCheckNAddStates(28, 30);
                   break;
                case 40:
                   if (curChar == 92)
                      jjstateSet[jjnewStateCnt++] = 41;
                   break;
                case 41:
-                  jjCheckNAddStates(34, 36);
+                  jjCheckNAddStates(28, 30);
+                  break;
+               case 43:
+                  if (curChar == 96)
+                     jjCheckNAddStates(37, 42);
                   break;
                case 44:
-                  if ((0xffffffffefffffffL & l) != 0L)
-                     jjCheckNAddStates(37, 39);
+                  if ((0xfffffffeefffffffL & l) != 0L)
+                     jjCheckNAddStates(31, 33);
                   break;
                case 45:
                   if (curChar == 92)
                      jjstateSet[jjnewStateCnt++] = 46;
                   break;
                case 46:
-                  jjCheckNAddStates(37, 39);
-                  break;
-               case 48:
-                  if ((0xffffffffefffffffL & l) != 0L)
-                     jjCheckNAddStates(40, 42);
-                  break;
-               case 49:
-                  if (curChar == 92)
-                     jjstateSet[jjnewStateCnt++] = 50;
-                  break;
-               case 50:
-                  jjCheckNAddStates(40, 42);
-                  break;
-               case 52:
-                  if (curChar == 96)
-                     jjCheckNAddStates(49, 54);
-                  break;
-               case 53:
-                  if ((0xfffffffeefffffffL & l) != 0L)
-                     jjCheckNAddStates(43, 45);
-                  break;
-               case 54:
-                  if (curChar == 92)
-                     jjstateSet[jjnewStateCnt++] = 55;
-                  break;
-               case 55:
-                  jjCheckNAddStates(43, 45);
+                  jjCheckNAddStates(31, 33);
                   break;
-               case 56:
+               case 47:
                   if (curChar == 96 && kind > 108)
                      kind = 108;
                   break;
-               case 57:
+               case 48:
                   if ((0xfffffffeefffffffL & l) != 0L)
-                     jjCheckNAddStates(46, 48);
+                     jjCheckNAddStates(34, 36);
                   break;
-               case 58:
+               case 49:
                   if (curChar == 92)
-                     jjstateSet[jjnewStateCnt++] = 59;
+                     jjstateSet[jjnewStateCnt++] = 50;
                   break;
-               case 59:
-                  jjCheckNAddStates(46, 48);
+               case 50:
+                  jjCheckNAddStates(34, 36);
                   break;
-               case 60:
-                  if (curChar == 96 && kind > 111)
-                     kind = 111;
+               case 51:
+                  if (curChar == 96 && kind > 110)
+                     kind = 110;
                   break;
                default : break;
             }
@@ -1763,8 +2340,8 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 14:
                   if ((jjbitVec0[i2] & l2) == 0L)
                      break;
-                  if (kind > 113)
-                     kind = 113;
+                  if (kind > 124)
+                     kind = 124;
                   jjCheckNAdd(14);
                   break;
                case 1:
@@ -1774,32 +2351,22 @@ static private final int jjMoveNfa_1(int startState, int curPos)
                case 35:
                case 37:
                   if ((jjbitVec0[i2] & l2) != 0L)
-                     jjCheckNAddStates(31, 33);
+                     jjCheckNAddStates(25, 27);
                   break;
                case 39:
                case 41:
                   if ((jjbitVec0[i2] & l2) != 0L)
-                     jjCheckNAddStates(34, 36);
+                     jjCheckNAddStates(28, 30);
                   break;
                case 44:
                case 46:
                   if ((jjbitVec0[i2] & l2) != 0L)
-                     jjCheckNAddStates(37, 39);
+                     jjCheckNAddStates(31, 33);
                   break;
                case 48:
                case 50:
                   if ((jjbitVec0[i2] & l2) != 0L)
-                     jjCheckNAddStates(40, 42);
-                  break;
-               case 53:
-               case 55:
-                  if ((jjbitVec0[i2] & l2) != 0L)
-                     jjCheckNAddStates(43, 45);
-                  break;
-               case 57:
-               case 59:
-                  if ((jjbitVec0[i2] & l2) != 0L)
-                     jjCheckNAddStates(46, 48);
+                     jjCheckNAddStates(34, 36);
                   break;
                default : break;
             }
@@ -1812,354 +2379,49 @@ static private final int jjMoveNfa_1(int startState, int curPos)
          kind = 0x7fffffff;
       }
       ++curPos;
-      if ((i = jjnewStateCnt) == (startsAt = 61 - (jjnewStateCnt = startsAt)))
+      if ((i = jjnewStateCnt) == (startsAt = 52 - (jjnewStateCnt = startsAt)))
          return curPos;
       try { curChar = input_stream.readChar(); }
       catch(java.io.IOException e) { return curPos; }
    }
 }
-static private final int jjMoveStringLiteralDfa0_4()
-{
-   switch(curChar)
-   {
-      case 42:
-         return jjMoveStringLiteralDfa1_4(0x1000000L);
-      case 84:
-      case 116:
-         return jjMoveStringLiteralDfa1_4(0x400000L);
-      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 & 0x1000000L) != 0L)
-            return jjStopAtPos(1, 24);
-         break;
-      case 79:
-      case 111:
-         return jjMoveStringLiteralDfa2_4(active0, 0x400000L);
-      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, 0x400000L);
-      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 & 0x400000L) != 0L)
-            return jjStopAtPos(3, 22);
-         break;
-      default :
-         return 4;
-   }
-   return 4;
-}
-private static final int jjStopStringLiteralDfa_3(int pos, long active0, long active1, long active2)
+private static final int jjStopStringLiteralDfa_7(int pos, long active0, long active1)
 {
    switch (pos)
    {
-      case 0:
-         if ((active1 & 0x3000000000L) != 0L)
-         {
-            jjmatchedKind = 113;
-            return 1;
-         }
-         return -1;
-      case 1:
-         if ((active1 & 0x2000000000L) != 0L)
-         {
-            if (jjmatchedPos != 1)
-            {
-               jjmatchedKind = 113;
-               jjmatchedPos = 1;
-            }
-            return 1;
-         }
-         if ((active1 & 0x1000000000L) != 0L)
-            return 1;
-         return -1;
       default :
          return -1;
    }
 }
-private static final int jjStartNfa_3(int pos, long active0, long active1, long active2)
+private static final int jjStartNfa_7(int pos, long active0, long active1)
 {
-   return jjMoveNfa_3(jjStopStringLiteralDfa_3(pos, active0, active1, active2), pos + 1);
+   return jjMoveNfa_7(jjStopStringLiteralDfa_7(pos, active0, active1), pos + 1);
 }
-static private final int jjStartNfaWithStates_3(int pos, int kind, int state)
+static private final int jjStartNfaWithStates_7(int pos, int kind, int state)
 {
    jjmatchedKind = kind;
    jjmatchedPos = pos;
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) { return pos + 1; }
-   return jjMoveNfa_3(state, pos + 1);
+   return jjMoveNfa_7(state, pos + 1);
 }
-static private final int jjMoveStringLiteralDfa0_3()
+static private final int jjMoveStringLiteralDfa0_7()
 {
    switch(curChar)
    {
-      case 9:
-         return jjStopAtPos(0, 12);
-      case 10:
-         return jjStopAtPos(0, 13);
-      case 12:
-         return jjStopAtPos(0, 15);
-      case 13:
-         return jjStopAtPos(0, 14);
-      case 32:
-         return jjStopAtPos(0, 11);
-      case 33:
-         jjmatchedKind = 81;
-         return jjMoveStringLiteralDfa1_3(0x0L, 0x0L, 0x28L);
-      case 36:
-         return jjStopAtPos(0, 112);
-      case 37:
-         jjmatchedKind = 96;
-         return jjMoveStringLiteralDfa1_3(0x0L, 0x0L, 0x10000L);
-      case 38:
-         jjmatchedKind = 93;
-         return jjMoveStringLiteralDfa1_3(0x0L, 0x400000L, 0x1000L);
-      case 40:
-         return jjStopAtPos(0, 117);
-      case 41:
-         return jjStopAtPos(0, 118);
-      case 42:
-         jjmatchedKind = 91;
-         return jjMoveStringLiteralDfa1_3(0x0L, 0x0L, 0x400L);
-      case 43:
-         jjmatchedKind = 89;
-         return jjMoveStringLiteralDfa1_3(0x0L, 0x800000L, 0x100L);
-      case 44:
-         return jjStopAtPos(0, 124);
-      case 45:
-         jjmatchedKind = 90;
-         return jjMoveStringLiteralDfa1_3(0x200000000000L, 0x1000000L, 0x200L);
-      case 46:
-         jjmatchedKind = 125;
-         return jjMoveStringLiteralDfa1_3(0x0L, 0x0L, 0x8000L);
-      case 47:
-         jjmatchedKind = 92;
-         return jjMoveStringLiteralDfa1_3(0x0L, 0x0L, 0x800L);
-      case 58:
-         jjmatchedKind = 84;
-         return jjMoveStringLiteralDfa1_3(0x400000000000L, 0x0L, 0x0L);
-      case 59:
-         return jjStopAtPos(0, 123);
-      case 60:
-         jjmatchedKind = 127;
-         return jjMoveStringLiteralDfa1_3(0x0L, 0x200000000L, 0x40012L);
-      case 61:
-         jjmatchedKind = 135;
-         return jjMoveStringLiteralDfa1_3(0x800000000000L, 0x0L, 0x41L);
-      case 62:
-         jjmatchedKind = 126;
-         return jjMoveStringLiteralDfa1_3(0x0L, 0xc00000000L, 0x80004L);
-      case 63:
-         jjmatchedKind = 83;
-         return jjMoveStringLiteralDfa1_3(0x10L, 0x0L, 0x0L);
-      case 64:
-         return jjStopAtPos(0, 80);
-      case 91:
-         return jjStopAtPos(0, 121);
-      case 93:
-         return jjStopAtPos(0, 122);
-      case 94:
-         jjmatchedKind = 95;
-         return jjMoveStringLiteralDfa1_3(0x0L, 0x0L, 0x4000L);
-      case 65:
-      case 97:
-         return jjMoveStringLiteralDfa1_3(0x0L, 0x2000000000L, 0x0L);
-      case 79:
-      case 111:
-         return jjMoveStringLiteralDfa1_3(0x0L, 0x1000000000L, 0x0L);
+      case 34:
+         return jjStopAtPos(0, 114);
       case 123:
-         return jjStopAtPos(0, 119);
-      case 124:
-         jjmatchedKind = 94;
-         return jjMoveStringLiteralDfa1_3(0x0L, 0x200000L, 0x2000L);
-      case 125:
-         return jjStopAtPos(0, 120);
-      case 126:
-         jjmatchedKind = 82;
-         return jjMoveStringLiteralDfa1_3(0x0L, 0x0L, 0x20000L);
+         return jjStopAtPos(0, 115);
       default :
-         return jjMoveNfa_3(0, 0);
+         return jjMoveNfa_7(0, 0);
    }
 }
-static private final int jjMoveStringLiteralDfa1_3(long active0, long active1, long active2)
-{
-   try { curChar = input_stream.readChar(); }
-   catch(java.io.IOException e) {
-      jjStopStringLiteralDfa_3(0, active0, active1, active2);
-      return 1;
-   }
-   switch(curChar)
-   {
-      case 38:
-         if ((active1 & 0x400000L) != 0L)
-            return jjStopAtPos(1, 86);
-         break;
-      case 43:
-         if ((active1 & 0x800000L) != 0L)
-            return jjStopAtPos(1, 87);
-         break;
-      case 45:
-         if ((active1 & 0x1000000L) != 0L)
-            return jjStopAtPos(1, 88);
-         break;
-      case 58:
-         if ((active0 & 0x400000000000L) != 0L)
-            return jjStopAtPos(1, 46);
-         break;
-      case 60:
-         if ((active1 & 0x200000000L) != 0L)
-         {
-            jjmatchedKind = 97;
-            jjmatchedPos = 1;
-         }
-         return jjMoveStringLiteralDfa2_3(active0, 0L, active1, 0L, active2, 0x40000L);
-      case 61:
-         if ((active2 & 0x1L) != 0L)
-         {
-            jjmatchedKind = 128;
-            jjmatchedPos = 1;
-         }
-         else if ((active2 & 0x2L) != 0L)
-            return jjStopAtPos(1, 129);
-         else if ((active2 & 0x4L) != 0L)
-            return jjStopAtPos(1, 130);
-         else if ((active2 & 0x8L) != 0L)
-         {
-            jjmatchedKind = 131;
-            jjmatchedPos = 1;
-         }
-         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);
-         else if ((active2 & 0x1000L) != 0L)
-            return jjStopAtPos(1, 140);
-         else if ((active2 & 0x2000L) != 0L)
-            return jjStopAtPos(1, 141);
-         else if ((active2 & 0x4000L) != 0L)
-            return jjStopAtPos(1, 142);
-         else if ((active2 & 0x8000L) != 0L)
-            return jjStopAtPos(1, 143);
-         else if ((active2 & 0x10000L) != 0L)
-            return jjStopAtPos(1, 144);
-         else if ((active2 & 0x20000L) != 0L)
-            return jjStopAtPos(1, 145);
-         return jjMoveStringLiteralDfa2_3(active0, 0L, active1, 0L, active2, 0x60L);
-      case 62:
-         if ((active0 & 0x10L) != 0L)
-            return jjStopAtPos(1, 4);
-         else if ((active0 & 0x200000000000L) != 0L)
-            return jjStopAtPos(1, 45);
-         else if ((active0 & 0x800000000000L) != 0L)
-            return jjStopAtPos(1, 47);
-         else if ((active1 & 0x400000000L) != 0L)
-         {
-            jjmatchedKind = 98;
-            jjmatchedPos = 1;
-         }
-         else if ((active2 & 0x10L) != 0L)
-            return jjStopAtPos(1, 132);
-         return jjMoveStringLiteralDfa2_3(active0, 0L, active1, 0x800000000L, active2, 0x80000L);
-      case 78:
-      case 110:
-         return jjMoveStringLiteralDfa2_3(active0, 0L, active1, 0x2000000000L, active2, 0L);
-      case 82:
-      case 114:
-         if ((active1 & 0x1000000000L) != 0L)
-            return jjStartNfaWithStates_3(1, 100, 1);
-         break;
-      case 124:
-         if ((active1 & 0x200000L) != 0L)
-            return jjStopAtPos(1, 85);
-         break;
-      default :
-         break;
-   }
-   return jjStartNfa_3(0, active0, active1, active2);
-}
-static private final int jjMoveStringLiteralDfa2_3(long old0, long active0, long old1, long active1, long old2, long active2)
-{
-   if (((active0 &= old0) | (active1 &= old1) | (active2 &= old2)) == 0L)
-      return jjStartNfa_3(0, old0, old1, old2); 
-   try { curChar = input_stream.readChar(); }
-   catch(java.io.IOException e) {
-      jjStopStringLiteralDfa_3(1, 0L, active1, active2);
-      return 2;
-   }
-   switch(curChar)
-   {
-      case 61:
-         if ((active2 & 0x20L) != 0L)
-            return jjStopAtPos(2, 133);
-         else if ((active2 & 0x40L) != 0L)
-            return jjStopAtPos(2, 134);
-         else if ((active2 & 0x40000L) != 0L)
-            return jjStopAtPos(2, 146);
-         else if ((active2 & 0x80000L) != 0L)
-            return jjStopAtPos(2, 147);
-         break;
-      case 62:
-         if ((active1 & 0x800000000L) != 0L)
-            return jjStopAtPos(2, 99);
-         break;
-      case 68:
-      case 100:
-         if ((active1 & 0x2000000000L) != 0L)
-            return jjStartNfaWithStates_3(2, 101, 1);
-         break;
-      default :
-         break;
-   }
-   return jjStartNfa_3(1, 0L, active1, active2);
-}
-static private final int jjMoveNfa_3(int startState, int curPos)
+static private final int jjMoveNfa_7(int startState, int curPos)
 {
    int[] nextStates;
    int startsAt = 0;
-   jjnewStateCnt = 2;
+   jjnewStateCnt = 4;
    int i = 1;
    jjstateSet[0] = startState;
    int j, kind = 0x7fffffff;
@@ -2175,10 +2437,15 @@ static private final int jjMoveNfa_3(int startState, int curPos)
             switch(jjstateSet[--i])
             {
                case 1:
+                  if (kind > 111)
+                     kind = 111;
+                  break;
+               case 3:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  kind = 113;
-                  jjstateSet[jjnewStateCnt++] = 1;
+                  if (kind > 124)
+                     kind = 124;
+                  jjstateSet[jjnewStateCnt++] = 3;
                   break;
                default : break;
             }
@@ -2192,12 +2459,26 @@ static private final int jjMoveNfa_3(int startState, int curPos)
             switch(jjstateSet[--i])
             {
                case 0:
+                  if ((0x87fffffe87fffffeL & l) != 0L)
+                  {
+                     if (kind > 124)
+                        kind = 124;
+                     jjCheckNAdd(3);
+                  }
+                  else if (curChar == 92)
+                     jjstateSet[jjnewStateCnt++] = 1;
+                  break;
                case 1:
+                  if (kind > 111)
+                     kind = 111;
+                  break;
+               case 2:
+               case 3:
                   if ((0x87fffffe87fffffeL & l) == 0L)
                      break;
-                  if (kind > 113)
-                     kind = 113;
-                  jjCheckNAdd(1);
+                  if (kind > 124)
+                     kind = 124;
+                  jjCheckNAdd(3);
                   break;
                default : break;
             }
@@ -2212,12 +2493,16 @@ static private final int jjMoveNfa_3(int startState, int curPos)
             switch(jjstateSet[--i])
             {
                case 0:
-               case 1:
+               case 3:
                   if ((jjbitVec0[i2] & l2) == 0L)
                      break;
-                  if (kind > 113)
-                     kind = 113;
-                  jjCheckNAdd(1);
+                  if (kind > 124)
+                     kind = 124;
+                  jjCheckNAdd(3);
+                  break;
+               case 1:
+                  if ((jjbitVec0[i2] & l2) != 0L && kind > 111)
+                     kind = 111;
                   break;
                default : break;
             }
@@ -2230,17 +2515,17 @@ static private final int jjMoveNfa_3(int startState, int curPos)
          kind = 0x7fffffff;
       }
       ++curPos;
-      if ((i = jjnewStateCnt) == (startsAt = 2 - (jjnewStateCnt = startsAt)))
+      if ((i = jjnewStateCnt) == (startsAt = 4 - (jjnewStateCnt = startsAt)))
          return curPos;
       try { curChar = input_stream.readChar(); }
       catch(java.io.IOException e) { return curPos; }
    }
 }
 static final int[] jjnextStates = {
-   16, 17, 22, 23, 26, 27, 12, 44, 45, 47, 48, 49, 51, 35, 36, 38, 
-   39, 40, 42, 31, 33, 6, 8, 9, 12, 18, 19, 12, 26, 27, 12, 35, 
-   36, 38, 39, 40, 42, 44, 45, 47, 48, 49, 51, 53, 54, 56, 57, 58, 
-   60, 53, 54, 56, 57, 58, 60, 10, 11, 20, 21, 24, 25, 28, 29, 
+   16, 17, 22, 23, 26, 27, 12, 35, 36, 38, 39, 40, 42, 31, 33, 6, 
+   8, 9, 12, 18, 19, 12, 26, 27, 12, 35, 36, 38, 39, 40, 42, 44, 
+   45, 47, 48, 49, 51, 44, 45, 47, 48, 49, 51, 10, 11, 20, 21, 24, 
+   25, 28, 29, 
 };
 public static final String[] jjstrLiteralImages = {
 "", "\74\77", null, "\74\77\75", "\77\76", null, null, null, null, null, null, 
@@ -2251,9 +2536,10 @@ null, null, null, null, null, null, null, null, null, null, null, null, null, nu
 null, null, null, null, null, null, null, null, null, null, null, null, null, null, 
 null, "\100", "\41", "\176", "\77", "\72", "\174\174", "\46\46", "\53\53", "\55\55", 
 "\53", "\55", "\52", "\57", "\46", "\174", "\136", "\45", "\74\74", "\76\76", 
-"\76\76\76", null, null, null, null, null, null, null, null, null, null, null, null, "\44", 
-null, null, null, null, "\50", "\51", "\173", "\175", "\133", "\135", "\73", "\54", 
-"\56", "\76", "\74", "\75\75", "\74\75", "\76\75", "\41\75", "\74\76", "\41\75\75", 
+"\76\76\76", null, null, null, null, null, null, null, null, null, null, null, null, "\42", 
+"\44", "\42", "\173", null, null, null, "\175", null, null, null, "\44", null, null, 
+null, null, null, "\50", "\51", "\173", "\175", "\133", "\135", "\73", "\54", "\56", 
+"\76", "\74", "\75\75", "\74\75", "\76\75", "\41\75", "\74\76", "\41\75\75", 
 "\75\75\75", "\75", "\53\75", "\55\75", "\52\75", "\57\75", "\46\75", "\174\75", "\136\75", 
 "\56\75", "\45\75", "\176\75", "\74\74\75", "\76\76\75", };
 public static final String[] lexStateNames = {
@@ -2263,30 +2549,35 @@ public static final String[] lexStateNames = {
    "IN_VARIABLE", 
    "IN_FORMAL_COMMENT", 
    "IN_MULTI_LINE_COMMENT", 
+   "IN_STRING", 
+   "DOLLAR_IN_STRING", 
+   "SKIPSTRING", 
+   "DOLLAR_IN_STRING_EXPR", 
 };
 public static final int[] jjnewLexState = {
    -1, 1, 1, 1, 0, -1, -1, -1, -1, -1, -1, 1, 1, 1, 1, 1, 2, 2, 4, 5, 1, -1, -1, -1, 1, 
    1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 1, 1, 1, -1, -1, 
    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
    -1, -1, -1, -1, -1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
-   1, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 3, -1, -1, -1, -1, 1, 1, 1, 1, 1, 1, 1, 1, 
-   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
+   1, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 6, 6, 7, 1, 9, 8, 6, -1, 7, -1, -1, -1, 3, -1, 
+   -1, -1, -1, 6, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
+   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
 };
 static final long[] jjtoToken = {
-   0xfffffffff880001fL, 0xffe3f47fffffffffL, 0xfffffL, 
+   0xfffffffff880001fL, 0x198f747fffffffffL, 0xfffffffeL, 
 };
 static final long[] jjtoSkip = {
-   0x37fffe0L, 0x0L, 0x0L, 
+   0x37fffe0L, 0x670800000000000L, 0x1L, 
 };
 static final long[] jjtoSpecial = {
-   0x37ff800L, 0x0L, 0x0L, 
+   0x37ff800L, 0x30000000000000L, 0x1L, 
 };
 static final long[] jjtoMore = {
    0x4000000L, 0x0L, 0x0L, 
 };
 static protected SimpleCharStream input_stream;
-static private final int[] jjrounds = new int[61];
-static private final int[] jjstateSet = new int[122];
+static private final int[] jjrounds = new int[52];
+static private final int[] jjstateSet = new int[104];
 static StringBuffer image;
 static int jjimageLen;
 static int lengthOfMatch;
@@ -2313,7 +2604,7 @@ static private final void ReInitRounds()
 {
    int i;
    jjround = 0x80000001;
-   for (i = 61; i-- > 0;)
+   for (i = 52; i-- > 0;)
       jjrounds[i] = 0x80000000;
 }
 static public void ReInit(SimpleCharStream stream, int lexState)
@@ -2323,7 +2614,7 @@ static public void ReInit(SimpleCharStream stream, int lexState)
 }
 static public void SwitchTo(int lexState)
 {
-   if (lexState >= 6 || lexState < 0)
+   if (lexState >= 10 || lexState < 0)
       throw new TokenMgrError("Error: Ignoring invalid lexical state : " + lexState + ". State unchanged.", TokenMgrError.INVALID_LEXICAL_STATE);
    else
       curLexState = lexState;
@@ -2333,12 +2624,21 @@ static protected Token jjFillToken()
 {
    Token t = Token.newToken(jjmatchedKind);
    t.kind = jjmatchedKind;
-   String im = jjstrLiteralImages[jjmatchedKind];
-   t.image = (im == null) ? input_stream.GetImage() : im;
-   t.beginLine = input_stream.getBeginLine();
-   t.beginColumn = input_stream.getBeginColumn();
-   t.endLine = input_stream.getEndLine();
-   t.endColumn = input_stream.getEndColumn();
+   if (jjmatchedPos < 0)
+   {
+      t.image = "";
+      t.beginLine = t.endLine = input_stream.getBeginLine();
+      t.beginColumn = t.endColumn = input_stream.getBeginColumn();
+   }
+   else
+   {
+      String im = jjstrLiteralImages[jjmatchedKind];
+      t.image = (im == null) ? input_stream.GetImage() : im;
+      t.beginLine = input_stream.getBeginLine();
+      t.beginColumn = input_stream.getBeginColumn();
+      t.endLine = input_stream.getEndLine();
+      t.endColumn = input_stream.getEndColumn();
+   }
    return t;
 }
 
@@ -2429,6 +2729,44 @@ public static Token getNextToken()
             jjmatchedKind = 26;
          }
          break;
+       case 6:
+         jjmatchedKind = 0x7fffffff;
+         jjmatchedPos = 0;
+         curPos = jjMoveStringLiteralDfa0_6();
+         if (jjmatchedPos == 0 && jjmatchedKind > 121)
+         {
+            jjmatchedKind = 121;
+         }
+         break;
+       case 7:
+         jjmatchedKind = 0x7fffffff;
+         jjmatchedPos = 0;
+         curPos = jjMoveStringLiteralDfa0_7();
+         if (jjmatchedPos == 0 && jjmatchedKind > 128)
+         {
+            jjmatchedKind = 128;
+         }
+         break;
+       case 8:
+         jjmatchedKind = 0x7fffffff;
+         jjmatchedPos = 0;
+         curPos = jjMoveStringLiteralDfa0_8();
+         if (jjmatchedPos == 0 && jjmatchedKind > 118)
+         {
+            jjmatchedKind = 118;
+         }
+         break;
+       case 9:
+         jjmatchedKind = 120;
+         jjmatchedPos = -1;
+         curPos = 0;
+         curPos = jjMoveStringLiteralDfa0_9();
+         if (jjmatchedPos < 0 || (jjmatchedPos == 0 && jjmatchedKind > 122))
+         {
+            jjmatchedKind = 122;
+            jjmatchedPos = 0;
+         }
+         break;
      }
      if (jjmatchedKind != 0x7fffffff)
      {
@@ -2438,6 +2776,7 @@ public static Token getNextToken()
         {
            matchedToken = jjFillToken();
            matchedToken.specialToken = specialToken;
+           TokenLexicalActions(matchedToken);
        if (jjnewLexState[jjmatchedKind] != -1)
          curLexState = jjnewLexState[jjmatchedKind];
            CommonTokenAction(matchedToken);
@@ -2513,4 +2852,12 @@ static void SkipLexicalActions(Token matchedToken)
          break;
    }
 }
+static void TokenLexicalActions(Token matchedToken)
+{
+   switch(jjmatchedKind)
+   {
+      default : 
+         break;
+   }
+}
 }