velocity-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From by...@apache.org
Subject svn commit: r741397 [2/3] - in /velocity/engine/branches/2.0_Exp/src: java/org/apache/velocity/context/ java/org/apache/velocity/runtime/directive/ java/org/apache/velocity/runtime/parser/ java/org/apache/velocity/runtime/parser/node/ parser/ test/org/...
Date Fri, 06 Feb 2009 04:24:52 GMT
Modified: velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/parser/ParserTokenManager.java
URL: http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/parser/ParserTokenManager.java?rev=741397&r1=741396&r2=741397&view=diff
==============================================================================
--- velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/parser/ParserTokenManager.java (original)
+++ velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/parser/ParserTokenManager.java Fri Feb  6 04:24:49 2009
@@ -12,7 +12,6 @@
 import org.apache.commons.lang.text.StrBuilder;
 import org.apache.velocity.runtime.RuntimeConstants;
 
-/** Token Manager. */
 public class ParserTokenManager implements ParserConstants
 {
     private int fileDepth = 0;
@@ -170,10 +169,7 @@
             }
         }
     }
-
-  /** Debug output. */
   public  java.io.PrintStream debugStream = System.out;
-  /** Set debug output. */
   public  void setDebugStream(java.io.PrintStream ds) { debugStream = ds; }
 private final int jjStopStringLiteralDfa_3(int pos, long active0)
 {
@@ -182,44 +178,44 @@
       case 0:
          if ((active0 & 0x40L) != 0L)
             return 58;
-         if ((active0 & 0x1000000000L) != 0L)
+         if ((active0 & 0x4000000000L) != 0L)
             return 101;
          if ((active0 & 0x100L) != 0L)
             return 65;
-         if ((active0 & 0x600000000L) != 0L)
+         if ((active0 & 0x1800000000L) != 0L)
          {
-            jjmatchedKind = 62;
+            jjmatchedKind = 64;
             return 63;
          }
-         if ((active0 & 0x4000000000000L) != 0L)
+         if ((active0 & 0x10000000000000L) != 0L)
             return 50;
-         if ((active0 & 0x3a0000L) != 0L)
+         if ((active0 & 0xe80000L) != 0L)
             return 7;
          return -1;
       case 1:
-         if ((active0 & 0x600000000L) != 0L)
+         if ((active0 & 0x1800000000L) != 0L)
          {
-            jjmatchedKind = 62;
+            jjmatchedKind = 64;
             jjmatchedPos = 1;
             return 63;
          }
-         if ((active0 & 0x80000L) != 0L)
+         if ((active0 & 0x200000L) != 0L)
             return 5;
          return -1;
       case 2:
-         if ((active0 & 0x600000000L) != 0L)
+         if ((active0 & 0x1800000000L) != 0L)
          {
-            jjmatchedKind = 62;
+            jjmatchedKind = 64;
             jjmatchedPos = 2;
             return 63;
          }
          return -1;
       case 3:
-         if ((active0 & 0x200000000L) != 0L)
+         if ((active0 & 0x800000000L) != 0L)
             return 63;
-         if ((active0 & 0x400000000L) != 0L)
+         if ((active0 & 0x1000000000L) != 0L)
          {
-            jjmatchedKind = 62;
+            jjmatchedKind = 64;
             jjmatchedPos = 3;
             return 63;
          }
@@ -232,47 +228,55 @@
 {
    return jjMoveNfa_3(jjStopStringLiteralDfa_3(pos, active0), pos + 1);
 }
-private int jjStopAtPos(int pos, int kind)
+private final int jjStopAtPos(int pos, int kind)
 {
    jjmatchedKind = kind;
    jjmatchedPos = pos;
    return pos + 1;
 }
-private int jjMoveStringLiteralDfa0_3()
+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);
+}
+private final int jjMoveStringLiteralDfa0_3()
 {
    switch(curChar)
    {
       case 35:
-         jjmatchedKind = 20;
-         return jjMoveStringLiteralDfa1_3(0x2a0000L);
+         jjmatchedKind = 22;
+         return jjMoveStringLiteralDfa1_3(0xa80000L);
       case 37:
-         return jjStopAtPos(0, 40);
+         return jjStopAtPos(0, 42);
       case 40:
          return jjStopAtPos(0, 10);
       case 42:
-         return jjStopAtPos(0, 38);
+         return jjStopAtPos(0, 40);
       case 43:
-         return jjStopAtPos(0, 37);
+         return jjStopAtPos(0, 39);
       case 44:
          return jjStopAtPos(0, 5);
       case 45:
-         return jjStartNfaWithStates_3(0, 36, 101);
+         return jjStartNfaWithStates_3(0, 38, 101);
       case 46:
          return jjMoveStringLiteralDfa1_3(0x40L);
       case 47:
-         return jjStopAtPos(0, 39);
+         return jjStopAtPos(0, 41);
       case 58:
          return jjStopAtPos(0, 7);
       case 61:
-         return jjStartNfaWithStates_3(0, 50, 50);
+         return jjStartNfaWithStates_3(0, 52, 50);
       case 91:
          return jjStopAtPos(0, 3);
       case 93:
          return jjStopAtPos(0, 4);
       case 102:
-         return jjMoveStringLiteralDfa1_3(0x400000000L);
+         return jjMoveStringLiteralDfa1_3(0x1000000000L);
       case 116:
-         return jjMoveStringLiteralDfa1_3(0x200000000L);
+         return jjMoveStringLiteralDfa1_3(0x800000000L);
       case 123:
          return jjStartNfaWithStates_3(0, 8, 65);
       case 125:
@@ -281,7 +285,7 @@
          return jjMoveNfa_3(0, 0);
    }
 }
-private int jjMoveStringLiteralDfa1_3(long active0)
+private final int jjMoveStringLiteralDfa1_3(long active0)
 {
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
@@ -291,32 +295,32 @@
    switch(curChar)
    {
       case 35:
-         if ((active0 & 0x200000L) != 0L)
-            return jjStopAtPos(1, 21);
+         if ((active0 & 0x800000L) != 0L)
+            return jjStopAtPos(1, 23);
          break;
       case 42:
-         if ((active0 & 0x80000L) != 0L)
-            return jjStartNfaWithStates_3(1, 19, 5);
+         if ((active0 & 0x200000L) != 0L)
+            return jjStartNfaWithStates_3(1, 21, 5);
          break;
       case 46:
          if ((active0 & 0x40L) != 0L)
             return jjStopAtPos(1, 6);
          break;
       case 91:
-         return jjMoveStringLiteralDfa2_3(active0, 0x20000L);
+         return jjMoveStringLiteralDfa2_3(active0, 0x80000L);
       case 97:
-         return jjMoveStringLiteralDfa2_3(active0, 0x400000000L);
+         return jjMoveStringLiteralDfa2_3(active0, 0x1000000000L);
       case 114:
-         return jjMoveStringLiteralDfa2_3(active0, 0x200000000L);
+         return jjMoveStringLiteralDfa2_3(active0, 0x800000000L);
       default :
          break;
    }
    return jjStartNfa_3(0, active0);
 }
-private int jjMoveStringLiteralDfa2_3(long old0, long active0)
+private final int jjMoveStringLiteralDfa2_3(long old0, long active0)
 {
    if (((active0 &= old0)) == 0L)
-      return jjStartNfa_3(0, old0);
+      return jjStartNfa_3(0, old0); 
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
       jjStopStringLiteralDfa_3(1, active0);
@@ -325,22 +329,22 @@
    switch(curChar)
    {
       case 91:
-         if ((active0 & 0x20000L) != 0L)
-            return jjStopAtPos(2, 17);
+         if ((active0 & 0x80000L) != 0L)
+            return jjStopAtPos(2, 19);
          break;
       case 108:
-         return jjMoveStringLiteralDfa3_3(active0, 0x400000000L);
+         return jjMoveStringLiteralDfa3_3(active0, 0x1000000000L);
       case 117:
-         return jjMoveStringLiteralDfa3_3(active0, 0x200000000L);
+         return jjMoveStringLiteralDfa3_3(active0, 0x800000000L);
       default :
          break;
    }
    return jjStartNfa_3(1, active0);
 }
-private int jjMoveStringLiteralDfa3_3(long old0, long active0)
+private final int jjMoveStringLiteralDfa3_3(long old0, long active0)
 {
    if (((active0 &= old0)) == 0L)
-      return jjStartNfa_3(1, old0);
+      return jjStartNfa_3(1, old0); 
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
       jjStopStringLiteralDfa_3(2, active0);
@@ -349,20 +353,20 @@
    switch(curChar)
    {
       case 101:
-         if ((active0 & 0x200000000L) != 0L)
-            return jjStartNfaWithStates_3(3, 33, 63);
+         if ((active0 & 0x800000000L) != 0L)
+            return jjStartNfaWithStates_3(3, 35, 63);
          break;
       case 115:
-         return jjMoveStringLiteralDfa4_3(active0, 0x400000000L);
+         return jjMoveStringLiteralDfa4_3(active0, 0x1000000000L);
       default :
          break;
    }
    return jjStartNfa_3(2, active0);
 }
-private int jjMoveStringLiteralDfa4_3(long old0, long active0)
+private final int jjMoveStringLiteralDfa4_3(long old0, long active0)
 {
    if (((active0 &= old0)) == 0L)
-      return jjStartNfa_3(2, old0);
+      return jjStartNfa_3(2, old0); 
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
       jjStopStringLiteralDfa_3(3, active0);
@@ -371,21 +375,43 @@
    switch(curChar)
    {
       case 101:
-         if ((active0 & 0x400000000L) != 0L)
-            return jjStartNfaWithStates_3(4, 34, 63);
+         if ((active0 & 0x1000000000L) != 0L)
+            return jjStartNfaWithStates_3(4, 36, 63);
          break;
       default :
          break;
    }
    return jjStartNfa_3(3, active0);
 }
