http://git-wip-us.apache.org/repos/asf/jena/blob/6e588daa/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParserTokenManager.java
----------------------------------------------------------------------
diff --git 
a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParserTokenManager.java
 
b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParserTokenManager.java
index 942d0e2..cce1b21 100644
--- 
a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParserTokenManager.java
+++ 
b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParserTokenManager.java
@@ -11,6 +11,7 @@ package org.apache.jena.sparql.lang.arq ;
 
 
 
+
 /** Token Manager. */
 public class ARQParserTokenManager implements ARQParserConstants
 {
@@ -45,160 +46,160 @@ private int jjMoveStringLiteralDfa0_0()
          jjmatchedKind = 1;
          return jjMoveNfa_0(0, 0);
       case 33:
-         jjmatchedKind = 180;
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x800000000000L, 0x0L);
+         jjmatchedKind = 185;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x10000000000000L, 0x0L);
       case 38:
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x100000000000000L, 
0x0L);
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x2000000000000000L, 
0x0L);
       case 40:
-         jjmatchedKind = 163;
+         jjmatchedKind = 168;
          return jjMoveNfa_0(0, 0);
       case 41:
-         jjmatchedKind = 164;
+         jjmatchedKind = 169;
          return jjMoveNfa_0(0, 0);
       case 42:
-         jjmatchedKind = 187;
+         jjmatchedKind = 192;
          return jjMoveNfa_0(0, 0);
       case 43:
-         jjmatchedKind = 185;
+         jjmatchedKind = 190;
          return jjMoveNfa_0(0, 0);
       case 44:
-         jjmatchedKind = 172;
+         jjmatchedKind = 177;
          return jjMoveNfa_0(0, 0);
       case 45:
-         jjmatchedKind = 186;
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x0L, 0x4L);
+         jjmatchedKind = 191;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x0L, 0x80L);
       case 46:
-         jjmatchedKind = 173;
+         jjmatchedKind = 178;
          return jjMoveNfa_0(0, 0);
       case 47:
-         jjmatchedKind = 188;
+         jjmatchedKind = 193;
          return jjMoveNfa_0(0, 0);
       case 58:
-         jjmatchedKind = 182;
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x8000000000000000L, 
0x0L);
+         jjmatchedKind = 187;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x0L, 0x10L);
       case 59:
-         jjmatchedKind = 171;
+         jjmatchedKind = 176;
          return jjMoveNfa_0(0, 0);
       case 60:
-         jjmatchedKind = 177;
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x4000000000000L, 0x8L);
+         jjmatchedKind = 182;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x80000000000000L, 
0x100L);
       case 61:
-         jjmatchedKind = 174;
+         jjmatchedKind = 179;
          return jjMoveNfa_0(0, 0);
       case 62:
-         jjmatchedKind = 176;
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x8000000000000L, 0x0L);
+         jjmatchedKind = 181;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x100000000000000L, 
0x0L);
       case 63:
-         jjmatchedKind = 196;
+         jjmatchedKind = 201;
          return jjMoveNfa_0(0, 0);
       case 64:
-         jjmatchedKind = 190;
+         jjmatchedKind = 195;
          return jjMoveNfa_0(0, 0);
       case 65:
-         return jjMoveStringLiteralDfa1_0(0x422008408000000L, 0x1000000L, 
0x4020L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x422008408000000L, 0x20000000L, 
0x80400L, 0x0L);
       case 66:
-         return jjMoveStringLiteralDfa1_0(0x8000100080100000L, 0x8L, 0x0L, 
0x0L);
+         return jjMoveStringLiteralDfa1_0(0x100080100000L, 0x110L, 0x0L, 0x0L);
       case 67:
-         return jjMoveStringLiteralDfa1_0(0x40000004000000L, 0x8120000c1L, 
0x98L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x40000004000000L, 0x10240001820L, 
0x1300L, 0x0L);
       case 68:
-         return jjMoveStringLiteralDfa1_0(0x802800000L, 0x5000040000002000L, 
0x2400L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x802800000L, 0x800000040000L, 
0x4800aL, 0x0L);
       case 69:
-         return jjMoveStringLiteralDfa1_0(0x800000000000L, 0x400000000L, 0x0L, 
0x0L);
+         return jjMoveStringLiteralDfa1_0(0x800000000000L, 0x8000000000L, 
0x0L, 0x0L);
       case 70:
-         return jjMoveStringLiteralDfa1_0(0x4000002000000000L, 
0x800000004000000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x2000000000L, 0x80000008L, 0x1L, 
0x0L);
       case 71:
-         return jjMoveStringLiteralDfa1_0(0x2004010000000000L, 0x0L, 0x0L, 
0x0L);
+         return jjMoveStringLiteralDfa1_0(0x4010000000000L, 0x4L, 0x0L, 0x0L);
       case 72:
-         return jjMoveStringLiteralDfa1_0(0x8000000000000L, 0x80000000000L, 
0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x8000000000000L, 0x1000000000000L, 
0x0L, 0x0L);
       case 73:
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x20000000001f0016L, 0x800L, 
0x0L);
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x3e002c0L, 0x10004L, 0x0L);
       case 76:
-         return jjMoveStringLiteralDfa1_0(0x400010000000L, 0x20000c000L, 0x4L, 
0x0L);
+         return jjMoveStringLiteralDfa1_0(0x400010000000L, 0x4000180000L, 
0x80L, 0x0L);
       case 77:
-         return jjMoveStringLiteralDfa1_0(0x180080000000000L, 
0x10120000000100L, 0x140L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x180080000000000L, 
0x202400000002000L, 0x2800L, 0x0L);
       case 78:
-         return jjMoveStringLiteralDfa1_0(0x1001000000000L, 0x1000000000000L, 
0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x1001000000000L, 0x20000000000000L, 
0x0L, 0x0L);
       case 79:
          return jjMoveStringLiteralDfa1_0(0x20060000000L, 0x0L, 0x0L, 0x0L);
       case 80:
          return jjMoveStringLiteralDfa1_0(0x200000L, 0x0L, 0x0L, 0x0L);
       case 82:
-         return jjMoveStringLiteralDfa1_0(0x1000000L, 0x88a00000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x1000000L, 0x1114000000L, 0x0L, 
0x0L);
       case 83:
-         return jjMoveStringLiteralDfa1_0(0x1a10200000400000L, 
0x3e420f060401e00L, 0x200L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x3a10200000400000L, 
0x7c841e0c0803c002L, 0x4000L, 0x0L);
       case 84:
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x400c00000000000L, 0x1000L, 
0x0L);
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x8018000000000000L, 0x20000L, 
0x0L);
       case 85:
-         return jjMoveStringLiteralDfa1_0(0x40200000000L, 0x2000100000020L, 
0x10000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x40200000000L, 0x40002000000400L, 
0x200000L, 0x0L);
       case 86:
-         return jjMoveStringLiteralDfa1_0(0x100000000L, 0x8000000000000L, 
0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0xc000000100000000L, 
0x100000000000001L, 0x0L, 0x0L);
       case 87:
-         return jjMoveStringLiteralDfa1_0(0x4000000000L, 0x0L, 0x8000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x4000000000L, 0x0L, 0x100000L, 
0x0L);
       case 89:
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x10000000000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x200000000000L, 0x0L, 0x0L);
       case 91:
-         jjmatchedKind = 168;
+         jjmatchedKind = 173;
          return jjMoveNfa_0(0, 0);
       case 93:
-         jjmatchedKind = 169;
+         jjmatchedKind = 174;
          return jjMoveNfa_0(0, 0);
       case 94:
-         jjmatchedKind = 193;
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x2000000000000000L, 
0x0L);
+         jjmatchedKind = 198;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x0L, 0x4L);
       case 97:
          jjmatchedKind = 19;
-         return jjMoveStringLiteralDfa1_0(0x422008408000000L, 0x1000000L, 
0x4020L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x422008408000000L, 0x20000000L, 
0x80400L, 0x0L);
       case 98:
-         return jjMoveStringLiteralDfa1_0(0x8000100080100000L, 0x8L, 0x0L, 
0x0L);
+         return jjMoveStringLiteralDfa1_0(0x100080100000L, 0x110L, 0x0L, 0x0L);
       case 99:
-         return jjMoveStringLiteralDfa1_0(0x40000004000000L, 0x8120000c1L, 
0x98L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x40000004000000L, 0x10240001820L, 
0x1300L, 0x0L);
       case 100:
-         return jjMoveStringLiteralDfa1_0(0x802800000L, 0x5000040000002000L, 
0x2400L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x802800000L, 0x800000040000L, 
0x4800aL, 0x0L);
       case 101:
-         return jjMoveStringLiteralDfa1_0(0x800000000000L, 0x400000000L, 0x0L, 
0x0L);
+         return jjMoveStringLiteralDfa1_0(0x800000000000L, 0x8000000000L, 
0x0L, 0x0L);
       case 102:
-         return jjMoveStringLiteralDfa1_0(0x4000002000000000L, 
0x800000004000000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x2000000000L, 0x80000008L, 0x1L, 
0x0L);
       case 103:
-         return jjMoveStringLiteralDfa1_0(0x2004010000000000L, 0x0L, 0x0L, 
0x0L);
+         return jjMoveStringLiteralDfa1_0(0x4010000000000L, 0x4L, 0x0L, 0x0L);
       case 104:
-         return jjMoveStringLiteralDfa1_0(0x8000000000000L, 0x80000000000L, 
0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x8000000000000L, 0x1000000000000L, 
0x0L, 0x0L);
       case 105:
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x20000000001f0016L, 0x800L, 
0x0L);
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x3e002c0L, 0x10004L, 0x0L);
       case 108:
-         return jjMoveStringLiteralDfa1_0(0x400010000000L, 0x20000c000L, 0x4L, 
0x0L);
+         return jjMoveStringLiteralDfa1_0(0x400010000000L, 0x4000180000L, 
0x80L, 0x0L);
       case 109:
-         return jjMoveStringLiteralDfa1_0(0x180080000000000L, 
0x10120000000100L, 0x140L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x180080000000000L, 
0x202400000002000L, 0x2800L, 0x0L);
       case 110:
-         return jjMoveStringLiteralDfa1_0(0x1001000000000L, 0x1000000000000L, 
0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x1001000000000L, 0x20000000000000L, 
0x0L, 0x0L);
       case 111:
          return jjMoveStringLiteralDfa1_0(0x20060000000L, 0x0L, 0x0L, 0x0L);
       case 112:
          return jjMoveStringLiteralDfa1_0(0x200000L, 0x0L, 0x0L, 0x0L);
       case 114:
-         return jjMoveStringLiteralDfa1_0(0x1000000L, 0x88a00000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x1000000L, 0x1114000000L, 0x0L, 
0x0L);
       case 115:
-         return jjMoveStringLiteralDfa1_0(0x1a10200000400000L, 
0x3e420f060401e00L, 0x200L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x3a10200000400000L, 
0x7c841e0c0803c002L, 0x4000L, 0x0L);
       case 116:
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x400c00000000000L, 0x1000L, 
0x0L);
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x8018000000000000L, 0x20000L, 
0x0L);
       case 117:
-         return jjMoveStringLiteralDfa1_0(0x40200000000L, 0x2000100000020L, 
0x10000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x40200000000L, 0x40002000000400L, 
0x200000L, 0x0L);
       case 118:
-         return jjMoveStringLiteralDfa1_0(0x100000000L, 0x8000000000000L, 
0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0xc000000100000000L, 
0x100000000000001L, 0x0L, 0x0L);
       case 119:
-         return jjMoveStringLiteralDfa1_0(0x4000000000L, 0x0L, 0x8000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x4000000000L, 0x0L, 0x100000L, 
0x0L);
       case 121:
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x10000000000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x200000000000L, 0x0L, 0x0L);
       case 123:
-         jjmatchedKind = 166;
+         jjmatchedKind = 171;
          return jjMoveNfa_0(0, 0);
       case 124:
-         jjmatchedKind = 192;
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x80000000000000L, 0x0L);
+         jjmatchedKind = 197;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x1000000000000000L, 
0x0L);
       case 125:
-         jjmatchedKind = 167;
+         jjmatchedKind = 172;
          return jjMoveNfa_0(0, 0);
       case 126:
-         jjmatchedKind = 181;
+         jjmatchedKind = 186;
          return jjMoveNfa_0(0, 0);
       case 65279:
          jjmatchedKind = 9;
@@ -216,102 +217,102 @@ private int jjMoveStringLiteralDfa1_0(long active0, 
long active1, long active2,
    switch(curChar)
    {
       case 38:
-         if ((active2 & 0x100000000000000L) != 0L)
+         if ((active2 & 0x2000000000000000L) != 0L)
          {
-            jjmatchedKind = 184;
+            jjmatchedKind = 189;
             jjmatchedPos = 1;
          }
          break;
       case 45:
-         if ((active3 & 0x8L) != 0L)
+         if ((active3 & 0x100L) != 0L)
          {
-            jjmatchedKind = 195;
+            jjmatchedKind = 200;
             jjmatchedPos = 1;
          }
          break;
       case 61:
-         if ((active2 & 0x800000000000L) != 0L)
+         if ((active2 & 0x10000000000000L) != 0L)
          {
-            jjmatchedKind = 175;
+            jjmatchedKind = 180;
             jjmatchedPos = 1;
          }
-         else if ((active2 & 0x4000000000000L) != 0L)
+         else if ((active2 & 0x80000000000000L) != 0L)
          {
-            jjmatchedKind = 178;
+            jjmatchedKind = 183;
             jjmatchedPos = 1;
          }
-         else if ((active2 & 0x8000000000000L) != 0L)
+         else if ((active2 & 0x100000000000000L) != 0L)
          {
-            jjmatchedKind = 179;
+            jjmatchedKind = 184;
             jjmatchedPos = 1;
          }
-         else if ((active2 & 0x8000000000000000L) != 0L)
+         else if ((active3 & 0x10L) != 0L)
          {
-            jjmatchedKind = 191;
+            jjmatchedKind = 196;
             jjmatchedPos = 1;
          }
          break;
       case 62:
-         if ((active3 & 0x4L) != 0L)
+         if ((active3 & 0x80L) != 0L)
          {
-            jjmatchedKind = 194;
+            jjmatchedKind = 199;
             jjmatchedPos = 1;
          }
          break;
       case 65:
-         return jjMoveStringLiteralDfa2_0(active0, 0x1108001100100000L, 
active1, 0x1800040000c0e0c0L, active2, 0L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0xc108001100100000L, 
active1, 0x8000181c1803L, active2, 0x3L, active3, 0L);
       case 66:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x1000000L, 
active2, 0L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x20000000L, 
active2, 0L, active3, 0L);
       case 67:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x300000000L, 
active2, 0L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x6000000000L, 
active2, 0L, active3, 0L);
       case 68:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 
0x10000000000000L, active2, 0x20L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 
0x200000000000000L, active2, 0x400L, active3, 0L);
       case 69:
-         return jjMoveStringLiteralDfa2_0(active0, 0x10600803400000L, active1, 
0x4008210082200000L, active2, 0x2100L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x10600803400000L, active1, 
0x104201044000000L, active2, 0x42008L, active3, 0L);
       case 70:
-         if ((active1 & 0x4L) != 0L)
+         if ((active1 & 0x80L) != 0L)
          {
-            jjmatchedKind = 66;
+            jjmatchedKind = 71;
             jjmatchedPos = 1;
          }
          return jjMoveStringLiteralDfa2_0(active0, 0x20000000L, active1, 0L, 
active2, 0L, active3, 0L);
       case 71:
          return jjMoveStringLiteralDfa2_0(active0, 0x20000000000000L, active1, 
0L, active2, 0L, active3, 0L);
       case 72:
-         return jjMoveStringLiteralDfa2_0(active0, 0x4000000000L, active1, 
0x3e0000000000200L, active2, 0L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x4000000000L, active1, 
0x7c00000000004000L, active2, 0L, active3, 0L);
       case 73:
-         return jjMoveStringLiteralDfa2_0(active0, 0x4080180010800000L, 
active1, 0x500000000000L, active2, 0x8200L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x80180010800000L, active1, 
0xa000000000008L, active2, 0x104000L, active3, 0L);
       case 76:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x4000000L, 
active2, 0x4008L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x80000000L, 
active2, 0x80100L, active3, 0L);
       case 78:
-         if ((active1 & 0x2L) != 0L)
+         if ((active1 & 0x40L) != 0L)
          {
-            jjmatchedKind = 65;
+            jjmatchedKind = 70;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_0(active0, 0x48200000000L, active1, 
0x2000000400000008L, active2, 0x800L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x48200000000L, active1, 
0x8000000100L, active2, 0x10004L, active3, 0L);
       case 79:
-         if ((active2 & 0x1000L) != 0L)
+         if ((active2 & 0x20000L) != 0L)
          {
-            jjmatchedKind = 140;
+            jjmatchedKind = 145;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_0(active0, 0x8041000004000000L, 
active1, 0x10a0818000001L, active2, 0xc4L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x41000004000000L, active1, 
0x21410300000030L, active2, 0x1880L, active3, 0L);
       case 80:
          return jjMoveStringLiteralDfa2_0(active0, 0x20000000000L, active1, 
0L, active2, 0L, active3, 0L);
       case 82:
-         return jjMoveStringLiteralDfa2_0(active0, 0x2004012040200000L, 
active1, 0x400000000000030L, active2, 0x410L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x4012040200000L, active1, 
0x8000000000000604L, active2, 0x8200L, active3, 0L);
       case 83:
          if ((active0 & 0x2000000000000L) != 0L)
          {
             jjmatchedKind = 49;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_0(active0, 0x408000000L, active1, 
0x1f0000L, active2, 0x10000L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x408000000L, active1, 
0x3e00000L, active2, 0x200000L, active3, 0L);
       case 84:
-         return jjMoveStringLiteralDfa2_0(active0, 0x800000000000000L, 
active1, 0x400f040001c00L, active2, 0L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x3800000000000000L, 
active1, 0x801e0800038000L, active2, 0L, active3, 0L);
       case 85:
-         return jjMoveStringLiteralDfa2_0(active0, 0x200000000000000L, 
active1, 0x2000020000100L, active2, 0L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x200000000000000L, 
active1, 0x40000400002000L, active2, 0L, active3, 0L);
       case 86:
          return jjMoveStringLiteralDfa2_0(active0, 0x400000000000000L, 
active1, 0L, active2, 0L, active3, 0L);
       case 88:
@@ -324,73 +325,73 @@ private int jjMoveStringLiteralDfa1_0(long active0, long 
active1, long active2,
          }
          break;
       case 90:
-         if ((active1 & 0x800000000000L) != 0L)
+         if ((active1 & 0x10000000000000L) != 0L)
          {
-            jjmatchedKind = 111;
+            jjmatchedKind = 116;
             jjmatchedPos = 1;
          }
          break;
       case 94:
-         if ((active2 & 0x2000000000000000L) != 0L)
+         if ((active3 & 0x4L) != 0L)
          {
-            jjmatchedKind = 189;
+            jjmatchedKind = 194;
             jjmatchedPos = 1;
          }
          break;
       case 97:
-         return jjMoveStringLiteralDfa2_0(active0, 0x1108001100100000L, 
active1, 0x1800040000c0e0c0L, active2, 0L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0xc108001100100000L, 
active1, 0x8000181c1803L, active2, 0x3L, active3, 0L);
       case 98:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x1000000L, 
active2, 0L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x20000000L, 
active2, 0L, active3, 0L);
       case 99:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x300000000L, 
active2, 0L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x6000000000L, 
active2, 0L, active3, 0L);
       case 100:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 
0x10000000000000L, active2, 0x20L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 
0x200000000000000L, active2, 0x400L, active3, 0L);
       case 101:
-         return jjMoveStringLiteralDfa2_0(active0, 0x10600803400000L, active1, 
0x4008210082200000L, active2, 0x2100L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x10600803400000L, active1, 
0x104201044000000L, active2, 0x42008L, active3, 0L);
       case 102:
-         if ((active1 & 0x4L) != 0L)
+         if ((active1 & 0x80L) != 0L)
          {
-            jjmatchedKind = 66;
+            jjmatchedKind = 71;
             jjmatchedPos = 1;
          }
          return jjMoveStringLiteralDfa2_0(active0, 0x20000000L, active1, 0L, 
active2, 0L, active3, 0L);
       case 103:
          return jjMoveStringLiteralDfa2_0(active0, 0x20000000000000L, active1, 
0L, active2, 0L, active3, 0L);
       case 104:
-         return jjMoveStringLiteralDfa2_0(active0, 0x4000000000L, active1, 
0x3e0000000000200L, active2, 0L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x4000000000L, active1, 
0x7c00000000004000L, active2, 0L, active3, 0L);
       case 105:
-         return jjMoveStringLiteralDfa2_0(active0, 0x4080180010800000L, 
active1, 0x500000000000L, active2, 0x8200L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x80180010800000L, active1, 
0xa000000000008L, active2, 0x104000L, active3, 0L);
       case 108:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x4000000L, 
active2, 0x4008L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x80000000L, 
active2, 0x80100L, active3, 0L);
       case 110:
-         if ((active1 & 0x2L) != 0L)
+         if ((active1 & 0x40L) != 0L)
          {
-            jjmatchedKind = 65;
+            jjmatchedKind = 70;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_0(active0, 0x48200000000L, active1, 
0x2000000400000008L, active2, 0x800L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x48200000000L, active1, 
0x8000000100L, active2, 0x10004L, active3, 0L);
       case 111:
-         if ((active2 & 0x1000L) != 0L)
+         if ((active2 & 0x20000L) != 0L)
          {
-            jjmatchedKind = 140;
+            jjmatchedKind = 145;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_0(active0, 0x8041000004000000L, 
active1, 0x10a0818000001L, active2, 0xc4L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x41000004000000L, active1, 
0x21410300000030L, active2, 0x1880L, active3, 0L);
       case 112:
          return jjMoveStringLiteralDfa2_0(active0, 0x20000000000L, active1, 
0L, active2, 0L, active3, 0L);
       case 114:
-         return jjMoveStringLiteralDfa2_0(active0, 0x2004012040200000L, 
active1, 0x400000000000030L, active2, 0x410L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x4012040200000L, active1, 
0x8000000000000604L, active2, 0x8200L, active3, 0L);
       case 115:
          if ((active0 & 0x2000000000000L) != 0L)
          {
             jjmatchedKind = 49;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_0(active0, 0x408000000L, active1, 
0x1f0000L, active2, 0x10000L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x408000000L, active1, 
0x3e00000L, active2, 0x200000L, active3, 0L);
       case 116:
-         return jjMoveStringLiteralDfa2_0(active0, 0x800000000000000L, 
active1, 0x400f040001c00L, active2, 0L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x3800000000000000L, 
active1, 0x801e0800038000L, active2, 0L, active3, 0L);
       case 117:
-         return jjMoveStringLiteralDfa2_0(active0, 0x200000000000000L, 
active1, 0x2000020000100L, active2, 0L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x200000000000000L, 
active1, 0x40000400002000L, active2, 0L, active3, 0L);
       case 118:
          return jjMoveStringLiteralDfa2_0(active0, 0x400000000000000L, 
active1, 0L, active2, 0L, active3, 0L);
       case 120:
@@ -403,16 +404,16 @@ private int jjMoveStringLiteralDfa1_0(long active0, long 
active1, long active2,
          }
          break;
       case 122:
-         if ((active1 & 0x800000000000L) != 0L)
+         if ((active1 & 0x10000000000000L) != 0L)
          {
-            jjmatchedKind = 111;
+            jjmatchedKind = 116;
             jjmatchedPos = 1;
          }
          break;
       case 124:
-         if ((active2 & 0x80000000000000L) != 0L)
+         if ((active2 & 0x1000000000000000L) != 0L)
          {
-            jjmatchedKind = 183;
+            jjmatchedKind = 188;
             jjmatchedPos = 1;
          }
          break;
@@ -432,39 +433,39 @@ private int jjMoveStringLiteralDfa2_0(long old0, long 
active0, long old1, long a
    switch(curChar)
    {
       case 53:
-         if ((active1 & 0x10000000000000L) != 0L)
+         if ((active1 & 0x200000000000000L) != 0L)
          {
-            jjmatchedKind = 116;
+            jjmatchedKind = 121;
             jjmatchedPos = 2;
          }
          break;
       case 65:
-         return jjMoveStringLiteralDfa3_0(active0, 0x10000000000L, active1, 
0x3e0010300000001L, active2, 0x4L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x10000000000L, active1, 
0x7c00206000000020L, active2, 0x80L);
       case 66:
-         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x20040000L, 
active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x400800000L, 
active2, 0L);
       case 67:
          if ((active0 & 0x400000000L) != 0L)
          {
             jjmatchedKind = 34;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 
0x200400000000L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 
0x4008000000000L, active2, 0L);
       case 68:
          if ((active0 & 0x8000000000L) != 0L)
          {
             jjmatchedKind = 39;
             jjmatchedPos = 2;
          }
-         else if ((active2 & 0x20L) != 0L)
+         else if ((active2 & 0x400L) != 0L)
          {
-            jjmatchedKind = 133;
+            jjmatchedKind = 138;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x800000241000000L, 
active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x3800000241000000L, 
active1, 0L, active2, 0L);
       case 69:
-         return jjMoveStringLiteralDfa3_0(active0, 0x4000200000L, active1, 0L, 
active2, 0x18L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x4000200000L, active1, 0L, 
active2, 0x300L);
       case 70:
-         return jjMoveStringLiteralDfa3_0(active0, 0x20000000L, active1, 0L, 
active2, 0x2000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x20000000L, active1, 0L, 
active2, 0x40000L);
       case 71:
          if ((active0 & 0x20000000000000L) != 0L)
          {
@@ -476,19 +477,19 @@ private int jjMoveStringLiteralDfa2_0(long old0, long 
active0, long old1, long a
             jjmatchedKind = 58;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x200000L, 
active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x4000000L, 
active2, 0L);
       case 73:
-         if ((active1 & 0x10L) != 0L)
+         if ((active1 & 0x200L) != 0L)
          {
-            jjmatchedKind = 68;
+            jjmatchedKind = 73;
             jjmatchedPos = 2;
          }
-         else if ((active1 & 0x20L) != 0L)
+         else if ((active1 & 0x400L) != 0L)
          {
-            jjmatchedKind = 69;
+            jjmatchedKind = 74;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x840000000000L, active1, 
0x2000002020000L, active2, 0x10000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x840000000000L, active1, 
0x40000040400000L, active2, 0x200000L);
       case 75:
          if ((active0 & 0x8000000L) != 0L)
          {
@@ -497,44 +498,44 @@ private int jjMoveStringLiteralDfa2_0(long old0, long 
active0, long old1, long a
          }
          break;
       case 76:
-         if ((active2 & 0x4000L) != 0L)
+         if ((active2 & 0x80000L) != 0L)
          {
-            jjmatchedKind = 142;
+            jjmatchedKind = 147;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x4000000100400000L, 
active1, 0x4800000000080180L, active2, 0x200L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x100400000L, active1, 
0x1003008L, active2, 0x4009L);
       case 77:
          if ((active0 & 0x200000000000000L) != 0L)
          {
             jjmatchedKind = 57;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x1000001010000000L, 
active1, 0x400000400000L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x1010000000L, active1, 
0x8000008000002L, active2, 0L);
       case 78:
          if ((active0 & 0x80000000000000L) != 0L)
          {
             jjmatchedKind = 55;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x180004000000L, active1, 
0x12081090c000L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x180004000000L, active1, 
0x2410212180000L, active2, 0L);
       case 79:
-         return jjMoveStringLiteralDfa3_0(active0, 0x2004002000000000L, 
active1, 0x4000208L, active2, 0x400L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x4002000000000L, active1, 
0x80004104L, active2, 0x8000L);
       case 80:
-         return jjMoveStringLiteralDfa3_0(active0, 0x10000000000000L, active1, 
0x80000000L, active2, 0x80L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x10000000000000L, active1, 
0x1000000000L, active2, 0x1000L);
       case 82:
-         if ((active1 & 0x400L) != 0L)
+         if ((active1 & 0x8000L) != 0L)
          {
-            jjmatchedKind = 74;
+            jjmatchedKind = 79;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x200000000000L, active1, 
0xc00f040001800L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0xc000200000000000L, 
active1, 0x1801e0800030001L, active2, 0L);
       case 83:
-         if ((active1 & 0x1000000L) != 0L)
+         if ((active1 & 0x20000000L) != 0L)
          {
-            jjmatchedKind = 88;
+            jjmatchedKind = 93;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x802900000L, active1, 
0x2000000000000040L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x802900000L, active1, 
0x800L, active2, 0x4L);
       case 84:
          if ((active0 & 0x400000000000L) != 0L)
          {
@@ -546,15 +547,15 @@ private int jjMoveStringLiteralDfa2_0(long old0, long 
active0, long old1, long a
             jjmatchedKind = 48;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x20000000000L, active1, 
0x1000000000002000L, active2, 0x8900L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x20000000000L, active1, 
0x40000L, active2, 0x112002L);
       case 85:
-         return jjMoveStringLiteralDfa3_0(active0, 0x8040000000000000L, 
active1, 0x400080008010000L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x40000000000000L, active1, 
0x8001000100200010L, active2, 0L);
       case 86:
-         return jjMoveStringLiteralDfa3_0(active0, 0x8000000000000L, active1, 
0L, active2, 0x40L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x8000000000000L, active1, 
0L, active2, 0x800L);
       case 87:
-         if ((active1 & 0x1000000000000L) != 0L)
+         if ((active1 & 0x20000000000000L) != 0L)
          {
-            jjmatchedKind = 112;
+            jjmatchedKind = 117;
             jjmatchedPos = 2;
          }
          break;
@@ -566,39 +567,39 @@ private int jjMoveStringLiteralDfa2_0(long old0, long 
active0, long old1, long a
          }
          break;
       case 89:
-         if ((active1 & 0x40000000000L) != 0L)
+         if ((active1 & 0x800000000000L) != 0L)
          {
-            jjmatchedKind = 106;
+            jjmatchedKind = 111;
             jjmatchedPos = 2;
          }
          break;
       case 97:
-         return jjMoveStringLiteralDfa3_0(active0, 0x10000000000L, active1, 
0x3e0010300000001L, active2, 0x4L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x10000000000L, active1, 
0x7c00206000000020L, active2, 0x80L);
       case 98:
-         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x20040000L, 
active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x400800000L, 
active2, 0L);
       case 99:
          if ((active0 & 0x400000000L) != 0L)
          {
             jjmatchedKind = 34;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 
0x200400000000L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 
0x4008000000000L, active2, 0L);
       case 100:
          if ((active0 & 0x8000000000L) != 0L)
          {
             jjmatchedKind = 39;
             jjmatchedPos = 2;
          }
-         else if ((active2 & 0x20L) != 0L)
+         else if ((active2 & 0x400L) != 0L)
          {
-            jjmatchedKind = 133;
+            jjmatchedKind = 138;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x800000241000000L, 
active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x3800000241000000L, 
active1, 0L, active2, 0L);
       case 101:
-         return jjMoveStringLiteralDfa3_0(active0, 0x4000200000L, active1, 0L, 
active2, 0x18L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x4000200000L, active1, 0L, 
active2, 0x300L);
       case 102:
-         return jjMoveStringLiteralDfa3_0(active0, 0x20000000L, active1, 0L, 
active2, 0x2000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x20000000L, active1, 0L, 
active2, 0x40000L);
       case 103:
          if ((active0 & 0x20000000000000L) != 0L)
          {
@@ -610,19 +611,19 @@ private int jjMoveStringLiteralDfa2_0(long old0, long 
active0, long old1, long a
             jjmatchedKind = 58;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x200000L, 
active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x4000000L, 
active2, 0L);
       case 105:
-         if ((active1 & 0x10L) != 0L)
+         if ((active1 & 0x200L) != 0L)
          {
-            jjmatchedKind = 68;
+            jjmatchedKind = 73;
             jjmatchedPos = 2;
          }
-         else if ((active1 & 0x20L) != 0L)
+         else if ((active1 & 0x400L) != 0L)
          {
-            jjmatchedKind = 69;
+            jjmatchedKind = 74;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x840000000000L, active1, 
0x2000002020000L, active2, 0x10000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x840000000000L, active1, 
0x40000040400000L, active2, 0x200000L);
       case 107:
          if ((active0 & 0x8000000L) != 0L)
          {
@@ -631,44 +632,44 @@ private int jjMoveStringLiteralDfa2_0(long old0, long 
active0, long old1, long a
          }
          break;
       case 108:
-         if ((active2 & 0x4000L) != 0L)
+         if ((active2 & 0x80000L) != 0L)
          {
-            jjmatchedKind = 142;
+            jjmatchedKind = 147;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x4000000100400000L, 
active1, 0x4800000000080180L, active2, 0x200L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x100400000L, active1, 
0x1003008L, active2, 0x4009L);
       case 109:
          if ((active0 & 0x200000000000000L) != 0L)
          {
             jjmatchedKind = 57;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x1000001010000000L, 
active1, 0x400000400000L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x1010000000L, active1, 
0x8000008000002L, active2, 0L);
       case 110:
          if ((active0 & 0x80000000000000L) != 0L)
          {
             jjmatchedKind = 55;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x180004000000L, active1, 
0x12081090c000L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x180004000000L, active1, 
0x2410212180000L, active2, 0L);
       case 111:
-         return jjMoveStringLiteralDfa3_0(active0, 0x2004002000000000L, 
active1, 0x4000208L, active2, 0x400L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x4002000000000L, active1, 
0x80004104L, active2, 0x8000L);
       case 112:
-         return jjMoveStringLiteralDfa3_0(active0, 0x10000000000000L, active1, 
0x80000000L, active2, 0x80L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x10000000000000L, active1, 
0x1000000000L, active2, 0x1000L);
       case 114:
-         if ((active1 & 0x400L) != 0L)
+         if ((active1 & 0x8000L) != 0L)
          {
-            jjmatchedKind = 74;
+            jjmatchedKind = 79;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x200000000000L, active1, 
0xc00f040001800L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0xc000200000000000L, 
active1, 0x1801e0800030001L, active2, 0L);
       case 115:
-         if ((active1 & 0x1000000L) != 0L)
+         if ((active1 & 0x20000000L) != 0L)
          {
-            jjmatchedKind = 88;
+            jjmatchedKind = 93;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x802900000L, active1, 
0x2000000000000040L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x802900000L, active1, 
0x800L, active2, 0x4L);
       case 116:
          if ((active0 & 0x400000000000L) != 0L)
          {
@@ -680,15 +681,15 @@ private int jjMoveStringLiteralDfa2_0(long old0, long 
active0, long old1, long a
             jjmatchedKind = 48;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x20000000000L, active1, 
0x1000000000002000L, active2, 0x8900L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x20000000000L, active1, 
0x40000L, active2, 0x112002L);
       case 117:
-         return jjMoveStringLiteralDfa3_0(active0, 0x8040000000000000L, 
active1, 0x400080008010000L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x40000000000000L, active1, 
0x8001000100200010L, active2, 0L);
       case 118:
-         return jjMoveStringLiteralDfa3_0(active0, 0x8000000000000L, active1, 
0L, active2, 0x40L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x8000000000000L, active1, 
0L, active2, 0x800L);
       case 119:
-         if ((active1 & 0x1000000000000L) != 0L)
+         if ((active1 & 0x20000000000000L) != 0L)
          {
-            jjmatchedKind = 112;
+            jjmatchedKind = 117;
             jjmatchedPos = 2;
          }
          break;
@@ -700,9 +701,9 @@ private int jjMoveStringLiteralDfa2_0(long old0, long 
active0, long old1, long a
          }
          break;
       case 121:
-         if ((active1 & 0x40000000000L) != 0L)
+         if ((active1 & 0x800000000000L) != 0L)
          {
-            jjmatchedKind = 106;
+            jjmatchedKind = 111;
             jjmatchedPos = 2;
          }
          break;
@@ -722,108 +723,108 @@ private int jjMoveStringLiteralDfa3_0(long old0, long 
active0, long old1, long a
    switch(curChar)
    {
       case 49:
-         if ((active1 & 0x20000000000000L) != 0L)
+         if ((active1 & 0x400000000000000L) != 0L)
          {
-            jjmatchedKind = 117;
+            jjmatchedKind = 122;
             jjmatchedPos = 3;
          }
          break;
       case 50:
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 
0xc0000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 
0x1800000000000000L, active2, 0L);
       case 51:
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 
0x100000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 
0x2000000000000000L, active2, 0L);
       case 53:
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 
0x200000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 
0x4000000000000000L, active2, 0L);
       case 65:
-         if ((active1 & 0x1000000000000000L) != 0L)
+         if ((active2 & 0x2L) != 0L)
          {
-            jjmatchedKind = 124;
+            jjmatchedKind = 129;
             jjmatchedPos = 3;
          }
-         else if ((active2 & 0x100L) != 0L)
+         else if ((active2 & 0x2000L) != 0L)
          {
-            jjmatchedKind = 136;
+            jjmatchedKind = 141;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x10000000000000L, active1, 
0x8000002000L, active2, 0x2018L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x10000000000000L, active1, 
0x100000040000L, active2, 0x40300L);
       case 66:
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x4000000000L, 
active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 
0x80000000000L, active2, 0L);
       case 67:
          if ((active0 & 0x800000000L) != 0L)
          {
             jjmatchedKind = 35;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x2000000L, active1, 
0x10000000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x2000000L, active1, 
0x200000000L, active2, 0L);
       case 68:
          if ((active0 & 0x100000000000L) != 0L)
          {
             jjmatchedKind = 44;
             jjmatchedPos = 3;
          }
-         else if ((active1 & 0x800000L) != 0L)
+         else if ((active1 & 0x10000000L) != 0L)
          {
-            jjmatchedKind = 87;
+            jjmatchedKind = 92;
             jjmatchedPos = 3;
          }
-         else if ((active1 & 0x2000000000000L) != 0L)
+         else if ((active1 & 0x40000000000000L) != 0L)
          {
-            jjmatchedKind = 113;
+            jjmatchedKind = 118;
             jjmatchedPos = 3;
          }
-         else if ((active2 & 0x4L) != 0L)
+         else if ((active2 & 0x80L) != 0L)
          {
-            jjmatchedKind = 130;
+            jjmatchedKind = 135;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x1008L, 
active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x20100L, 
active2, 0L);
       case 69:
          if ((active0 & 0x100000L) != 0L)
          {
             jjmatchedKind = 20;
             jjmatchedPos = 3;
          }
-         else if ((active1 & 0x400000000000000L) != 0L)
+         else if ((active1 & 0x8000000000000000L) != 0L)
          {
-            jjmatchedKind = 122;
+            jjmatchedKind = 127;
             jjmatchedPos = 3;
          }
-         else if ((active2 & 0x40L) != 0L)
+         else if ((active2 & 0x800L) != 0L)
          {
-            jjmatchedKind = 134;
+            jjmatchedKind = 139;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x800001240400000L, 
active1, 0x6000402000600000L, active2, 0x200L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x3800001240400000L, 
active1, 0x804000c000000L, active2, 0x400cL);
       case 70:
          return jjMoveStringLiteralDfa4_0(active0, 0x200000L, active1, 0L, 
active2, 0L);
       case 71:
-         if ((active1 & 0x4000L) != 0L)
+         if ((active1 & 0x80000L) != 0L)
          {
-            jjmatchedKind = 78;
+            jjmatchedKind = 83;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x8000L, 
active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x100000L, 
active2, 0L);
       case 72:
-         if ((active2 & 0x8000L) != 0L)
+         if ((active2 & 0x100000L) != 0L)
          {
-            jjmatchedKind = 143;
+            jjmatchedKind = 148;
             jjmatchedPos = 3;
          }
          break;
       case 73:
-         return jjMoveStringLiteralDfa4_0(active0, 0x8020010000000L, active1, 
0x80000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x4008020010000000L, 
active1, 0x1000000L, active2, 0L);
       case 76:
-         if ((active1 & 0x80L) != 0L)
+         if ((active1 & 0x1000L) != 0L)
          {
-            jjmatchedKind = 71;
+            jjmatchedKind = 76;
             jjmatchedPos = 3;
          }
-         else if ((active1 & 0x2000000L) != 0L)
+         else if ((active1 & 0x40000000L) != 0L)
          {
-            jjmatchedKind = 89;
+            jjmatchedKind = 94;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0xc0040801L, 
active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x1800810020L, 
active2, 0L);
       case 77:
          if ((active0 & 0x2000000000L) != 0L)
          {
@@ -832,138 +833,140 @@ private int jjMoveStringLiteralDfa3_0(long old0, long 
active0, long old1, long a
          }
          break;
       case 78:
-         return jjMoveStringLiteralDfa4_0(active0, 0x8040000000000000L, 
active1, 0x8000000L, active2, 0x10000L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x40000000000000L, active1, 
0x100000010L, active2, 0x200000L);
       case 79:
-         if ((active2 & 0x800L) != 0L)
+         if ((active2 & 0x10000L) != 0L)
          {
-            jjmatchedKind = 139;
+            jjmatchedKind = 144;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x40000000000L, active1, 
0x200404000000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x40000000000L, active1, 
0x4008080000000L, active2, 0L);
       case 80:
-         if ((active2 & 0x400L) != 0L)
+         if ((active2 & 0x8000L) != 0L)
          {
-            jjmatchedKind = 138;
+            jjmatchedKind = 143;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x1000010000000000L, 
active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x10000000000L, active1, 
0x2L, active2, 0L);
       case 82:
-         if ((active1 & 0x10000000000L) != 0L)
+         if ((active1 & 0x200000000000L) != 0L)
          {
-            jjmatchedKind = 104;
+            jjmatchedKind = 109;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x4000000000L, active1, 
0x80000030200L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x4000000000L, active1, 
0x1000000604000L, active2, 0L);
       case 83:
-         return jjMoveStringLiteralDfa4_0(active0, 0x800024000000L, active1, 
0x808001320000000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x800024000000L, active1, 
0x100026400000000L, active2, 0x1L);
       case 84:
-         if ((active1 & 0x40L) != 0L)
+         if ((active1 & 0x800L) != 0L)
          {
-            jjmatchedKind = 70;
+            jjmatchedKind = 75;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x4000000000800000L, 
active1, 0x20800000100L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x800000L, active1, 
0x410000002008L, active2, 0L);
       case 85:
-         return jjMoveStringLiteralDfa4_0(active0, 0x2004080101000000L, 
active1, 0x4100000100000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x4080101000000L, active1, 
0x82000002000004L, active2, 0L);
       case 86:
          return jjMoveStringLiteralDfa4_0(active0, 0x200000000000L, active1, 
0L, active2, 0L);
       case 89:
-         if ((active2 & 0x80L) != 0L)
+         if ((active2 & 0x1000L) != 0L)
          {
-            jjmatchedKind = 135;
+            jjmatchedKind = 140;
             jjmatchedPos = 3;
          }
          break;
+      case 95:
+         return jjMoveStringLiteralDfa4_0(active0, 0x8000000000000000L, 
active1, 0x1L, active2, 0L);
       case 97:
-         if ((active1 & 0x1000000000000000L) != 0L)
+         if ((active2 & 0x2L) != 0L)
          {
-            jjmatchedKind = 124;
+            jjmatchedKind = 129;
             jjmatchedPos = 3;
          }
-         else if ((active2 & 0x100L) != 0L)
+         else if ((active2 & 0x2000L) != 0L)
          {
-            jjmatchedKind = 136;
+            jjmatchedKind = 141;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x10000000000000L, active1, 
0x8000002000L, active2, 0x2018L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x10000000000000L, active1, 
0x100000040000L, active2, 0x40300L);
       case 98:
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x4000000000L, 
active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 
0x80000000000L, active2, 0L);
       case 99:
          if ((active0 & 0x800000000L) != 0L)
          {
             jjmatchedKind = 35;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x2000000L, active1, 
0x10000000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x2000000L, active1, 
0x200000000L, active2, 0L);
       case 100:
          if ((active0 & 0x100000000000L) != 0L)
          {
             jjmatchedKind = 44;
             jjmatchedPos = 3;
          }
-         else if ((active1 & 0x800000L) != 0L)
+         else if ((active1 & 0x10000000L) != 0L)
          {
-            jjmatchedKind = 87;
+            jjmatchedKind = 92;
             jjmatchedPos = 3;
          }
-         else if ((active1 & 0x2000000000000L) != 0L)
+         else if ((active1 & 0x40000000000000L) != 0L)
          {
-            jjmatchedKind = 113;
+            jjmatchedKind = 118;
             jjmatchedPos = 3;
          }
-         else if ((active2 & 0x4L) != 0L)
+         else if ((active2 & 0x80L) != 0L)
          {
-            jjmatchedKind = 130;
+            jjmatchedKind = 135;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x1008L, 
active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x20100L, 
active2, 0L);
       case 101:
          if ((active0 & 0x100000L) != 0L)
          {
             jjmatchedKind = 20;
             jjmatchedPos = 3;
          }
-         else if ((active1 & 0x400000000000000L) != 0L)
+         else if ((active1 & 0x8000000000000000L) != 0L)
          {
-            jjmatchedKind = 122;
+            jjmatchedKind = 127;
             jjmatchedPos = 3;
          }
-         else if ((active2 & 0x40L) != 0L)
+         else if ((active2 & 0x800L) != 0L)
          {
-            jjmatchedKind = 134;
+            jjmatchedKind = 139;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x800001240400000L, 
active1, 0x6000402000600000L, active2, 0x200L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x3800001240400000L, 
active1, 0x804000c000000L, active2, 0x400cL);
       case 102:
          return jjMoveStringLiteralDfa4_0(active0, 0x200000L, active1, 0L, 
active2, 0L);
       case 103:
-         if ((active1 & 0x4000L) != 0L)
+         if ((active1 & 0x80000L) != 0L)
          {
-            jjmatchedKind = 78;
+            jjmatchedKind = 83;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x8000L, 
active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x100000L, 
active2, 0L);
       case 104:
-         if ((active2 & 0x8000L) != 0L)
+         if ((active2 & 0x100000L) != 0L)
          {
-            jjmatchedKind = 143;
+            jjmatchedKind = 148;
             jjmatchedPos = 3;
          }
          break;
       case 105:
-         return jjMoveStringLiteralDfa4_0(active0, 0x8020010000000L, active1, 
0x80000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x4008020010000000L, 
active1, 0x1000000L, active2, 0L);
       case 108:
-         if ((active1 & 0x80L) != 0L)
+         if ((active1 & 0x1000L) != 0L)
          {
-            jjmatchedKind = 71;
+            jjmatchedKind = 76;
             jjmatchedPos = 3;
          }
-         else if ((active1 & 0x2000000L) != 0L)
+         else if ((active1 & 0x40000000L) != 0L)
          {
-            jjmatchedKind = 89;
+            jjmatchedKind = 94;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0xc0040801L, 
active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x1800810020L, 
active2, 0L);
       case 109:
          if ((active0 & 0x2000000000L) != 0L)
          {
@@ -972,45 +975,45 @@ private int jjMoveStringLiteralDfa3_0(long old0, long 
active0, long old1, long a
          }
          break;
       case 110:
-         return jjMoveStringLiteralDfa4_0(active0, 0x8040000000000000L, 
active1, 0x8000000L, active2, 0x10000L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x40000000000000L, active1, 
0x100000010L, active2, 0x200000L);
       case 111:
-         if ((active2 & 0x800L) != 0L)
+         if ((active2 & 0x10000L) != 0L)
          {
-            jjmatchedKind = 139;
+            jjmatchedKind = 144;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x40000000000L, active1, 
0x200404000000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x40000000000L, active1, 
0x4008080000000L, active2, 0L);
       case 112:
-         if ((active2 & 0x400L) != 0L)
+         if ((active2 & 0x8000L) != 0L)
          {
-            jjmatchedKind = 138;
+            jjmatchedKind = 143;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x1000010000000000L, 
active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x10000000000L, active1, 
0x2L, active2, 0L);
       case 114:
-         if ((active1 & 0x10000000000L) != 0L)
+         if ((active1 & 0x200000000000L) != 0L)
          {
-            jjmatchedKind = 104;
+            jjmatchedKind = 109;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x4000000000L, active1, 
0x80000030200L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x4000000000L, active1, 
0x1000000604000L, active2, 0L);
       case 115:
-         return jjMoveStringLiteralDfa4_0(active0, 0x800024000000L, active1, 
0x808001320000000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x800024000000L, active1, 
0x100026400000000L, active2, 0x1L);
       case 116:
-         if ((active1 & 0x40L) != 0L)
+         if ((active1 & 0x800L) != 0L)
          {
-            jjmatchedKind = 70;
+            jjmatchedKind = 75;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x4000000000800000L, 
active1, 0x20800000100L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x800000L, active1, 
0x410000002008L, active2, 0L);
       case 117:
-         return jjMoveStringLiteralDfa4_0(active0, 0x2004080101000000L, 
active1, 0x4100000100000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x4080101000000L, active1, 
0x82000002000004L, active2, 0L);
       case 118:
          return jjMoveStringLiteralDfa4_0(active0, 0x200000000000L, active1, 
0L, active2, 0L);
       case 121:
-         if ((active2 & 0x80L) != 0L)
+         if ((active2 & 0x1000L) != 0L)
          {
-            jjmatchedKind = 135;
+            jjmatchedKind = 140;
             jjmatchedPos = 3;
          }
          break;
@@ -1030,15 +1033,15 @@ private int jjMoveStringLiteralDfa4_0(long old0, long 
active0, long old1, long a
    switch(curChar)
    {
       case 49:
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 
0x200000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 
0x4000000000000000L, active2, 0L);
       case 50:
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 
0x40000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 
0x800000000000000L, active2, 0L);
       case 53:
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 
0x80000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 
0x1000000000000000L, active2, 0L);
       case 56:
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 
0x100000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 
0x2000000000000000L, active2, 0L);
       case 65:
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x890040800L, 
active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x4000000000000000L, 
active1, 0x11200810000L, active2, 0L);
       case 67:
          return jjMoveStringLiteralDfa5_0(active0, 0x1400000L, active1, 0L, 
active2, 0L);
       case 68:
@@ -1047,55 +1050,55 @@ private int jjMoveStringLiteralDfa4_0(long old0, long 
active0, long old1, long a
             jjmatchedKind = 36;
             jjmatchedPos = 4;
          }
-         else if ((active0 & 0x8000000000000000L) != 0L)
+         else if ((active1 & 0x10L) != 0L)
          {
-            jjmatchedKind = 63;
+            jjmatchedKind = 68;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x8000000L) != 0L)
+         else if ((active1 & 0x100000000L) != 0L)
          {
-            jjmatchedKind = 91;
+            jjmatchedKind = 96;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x400000000L, 
active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x8000000000L, 
active2, 0L);
       case 69:
          if ((active0 & 0x4000000000L) != 0L)
          {
             jjmatchedKind = 38;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x8L) != 0L)
+         else if ((active1 & 0x100L) != 0L)
          {
-            jjmatchedKind = 67;
+            jjmatchedKind = 72;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x100000000L) != 0L)
+         else if ((active1 & 0x2000000000L) != 0L)
          {
-            jjmatchedKind = 96;
+            jjmatchedKind = 101;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x200000000L) != 0L)
+         else if ((active1 & 0x4000000000L) != 0L)
          {
-            jjmatchedKind = 97;
+            jjmatchedKind = 102;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x800000000000000L) != 0L)
+         else if ((active2 & 0x1L) != 0L)
          {
-            jjmatchedKind = 123;
+            jjmatchedKind = 128;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x4000000120000000L, 
active1, 0x4040000001L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x120000000L, active1, 
0x80800000028L, active2, 0L);
       case 70:
          if ((active0 & 0x200000000L) != 0L)
          {
             jjmatchedKind = 33;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x8000000000L, 
active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 
0x100000000000L, active2, 0L);
       case 71:
-         if ((active2 & 0x10000L) != 0L)
+         if ((active2 & 0x200000L) != 0L)
          {
-            jjmatchedKind = 144;
+            jjmatchedKind = 149;
             jjmatchedPos = 4;
          }
          break;
@@ -1105,40 +1108,40 @@ private int jjMoveStringLiteralDfa4_0(long old0, long 
active0, long old1, long a
             jjmatchedKind = 40;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x20000000000L) != 0L)
+         else if ((active1 & 0x400000000000L) != 0L)
          {
-            jjmatchedKind = 105;
+            jjmatchedKind = 110;
             jjmatchedPos = 4;
          }
          break;
       case 73:
-         if ((active1 & 0x100L) != 0L)
+         if ((active1 & 0x2000L) != 0L)
          {
-            jjmatchedKind = 72;
+            jjmatchedKind = 77;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x10000L) != 0L)
+         else if ((active1 & 0x200000L) != 0L)
          {
-            jjmatchedKind = 80;
+            jjmatchedKind = 85;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x20000L) != 0L)
+         else if ((active1 & 0x400000L) != 0L)
          {
-            jjmatchedKind = 81;
+            jjmatchedKind = 86;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x200000a00000L, active1, 
0x8000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x200000a00000L, active1, 
0x100000000000000L, active2, 0L);
       case 76:
-         return jjMoveStringLiteralDfa5_0(active0, 0x1000000000000000L, 
active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x2L, active2, 
0L);
       case 77:
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x108000L, 
active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x2100000L, 
active2, 0L);
       case 78:
          if ((active0 & 0x40000000000L) != 0L)
          {
             jjmatchedKind = 42;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x8000000000000L, active1, 
0x202000000000L, active2, 0x200L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x8000000000000L, active1, 
0x4040000000000L, active2, 0x4000L);
       case 79:
          return jjMoveStringLiteralDfa5_0(active0, 0x20000000000L, active1, 
0L, active2, 0L);
       case 80:
@@ -1147,36 +1150,36 @@ private int jjMoveStringLiteralDfa4_0(long old0, long 
active0, long old1, long a
             jjmatchedKind = 50;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x2000000000000000L, 
active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x5L, active2, 
0L);
       case 82:
          if ((active0 & 0x40000000L) != 0L)
          {
             jjmatchedKind = 30;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x4000000L) != 0L)
+         else if ((active1 & 0x80000000L) != 0L)
          {
-            jjmatchedKind = 90;
+            jjmatchedKind = 95;
             jjmatchedPos = 4;
          }
-         else if ((active2 & 0x8L) != 0L)
+         else if ((active2 & 0x100L) != 0L)
          {
-            jjmatchedKind = 131;
+            jjmatchedKind = 136;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x10000002000000L, active1, 
0x2000000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x10000002000000L, active1, 
0L, active2, 0x4L);
       case 83:
          if ((active0 & 0x80000000000L) != 0L)
          {
             jjmatchedKind = 43;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x80000000000L) != 0L)
+         else if ((active1 & 0x1000000000000L) != 0L)
          {
-            jjmatchedKind = 107;
+            jjmatchedKind = 112;
             jjmatchedPos = 4;
          }
-         break;
+         return jjMoveStringLiteralDfa5_0(active0, 0x8000000000000000L, 
active1, 0L, active2, 0L);
       case 84:
          if ((active0 & 0x10000000L) != 0L)
          {
@@ -1188,32 +1191,32 @@ private int jjMoveStringLiteralDfa4_0(long old0, long 
active0, long old1, long a
             jjmatchedKind = 54;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x1000L) != 0L)
+         else if ((active1 & 0x20000L) != 0L)
          {
-            jjmatchedKind = 76;
+            jjmatchedKind = 81;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x800004000000L, active1, 
0x4000101020482200L, active2, 0x10L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x800004000000L, active1, 
0x2020409044000L, active2, 0x208L);
       case 85:
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 
0x4000000000000L, active2, 0x2000L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 
0x80000000000000L, active2, 0x40000L);
       case 86:
          if ((active0 & 0x800000000000000L) != 0L)
          {
             jjmatchedKind = 59;
             jjmatchedPos = 4;
          }
-         break;
+         return jjMoveStringLiteralDfa5_0(active0, 0x3000000000000000L, 
active1, 0L, active2, 0L);
       case 88:
-         if ((active1 & 0x200000L) != 0L)
+         if ((active1 & 0x4000000L) != 0L)
          {
-            jjmatchedKind = 85;
+            jjmatchedKind = 90;
             jjmatchedPos = 4;
          }
          break;
       case 90:
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 
0x400000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 
0x8000000000000L, active2, 0L);
       case 97:
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x890040800L, 
active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x4000000000000000L, 
active1, 0x11200810000L, active2, 0L);
       case 99:
          return jjMoveStringLiteralDfa5_0(active0, 0x1400000L, active1, 0L, 
active2, 0L);
       case 100:
@@ -1222,55 +1225,55 @@ private int jjMoveStringLiteralDfa4_0(long old0, long 
active0, long old1, long a
             jjmatchedKind = 36;
             jjmatchedPos = 4;
          }
-         else if ((active0 & 0x8000000000000000L) != 0L)
+         else if ((active1 & 0x10L) != 0L)
          {
-            jjmatchedKind = 63;
+            jjmatchedKind = 68;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x8000000L) != 0L)
+         else if ((active1 & 0x100000000L) != 0L)
          {
-            jjmatchedKind = 91;
+            jjmatchedKind = 96;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x400000000L, 
active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x8000000000L, 
active2, 0L);
       case 101:
          if ((active0 & 0x4000000000L) != 0L)
          {
             jjmatchedKind = 38;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x8L) != 0L)