-private int jjStartNfaWithStates_3(int pos, int kind, int state)
+private final void jjCheckNAdd(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);
+   if (jjrounds[state] != jjround)
+   {
+      jjstateSet[jjnewStateCnt++] = state;
+      jjrounds[state] = jjround;
+   }
+}
+private final void jjAddStates(int start, int end)
+{
+   do {
+      jjstateSet[jjnewStateCnt++] = jjnextStates[start];
+   } while (start++ != end);
+}
+private final void jjCheckNAddTwoStates(int state1, int state2)
+{
+   jjCheckNAdd(state1);
+   jjCheckNAdd(state2);
+}
+private final void jjCheckNAddStates(int start, int end)
+{
+   do {
+      jjCheckNAdd(jjnextStates[start]);
+   } while (start++ != end);
+}
+private final void jjCheckNAddStates(int start)
+{
+   jjCheckNAdd(jjnextStates[start]);
+   jjCheckNAdd(jjnextStates[start + 1]);
 }
 static final long[] jjbitVec0 = {
    0xfffffffffffffffeL, 0xffffffffffffffffL, 0xffffffffffffffffL, 0xffffffffffffffffL
@@ -393,13 +419,14 @@
 static final long[] jjbitVec2 = {
    0x0L, 0x0L, 0xffffffffffffffffL, 0xffffffffffffffffL
 };
-private int jjMoveNfa_3(int startState, int curPos)
+private final int jjMoveNfa_3(int startState, int curPos)
 {
+   int[] nextStates;
    int startsAt = 0;
    jjnewStateCnt = 101;
    int i = 1;
    jjstateSet[0] = startState;
-   int kind = 0x7fffffff;
+   int j, kind = 0x7fffffff;
    for (;;)
    {
       if (++jjround == 0x7fffffff)
@@ -407,37 +434,37 @@
       if (curChar < 64)
       {
          long l = 1L << curChar;
-         do
+         MatchLoop: do
          {
             switch(jjstateSet[--i])
             {
                case 0:
                   if ((0x3ff000000000000L & l) != 0L)
                   {
-                     if (kind > 57)
-                        kind = 57;
+                     if (kind > 59)
+                        kind = 59;
                      jjCheckNAddStates(0, 5);
                   }
                   else if ((0x100002600L & l) != 0L)
                   {
-                     if (kind > 31)
-                        kind = 31;
+                     if (kind > 33)
+                        kind = 33;
                      jjCheckNAdd(9);
                   }
                   else if (curChar == 45)
                      jjCheckNAddStates(6, 9);
                   else if (curChar == 36)
                   {
-                     if (kind > 15)
-                        kind = 15;
+                     if (kind > 17)
+                        kind = 17;
                      jjCheckNAddTwoStates(73, 74);
                   }
                   else if (curChar == 46)
                      jjCheckNAdd(58);
                   else if (curChar == 33)
                   {
-                     if (kind > 49)
-                        kind = 49;
+                     if (kind > 51)
+                        kind = 51;
                   }
                   else if (curChar == 61)
                      jjstateSet[jjnewStateCnt++] = 50;
@@ -461,20 +488,20 @@
                   }
                   if ((0x2400L & l) != 0L)
                   {
-                     if (kind > 35)
-                        kind = 35;
+                     if (kind > 37)
+                        kind = 37;
                   }
                   else if (curChar == 33)
                      jjstateSet[jjnewStateCnt++] = 54;
                   else if (curChar == 62)
                   {
-                     if (kind > 45)
-                        kind = 45;
+                     if (kind > 47)
+                        kind = 47;
                   }
                   else if (curChar == 60)
                   {
-                     if (kind > 43)
-                        kind = 43;
+                     if (kind > 45)
+                        kind = 45;
                   }
                   if (curChar == 13)
                      jjstateSet[jjnewStateCnt++] = 33;
@@ -488,8 +515,8 @@
                      jjCheckNAddTwoStates(90, 91);
                   if ((0x3ff000000000000L & l) != 0L)
                   {
-                     if (kind > 57)
-                        kind = 57;
+                     if (kind > 59)
+                        kind = 59;
                      jjCheckNAddTwoStates(87, 89);
                   }
                   break;
@@ -514,8 +541,8 @@
                      jjstateSet[jjnewStateCnt++] = 6;
                   break;
                case 6:
-                  if ((0xfffffff7ffffffffL & l) != 0L && kind > 18)
-                     kind = 18;
+                  if ((0xfffffff7ffffffffL & l) != 0L && kind > 20)
+                     kind = 20;
                   break;
                case 7:
                   if (curChar == 42)
@@ -528,8 +555,8 @@
                case 9:
                   if ((0x100002600L & l) == 0L)
                      break;
-                  if (kind > 31)
-                     kind = 31;
+                  if (kind > 33)
+                     kind = 33;
                   jjCheckNAdd(9);
                   break;
                case 10:
@@ -541,8 +568,8 @@
                      jjCheckNAddStates(13, 15);
                   break;
                case 12:
-                  if (curChar == 34 && kind > 32)
-                     kind = 32;
+                  if (curChar == 34 && kind > 34)
+                     kind = 34;
                   break;
                case 14:
                   if ((0x8400000000L & l) != 0L)
@@ -605,72 +632,72 @@
                      jjCheckNAddStates(10, 12);
                   break;
                case 31:
-                  if (curChar == 39 && kind > 32)
-                     kind = 32;
+                  if (curChar == 39 && kind > 34)
+                     kind = 34;
                   break;
                case 32:
-                  if ((0x2400L & l) != 0L && kind > 35)
-                     kind = 35;
+                  if ((0x2400L & l) != 0L && kind > 37)
+                     kind = 37;
                   break;
                case 33:
-                  if (curChar == 10 && kind > 35)
-                     kind = 35;
+                  if (curChar == 10 && kind > 37)
+                     kind = 37;
                   break;
                case 34:
                   if (curChar == 13)
                      jjstateSet[jjnewStateCnt++] = 33;
                   break;
                case 35:
-                  if (curChar == 38 && kind > 41)
-                     kind = 41;
+                  if (curChar == 38 && kind > 43)
+                     kind = 43;
                   break;
                case 36:
                   if (curChar == 38)
                      jjstateSet[jjnewStateCnt++] = 35;
                   break;
                case 44:
-                  if (curChar == 60 && kind > 43)
-                     kind = 43;
+                  if (curChar == 60 && kind > 45)
+                     kind = 45;
                   break;
                case 45:
-                  if (curChar == 61 && kind > 44)
-                     kind = 44;
+                  if (curChar == 61 && kind > 46)
+                     kind = 46;
                   break;
                case 46:
                   if (curChar == 60)
                      jjstateSet[jjnewStateCnt++] = 45;
                   break;
                case 47:
-                  if (curChar == 62 && kind > 45)
-                     kind = 45;
+                  if (curChar == 62 && kind > 47)
+                     kind = 47;
                   break;
                case 48:
-                  if (curChar == 61 && kind > 46)
-                     kind = 46;
+                  if (curChar == 61 && kind > 48)
+                     kind = 48;
                   break;
                case 49:
                   if (curChar == 62)
                      jjstateSet[jjnewStateCnt++] = 48;
                   break;
                case 50:
-                  if (curChar == 61 && kind > 47)
-                     kind = 47;
+                  if (curChar == 61 && kind > 49)
+                     kind = 49;
                   break;
                case 51:
                   if (curChar == 61)
                      jjstateSet[jjnewStateCnt++] = 50;
                   break;
                case 54:
-                  if (curChar == 61 && kind > 48)
-                     kind = 48;
+                  if (curChar == 61 && kind > 50)
+                     kind = 50;
                   break;
                case 55:
                   if (curChar == 33)
                      jjstateSet[jjnewStateCnt++] = 54;
                   break;
                case 56:
-                  if (curChar == 33 && kind > 49)
-                     kind = 49;
+                  if (curChar == 33 && kind > 51)
+                     kind = 51;
                   break;
                case 57:
                   if (curChar == 46)
@@ -679,8 +706,8 @@
                case 58:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 58)
-                     kind = 58;
+                  if (kind > 60)
+                     kind = 60;
                   jjCheckNAddTwoStates(58, 59);
                   break;
                case 60:
@@ -690,15 +717,15 @@
                case 61:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 58)
-                     kind = 58;
+                  if (kind > 60)
+                     kind = 60;
                   jjCheckNAdd(61);
                   break;
                case 63:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 62)
-                     kind = 62;
+                  if (kind > 64)
+                     kind = 64;
                   jjstateSet[jjnewStateCnt++] = 63;
                   break;
                case 66:
@@ -706,22 +733,22 @@
                      jjAddStates(27, 28);
                   break;
                case 70:
-                  if (curChar == 36 && kind > 15)
-                     kind = 15;
+                  if (curChar == 36 && kind > 17)
+                     kind = 17;
                   break;
                case 72:
                   if (curChar == 36)
                      jjCheckNAddTwoStates(73, 74);
                   break;
                case 74:
-                  if (curChar == 33 && kind > 16)
-                     kind = 16;
+                  if (curChar == 33 && kind > 18)
+                     kind = 18;
                   break;
                case 75:
                   if (curChar != 36)
                      break;
-                  if (kind > 15)
-                     kind = 15;
+                  if (kind > 17)
+                     kind = 17;
                   jjCheckNAddTwoStates(73, 74);
                   break;
                case 86:
@@ -731,13 +758,13 @@
                case 87:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 57)
-                     kind = 57;
+                  if (kind > 59)
+                     kind = 59;
                   jjCheckNAddTwoStates(87, 89);
                   break;
                case 88:
-                  if (curChar == 46 && kind > 57)
-                     kind = 57;
+                  if (curChar == 46 && kind > 59)
+                     kind = 59;
                   break;
                case 89:
                   if (curChar == 46)
@@ -750,15 +777,15 @@
                case 91:
                   if (curChar != 46)
                      break;
-                  if (kind > 58)
-                     kind = 58;
+                  if (kind > 60)
+                     kind = 60;
                   jjCheckNAddTwoStates(92, 93);
                   break;
                case 92:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 58)
-                     kind = 58;
+                  if (kind > 60)
+                     kind = 60;
                   jjCheckNAddTwoStates(92, 93);
                   break;
                case 94:
@@ -768,8 +795,8 @@
                case 95:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 58)
-                     kind = 58;
+                  if (kind > 60)
+                     kind = 60;
                   jjCheckNAdd(95);
                   break;
                case 96:
@@ -783,15 +810,15 @@
                case 99:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 58)
-                     kind = 58;
+                  if (kind > 60)
+                     kind = 60;
                   jjCheckNAdd(99);
                   break;
                case 100:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 57)
-                     kind = 57;
+                  if (kind > 59)
+                     kind = 59;
                   jjCheckNAddStates(0, 5);
                   break;
                default : break;
@@ -801,15 +828,15 @@
       else if (curChar < 128)
       {
          long l = 1L << (curChar & 077);
-         do
+         MatchLoop: do
          {
             switch(jjstateSet[--i])
             {
                case 0:
                   if ((0x7fffffe87ffffffL & l) != 0L)
                   {
-                     if (kind > 62)
-                        kind = 62;
+                     if (kind > 64)
+                        kind = 64;
                      jjCheckNAdd(63);
                   }
                   else if (curChar == 92)
@@ -832,8 +859,8 @@
                      jjstateSet[jjnewStateCnt++] = 38;
                   break;
                case 6:
-                  if (kind > 18)
-                     kind = 18;
+                  if (kind > 20)
+                     kind = 20;
                   break;
                case 11:
                   jjCheckNAddStates(13, 15);
@@ -874,8 +901,8 @@
                      jjAddStates(25, 26);
                   break;
                case 37:
-                  if (curChar == 100 && kind > 41)
-                     kind = 41;
+                  if (curChar == 100 && kind > 43)
+                     kind = 43;
                   break;
                case 38:
                   if (curChar == 110)
@@ -886,24 +913,24 @@
                      jjstateSet[jjnewStateCnt++] = 38;
                   break;
                case 40:
-                  if (curChar == 124 && kind > 42)
-                     kind = 42;
+                  if (curChar == 124 && kind > 44)
+                     kind = 44;
                   break;
                case 41:
                   if (curChar == 124)
                      jjstateSet[jjnewStateCnt++] = 40;
                   break;
                case 42:
-                  if (curChar == 114 && kind > 42)
-                     kind = 42;
+                  if (curChar == 114 && kind > 44)
+                     kind = 44;
                   break;
                case 43:
                   if (curChar == 111)
                      jjstateSet[jjnewStateCnt++] = 42;
                   break;
                case 52:
-                  if (curChar == 113 && kind > 47)
-                     kind = 47;
+                  if (curChar == 113 && kind > 49)
+                     kind = 49;
                   break;
                case 53:
                   if (curChar == 101)
@@ -917,8 +944,8 @@
                case 63:
                   if ((0x7fffffe87ffffffL & l) == 0L)
                      break;
-                  if (kind > 62)
-                     kind = 62;
+                  if (kind > 64)
+                     kind = 64;
                   jjCheckNAdd(63);
                   break;
                case 64:
@@ -934,8 +961,8 @@
                      jjCheckNAddTwoStates(66, 67);
                   break;
                case 67:
-                  if (curChar == 125 && kind > 63)
-                     kind = 63;
+                  if (curChar == 125 && kind > 65)
+                     kind = 65;
                   break;
                case 68:
                   if (curChar == 92)
@@ -958,36 +985,36 @@
                      jjAddStates(37, 38);
                   break;
                case 77:
-                  if (curChar == 116 && kind > 43)
-                     kind = 43;
+                  if (curChar == 116 && kind > 45)
+                     kind = 45;
                   break;
                case 78:
-                  if (curChar == 101 && kind > 44)
-                     kind = 44;
+                  if (curChar == 101 && kind > 46)
+                     kind = 46;
                   break;
                case 79:
                   if (curChar == 103)
                      jjAddStates(35, 36);
                   break;
                case 80:
-                  if (curChar == 116 && kind > 45)
-                     kind = 45;
+                  if (curChar == 116 && kind > 47)
+                     kind = 47;
                   break;
                case 81:
-                  if (curChar == 101 && kind > 46)
-                     kind = 46;
+                  if (curChar == 101 && kind > 48)
+                     kind = 48;
                   break;
                case 82:
                   if (curChar == 110)
                      jjAddStates(33, 34);
                   break;
                case 83:
-                  if (curChar == 101 && kind > 48)
-                     kind = 48;
+                  if (curChar == 101 && kind > 50)
+                     kind = 50;
                   break;
                case 84:
-                  if (curChar == 116 && kind > 49)
-                     kind = 49;
+                  if (curChar == 116 && kind > 51)
+                     kind = 51;
                   break;
                case 85:
                   if (curChar == 111)
@@ -1012,13 +1039,13 @@
          long l1 = 1L << (hiByte & 077);
          int i2 = (curChar & 0xff) >> 6;
          long l2 = 1L << (curChar & 077);
-         do
+         MatchLoop: do
          {
             switch(jjstateSet[--i])
             {
                case 6:
-                  if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 18)
-                     kind = 18;
+                  if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 20)
+                     kind = 20;
                   break;
                case 11:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
@@ -1050,11 +1077,11 @@
    switch (pos)
    {
       case 0:
-         if ((active0 & 0x3a0000L) != 0L)
+         if ((active0 & 0xe80000L) != 0L)
             return 2;
          return -1;
       case 1:
-         if ((active0 & 0x80000L) != 0L)
+         if ((active0 & 0x200000L) != 0L)
             return 0;
          return -1;
       default :
@@ -1065,18 +1092,26 @@
 {
    return jjMoveNfa_11(jjStopStringLiteralDfa_11(pos, active0), pos + 1);
 }
-private int jjMoveStringLiteralDfa0_11()
+private final int jjStartNfaWithStates_11(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_11(state, pos + 1);
+}
+private final int jjMoveStringLiteralDfa0_11()
 {
    switch(curChar)
    {
       case 35:
-         jjmatchedKind = 20;
-         return jjMoveStringLiteralDfa1_11(0x2a0000L);
+         jjmatchedKind = 22;
+         return jjMoveStringLiteralDfa1_11(0xa80000L);
       default :
          return jjMoveNfa_11(3, 0);
    }
 }
-private int jjMoveStringLiteralDfa1_11(long active0)
+private final int jjMoveStringLiteralDfa1_11(long active0)
 {
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
@@ -1086,24 +1121,24 @@
    switch(curChar)
    {
       case 35:
-         if ((active0 & 0x200000L) != 0L)
-            return jjStopAtPos(1, 21);
+         if ((active0 & 0x800000L) != 0L)
+            return jjStopAtPos(1, 23);
          break;
       case 42:
-         if ((active0 & 0x80000L) != 0L)
-            return jjStartNfaWithStates_11(1, 19, 0);
+         if ((active0 & 0x200000L) != 0L)
+            return jjStartNfaWithStates_11(1, 21, 0);
          break;
       case 91:
-         return jjMoveStringLiteralDfa2_11(active0, 0x20000L);
+         return jjMoveStringLiteralDfa2_11(active0, 0x80000L);
       default :
          break;
    }
    return jjStartNfa_11(0, active0);
 }
-private int jjMoveStringLiteralDfa2_11(long old0, long active0)
+private final int jjMoveStringLiteralDfa2_11(long old0, long active0)
 {
    if (((active0 &= old0)) == 0L)
-      return jjStartNfa_11(0, old0);
+      return jjStartNfa_11(0, old0); 
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
       jjStopStringLiteralDfa_11(1, active0);
@@ -1112,29 +1147,22 @@
    switch(curChar)
    {
       case 91:
-         if ((active0 & 0x20000L) != 0L)
-            return jjStopAtPos(2, 17);
+         if ((active0 & 0x80000L) != 0L)
+            return jjStopAtPos(2, 19);
          break;
       default :
          break;
    }
    return jjStartNfa_11(1, active0);
 }
-private int jjStartNfaWithStates_11(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_11(state, pos + 1);
-}
-private int jjMoveNfa_11(int startState, int curPos)
+private final int jjMoveNfa_11(int startState, int curPos)
 {
+   int[] nextStates;
    int startsAt = 0;
    jjnewStateCnt = 92;
    int i = 1;
    jjstateSet[0] = startState;
-   int kind = 0x7fffffff;
+   int j, kind = 0x7fffffff;
    for (;;)
    {
       if (++jjround == 0x7fffffff)
@@ -1142,23 +1170,23 @@
       if (curChar < 64)
       {
          long l = 1L << curChar;
-         do
+         MatchLoop: do
          {
             switch(jjstateSet[--i])
             {
                case 3:
                   if ((0x3ff000000000000L & l) != 0L)
                   {
-                     if (kind > 57)
-                        kind = 57;
+                     if (kind > 59)
+                        kind = 59;
                      jjCheckNAddStates(53, 58);
                   }
                   else if (curChar == 45)
                      jjCheckNAddStates(59, 62);
                   else if (curChar == 36)
                   {
-                     if (kind > 15)
-                        kind = 15;
+                     if (kind > 17)
+                        kind = 17;
                      jjCheckNAddTwoStates(26, 27);
                   }
                   else if (curChar == 46)
@@ -1171,8 +1199,8 @@
                      jjstateSet[jjnewStateCnt++] = 1;
                   break;
                case 1:
-                  if ((0xfffffff7ffffffffL & l) != 0L && kind > 18)
-                     kind = 18;
+                  if ((0xfffffff7ffffffffL & l) != 0L && kind > 20)
+                     kind = 20;
                   break;
                case 2:
                   if (curChar == 42)
@@ -1185,8 +1213,8 @@
                case 11:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 58)
-                     kind = 58;
+                  if (kind > 60)
+                     kind = 60;
                   jjCheckNAddTwoStates(11, 12);
                   break;
                case 13:
@@ -1196,15 +1224,15 @@
                case 14:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 58)
-                     kind = 58;
+                  if (kind > 60)
+                     kind = 60;
                   jjCheckNAdd(14);
                   break;
                case 16:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 62)
-                     kind = 62;
+                  if (kind > 64)
+                     kind = 64;
                   jjstateSet[jjnewStateCnt++] = 16;
                   break;
                case 19:
@@ -1212,22 +1240,22 @@
                      jjAddStates(63, 64);
                   break;
                case 23:
-                  if (curChar == 36 && kind > 15)
-                     kind = 15;
+                  if (curChar == 36 && kind > 17)
+                     kind = 17;
                   break;
                case 25:
                   if (curChar == 36)
                      jjCheckNAddTwoStates(26, 27);
                   break;
                case 27:
-                  if (curChar == 33 && kind > 16)
-                     kind = 16;
+                  if (curChar == 33 && kind > 18)
+                     kind = 18;
                   break;
                case 28:
                   if (curChar != 36)
                      break;
-                  if (kind > 15)
-                     kind = 15;
+                  if (kind > 17)
+                     kind = 17;
                   jjCheckNAddTwoStates(26, 27);
                   break;
                case 31:
@@ -1235,12 +1263,12 @@
                      jjCheckNAddStates(65, 67);
                   break;
                case 32:
-                  if ((0x2400L & l) != 0L && kind > 51)
-                     kind = 51;
+                  if ((0x2400L & l) != 0L && kind > 53)
+                     kind = 53;
                   break;
                case 33:
-                  if (curChar == 10 && kind > 51)
-                     kind = 51;
+                  if (curChar == 10 && kind > 53)
+                     kind = 53;
                   break;
                case 34:
                case 51:
@@ -1252,12 +1280,12 @@
                      jjCheckNAddStates(68, 70);
                   break;
                case 43:
-                  if ((0x2400L & l) != 0L && kind > 54)
-                     kind = 54;
+                  if ((0x2400L & l) != 0L && kind > 56)
+                     kind = 56;
                   break;
                case 44:
-                  if (curChar == 10 && kind > 54)
-                     kind = 54;
+                  if (curChar == 10 && kind > 56)
+                     kind = 56;
                   break;
                case 45:
                case 67:
@@ -1279,13 +1307,13 @@
                case 78:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 57)
-                     kind = 57;
+                  if (kind > 59)
+                     kind = 59;
                   jjCheckNAddTwoStates(78, 80);
                   break;
                case 79:
-                  if (curChar == 46 && kind > 57)
-                     kind = 57;
+                  if (curChar == 46 && kind > 59)
+                     kind = 59;
                   break;
                case 80:
                   if (curChar == 46)
@@ -1298,15 +1326,15 @@
                case 82:
                   if (curChar != 46)
                      break;
-                  if (kind > 58)
-                     kind = 58;
+                  if (kind > 60)
+                     kind = 60;
                   jjCheckNAddTwoStates(83, 84);
                   break;
                case 83:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 58)
-                     kind = 58;
+                  if (kind > 60)
+                     kind = 60;
                   jjCheckNAddTwoStates(83, 84);
                   break;
                case 85:
@@ -1316,8 +1344,8 @@
                case 86:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 58)
-                     kind = 58;
+                  if (kind > 60)
+                     kind = 60;
                   jjCheckNAdd(86);
                   break;
                case 87:
@@ -1331,15 +1359,15 @@
                case 90:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 58)
-                     kind = 58;
+                  if (kind > 60)
+                     kind = 60;
                   jjCheckNAdd(90);
                   break;
                case 91:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 57)
-                     kind = 57;
+                  if (kind > 59)
+                     kind = 59;
                   jjCheckNAddStates(53, 58);
                   break;
                default : break;
@@ -1349,15 +1377,15 @@
       else if (curChar < 128)
       {
          long l = 1L << (curChar & 077);
-         do
+         MatchLoop: do
          {
             switch(jjstateSet[--i])
             {
                case 3:
                   if ((0x7fffffe87ffffffL & l) != 0L)
                   {
-                     if (kind > 62)
-                        kind = 62;
+                     if (kind > 64)
+                        kind = 64;
                      jjCheckNAdd(16);
                   }
                   else if (curChar == 123)
@@ -1374,20 +1402,20 @@
                      jjstateSet[jjnewStateCnt++] = 4;
                   break;
                case 1:
-                  if (kind > 18)
-                     kind = 18;
+                  if (kind > 20)
+                     kind = 20;
                   break;
                case 4:
-                  if (curChar == 102 && kind > 52)
-                     kind = 52;
+                  if (curChar == 102 && kind > 54)
+                     kind = 54;
                   break;
                case 5:
                   if (curChar == 105)
                      jjstateSet[jjnewStateCnt++] = 4;
                   break;
                case 6:
-                  if (curChar == 112 && kind > 55)
-                     kind = 55;
+                  if (curChar == 112 && kind > 57)
+                     kind = 57;
                   break;
                case 7:
                   if (curChar == 111)
@@ -1409,8 +1437,8 @@
                case 16:
                   if ((0x7fffffe87ffffffL & l) == 0L)
                      break;
-                  if (kind > 62)
-                     kind = 62;
+                  if (kind > 64)
+                     kind = 64;
                   jjCheckNAdd(16);
                   break;
                case 17:
@@ -1426,8 +1454,8 @@
                      jjCheckNAddTwoStates(19, 20);
                   break;
                case 20:
-                  if (curChar == 125 && kind > 63)
-                     kind = 63;
+                  if (curChar == 125 && kind > 65)
+                     kind = 65;
                   break;
                case 21:
                   if (curChar == 92)
@@ -1452,8 +1480,8 @@
                case 30:
                   if (curChar != 100)
                      break;
-                  if (kind > 51)
-                     kind = 51;
+                  if (kind > 53)
+                     kind = 53;
                   jjCheckNAddStates(65, 67);
                   break;
                case 35:
@@ -1461,8 +1489,8 @@
                      jjstateSet[jjnewStateCnt++] = 30;
                   break;
                case 36:
-                  if (curChar == 102 && kind > 53)
-                     kind = 53;
+                  if (curChar == 102 && kind > 55)
+                     kind = 55;
                   break;
                case 37:
                   if (curChar == 105)
@@ -1483,8 +1511,8 @@
                case 41:
                   if (curChar != 101)
                      break;
-                  if (kind > 54)
-                     kind = 54;
+                  if (kind > 56)
+                     kind = 56;
                   jjCheckNAddStates(68, 70);
                   break;
                case 46:
@@ -1502,8 +1530,8 @@
                case 49:
                   if (curChar != 125)
                      break;
-                  if (kind > 51)
-                     kind = 51;
+                  if (kind > 53)
+                     kind = 53;
                   jjCheckNAddStates(71, 73);
                   break;
                case 52:
@@ -1519,8 +1547,8 @@
                      jjstateSet[jjnewStateCnt++] = 53;
                   break;
                case 55:
-                  if (curChar == 125 && kind > 52)
-                     kind = 52;
+                  if (curChar == 125 && kind > 54)
+                     kind = 54;
                   break;
                case 56:
                   if (curChar == 102)
@@ -1531,8 +1559,8 @@
                      jjstateSet[jjnewStateCnt++] = 56;
                   break;
                case 58:
-                  if (curChar == 125 && kind > 53)
-                     kind = 53;
+                  if (curChar == 125 && kind > 55)
+                     kind = 55;
                   break;
                case 59:
                   if (curChar == 102)
@@ -1561,8 +1589,8 @@
                case 65:
                   if (curChar != 125)
                      break;
-                  if (kind > 54)
-                     kind = 54;
+                  if (kind > 56)
+                     kind = 56;
                   jjCheckNAddStates(74, 76);
                   break;
                case 68:
@@ -1582,8 +1610,8 @@
                      jjstateSet[jjnewStateCnt++] = 70;
                   break;
                case 72:
-                  if (curChar == 125 && kind > 55)
-                     kind = 55;
+                  if (curChar == 125 && kind > 57)
+                     kind = 57;
                   break;
                case 73:
                   if (curChar == 112)
@@ -1620,13 +1648,13 @@
          long l1 = 1L << (hiByte & 077);
          int i2 = (curChar & 0xff) >> 6;
          long l2 = 1L << (curChar & 077);
-         do
+         MatchLoop: do
          {
             switch(jjstateSet[--i])
             {
                case 1:
-                  if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 18)
-                     kind = 18;
+                  if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 20)
+                     kind = 20;
                   break;
                default : break;
             }
@@ -1650,11 +1678,11 @@
    switch (pos)
    {
       case 0:
-         if ((active0 & 0x1a0000L) != 0L)
+         if ((active0 & 0x680000L) != 0L)
             return 2;
          return -1;
       case 1:
-         if ((active0 & 0x80000L) != 0L)
+         if ((active0 & 0x200000L) != 0L)
             return 0;
          return -1;
       default :
@@ -1665,20 +1693,28 @@
 {
    return jjMoveNfa_8(jjStopStringLiteralDfa_8(pos, active0), pos + 1);
 }
-private int jjMoveStringLiteralDfa0_8()
+private final int jjStartNfaWithStates_8(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_8(state, pos + 1);
+}
+private final int jjMoveStringLiteralDfa0_8()
 {
    switch(curChar)
    {
       case 35:
-         jjmatchedKind = 20;
-         return jjMoveStringLiteralDfa1_8(0xa0000L);
+         jjmatchedKind = 22;
+         return jjMoveStringLiteralDfa1_8(0x280000L);
       case 42:
-         return jjMoveStringLiteralDfa1_8(0x8000000L);
+         return jjMoveStringLiteralDfa1_8(0x20000000L);
       default :
          return jjMoveNfa_8(3, 0);
    }
 }
-private int jjMoveStringLiteralDfa1_8(long active0)
+private final int jjMoveStringLiteralDfa1_8(long active0)
 {
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
@@ -1688,24 +1724,24 @@
    switch(curChar)
    {
       case 35:
-         if ((active0 & 0x8000000L) != 0L)
-            return jjStopAtPos(1, 27);
+         if ((active0 & 0x20000000L) != 0L)
+            return jjStopAtPos(1, 29);
          break;
       case 42:
-         if ((active0 & 0x80000L) != 0L)
-            return jjStartNfaWithStates_8(1, 19, 0);
+         if ((active0 & 0x200000L) != 0L)
+            return jjStartNfaWithStates_8(1, 21, 0);
          break;
       case 91:
-         return jjMoveStringLiteralDfa2_8(active0, 0x20000L);
+         return jjMoveStringLiteralDfa2_8(active0, 0x80000L);
       default :
          break;
    }
    return jjStartNfa_8(0, active0);
 }
-private int jjMoveStringLiteralDfa2_8(long old0, long active0)
+private final int jjMoveStringLiteralDfa2_8(long old0, long active0)
 {
    if (((active0 &= old0)) == 0L)
-      return jjStartNfa_8(0, old0);
+      return jjStartNfa_8(0, old0); 
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
       jjStopStringLiteralDfa_8(1, active0);
@@ -1714,29 +1750,22 @@
    switch(curChar)
    {
       case 91:
-         if ((active0 & 0x20000L) != 0L)
-            return jjStopAtPos(2, 17);
+         if ((active0 & 0x80000L) != 0L)
+            return jjStopAtPos(2, 19);
          break;
       default :
          break;
    }
    return jjStartNfa_8(1, active0);
 }
-private int jjStartNfaWithStates_8(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_8(state, pos + 1);
-}
-private int jjMoveNfa_8(int startState, int curPos)
+private final int jjMoveNfa_8(int startState, int curPos)
 {
+   int[] nextStates;
    int startsAt = 0;
    jjnewStateCnt = 12;
    int i = 1;
    jjstateSet[0] = startState;
-   int kind = 0x7fffffff;
+   int j, kind = 0x7fffffff;
    for (;;)
    {
       if (++jjround == 0x7fffffff)
@@ -1744,15 +1773,15 @@
       if (curChar < 64)
       {
          long l = 1L << curChar;
-         do
+         MatchLoop: do
          {
             switch(jjstateSet[--i])
             {
                case 3:
                   if (curChar == 36)
                   {
-                     if (kind > 15)
-                        kind = 15;
+                     if (kind > 17)
+                        kind = 17;
                      jjCheckNAddTwoStates(9, 10);
                   }
                   else if (curChar == 35)
@@ -1763,30 +1792,30 @@
                      jjstateSet[jjnewStateCnt++] = 1;
                   break;
                case 1:
-                  if ((0xfffffff7ffffffffL & l) != 0L && kind > 18)
-                     kind = 18;
+                  if ((0xfffffff7ffffffffL & l) != 0L && kind > 20)
+                     kind = 20;
                   break;
                case 2:
                   if (curChar == 42)
                      jjstateSet[jjnewStateCnt++] = 0;
                   break;
                case 6:
-                  if (curChar == 36 && kind > 15)
-                     kind = 15;
+                  if (curChar == 36 && kind > 17)
+                     kind = 17;
                   break;
                case 8:
                   if (curChar == 36)
                      jjCheckNAddTwoStates(9, 10);
                   break;
                case 10:
-                  if (curChar == 33 && kind > 16)
-                     kind = 16;
+                  if (curChar == 33 && kind > 18)
+                     kind = 18;
                   break;
                case 11:
                   if (curChar != 36)
                      break;
-                  if (kind > 15)
-                     kind = 15;
+                  if (kind > 17)
+                     kind = 17;
                   jjCheckNAddTwoStates(9, 10);
                   break;
                default : break;
@@ -1796,7 +1825,7 @@
       else if (curChar < 128)
       {
          long l = 1L << (curChar & 077);
-         do
+         MatchLoop: do
          {
             switch(jjstateSet[--i])
             {
@@ -1805,8 +1834,8 @@
                      jjCheckNAddStates(97, 100);
                   break;
                case 1:
-                  if (kind > 18)
-                     kind = 18;
+                  if (kind > 20)
+                     kind = 20;
                   break;
                case 5:
                   if (curChar == 92)
@@ -1831,13 +1860,13 @@
          long l1 = 1L << (hiByte & 077);
          int i2 = (curChar & 0xff) >> 6;
          long l2 = 1L << (curChar & 077);
-         do
+         MatchLoop: do
          {
             switch(jjstateSet[--i])
             {
                case 1:
-                  if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 18)
-                     kind = 18;
+                  if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 20)
+                     kind = 20;
                   break;
                default : break;
             }
@@ -1861,11 +1890,11 @@
    switch (pos)
    {
       case 0:
-         if ((active0 & 0x1a0000L) != 0L)
+         if ((active0 & 0x680000L) != 0L)
             return 2;
          return -1;
       case 1:
-         if ((active0 & 0x80000L) != 0L)
+         if ((active0 & 0x200000L) != 0L)
             return 0;
          return -1;
       default :
@@ -1876,18 +1905,26 @@
 {
    return jjMoveNfa_6(jjStopStringLiteralDfa_6(pos, active0), pos + 1);
 }
-private int jjMoveStringLiteralDfa0_6()
+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);
+}
+private final int jjMoveStringLiteralDfa0_6()
 {
    switch(curChar)
    {
       case 35:
-         jjmatchedKind = 20;
-         return jjMoveStringLiteralDfa1_6(0xa0000L);
+         jjmatchedKind = 22;
+         return jjMoveStringLiteralDfa1_6(0x280000L);
       default :
          return jjMoveNfa_6(3, 0);
    }
 }
-private int jjMoveStringLiteralDfa1_6(long active0)
+private final int jjMoveStringLiteralDfa1_6(long active0)
 {
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
@@ -1897,20 +1934,20 @@
    switch(curChar)
    {
       case 42:
-         if ((active0 & 0x80000L) != 0L)
-            return jjStartNfaWithStates_6(1, 19, 0);
+         if ((active0 & 0x200000L) != 0L)
+            return jjStartNfaWithStates_6(1, 21, 0);
          break;
       case 91:
-         return jjMoveStringLiteralDfa2_6(active0, 0x20000L);
+         return jjMoveStringLiteralDfa2_6(active0, 0x80000L);
       default :
          break;
    }
    return jjStartNfa_6(0, active0);
 }
-private int jjMoveStringLiteralDfa2_6(long old0, long active0)
+private final int jjMoveStringLiteralDfa2_6(long old0, long active0)
 {
    if (((active0 &= old0)) == 0L)
-      return jjStartNfa_6(0, old0);
+      return jjStartNfa_6(0, old0); 
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
       jjStopStringLiteralDfa_6(1, active0);
@@ -1919,29 +1956,22 @@
    switch(curChar)
    {
       case 91:
-         if ((active0 & 0x20000L) != 0L)
-            return jjStopAtPos(2, 17);
+         if ((active0 & 0x80000L) != 0L)
+            return jjStopAtPos(2, 19);
          break;
       default :
          break;
    }
    return jjStartNfa_6(1, active0);
 }
-private 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);
-}
-private int jjMoveNfa_6(int startState, int curPos)
+private final int jjMoveNfa_6(int startState, int curPos)
 {
+   int[] nextStates;
    int startsAt = 0;
    jjnewStateCnt = 12;
    int i = 1;
    jjstateSet[0] = startState;
-   int kind = 0x7fffffff;
+   int j, kind = 0x7fffffff;
    for (;;)
    {
       if (++jjround == 0x7fffffff)
@@ -1949,15 +1979,15 @@
       if (curChar < 64)
       {
          long l = 1L << curChar;
-         do
+         MatchLoop: do
          {
             switch(jjstateSet[--i])
             {
                case 3:
                   if (curChar == 36)
                   {
-                     if (kind > 15)
-                        kind = 15;
+                     if (kind > 17)
+                        kind = 17;
                      jjCheckNAddTwoStates(9, 10);
                   }
                   else if (curChar == 35)
@@ -1968,30 +1998,30 @@
                      jjstateSet[jjnewStateCnt++] = 1;
                   break;
                case 1:
-                  if ((0xfffffff7ffffffffL & l) != 0L && kind > 18)
-                     kind = 18;
+                  if ((0xfffffff7ffffffffL & l) != 0L && kind > 20)
+                     kind = 20;
                   break;
                case 2:
                   if (curChar == 42)
                      jjstateSet[jjnewStateCnt++] = 0;
                   break;
                case 6:
-                  if (curChar == 36 && kind > 15)
-                     kind = 15;
+                  if (curChar == 36 && kind > 17)
+                     kind = 17;
                   break;
                case 8:
                   if (curChar == 36)
                      jjCheckNAddTwoStates(9, 10);
                   break;
                case 10:
-                  if (curChar == 33 && kind > 16)
-                     kind = 16;
+                  if (curChar == 33 && kind > 18)
+                     kind = 18;
                   break;
                case 11:
                   if (curChar != 36)
                      break;
-                  if (kind > 15)
-                     kind = 15;
+                  if (kind > 17)
+                     kind = 17;
                   jjCheckNAddTwoStates(9, 10);
                   break;
                default : break;
@@ -2001,7 +2031,7 @@
       else if (curChar < 128)
       {
          long l = 1L << (curChar & 077);
-         do
+         MatchLoop: do
          {
             switch(jjstateSet[--i])
             {
@@ -2010,8 +2040,8 @@
                      jjCheckNAddStates(97, 100);
                   break;
                case 1:
-                  if (kind > 18)
-                     kind = 18;
+                  if (kind > 20)
+                     kind = 20;
                   break;
                case 5:
                   if (curChar == 92)
@@ -2036,13 +2066,13 @@
          long l1 = 1L << (hiByte & 077);
          int i2 = (curChar & 0xff) >> 6;
          long l2 = 1L << (curChar & 077);
-         do
+         MatchLoop: do
          {
             switch(jjstateSet[--i])
             {
                case 1:
-                  if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 18)
-                     kind = 18;
+                  if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 20)
+                     kind = 20;
                   break;
                default : break;
             }
@@ -2066,16 +2096,16 @@
    switch (pos)
    {
       case 0:
-         if ((active0 & 0xc00000L) != 0L)
-            return 19;
-         if ((active0 & 0x3a0000L) != 0L)
-            return 38;
+         if ((active0 & 0x3000000L) != 0L)
+            return 7;
+         if ((active0 & 0xe80000L) != 0L)
+            return 73;
          return -1;
       case 1:
-         if ((active0 & 0x400000L) != 0L)
-            return 39;
-         if ((active0 & 0x80000L) != 0L)
-            return 36;
+         if ((active0 & 0x200000L) != 0L)
+            return 71;
+         if ((active0 & 0x1000000L) != 0L)
+            return 74;
          return -1;
       default :
          return -1;
@@ -2085,21 +2115,29 @@
 {
    return jjMoveNfa_5(jjStopStringLiteralDfa_5(pos, active0), pos + 1);
 }
-private int jjMoveStringLiteralDfa0_5()
+private final int jjStartNfaWithStates_5(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_5(state, pos + 1);
+}
+private final int jjMoveStringLiteralDfa0_5()
 {
    switch(curChar)
    {
       case 35:
-         jjmatchedKind = 20;
-         return jjMoveStringLiteralDfa1_5(0x2a0000L);
+         jjmatchedKind = 22;
+         return jjMoveStringLiteralDfa1_5(0xa80000L);
       case 92:
-         jjmatchedKind = 23;
-         return jjMoveStringLiteralDfa1_5(0x400000L);
+         jjmatchedKind = 25;
+         return jjMoveStringLiteralDfa1_5(0x1000000L);
       default :
-         return jjMoveNfa_5(13, 0);
+         return jjMoveNfa_5(1, 0);
    }
 }
-private int jjMoveStringLiteralDfa1_5(long active0)
+private final int jjMoveStringLiteralDfa1_5(long active0)
 {
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
@@ -2109,28 +2147,28 @@
    switch(curChar)
    {
       case 35:
-         if ((active0 & 0x200000L) != 0L)
-            return jjStopAtPos(1, 21);
+         if ((active0 & 0x800000L) != 0L)
+            return jjStopAtPos(1, 23);
          break;
       case 42:
-         if ((active0 & 0x80000L) != 0L)
-            return jjStartNfaWithStates_5(1, 19, 36);
+         if ((active0 & 0x200000L) != 0L)
+            return jjStartNfaWithStates_5(1, 21, 71);
          break;
       case 91:
-         return jjMoveStringLiteralDfa2_5(active0, 0x20000L);
+         return jjMoveStringLiteralDfa2_5(active0, 0x80000L);
       case 92:
-         if ((active0 & 0x400000L) != 0L)
-            return jjStartNfaWithStates_5(1, 22, 39);
+         if ((active0 & 0x1000000L) != 0L)
+            return jjStartNfaWithStates_5(1, 24, 74);
          break;
       default :
          break;
    }
    return jjStartNfa_5(0, active0);
 }
-private int jjMoveStringLiteralDfa2_5(long old0, long active0)
+private final int jjMoveStringLiteralDfa2_5(long old0, long active0)
 {
    if (((active0 &= old0)) == 0L)
-      return jjStartNfa_5(0, old0);
+      return jjStartNfa_5(0, old0); 
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
       jjStopStringLiteralDfa_5(1, active0);
@@ -2139,29 +2177,22 @@
    switch(curChar)
    {
       case 91:
-         if ((active0 & 0x20000L) != 0L)
-            return jjStopAtPos(2, 17);
+         if ((active0 & 0x80000L) != 0L)
+            return jjStopAtPos(2, 19);
          break;
       default :
          break;
    }
    return jjStartNfa_5(1, active0);
 }
-private int jjStartNfaWithStates_5(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_5(state, pos + 1);
-}
-private int jjMoveNfa_5(int startState, int curPos)
+private final int jjMoveNfa_5(int startState, int curPos)
 {
+   int[] nextStates;
    int startsAt = 0;
-   jjnewStateCnt = 39;
+   jjnewStateCnt = 74;
    int i = 1;
    jjstateSet[0] = startState;
-   int kind = 0x7fffffff;
+   int j, kind = 0x7fffffff;
    for (;;)
    {
       if (++jjround == 0x7fffffff)
@@ -2169,127 +2200,163 @@
       if (curChar < 64)
       {
          long l = 1L << curChar;
-         do
+         MatchLoop: do
          {
             switch(jjstateSet[--i])
             {
-               case 19:
+               case 7:
                   if (curChar == 36)
-                     jjCheckNAddTwoStates(32, 33);
+                     jjCheckNAddTwoStates(67, 68);
                   else if (curChar == 35)
                      jjAddStates(103, 104);
                   if (curChar == 36)
                   {
-                     if (kind > 15)
-                        kind = 15;
+                     if (kind > 17)
+                        kind = 17;
                   }
                   break;
-               case 38:
+               case 73:
                   if (curChar == 42)
-                     jjstateSet[jjnewStateCnt++] = 36;
-                  break;
-               case 39:
-                  if (curChar == 36)
-                     jjCheckNAddTwoStates(32, 33);
-                  if (curChar == 36)
-                  {
-                     if (kind > 15)
-                        kind = 15;
-                  }
+                     jjstateSet[jjnewStateCnt++] = 71;
                   break;
-               case 13:
+               case 1:
                   if ((0xffffffe7ffffffffL & l) != 0L)
                   {
-                     if (kind > 24)
-                        kind = 24;
-                     jjCheckNAdd(12);
+                     if (kind > 26)
+                        kind = 26;
+                     jjCheckNAdd(0);
                   }
                   else if (curChar == 35)
-                     jjCheckNAddStates(105, 107);
+                     jjCheckNAddStates(105, 111);
                   else if (curChar == 36)
                   {
-                     if (kind > 15)
-                        kind = 15;
-                     jjCheckNAddTwoStates(32, 33);
+                     if (kind > 17)
+                        kind = 17;
+                     jjCheckNAddTwoStates(67, 68);
                   }
                   if ((0x100000200L & l) != 0L)
-                     jjCheckNAddTwoStates(0, 1);
+                     jjCheckNAddStates(112, 117);
                   else if (curChar == 36)
-                     jjCheckNAddStates(108, 110);
+                     jjCheckNAddStates(118, 120);
                   break;
-               case 0:
-                  if ((0x100000200L & l) != 0L)
-                     jjCheckNAddTwoStates(0, 1);
+               case 74:
+                  if (curChar == 36)
+                     jjCheckNAddTwoStates(67, 68);
+                  if (curChar == 36)
+                  {
+                     if (kind > 17)
+                        kind = 17;
+                  }
                   break;
-               case 1:
-                  if (curChar == 35)
-                     jjCheckNAddTwoStates(6, 11);
+               case 0:
+                  if ((0xffffffe7ffffffffL & l) == 0L)
+                     break;
+                  if (kind > 26)
+                     kind = 26;
+                  jjCheckNAdd(0);
                   break;
                case 3:
-                  if (curChar == 32)
-                     jjAddStates(111, 112);
-                  break;
                case 4:
-                  if (curChar == 40 && kind > 14)
-                     kind = 14;
-                  break;
-               case 12:
-                  if ((0xffffffe7ffffffffL & l) == 0L)
-                     break;
-                  if (kind > 24)
-                     kind = 24;
-                  jjCheckNAdd(12);
-                  break;
-               case 15:
-               case 16:
                   if (curChar == 33)
-                     jjCheckNAdd(14);
+                     jjCheckNAdd(2);
                   break;
-               case 20:
+               case 8:
                   if (curChar == 35)
                      jjAddStates(103, 104);
                   break;
-               case 22:
+               case 10:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 13)
                      kind = 13;
-                  jjstateSet[jjnewStateCnt++] = 22;
+                  jjstateSet[jjnewStateCnt++] = 10;
                   break;
-               case 25:
+               case 13:
                   if ((0x3ff000000000000L & l) != 0L)
-                     jjAddStates(113, 114);
+                     jjAddStates(89, 90);
+                  break;
+               case 15:
+                  if ((0x100000200L & l) != 0L)
+                     jjCheckNAddStates(112, 117);
+                  break;
+               case 16:
+                  if ((0x100000200L & l) != 0L)
+                     jjCheckNAddTwoStates(16, 17);
+                  break;
+               case 17:
+                  if (curChar == 35)
+                     jjCheckNAddTwoStates(22, 27);
+                  break;
+               case 19:
+                  if (curChar == 32)
+                     jjAddStates(63, 64);
+                  break;
+               case 20:
+                  if (curChar == 40 && kind > 14)
+                     kind = 14;
+                  break;
+               case 28:
+                  if ((0x100000200L & l) != 0L)
+                     jjCheckNAddTwoStates(28, 29);
                   break;
                case 29:
-                  if (curChar == 36 && kind > 15)
-                     kind = 15;
+                  if (curChar == 35)
+                     jjCheckNAddTwoStates(36, 43);
                   break;
                case 31:
-                  if (curChar == 36)
-                     jjCheckNAddTwoStates(32, 33);
+                  if (curChar == 32)
+                     jjAddStates(121, 122);
                   break;
-               case 33:
-                  if (curChar == 33 && kind > 16)
+               case 32:
+                  if (curChar == 40 && kind > 15)
+                     kind = 15;
+                  break;
+               case 44:
+                  if ((0x100000200L & l) != 0L)
+                     jjCheckNAddTwoStates(44, 45);
+                  break;
+               case 45:
+                  if (curChar == 35)
+                     jjCheckNAddTwoStates(53, 61);
+                  break;
+               case 47:
+                  if (curChar == 32)
+                     jjAddStates(123, 124);
+                  break;
+               case 48:
+                  if (curChar == 40 && kind > 16)
                      kind = 16;
                   break;
-               case 34:
+               case 64:
+                  if (curChar == 36 && kind > 17)
+                     kind = 17;
+                  break;
+               case 66:
+                  if (curChar == 36)
+                     jjCheckNAddTwoStates(67, 68);
+                  break;
+               case 68:
+                  if (curChar == 33 && kind > 18)
+                     kind = 18;
+                  break;
+               case 69:
                   if (curChar != 36)
                      break;
-                  if (kind > 15)
-                     kind = 15;
-                  jjCheckNAddTwoStates(32, 33);
+                  if (kind > 17)
+                     kind = 17;
+                  jjCheckNAddTwoStates(67, 68);
                   break;
-               case 35:
+               case 70:
                   if (curChar == 35)
-                     jjCheckNAddStates(105, 107);
+                     jjCheckNAddStates(105, 111);
                   break;
-               case 36:
+               case 71:
                   if (curChar == 42)
-                     jjstateSet[jjnewStateCnt++] = 37;
+                     jjstateSet[jjnewStateCnt++] = 72;
                   break;
-               case 37:
-                  if ((0xfffffff7ffffffffL & l) != 0L && kind > 18)
-                     kind = 18;
+               case 72:
+                  if ((0xfffffff7ffffffffL & l) != 0L && kind > 20)
+                     kind = 20;
                   break;
                default : break;
             }
@@ -2298,138 +2365,250 @@
       else if (curChar < 128)
       {
          long l = 1L << (curChar & 077);
-         do
+         MatchLoop: do
          {
             switch(jjstateSet[--i])
             {
-               case 19:
+               case 7:
                   if (curChar == 92)
-                     jjCheckNAddTwoStates(30, 31);
+                     jjCheckNAddTwoStates(65, 66);
                   if (curChar == 92)
-                     jjCheckNAddTwoStates(28, 29);
+                     jjCheckNAddTwoStates(63, 64);
                   if (curChar == 92)
-                     jjstateSet[jjnewStateCnt++] = 18;
+                     jjstateSet[jjnewStateCnt++] = 6;
                   break;
-               case 38:
+               case 73:
                   if (curChar == 123)
-                     jjstateSet[jjnewStateCnt++] = 10;
+                     jjstateSet[jjnewStateCnt++] = 60;
+                  else if (curChar == 103)
+                     jjstateSet[jjnewStateCnt++] = 52;
+                  else if (curChar == 108)
+                     jjstateSet[jjnewStateCnt++] = 35;
                   else if (curChar == 115)
-                     jjstateSet[jjnewStateCnt++] = 5;
-                  break;
-               case 39:
-                  if (curChar == 92)
-                     jjAddStates(63, 64);
-                  if (curChar == 92)
-                     jjCheckNAddTwoStates(30, 31);
-                  if (curChar == 92)
-                     jjCheckNAddTwoStates(28, 29);
+                     jjstateSet[jjnewStateCnt++] = 21;
+                  if (curChar == 123)
+                     jjstateSet[jjnewStateCnt++] = 42;
+                  if (curChar == 123)
+                     jjstateSet[jjnewStateCnt++] = 26;
                   break;
-               case 13:
+               case 1:
                   if ((0xffffffffefffffffL & l) != 0L)
                   {
-                     if (kind > 24)
-                        kind = 24;
-                     jjCheckNAdd(12);
+                     if (kind > 26)
+                        kind = 26;
+                     jjCheckNAdd(0);
                   }
                   else if (curChar == 92)
-                     jjCheckNAddStates(115, 118);
+                     jjCheckNAddStates(125, 128);
                   if (curChar == 92)
-                     jjAddStates(63, 64);
+                     jjAddStates(129, 130);
+                  break;
+               case 74:
+                  if (curChar == 92)
+                     jjAddStates(129, 130);
+                  if (curChar == 92)
+                     jjCheckNAddTwoStates(65, 66);
+                  if (curChar == 92)
+                     jjCheckNAddTwoStates(63, 64);
+                  break;
+               case 0:
+                  if ((0xffffffffefffffffL & l) == 0L)
+                     break;
+                  if (kind > 26)
+                     kind = 26;
+                  jjCheckNAdd(0);
                   break;
                case 2:
-                  if (curChar == 116)
-                     jjCheckNAddTwoStates(3, 4);
+                  if (curChar == 91 && kind > 75)
+                     kind = 75;
                   break;
                case 5:
-                  if (curChar == 101)
-                     jjstateSet[jjnewStateCnt++] = 2;
+                  if (curChar == 92)
+                     jjstateSet[jjnewStateCnt++] = 4;
                   break;
                case 6:
-                  if (curChar == 115)
-                     jjstateSet[jjnewStateCnt++] = 5;
-                  break;
-               case 7:
-                  if (curChar == 125)
-                     jjCheckNAddTwoStates(3, 4);
-                  break;
-               case 8:
-                  if (curChar == 116)
-                     jjstateSet[jjnewStateCnt++] = 7;
+                  if (curChar == 92)
+                     jjAddStates(129, 130);
                   break;
                case 9:
-                  if (curChar == 101)
-                     jjstateSet[jjnewStateCnt++] = 8;
-                  break;
                case 10:
-                  if (curChar == 115)
-                     jjstateSet[jjnewStateCnt++] = 9;
+                  if ((0x7fffffe87ffffffL & l) == 0L)
+                     break;
+                  if (kind > 13)
+                     kind = 13;
+                  jjCheckNAdd(10);
                   break;
                case 11:
                   if (curChar == 123)
-                     jjstateSet[jjnewStateCnt++] = 10;
+                     jjstateSet[jjnewStateCnt++] = 12;
                   break;
                case 12:
-                  if ((0xffffffffefffffffL & l) == 0L)
-                     break;
-                  if (kind > 24)
-                     kind = 24;
-                  jjCheckNAdd(12);
+                  if ((0x7fffffe87fffffeL & l) != 0L)
+                     jjCheckNAddTwoStates(13, 14);
                   break;
-               case 14:
-                  if (curChar == 91 && kind > 73)
-                     kind = 73;
+               case 13:
+                  if ((0x7fffffe87ffffffL & l) != 0L)
+                     jjCheckNAddTwoStates(13, 14);
                   break;
-               case 17:
-                  if (curChar == 92)
-                     jjstateSet[jjnewStateCnt++] = 16;
+               case 14:
+                  if (curChar == 125 && kind > 13)
+                     kind = 13;
                   break;
                case 18:
-                  if (curChar == 92)
-                     jjAddStates(63, 64);
+                  if (curChar == 116)
+                     jjCheckNAddTwoStates(19, 20);
                   break;
                case 21:
+                  if (curChar == 101)
+                     jjstateSet[jjnewStateCnt++] = 18;
+                  break;
                case 22:
-                  if ((0x7fffffe87ffffffL & l) == 0L)
-                     break;
-                  if (kind > 13)
-                     kind = 13;
-                  jjCheckNAdd(22);
+                  if (curChar == 115)
+                     jjstateSet[jjnewStateCnt++] = 21;
                   break;
                case 23:
-                  if (curChar == 123)
-                     jjstateSet[jjnewStateCnt++] = 24;
+                  if (curChar == 125)
+                     jjCheckNAddTwoStates(19, 20);
                   break;
                case 24:
-                  if ((0x7fffffe87fffffeL & l) != 0L)
-                     jjCheckNAddTwoStates(25, 26);
+                  if (curChar == 116)
+                     jjstateSet[jjnewStateCnt++] = 23;
                   break;
                case 25:
-                  if ((0x7fffffe87ffffffL & l) != 0L)
-                     jjCheckNAddTwoStates(25, 26);
+                  if (curChar == 101)
+                     jjstateSet[jjnewStateCnt++] = 24;
                   break;
                case 26:
-                  if (curChar == 125 && kind > 13)
-                     kind = 13;
+                  if (curChar == 115)
+                     jjstateSet[jjnewStateCnt++] = 25;
                   break;
                case 27:
+                  if (curChar == 123)
+                     jjstateSet[jjnewStateCnt++] = 26;
+                  break;
+               case 30:
+                  if (curChar == 108)
+                     jjCheckNAddTwoStates(31, 32);
+                  break;
+               case 33:
+                  if (curChar == 97)
+                     jjstateSet[jjnewStateCnt++] = 30;
+                  break;
+               case 34:
+                  if (curChar == 99)
+                     jjstateSet[jjnewStateCnt++] = 33;
+                  break;
+               case 35:
+                  if (curChar == 111)
+                     jjstateSet[jjnewStateCnt++] = 34;
+                  break;
+               case 36:
+                  if (curChar == 108)
+                     jjstateSet[jjnewStateCnt++] = 35;
+                  break;
+               case 37:
+                  if (curChar == 125)
+                     jjCheckNAddTwoStates(31, 32);
+                  break;
+               case 38:
+                  if (curChar == 108)
+                     jjstateSet[jjnewStateCnt++] = 37;
+                  break;
+               case 39:
+                  if (curChar == 97)
+                     jjstateSet[jjnewStateCnt++] = 38;
+                  break;
+               case 40:
+                  if (curChar == 99)
+                     jjstateSet[jjnewStateCnt++] = 39;
+                  break;
+               case 41:
+                  if (curChar == 111)
+                     jjstateSet[jjnewStateCnt++] = 40;
+                  break;
+               case 42:
+                  if (curChar == 108)
+                     jjstateSet[jjnewStateCnt++] = 41;
+                  break;
+               case 43:
+                  if (curChar == 123)
+                     jjstateSet[jjnewStateCnt++] = 42;
+                  break;
+               case 46:
+                  if (curChar == 108)
+                     jjCheckNAddTwoStates(47, 48);
+                  break;
+               case 49:
+                  if (curChar == 97)
+                     jjstateSet[jjnewStateCnt++] = 46;
+                  break;
+               case 50:
+                  if (curChar == 98)
+                     jjstateSet[jjnewStateCnt++] = 49;
+                  break;
+               case 51:
+                  if (curChar == 111)
+                     jjstateSet[jjnewStateCnt++] = 50;
+                  break;
+               case 52:
+                  if (curChar == 108)
+                     jjstateSet[jjnewStateCnt++] = 51;
+                  break;
+               case 53:
+                  if (curChar == 103)
+                     jjstateSet[jjnewStateCnt++] = 52;
+                  break;
+               case 54:
+                  if (curChar == 125)
+                     jjCheckNAddTwoStates(47, 48);
+                  break;
+               case 55:
+                  if (curChar == 108)
+                     jjstateSet[jjnewStateCnt++] = 54;
+                  break;
+               case 56:
+                  if (curChar == 97)
+                     jjstateSet[jjnewStateCnt++] = 55;
+                  break;
+               case 57:
+                  if (curChar == 98)
+                     jjstateSet[jjnewStateCnt++] = 56;
+                  break;
+               case 58:
+                  if (curChar == 111)
+                     jjstateSet[jjnewStateCnt++] = 57;
+                  break;
+               case 59:
+                  if (curChar == 108)
+                     jjstateSet[jjnewStateCnt++] = 58;
+                  break;
+               case 60:
+                  if (curChar == 103)
+                     jjstateSet[jjnewStateCnt++] = 59;
+                  break;
+               case 61:
+                  if (curChar == 123)
+                     jjstateSet[jjnewStateCnt++] = 60;
+                  break;
+               case 62:
                   if (curChar == 92)
-                     jjCheckNAddStates(115, 118);
+                     jjCheckNAddStates(125, 128);
                   break;
-               case 28:
+               case 63:
                   if (curChar == 92)
-                     jjCheckNAddTwoStates(28, 29);
+                     jjCheckNAddTwoStates(63, 64);
                   break;
-               case 30:
+               case 65:
                   if (curChar == 92)
-                     jjCheckNAddTwoStates(30, 31);
+                     jjCheckNAddTwoStates(65, 66);
                   break;
-               case 32:
+               case 67:
                   if (curChar == 92)
-                     jjAddStates(119, 120);
+                     jjAddStates(131, 132);
                   break;
-               case 37:
-                  if (kind > 18)
-                     kind = 18;
+               case 72:
+                  if (kind > 20)
+                     kind = 20;
                   break;
                default : break;
             }
@@ -2442,21 +2621,21 @@
          long l1 = 1L << (hiByte & 077);
          int i2 = (curChar & 0xff) >> 6;
          long l2 = 1L << (curChar & 077);
-         do
+         MatchLoop: do
          {
             switch(jjstateSet[--i])
             {
-               case 13:
-               case 12:
+               case 1:
+               case 0:
                   if (!jjCanMove_0(hiByte, i1, i2, l1, l2))
                      break;
-                  if (kind > 24)
-                     kind = 24;
-                  jjCheckNAdd(12);
+                  if (kind > 26)
+                     kind = 26;
+                  jjCheckNAdd(0);
                   break;
-               case 37:
-                  if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 18)
-                     kind = 18;
+               case 72:
+                  if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 20)
+                     kind = 20;
                   break;
                default : break;
             }
@@ -2469,7 +2648,7 @@
          kind = 0x7fffffff;
       }
       ++curPos;
-      if ((i = jjnewStateCnt) == (startsAt = 39 - (jjnewStateCnt = startsAt)))
+      if ((i = jjnewStateCnt) == (startsAt = 74 - (jjnewStateCnt = startsAt)))
          return curPos;
       try { curChar = input_stream.readChar(); }
       catch(java.io.IOException e) { return curPos; }
@@ -2480,11 +2659,11 @@
    switch (pos)
    {
       case 0:
-         if ((active0 & 0x1a0000L) != 0L)
+         if ((active0 & 0x680000L) != 0L)
             return 2;
          return -1;
       case 1:
-         if ((active0 & 0x80000L) != 0L)
+         if ((active0 & 0x200000L) != 0L)
             return 0;
          return -1;
       default :
@@ -2495,20 +2674,28 @@
 {
    return jjMoveNfa_9(jjStopStringLiteralDfa_9(pos, active0), pos + 1);
 }
-private int jjMoveStringLiteralDfa0_9()
+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);
+}
+private final int jjMoveStringLiteralDfa0_9()
 {
    switch(curChar)
    {
       case 35:
-         jjmatchedKind = 20;
-         return jjMoveStringLiteralDfa1_9(0xa0000L);
+         jjmatchedKind = 22;
+         return jjMoveStringLiteralDfa1_9(0x280000L);
       case 42:
-         return jjMoveStringLiteralDfa1_9(0x4000000L);
+         return jjMoveStringLiteralDfa1_9(0x10000000L);
       default :
          return jjMoveNfa_9(3, 0);
    }
 }
-private int jjMoveStringLiteralDfa1_9(long active0)
+private final int jjMoveStringLiteralDfa1_9(long active0)
 {
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
@@ -2518,24 +2705,24 @@
    switch(curChar)
    {
       case 35:
-         if ((active0 & 0x4000000L) != 0L)
-            return jjStopAtPos(1, 26);
+         if ((active0 & 0x10000000L) != 0L)
+            return jjStopAtPos(1, 28);
          break;
       case 42:
-         if ((active0 & 0x80000L) != 0L)
-            return jjStartNfaWithStates_9(1, 19, 0);
+         if ((active0 & 0x200000L) != 0L)
+            return jjStartNfaWithStates_9(1, 21, 0);
          break;
       case 91:
-         return jjMoveStringLiteralDfa2_9(active0, 0x20000L);
+         return jjMoveStringLiteralDfa2_9(active0, 0x80000L);
       default :
          break;
    }
    return jjStartNfa_9(0, active0);
 }
-private int jjMoveStringLiteralDfa2_9(long old0, long active0)
+private final int jjMoveStringLiteralDfa2_9(long old0, long active0)
 {
    if (((active0 &= old0)) == 0L)
-      return jjStartNfa_9(0, old0);
+      return jjStartNfa_9(0, old0); 
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
       jjStopStringLiteralDfa_9(1, active0);
@@ -2544,29 +2731,22 @@
    switch(curChar)
    {
       case 91:
-         if ((active0 & 0x20000L) != 0L)
-            return jjStopAtPos(2, 17);
+         if ((active0 & 0x80000L) != 0L)
+            return jjStopAtPos(2, 19);
          break;
       default :
          break;
    }
    return jjStartNfa_9(1, active0);
 }
-private 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);
-}
-private int jjMoveNfa_9(int startState, int curPos)
+private final int jjMoveNfa_9(int startState, int curPos)
 {
+   int[] nextStates;
    int startsAt = 0;
    jjnewStateCnt = 12;
    int i = 1;
    jjstateSet[0] = startState;
-   int kind = 0x7fffffff;
+   int j, kind = 0x7fffffff;
    for (;;)
    {
       if (++jjround == 0x7fffffff)
@@ -2574,15 +2754,15 @@
       if (curChar < 64)
       {
          long l = 1L << curChar;
-         do
+         MatchLoop: do
          {
             switch(jjstateSet[--i])
             {
                case 3:
                   if (curChar == 36)
                   {
-                     if (kind > 15)
-                        kind = 15;
+                     if (kind > 17)
+                        kind = 17;
                      jjCheckNAddTwoStates(9, 10);
                   }
                   else if (curChar == 35)
@@ -2593,30 +2773,30 @@
                      jjstateSet[jjnewStateCnt++] = 1;
                   break;
                case 1:
-                  if ((0xfffffff7ffffffffL & l) != 0L && kind > 18)
-                     kind = 18;
+                  if ((0xfffffff7ffffffffL & l) != 0L && kind > 20)
+                     kind = 20;
                   break;
                case 2:
                   if (curChar == 42)
                      jjstateSet[jjnewStateCnt++] = 0;
                   break;
                case 6:
-                  if (curChar == 36 && kind > 15)
-                     kind = 15;
+                  if (curChar == 36 && kind > 17)
+                     kind = 17;
                   break;
                case 8:
                   if (curChar == 36)
                      jjCheckNAddTwoStates(9, 10);
                   break;
                case 10:
-                  if (curChar == 33 && kind > 16)
-                     kind = 16;
+                  if (curChar == 33 && kind > 18)
+                     kind = 18;
                   break;
                case 11:
                   if (curChar != 36)
                      break;
-                  if (kind > 15)
-                     kind = 15;
+                  if (kind > 17)
+                     kind = 17;
                   jjCheckNAddTwoStates(9, 10);
                   break;
                default : break;
@@ -2626,7 +2806,7 @@
       else if (curChar < 128)
       {
          long l = 1L << (curChar & 077);
-         do
+         MatchLoop: do
          {
             switch(jjstateSet[--i])
             {
@@ -2635,8 +2815,8 @@
                      jjCheckNAddStates(97, 100);
                   break;
                case 1:
-                  if (kind > 18)
-                     kind = 18;
+                  if (kind > 20)
+                     kind = 20;
                   break;
                case 5:
                   if (curChar == 92)
@@ -2661,13 +2841,13 @@
          long l1 = 1L << (hiByte & 077);
          int i2 = (curChar & 0xff) >> 6;
          long l2 = 1L << (curChar & 077);
-         do
+         MatchLoop: do
          {
             switch(jjstateSet[--i])
             {
                case 1:
-                  if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 18)
-                     kind = 18;
+                  if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 20)
+                     kind = 20;
                   break;
                default : break;
             }
@@ -2691,11 +2871,11 @@
    switch (pos)
    {
       case 0:
-         if ((active0 & 0x1a0000L) != 0L)
+         if ((active0 & 0x680000L) != 0L)
             return 2;
          return -1;
       case 1:
-         if ((active0 & 0x80000L) != 0L)
+         if ((active0 & 0x200000L) != 0L)
             return 0;
          return -1;
       default :
@@ -2706,24 +2886,32 @@
 {
    return jjMoveNfa_2(jjStopStringLiteralDfa_2(pos, active0), pos + 1);
 }
-private int jjMoveStringLiteralDfa0_2()
+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_2(state, pos + 1);
+}
+private final int jjMoveStringLiteralDfa0_2()
 {
    switch(curChar)
    {
       case 35:
-         jjmatchedKind = 20;
-         return jjMoveStringLiteralDfa1_2(0xa0000L);
+         jjmatchedKind = 22;
+         return jjMoveStringLiteralDfa1_2(0x280000L);
       case 93:

[... 4200 lines stripped ...]


Mime
View raw message