+         else if ((active1 & 0x100L) != 0L)
          {
-            jjmatchedKind = 67;
+            jjmatchedKind = 72;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x100000000L) != 0L)
+         else if ((active1 & 0x2000000000L) != 0L)
          {
-            jjmatchedKind = 96;
+            jjmatchedKind = 101;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x200000000L) != 0L)
+         else if ((active1 & 0x4000000000L) != 0L)
          {
-            jjmatchedKind = 97;
+            jjmatchedKind = 102;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x800000000000000L) != 0L)
+         else if ((active2 & 0x1L) != 0L)
          {
-            jjmatchedKind = 123;
+            jjmatchedKind = 128;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x4000000120000000L, 
active1, 0x4040000001L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x120000000L, active1, 
0x80800000028L, active2, 0L);
       case 102:
          if ((active0 & 0x200000000L) != 0L)
          {
             jjmatchedKind = 33;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x8000000000L, 
active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 
0x100000000000L, active2, 0L);
       case 103:
-         if ((active2 & 0x10000L) != 0L)
+         if ((active2 & 0x200000L) != 0L)
          {
-            jjmatchedKind = 144;
+            jjmatchedKind = 149;
             jjmatchedPos = 4;
          }
          break;
@@ -1280,40 +1283,40 @@ private int jjMoveStringLiteralDfa4_0(long old0, long 
active0, long old1, long a
             jjmatchedKind = 40;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x20000000000L) != 0L)
+         else if ((active1 & 0x400000000000L) != 0L)
          {
-            jjmatchedKind = 105;
+            jjmatchedKind = 110;
             jjmatchedPos = 4;
          }
          break;
       case 105:
-         if ((active1 & 0x100L) != 0L)
+         if ((active1 & 0x2000L) != 0L)
          {
-            jjmatchedKind = 72;
+            jjmatchedKind = 77;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x10000L) != 0L)
+         else if ((active1 & 0x200000L) != 0L)
          {
-            jjmatchedKind = 80;
+            jjmatchedKind = 85;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x20000L) != 0L)
+         else if ((active1 & 0x400000L) != 0L)
          {
-            jjmatchedKind = 81;
+            jjmatchedKind = 86;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x200000a00000L, active1, 
0x8000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x200000a00000L, active1, 
0x100000000000000L, active2, 0L);
       case 108:
-         return jjMoveStringLiteralDfa5_0(active0, 0x1000000000000000L, 
active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x2L, active2, 
0L);
       case 109:
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x108000L, 
active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x2100000L, 
active2, 0L);
       case 110:
          if ((active0 & 0x40000000000L) != 0L)
          {
             jjmatchedKind = 42;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x8000000000000L, active1, 
0x202000000000L, active2, 0x200L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x8000000000000L, active1, 
0x4040000000000L, active2, 0x4000L);
       case 111:
          return jjMoveStringLiteralDfa5_0(active0, 0x20000000000L, active1, 
0L, active2, 0L);
       case 112:
@@ -1322,36 +1325,36 @@ private int jjMoveStringLiteralDfa4_0(long old0, long 
active0, long old1, long a
             jjmatchedKind = 50;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x2000000000000000L, 
active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x5L, active2, 
0L);
       case 114:
          if ((active0 & 0x40000000L) != 0L)
          {
             jjmatchedKind = 30;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x4000000L) != 0L)
+         else if ((active1 & 0x80000000L) != 0L)
          {
-            jjmatchedKind = 90;
+            jjmatchedKind = 95;
             jjmatchedPos = 4;
          }
-         else if ((active2 & 0x8L) != 0L)
+         else if ((active2 & 0x100L) != 0L)
          {
-            jjmatchedKind = 131;
+            jjmatchedKind = 136;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x10000002000000L, active1, 
0x2000000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x10000002000000L, active1, 
0L, active2, 0x4L);
       case 115:
          if ((active0 & 0x80000000000L) != 0L)
          {
             jjmatchedKind = 43;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x80000000000L) != 0L)
+         else if ((active1 & 0x1000000000000L) != 0L)
          {
-            jjmatchedKind = 107;
+            jjmatchedKind = 112;
             jjmatchedPos = 4;
          }
-         break;
+         return jjMoveStringLiteralDfa5_0(active0, 0x8000000000000000L, 
active1, 0L, active2, 0L);
       case 116:
          if ((active0 & 0x10000000L) != 0L)
          {
@@ -1363,30 +1366,30 @@ private int jjMoveStringLiteralDfa4_0(long old0, long 
active0, long old1, long a
             jjmatchedKind = 54;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x1000L) != 0L)
+         else if ((active1 & 0x20000L) != 0L)
          {
-            jjmatchedKind = 76;
+            jjmatchedKind = 81;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x800004000000L, active1, 
0x4000101020482200L, active2, 0x10L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x800004000000L, active1, 
0x2020409044000L, active2, 0x208L);
       case 117:
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 
0x4000000000000L, active2, 0x2000L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 
0x80000000000000L, active2, 0x40000L);
       case 118:
          if ((active0 & 0x800000000000000L) != 0L)
          {
             jjmatchedKind = 59;
             jjmatchedPos = 4;
          }
-         break;
+         return jjMoveStringLiteralDfa5_0(active0, 0x3000000000000000L, 
active1, 0L, active2, 0L);
       case 120:
-         if ((active1 & 0x200000L) != 0L)
+         if ((active1 & 0x4000000L) != 0L)
          {
-            jjmatchedKind = 85;
+            jjmatchedKind = 90;
             jjmatchedPos = 4;
          }
          break;
       case 122:
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 
0x400000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 
0x8000000000000L, active2, 0L);
       default :
          break;
    }
@@ -1403,56 +1406,56 @@ private int jjMoveStringLiteralDfa5_0(long old0, long 
active0, long old1, long a
    switch(curChar)
    {
       case 50:
-         if ((active1 & 0x200000000000000L) != 0L)
+         if ((active1 & 0x4000000000000000L) != 0L)
          {
-            jjmatchedKind = 121;
+            jjmatchedKind = 126;
             jjmatchedPos = 5;
          }
          break;
       case 52:
-         if ((active1 & 0x40000000000000L) != 0L)
+         if ((active1 & 0x800000000000000L) != 0L)
          {
-            jjmatchedKind = 118;
+            jjmatchedKind = 123;
             jjmatchedPos = 5;
          }
-         else if ((active1 & 0x100000000000000L) != 0L)
+         else if ((active1 & 0x2000000000000000L) != 0L)
          {
-            jjmatchedKind = 120;
+            jjmatchedKind = 125;
             jjmatchedPos = 5;
          }
          break;
       case 54:
-         if ((active1 & 0x80000000000000L) != 0L)
+         if ((active1 & 0x1000000000000000L) != 0L)
          {
-            jjmatchedKind = 119;
+            jjmatchedKind = 124;
             jjmatchedPos = 5;
          }
          break;
       case 65:
-         return jjMoveStringLiteralDfa6_0(active0, 0x10000000000000L, active1, 
0x1000008000L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x8010000000000000L, 
active1, 0x20000100000L, active2, 0L);
       case 67:
-         return jjMoveStringLiteralDfa6_0(active0, 0x200000000000L, active1, 
0x80000000L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x200000000000L, active1, 
0x1000000000L, active2, 0L);
       case 68:
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 
0x202000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 
0x4040000000000L, active2, 0L);
       case 69:
-         if ((active0 & 0x1000000000000000L) != 0L)
+         if ((active1 & 0x2L) != 0L)
          {
-            jjmatchedKind = 60;
+            jjmatchedKind = 65;
             jjmatchedPos = 5;
          }
-         else if ((active1 & 0x4000000000000000L) != 0L)
+         else if ((active2 & 0x8L) != 0L)
          {
-            jjmatchedKind = 126;
+            jjmatchedKind = 131;
             jjmatchedPos = 5;
          }
-         else if ((active2 & 0x10L) != 0L)
+         else if ((active2 & 0x200L) != 0L)
          {
-            jjmatchedKind = 132;
+            jjmatchedKind = 137;
             jjmatchedPos = 5;
          }
-         return jjMoveStringLiteralDfa6_0(active0, 0x1000000L, active1, 
0x100400580200L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x1000000L, active1, 
0x200800b004000L, active2, 0L);
       case 70:
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x4000000000L, 
active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 
0x80000000000L, active2, 0L);
       case 71:
          if ((active0 & 0x8000000000000L) != 0L)
          {
@@ -1461,27 +1464,27 @@ private int jjMoveStringLiteralDfa5_0(long old0, long 
active0, long old1, long a
          }
          break;
       case 73:
-         return jjMoveStringLiteralDfa6_0(active0, 0x2000000L, active1, 
0x4000800000000L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x2000000L, active1, 
0x80010000000000L, active2, 0L);
       case 76:
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0L, active2, 
0x2000L);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0L, active2, 
0x40000L);
       case 78:
-         if ((active1 & 0x40000000L) != 0L)
+         if ((active1 & 0x800000000L) != 0L)
          {
-            jjmatchedKind = 94;
+            jjmatchedKind = 99;
             jjmatchedPos = 5;
          }
-         return jjMoveStringLiteralDfa6_0(active0, 0x20000800000L, active1, 
0x40800L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x4000020000800000L, 
active1, 0x810000L, active2, 0L);
       case 79:
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 
0x8400000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 
0x108000000000001L, active2, 0L);
       case 82:
-         if ((active0 & 0x4000000000000000L) != 0L)
+         if ((active1 & 0x8L) != 0L)
          {
-            jjmatchedKind = 62;
+            jjmatchedKind = 67;
             jjmatchedPos = 5;
          }
-         else if ((active1 & 0x20000000L) != 0L)
+         else if ((active1 & 0x400000000L) != 0L)
          {
-            jjmatchedKind = 93;
+            jjmatchedKind = 98;
             jjmatchedPos = 5;
          }
          return jjMoveStringLiteralDfa6_0(active0, 0x4000000L, active1, 0L, 
active2, 0L);
@@ -1496,7 +1499,7 @@ private int jjMoveStringLiteralDfa5_0(long old0, long 
active0, long old1, long a
             jjmatchedKind = 47;
             jjmatchedPos = 5;
          }
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x1L, active2, 
0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x20L, 
active2, 0L);
       case 84:
          if ((active0 & 0x400000L) != 0L)
          {
@@ -1508,22 +1511,22 @@ private int jjMoveStringLiteralDfa5_0(long old0, long 
active0, long old1, long a
             jjmatchedKind = 29;
             jjmatchedPos = 5;
          }
-         else if ((active1 & 0x10000000L) != 0L)
+         else if ((active1 & 0x200000000L) != 0L)
          {
-            jjmatchedKind = 92;
+            jjmatchedKind = 97;
             jjmatchedPos = 5;
          }
-         else if ((active1 & 0x2000000000000000L) != 0L)
+         else if ((active2 & 0x4L) != 0L)
          {
-            jjmatchedKind = 125;
+            jjmatchedKind = 130;
             jjmatchedPos = 5;
          }
-         else if ((active2 & 0x200L) != 0L)
+         else if ((active2 & 0x4000L) != 0L)
          {
-            jjmatchedKind = 137;
+            jjmatchedKind = 142;
             jjmatchedPos = 5;
          }
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x8000000000L, 
active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 
0x100000000000L, active2, 0L);
       case 88:
          if ((active0 & 0x200000L) != 0L)
          {
@@ -1532,34 +1535,34 @@ private int jjMoveStringLiteralDfa5_0(long old0, long 
active0, long old1, long a
          }
          break;
       case 89:
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x2000L, 
active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x40000L, 
active2, 0L);
       case 95:
-         return jjMoveStringLiteralDfa6_0(active0, 0x2000000000000000L, 
active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x3000000000000000L, 
active1, 0x4L, active2, 0L);
       case 97:
-         return jjMoveStringLiteralDfa6_0(active0, 0x10000000000000L, active1, 
0x1000008000L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x8010000000000000L, 
active1, 0x20000100000L, active2, 0L);
       case 99:
-         return jjMoveStringLiteralDfa6_0(active0, 0x200000000000L, active1, 
0x80000000L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x200000000000L, active1, 
0x1000000000L, active2, 0L);
       case 100:
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 
0x202000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 
0x4040000000000L, active2, 0L);
       case 101:
-         if ((active0 & 0x1000000000000000L) != 0L)
+         if ((active1 & 0x2L) != 0L)
          {
-            jjmatchedKind = 60;
+            jjmatchedKind = 65;
             jjmatchedPos = 5;
          }
-         else if ((active1 & 0x4000000000000000L) != 0L)
+         else if ((active2 & 0x8L) != 0L)
          {
-            jjmatchedKind = 126;
+            jjmatchedKind = 131;
             jjmatchedPos = 5;
          }
-         else if ((active2 & 0x10L) != 0L)
+         else if ((active2 & 0x200L) != 0L)
          {
-            jjmatchedKind = 132;
+            jjmatchedKind = 137;
             jjmatchedPos = 5;
          }
-         return jjMoveStringLiteralDfa6_0(active0, 0x1000000L, active1, 
0x100400580200L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x1000000L, active1, 
0x200800b004000L, active2, 0L);
       case 102:
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x4000000000L, 
active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 
0x80000000000L, active2, 0L);
       case 103:
          if ((active0 & 0x8000000000000L) != 0L)
          {
@@ -1568,27 +1571,27 @@ private int jjMoveStringLiteralDfa5_0(long old0, long 
active0, long old1, long a
          }
          break;
       case 105:
-         return jjMoveStringLiteralDfa6_0(active0, 0x2000000L, active1, 
0x4000800000000L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x2000000L, active1, 
0x80010000000000L, active2, 0L);
       case 108:
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0L, active2, 
0x2000L);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0L, active2, 
0x40000L);
       case 110:
-         if ((active1 & 0x40000000L) != 0L)
+         if ((active1 & 0x800000000L) != 0L)
          {
-            jjmatchedKind = 94;
+            jjmatchedKind = 99;
             jjmatchedPos = 5;
          }
-         return jjMoveStringLiteralDfa6_0(active0, 0x20000800000L, active1, 
0x40800L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x4000020000800000L, 
active1, 0x810000L, active2, 0L);
       case 111:
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 
0x8400000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 
0x108000000000001L, active2, 0L);
       case 114:
-         if ((active0 & 0x4000000000000000L) != 0L)
+         if ((active1 & 0x8L) != 0L)
          {
-            jjmatchedKind = 62;
+            jjmatchedKind = 67;
             jjmatchedPos = 5;
          }
-         else if ((active1 & 0x20000000L) != 0L)
+         else if ((active1 & 0x400000000L) != 0L)
          {
-            jjmatchedKind = 93;
+            jjmatchedKind = 98;
             jjmatchedPos = 5;
          }
          return jjMoveStringLiteralDfa6_0(active0, 0x4000000L, active1, 0L, 
active2, 0L);
@@ -1603,7 +1606,7 @@ private int jjMoveStringLiteralDfa5_0(long old0, long 
active0, long old1, long a
             jjmatchedKind = 47;
             jjmatchedPos = 5;
          }
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x1L, active2, 
0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x20L, 
active2, 0L);
       case 116:
          if ((active0 & 0x400000L) != 0L)
          {
@@ -1615,22 +1618,22 @@ private int jjMoveStringLiteralDfa5_0(long old0, long 
active0, long old1, long a
             jjmatchedKind = 29;
             jjmatchedPos = 5;
          }
-         else if ((active1 & 0x10000000L) != 0L)
+         else if ((active1 & 0x200000000L) != 0L)
          {
-            jjmatchedKind = 92;
+            jjmatchedKind = 97;
             jjmatchedPos = 5;
          }
-         else if ((active1 & 0x2000000000000000L) != 0L)
+         else if ((active2 & 0x4L) != 0L)
          {
-            jjmatchedKind = 125;
+            jjmatchedKind = 130;
             jjmatchedPos = 5;
          }
-         else if ((active2 & 0x200L) != 0L)
+         else if ((active2 & 0x4000L) != 0L)
          {
-            jjmatchedKind = 137;
+            jjmatchedKind = 142;
             jjmatchedPos = 5;
          }
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x8000000000L, 
active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 
0x100000000000L, active2, 0L);
       case 120:
          if ((active0 & 0x200000L) != 0L)
          {
@@ -1639,7 +1642,7 @@ private int jjMoveStringLiteralDfa5_0(long old0, long 
active0, long old1, long a
          }
          break;
       case 121:
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x2000L, 
active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x40000L, 
active2, 0L);
       default :
          break;
    }
@@ -1660,16 +1663,16 @@ private int jjMoveStringLiteralDfa6_0(long old0, long 
active0, long old1, long a
       case 66:
          return jjMoveStringLiteralDfa7_0(active0, 0x2000000L, active1, 0L, 
active2, 0L);
       case 67:
-         return jjMoveStringLiteralDfa7_0(active0, 0x2000000000800000L, 
active1, 0x1L, active2, 0L);
+         return jjMoveStringLiteralDfa7_0(active0, 0x4000000000800000L, 
active1, 0x24L, active2, 0L);
       case 68:
          if ((active0 & 0x1000000L) != 0L)
          {
             jjmatchedKind = 24;
             jjmatchedPos = 6;
          }
-         else if ((active1 & 0x4000000000000L) != 0L)
+         else if ((active1 & 0x80000000000000L) != 0L)
          {
-            jjmatchedKind = 114;
+            jjmatchedKind = 119;
             jjmatchedPos = 6;
          }
          break;
@@ -1679,82 +1682,89 @@ private int jjMoveStringLiteralDfa6_0(long old0, long 
active0, long old1, long a
             jjmatchedKind = 45;
             jjmatchedPos = 6;
          }
-         else if ((active1 & 0x80000000L) != 0L)
+         else if ((active1 & 0x1000000000L) != 0L)
          {
-            jjmatchedKind = 95;
+            jjmatchedKind = 100;
             jjmatchedPos = 6;
          }
-         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x8000000000L, 
active2, 0L);
+         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 
0x100000000000L, active2, 0L);
       case 71:
-         if ((active1 & 0x800L) != 0L)
+         if ((active1 & 0x10000L) != 0L)
          {
-            jjmatchedKind = 75;
+            jjmatchedKind = 80;
             jjmatchedPos = 6;
          }
          break;
       case 75:
-         if ((active1 & 0x40000L) != 0L)
+         if ((active1 & 0x800000L) != 0L)
          {
-            jjmatchedKind = 82;
+            jjmatchedKind = 87;
             jjmatchedPos = 6;
          }
          break;
+      case 77:
+         return jjMoveStringLiteralDfa7_0(active0, 0x8000000000000000L, 
active1, 0L, active2, 0L);
       case 78:
-         if ((active1 & 0x8000000000000L) != 0L)
+         if ((active1 & 0x100000000000000L) != 0L)
          {
-            jjmatchedKind = 115;
+            jjmatchedKind = 120;
             jjmatchedPos = 6;
          }
-         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 
0x400800000000L, active2, 0L);
+         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 
0x8010000000000L, active2, 0L);
       case 79:
-         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x4000000000L, 
active2, 

<TRUNCATED>

Reply via email to