You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2012/05/14 17:08:35 UTC

svn commit: r1338242 [6/7] - in /jena/trunk/jena-arq: ./ Grammar/ src/main/java/com/hp/hpl/jena/query/ src/main/java/com/hp/hpl/jena/sparql/algebra/ src/main/java/com/hp/hpl/jena/sparql/core/ src/main/java/com/hp/hpl/jena/sparql/lang/ src/main/java/com...

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/sparql_11/SPARQLParser11TokenManager.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/sparql_11/SPARQLParser11TokenManager.java?rev=1338242&r1=1338241&r2=1338242&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/sparql_11/SPARQLParser11TokenManager.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/sparql_11/SPARQLParser11TokenManager.java Mon May 14 15:08:33 2012
@@ -61,160 +61,160 @@ private int jjMoveStringLiteralDfa0_0()
          jjmatchedKind = 1;
          return jjMoveNfa_0(0, 0);
       case 33:
-         jjmatchedKind = 174;
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x20000000000L);
+         jjmatchedKind = 173;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x10000000000L);
       case 38:
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x4000000000000L);
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x2000000000000L);
       case 40:
-         jjmatchedKind = 157;
+         jjmatchedKind = 156;
          return jjMoveNfa_0(0, 0);
       case 41:
-         jjmatchedKind = 158;
+         jjmatchedKind = 157;
          return jjMoveNfa_0(0, 0);
       case 42:
-         jjmatchedKind = 181;
+         jjmatchedKind = 180;
          return jjMoveNfa_0(0, 0);
       case 43:
-         jjmatchedKind = 179;
+         jjmatchedKind = 178;
          return jjMoveNfa_0(0, 0);
       case 44:
-         jjmatchedKind = 166;
+         jjmatchedKind = 165;
          return jjMoveNfa_0(0, 0);
       case 45:
-         jjmatchedKind = 180;
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x800000000000000L);
+         jjmatchedKind = 179;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x400000000000000L);
       case 46:
-         jjmatchedKind = 167;
+         jjmatchedKind = 166;
          return jjMoveNfa_0(0, 0);
       case 47:
-         jjmatchedKind = 182;
+         jjmatchedKind = 181;
          return jjMoveNfa_0(0, 0);
       case 58:
-         jjmatchedKind = 176;
+         jjmatchedKind = 175;
          return jjMoveNfa_0(0, 0);
       case 59:
-         jjmatchedKind = 165;
+         jjmatchedKind = 164;
          return jjMoveNfa_0(0, 0);
       case 60:
-         jjmatchedKind = 171;
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x1000100000000000L);
+         jjmatchedKind = 170;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x800080000000000L);
       case 61:
-         jjmatchedKind = 168;
+         jjmatchedKind = 167;
          return jjMoveNfa_0(0, 0);
       case 62:
-         jjmatchedKind = 170;
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x200000000000L);
+         jjmatchedKind = 169;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x100000000000L);
       case 63:
-         jjmatchedKind = 189;
+         jjmatchedKind = 188;
          return jjMoveNfa_0(0, 0);
       case 64:
-         jjmatchedKind = 184;
+         jjmatchedKind = 183;
          return jjMoveNfa_0(0, 0);
       case 65:
-         return jjMoveStringLiteralDfa1_0(0x211008404000000L, 0x8000000000080000L, 0x100L);
+         return jjMoveStringLiteralDfa1_0(0x108804204000000L, 0x4000000000040000L, 0x80L);
       case 66:
-         return jjMoveStringLiteralDfa1_0(0x40001000c0080000L, 0x4L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x2000080040080000L, 0x2L, 0x0L);
       case 67:
-         return jjMoveStringLiteralDfa1_0(0x8020000002000000L, 0x6000000040900000L, 0x2L);
+         return jjMoveStringLiteralDfa1_0(0x4010000002000000L, 0x3000000020480000L, 0x1L);
       case 68:
-         return jjMoveStringLiteralDfa1_0(0x801400000L, 0x140002000000100L, 0x90L);
+         return jjMoveStringLiteralDfa1_0(0x401400000L, 0xa0001000000080L, 0x48L);
       case 69:
-         return jjMoveStringLiteralDfa1_0(0x400000000000L, 0x20000000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x200000000000L, 0x10000000L, 0x0L);
       case 70:
-         return jjMoveStringLiteralDfa1_0(0x2000002000000000L, 0x20000000200000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x1000001000000000L, 0x10000000100000L, 0x0L);
       case 71:
-         return jjMoveStringLiteralDfa1_0(0x1002010000000000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x801008000000000L, 0x0L, 0x0L);
       case 72:
-         return jjMoveStringLiteralDfa1_0(0x4000000000000L, 0x4000000000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x2000000000000L, 0x2000000000L, 0x0L);
       case 73:
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x8000000000f80bL, 0x20L);
+         return jjMoveStringLiteralDfa1_0(0x8000000000000000L, 0x40000000007c05L, 0x10L);
       case 76:
-         return jjMoveStringLiteralDfa1_0(0x8000000L, 0x1000000010000600L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x8000000L, 0x800000008000300L, 0x0L);
       case 77:
-         return jjMoveStringLiteralDfa1_0(0xc0080000000000L, 0x409000000000L, 0x5L);
+         return jjMoveStringLiteralDfa1_0(0x60040000000000L, 0x8000204800000000L, 0x2L);
       case 78:
-         return jjMoveStringLiteralDfa1_0(0x801000000000L, 0x80000000000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x400800000000L, 0x40000000000L, 0x0L);
       case 79:
-         return jjMoveStringLiteralDfa1_0(0x20030000000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x10030000000L, 0x0L, 0x0L);
       case 80:
          return jjMoveStringLiteralDfa1_0(0x100000L, 0x0L, 0x0L);
       case 82:
-         return jjMoveStringLiteralDfa1_0(0x800000L, 0x4450000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x800000L, 0x2228000L, 0x0L);
       case 83:
-         return jjMoveStringLiteralDfa1_0(0xd08200000200000L, 0xfa107830200e0L, 0x8L);
+         return jjMoveStringLiteralDfa1_0(0x684100000200000L, 0x7d083c1810070L, 0x4L);
       case 84:
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x10060000000000L, 0x40L);
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x8030000000000L, 0x20L);
       case 85:
-         return jjMoveStringLiteralDfa1_0(0x40200000000L, 0x100008000010L, 0x400L);
+         return jjMoveStringLiteralDfa1_0(0x20100000000L, 0x80004000008L, 0x200L);
       case 86:
-         return jjMoveStringLiteralDfa1_0(0x100000000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x80000000L, 0x0L, 0x0L);
       case 87:
-         return jjMoveStringLiteralDfa1_0(0x4000000000L, 0x0L, 0x200L);
+         return jjMoveStringLiteralDfa1_0(0x2000000000L, 0x0L, 0x100L);
       case 89:
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x800000000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x400000000L, 0x0L);
       case 91:
-         jjmatchedKind = 162;
+         jjmatchedKind = 161;
          return jjMoveNfa_0(0, 0);
       case 93:
-         jjmatchedKind = 163;
+         jjmatchedKind = 162;
          return jjMoveNfa_0(0, 0);
       case 94:
-         jjmatchedKind = 186;
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x80000000000000L);
+         jjmatchedKind = 185;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x40000000000000L);
       case 97:
          jjmatchedKind = 18;
-         return jjMoveStringLiteralDfa1_0(0x211008404000000L, 0x8000000000080000L, 0x100L);
+         return jjMoveStringLiteralDfa1_0(0x108804204000000L, 0x4000000000040000L, 0x80L);
       case 98:
-         return jjMoveStringLiteralDfa1_0(0x40001000c0080000L, 0x4L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x2000080040080000L, 0x2L, 0x0L);
       case 99:
-         return jjMoveStringLiteralDfa1_0(0x8020000002000000L, 0x6000000040900000L, 0x2L);
+         return jjMoveStringLiteralDfa1_0(0x4010000002000000L, 0x3000000020480000L, 0x1L);
       case 100:
-         return jjMoveStringLiteralDfa1_0(0x801400000L, 0x140002000000100L, 0x90L);
+         return jjMoveStringLiteralDfa1_0(0x401400000L, 0xa0001000000080L, 0x48L);
       case 101:
-         return jjMoveStringLiteralDfa1_0(0x400000000000L, 0x20000000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x200000000000L, 0x10000000L, 0x0L);
       case 102:
-         return jjMoveStringLiteralDfa1_0(0x2000002000000000L, 0x20000000200000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x1000001000000000L, 0x10000000100000L, 0x0L);
       case 103:
-         return jjMoveStringLiteralDfa1_0(0x1002010000000000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x801008000000000L, 0x0L, 0x0L);
       case 104:
-         return jjMoveStringLiteralDfa1_0(0x4000000000000L, 0x4000000000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x2000000000000L, 0x2000000000L, 0x0L);
       case 105:
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x8000000000f80bL, 0x20L);
+         return jjMoveStringLiteralDfa1_0(0x8000000000000000L, 0x40000000007c05L, 0x10L);
       case 108:
-         return jjMoveStringLiteralDfa1_0(0x8000000L, 0x1000000010000600L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x8000000L, 0x800000008000300L, 0x0L);
       case 109:
-         return jjMoveStringLiteralDfa1_0(0xc0080000000000L, 0x409000000000L, 0x5L);
+         return jjMoveStringLiteralDfa1_0(0x60040000000000L, 0x8000204800000000L, 0x2L);
       case 110:
-         return jjMoveStringLiteralDfa1_0(0x801000000000L, 0x80000000000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x400800000000L, 0x40000000000L, 0x0L);
       case 111:
-         return jjMoveStringLiteralDfa1_0(0x20030000000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x10030000000L, 0x0L, 0x0L);
       case 112:
          return jjMoveStringLiteralDfa1_0(0x100000L, 0x0L, 0x0L);
       case 114:
-         return jjMoveStringLiteralDfa1_0(0x800000L, 0x4450000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x800000L, 0x2228000L, 0x0L);
       case 115:
-         return jjMoveStringLiteralDfa1_0(0xd08200000200000L, 0xfa107830200e0L, 0x8L);
+         return jjMoveStringLiteralDfa1_0(0x684100000200000L, 0x7d083c1810070L, 0x4L);
       case 116:
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x10060000000000L, 0x40L);
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x8030000000000L, 0x20L);
       case 117:
-         return jjMoveStringLiteralDfa1_0(0x40200000000L, 0x100008000010L, 0x400L);
+         return jjMoveStringLiteralDfa1_0(0x20100000000L, 0x80004000008L, 0x200L);
       case 118:
-         return jjMoveStringLiteralDfa1_0(0x100000000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x80000000L, 0x0L, 0x0L);
       case 119:
-         return jjMoveStringLiteralDfa1_0(0x4000000000L, 0x0L, 0x200L);
+         return jjMoveStringLiteralDfa1_0(0x2000000000L, 0x0L, 0x100L);
       case 121:
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x800000000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x400000000L, 0x0L);
       case 123:
-         jjmatchedKind = 160;
+         jjmatchedKind = 159;
          return jjMoveNfa_0(0, 0);
       case 124:
-         jjmatchedKind = 185;
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x2000000000000L);
+         jjmatchedKind = 184;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x1000000000000L);
       case 125:
-         jjmatchedKind = 161;
+         jjmatchedKind = 160;
          return jjMoveNfa_0(0, 0);
       case 126:
-         jjmatchedKind = 175;
+         jjmatchedKind = 174;
          return jjMoveNfa_0(0, 0);
       default :
          return jjMoveNfa_0(0, 0);
@@ -229,101 +229,101 @@ private int jjMoveStringLiteralDfa1_0(lo
    switch(curChar)
    {
       case 38:
-         if ((active2 & 0x4000000000000L) != 0L)
+         if ((active2 & 0x2000000000000L) != 0L)
          {
-            jjmatchedKind = 178;
+            jjmatchedKind = 177;
             jjmatchedPos = 1;
          }
          break;
       case 45:
-         if ((active2 & 0x1000000000000000L) != 0L)
+         if ((active2 & 0x800000000000000L) != 0L)
          {
-            jjmatchedKind = 188;
+            jjmatchedKind = 187;
             jjmatchedPos = 1;
          }
          break;
       case 61:
-         if ((active2 & 0x20000000000L) != 0L)
+         if ((active2 & 0x10000000000L) != 0L)
          {
-            jjmatchedKind = 169;
+            jjmatchedKind = 168;
             jjmatchedPos = 1;
          }
-         else if ((active2 & 0x100000000000L) != 0L)
+         else if ((active2 & 0x80000000000L) != 0L)
          {
-            jjmatchedKind = 172;
+            jjmatchedKind = 171;
             jjmatchedPos = 1;
          }
-         else if ((active2 & 0x200000000000L) != 0L)
+         else if ((active2 & 0x100000000000L) != 0L)
          {
-            jjmatchedKind = 173;
+            jjmatchedKind = 172;
             jjmatchedPos = 1;
          }
          break;
       case 62:
-         if ((active2 & 0x800000000000000L) != 0L)
+         if ((active2 & 0x400000000000000L) != 0L)
          {
-            jjmatchedKind = 187;
+            jjmatchedKind = 186;
             jjmatchedPos = 1;
          }
          break;
       case 65:
-         return jjMoveStringLiteralDfa2_0(active0, 0x884001100080000L, active1, 0x60002000060700L, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x442000880080000L, active1, 0x30001000030380L, active2, 0L);
       case 66:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x80000L, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x40000L, active2, 0L);
       case 67:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x18000000L, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0xc000000L, active2, 0L);
       case 68:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x8000400000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x4000200000000000L, active2, 0L);
       case 69:
-         return jjMoveStringLiteralDfa2_0(active0, 0x8200801a00000L, active1, 0x100010804110000L, active2, 0x84L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x4100401a00000L, active1, 0x80008402088000L, active2, 0x42L);
       case 70:
-         if ((active1 & 0x2L) != 0L)
+         if ((active1 & 0x1L) != 0L)
          {
-            jjmatchedKind = 65;
+            jjmatchedKind = 64;
             jjmatchedPos = 1;
          }
          return jjMoveStringLiteralDfa2_0(active0, 0x10000000L, active1, 0L, active2, 0L);
       case 71:
-         return jjMoveStringLiteralDfa2_0(active0, 0x10000000000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x8000000000000L, active1, 0L, active2, 0L);
       case 72:
-         return jjMoveStringLiteralDfa2_0(active0, 0x4000000000L, active1, 0xf800000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x2000000000L, active1, 0x7c00000000000L, active2, 0L);
       case 73:
-         return jjMoveStringLiteralDfa2_0(active0, 0x2040180088400000L, active1, 0x28000000000L, active2, 0x208L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x10200c0008400000L, active1, 0x14000000000L, active2, 0x104L);
       case 76:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x2000000000200000L, active2, 0x100L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x1000000000100000L, active2, 0x80L);
       case 78:
-         if ((active1 & 0x1L) != 0L)
+         if ((active0 & 0x8000000000000000L) != 0L)
          {
-            jjmatchedKind = 64;
+            jjmatchedKind = 63;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_0(active0, 0x48200000000L, active1, 0x80000020000004L, active2, 0x20L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x24100000000L, active1, 0x40000010000002L, active2, 0x10L);
       case 79:
-         if ((active2 & 0x40L) != 0L)
+         if ((active2 & 0x20L) != 0L)
          {
-            jjmatchedKind = 134;
+            jjmatchedKind = 133;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_0(active0, 0xc020800002000000L, active1, 0x1000085040c00000L, active2, 0x3L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x6010400002000000L, active1, 0x8800042820600000L, active2, 0x1L);
       case 80:
-         return jjMoveStringLiteralDfa2_0(active0, 0x20000000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x10000000000L, active1, 0L, active2, 0L);
       case 82:
-         return jjMoveStringLiteralDfa2_0(active0, 0x1002012020100000L, active1, 0x4010000000000018L, active2, 0x10L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x801009020100000L, active1, 0x200800000000000cL, active2, 0x8L);
       case 83:
-         if ((active0 & 0x1000000000000L) != 0L)
+         if ((active0 & 0x800000000000L) != 0L)
          {
-            jjmatchedKind = 48;
+            jjmatchedKind = 47;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_0(active0, 0x404000000L, active1, 0xf800L, active2, 0x400L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x204000000L, active1, 0x7c00L, active2, 0x200L);
       case 84:
-         return jjMoveStringLiteralDfa2_0(active0, 0x400000000000000L, active1, 0x2007820000e0L, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x200000000000000L, active1, 0x1003c1000070L, active2, 0L);
       case 85:
-         return jjMoveStringLiteralDfa2_0(active0, 0x100000000000000L, active1, 0x100001000000L, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x80000000000000L, active1, 0x80000800000L, active2, 0L);
       case 86:
-         return jjMoveStringLiteralDfa2_0(active0, 0x200000000000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x100000000000000L, active1, 0L, active2, 0L);
       case 88:
-         return jjMoveStringLiteralDfa2_0(active0, 0x400000000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x200000000000L, active1, 0L, active2, 0L);
       case 89:
          if ((active0 & 0x40000000L) != 0L)
          {
@@ -332,77 +332,77 @@ private int jjMoveStringLiteralDfa1_0(lo
          }
          break;
       case 90:
-         if ((active1 & 0x40000000000L) != 0L)
+         if ((active1 & 0x20000000000L) != 0L)
          {
-            jjmatchedKind = 106;
+            jjmatchedKind = 105;
             jjmatchedPos = 1;
          }
          break;
       case 94:
-         if ((active2 & 0x80000000000000L) != 0L)
+         if ((active2 & 0x40000000000000L) != 0L)
          {
-            jjmatchedKind = 183;
+            jjmatchedKind = 182;
             jjmatchedPos = 1;
          }
          break;
       case 97:
-         return jjMoveStringLiteralDfa2_0(active0, 0x884001100080000L, active1, 0x60002000060700L, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x442000880080000L, active1, 0x30001000030380L, active2, 0L);
       case 98:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x80000L, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x40000L, active2, 0L);
       case 99:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x18000000L, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0xc000000L, active2, 0L);
       case 100:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x8000400000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x4000200000000000L, active2, 0L);
       case 101:
-         return jjMoveStringLiteralDfa2_0(active0, 0x8200801a00000L, active1, 0x100010804110000L, active2, 0x84L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x4100401a00000L, active1, 0x80008402088000L, active2, 0x42L);
       case 102:
-         if ((active1 & 0x2L) != 0L)
+         if ((active1 & 0x1L) != 0L)
          {
-            jjmatchedKind = 65;
+            jjmatchedKind = 64;
             jjmatchedPos = 1;
          }
          return jjMoveStringLiteralDfa2_0(active0, 0x10000000L, active1, 0L, active2, 0L);
       case 103:
-         return jjMoveStringLiteralDfa2_0(active0, 0x10000000000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x8000000000000L, active1, 0L, active2, 0L);
       case 104:
-         return jjMoveStringLiteralDfa2_0(active0, 0x4000000000L, active1, 0xf800000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x2000000000L, active1, 0x7c00000000000L, active2, 0L);
       case 105:
-         return jjMoveStringLiteralDfa2_0(active0, 0x2040180088400000L, active1, 0x28000000000L, active2, 0x208L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x10200c0008400000L, active1, 0x14000000000L, active2, 0x104L);
       case 108:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x2000000000200000L, active2, 0x100L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x1000000000100000L, active2, 0x80L);
       case 110:
-         if ((active1 & 0x1L) != 0L)
+         if ((active0 & 0x8000000000000000L) != 0L)
          {
-            jjmatchedKind = 64;
+            jjmatchedKind = 63;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_0(active0, 0x48200000000L, active1, 0x80000020000004L, active2, 0x20L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x24100000000L, active1, 0x40000010000002L, active2, 0x10L);
       case 111:
-         if ((active2 & 0x40L) != 0L)
+         if ((active2 & 0x20L) != 0L)
          {
-            jjmatchedKind = 134;
+            jjmatchedKind = 133;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_0(active0, 0xc020800002000000L, active1, 0x1000085040c00000L, active2, 0x3L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x6010400002000000L, active1, 0x8800042820600000L, active2, 0x1L);
       case 112:
-         return jjMoveStringLiteralDfa2_0(active0, 0x20000000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x10000000000L, active1, 0L, active2, 0L);
       case 114:
-         return jjMoveStringLiteralDfa2_0(active0, 0x1002012020100000L, active1, 0x4010000000000018L, active2, 0x10L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x801009020100000L, active1, 0x200800000000000cL, active2, 0x8L);
       case 115:
-         if ((active0 & 0x1000000000000L) != 0L)
+         if ((active0 & 0x800000000000L) != 0L)
          {
-            jjmatchedKind = 48;
+            jjmatchedKind = 47;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_0(active0, 0x404000000L, active1, 0xf800L, active2, 0x400L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x204000000L, active1, 0x7c00L, active2, 0x200L);
       case 116:
-         return jjMoveStringLiteralDfa2_0(active0, 0x400000000000000L, active1, 0x2007820000e0L, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x200000000000000L, active1, 0x1003c1000070L, active2, 0L);
       case 117:
-         return jjMoveStringLiteralDfa2_0(active0, 0x100000000000000L, active1, 0x100001000000L, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x80000000000000L, active1, 0x80000800000L, active2, 0L);
       case 118:
-         return jjMoveStringLiteralDfa2_0(active0, 0x200000000000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x100000000000000L, active1, 0L, active2, 0L);
       case 120:
-         return jjMoveStringLiteralDfa2_0(active0, 0x400000000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x200000000000L, active1, 0L, active2, 0L);
       case 121:
          if ((active0 & 0x40000000L) != 0L)
          {
@@ -411,16 +411,16 @@ private int jjMoveStringLiteralDfa1_0(lo
          }
          break;
       case 122:
-         if ((active1 & 0x40000000000L) != 0L)
+         if ((active1 & 0x20000000000L) != 0L)
          {
-            jjmatchedKind = 106;
+            jjmatchedKind = 105;
             jjmatchedPos = 1;
          }
          break;
       case 124:
-         if ((active2 & 0x2000000000000L) != 0L)
+         if ((active2 & 0x1000000000000L) != 0L)
          {
-            jjmatchedKind = 177;
+            jjmatchedKind = 176;
             jjmatchedPos = 1;
          }
          break;
@@ -440,63 +440,63 @@ private int jjMoveStringLiteralDfa2_0(lo
    switch(curChar)
    {
       case 53:
-         if ((active1 & 0x400000000000L) != 0L)
+         if ((active1 & 0x200000000000L) != 0L)
          {
-            jjmatchedKind = 110;
+            jjmatchedKind = 109;
             jjmatchedPos = 2;
          }
          break;
       case 65:
-         return jjMoveStringLiteralDfa3_0(active0, 0x8000010000000000L, active1, 0x100f800818000000L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x4000008000000000L, active1, 0x807c0040c000000L, active2, 0L);
       case 66:
-         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x1002000L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x801000L, active2, 0L);
       case 67:
-         if ((active0 & 0x400000000L) != 0L)
+         if ((active0 & 0x200000000L) != 0L)
          {
-            jjmatchedKind = 34;
+            jjmatchedKind = 33;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x10020000000L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x8010000000L, active2, 0L);
       case 68:
-         if ((active0 & 0x8000000000L) != 0L)
+         if ((active0 & 0x4000000000L) != 0L)
          {
-            jjmatchedKind = 39;
+            jjmatchedKind = 38;
             jjmatchedPos = 2;
          }
-         else if ((active1 & 0x8000000000000000L) != 0L)
+         else if ((active1 & 0x4000000000000000L) != 0L)
          {
-            jjmatchedKind = 127;
+            jjmatchedKind = 126;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x400000220800000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x200000120800000L, active1, 0L, active2, 0L);
       case 69:
-         return jjMoveStringLiteralDfa3_0(active0, 0x4000100000L, active1, 0x6000000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x2000100000L, active1, 0x3000000000000000L, active2, 0L);
       case 70:
-         return jjMoveStringLiteralDfa3_0(active0, 0x10000000L, active1, 0L, active2, 0x80L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x10000000L, active1, 0L, active2, 0x40L);
       case 71:
-         if ((active0 & 0x10000000000000L) != 0L)
+         if ((active0 & 0x8000000000000L) != 0L)
          {
-            jjmatchedKind = 52;
+            jjmatchedKind = 51;
             jjmatchedPos = 2;
          }
-         else if ((active0 & 0x200000000000000L) != 0L)
+         else if ((active0 & 0x100000000000000L) != 0L)
          {
-            jjmatchedKind = 57;
+            jjmatchedKind = 56;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x10000L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x8000L, active2, 0L);
       case 73:
-         if ((active1 & 0x8L) != 0L)
+         if ((active1 & 0x4L) != 0L)
          {
-            jjmatchedKind = 67;
+            jjmatchedKind = 66;
             jjmatchedPos = 2;
          }
-         else if ((active1 & 0x10L) != 0L)
+         else if ((active1 & 0x8L) != 0L)
          {
-            jjmatchedKind = 68;
+            jjmatchedKind = 67;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x440000000000L, active1, 0x100000101000L, active2, 0x400L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x220000000000L, active1, 0x80000080800L, active2, 0x200L);
       case 75:
          if ((active0 & 0x4000000L) != 0L)
          {
@@ -505,127 +505,127 @@ private int jjMoveStringLiteralDfa2_0(lo
          }
          break;
       case 76:
-         if ((active2 & 0x100L) != 0L)
+         if ((active2 & 0x80L) != 0L)
          {
-            jjmatchedKind = 136;
+            jjmatchedKind = 135;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x2000000100200000L, active1, 0x120000000004000L, active2, 0x8L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x1000000080200000L, active1, 0x90000000002000L, active2, 0x4L);
       case 77:
-         if ((active0 & 0x100000000000000L) != 0L)
+         if ((active0 & 0x80000000000000L) != 0L)
          {
-            jjmatchedKind = 56;
+            jjmatchedKind = 55;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x800001008000000L, active1, 0x20000020000L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x400000808000000L, active1, 0x10000010000L, active2, 0L);
       case 78:
-         if ((active0 & 0x40000000000000L) != 0L)
+         if ((active0 & 0x20000000000000L) != 0L)
          {
-            jjmatchedKind = 54;
+            jjmatchedKind = 53;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x180082000000L, active1, 0x9040848600L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0xc0002000000L, active1, 0x4820424300L, active2, 0L);
       case 79:
-         return jjMoveStringLiteralDfa3_0(active0, 0x1002002000000000L, active1, 0x200004L, active2, 0x10L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x801001000000000L, active1, 0x100002L, active2, 0x8L);
       case 80:
-         return jjMoveStringLiteralDfa3_0(active0, 0x8000000000000L, active1, 0x4000000L, active2, 0x2L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x4000000000000L, active1, 0x2000000L, active2, 0x1L);
       case 82:
-         if ((active1 & 0x20L) != 0L)
+         if ((active1 & 0x10L) != 0L)
          {
-            jjmatchedKind = 69;
+            jjmatchedKind = 68;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x200000000000L, active1, 0x2007820000c0L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x100000000000L, active1, 0x1003c1000060L, active2, 0L);
       case 83:
-         if ((active1 & 0x80000L) != 0L)
+         if ((active1 & 0x40000L) != 0L)
          {
-            jjmatchedKind = 83;
+            jjmatchedKind = 82;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x801480000L, active1, 0x80000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x401480000L, active1, 0x40000000000000L, active2, 0L);
       case 84:
-         if ((active0 & 0x800000000000L) != 0L)
+         if ((active0 & 0x400000000000L) != 0L)
          {
-            jjmatchedKind = 47;
+            jjmatchedKind = 46;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x20000000000L, active1, 0x40000000000100L, active2, 0x224L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x10000000000L, active1, 0x20000000000080L, active2, 0x112L);
       case 85:
-         return jjMoveStringLiteralDfa3_0(active0, 0x4020000000000000L, active1, 0x10004000400800L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x2010000000000000L, active1, 0x8002000200400L, active2, 0L);
       case 86:
-         return jjMoveStringLiteralDfa3_0(active0, 0x4000000000000L, active1, 0L, active2, 0x1L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x2000000000000L, active1, 0x8000000000000000L, active2, 0L);
       case 87:
-         if ((active1 & 0x80000000000L) != 0L)
+         if ((active1 & 0x40000000000L) != 0L)
          {
-            jjmatchedKind = 107;
+            jjmatchedKind = 106;
             jjmatchedPos = 2;
          }
          break;
       case 88:
-         if ((active0 & 0x80000000000000L) != 0L)
+         if ((active0 & 0x40000000000000L) != 0L)
          {
-            jjmatchedKind = 55;
+            jjmatchedKind = 54;
             jjmatchedPos = 2;
          }
          break;
       case 89:
-         if ((active1 & 0x2000000000L) != 0L)
+         if ((active1 & 0x1000000000L) != 0L)
          {
-            jjmatchedKind = 101;
+            jjmatchedKind = 100;
             jjmatchedPos = 2;
          }
          break;
       case 97:
-         return jjMoveStringLiteralDfa3_0(active0, 0x8000010000000000L, active1, 0x100f800818000000L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x4000008000000000L, active1, 0x807c0040c000000L, active2, 0L);
       case 98:
-         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x1002000L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x801000L, active2, 0L);
       case 99:
-         if ((active0 & 0x400000000L) != 0L)
+         if ((active0 & 0x200000000L) != 0L)
          {
-            jjmatchedKind = 34;
+            jjmatchedKind = 33;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x10020000000L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x8010000000L, active2, 0L);
       case 100:
-         if ((active0 & 0x8000000000L) != 0L)
+         if ((active0 & 0x4000000000L) != 0L)
          {
-            jjmatchedKind = 39;
+            jjmatchedKind = 38;
             jjmatchedPos = 2;
          }
-         else if ((active1 & 0x8000000000000000L) != 0L)
+         else if ((active1 & 0x4000000000000000L) != 0L)
          {
-            jjmatchedKind = 127;
+            jjmatchedKind = 126;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x400000220800000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x200000120800000L, active1, 0L, active2, 0L);
       case 101:
-         return jjMoveStringLiteralDfa3_0(active0, 0x4000100000L, active1, 0x6000000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x2000100000L, active1, 0x3000000000000000L, active2, 0L);
       case 102:
-         return jjMoveStringLiteralDfa3_0(active0, 0x10000000L, active1, 0L, active2, 0x80L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x10000000L, active1, 0L, active2, 0x40L);
       case 103:
-         if ((active0 & 0x10000000000000L) != 0L)
+         if ((active0 & 0x8000000000000L) != 0L)
          {
-            jjmatchedKind = 52;
+            jjmatchedKind = 51;
             jjmatchedPos = 2;
          }
-         else if ((active0 & 0x200000000000000L) != 0L)
+         else if ((active0 & 0x100000000000000L) != 0L)
          {
-            jjmatchedKind = 57;
+            jjmatchedKind = 56;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x10000L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x8000L, active2, 0L);
       case 105:
-         if ((active1 & 0x8L) != 0L)
+         if ((active1 & 0x4L) != 0L)
          {
-            jjmatchedKind = 67;
+            jjmatchedKind = 66;
             jjmatchedPos = 2;
          }
-         else if ((active1 & 0x10L) != 0L)
+         else if ((active1 & 0x8L) != 0L)
          {
-            jjmatchedKind = 68;
+            jjmatchedKind = 67;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x440000000000L, active1, 0x100000101000L, active2, 0x400L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x220000000000L, active1, 0x80000080800L, active2, 0x200L);
       case 107:
          if ((active0 & 0x4000000L) != 0L)
          {
@@ -634,73 +634,73 @@ private int jjMoveStringLiteralDfa2_0(lo
          }
          break;
       case 108:
-         if ((active2 & 0x100L) != 0L)
+         if ((active2 & 0x80L) != 0L)
          {
-            jjmatchedKind = 136;
+            jjmatchedKind = 135;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x2000000100200000L, active1, 0x120000000004000L, active2, 0x8L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x1000000080200000L, active1, 0x90000000002000L, active2, 0x4L);
       case 109:
-         if ((active0 & 0x100000000000000L) != 0L)
+         if ((active0 & 0x80000000000000L) != 0L)
          {
-            jjmatchedKind = 56;
+            jjmatchedKind = 55;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x800001008000000L, active1, 0x20000020000L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x400000808000000L, active1, 0x10000010000L, active2, 0L);
       case 110:
-         if ((active0 & 0x40000000000000L) != 0L)
+         if ((active0 & 0x20000000000000L) != 0L)
          {
-            jjmatchedKind = 54;
+            jjmatchedKind = 53;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x180082000000L, active1, 0x9040848600L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0xc0002000000L, active1, 0x4820424300L, active2, 0L);
       case 111:
-         return jjMoveStringLiteralDfa3_0(active0, 0x1002002000000000L, active1, 0x200004L, active2, 0x10L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x801001000000000L, active1, 0x100002L, active2, 0x8L);
       case 112:
-         return jjMoveStringLiteralDfa3_0(active0, 0x8000000000000L, active1, 0x4000000L, active2, 0x2L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x4000000000000L, active1, 0x2000000L, active2, 0x1L);
       case 114:
-         if ((active1 & 0x20L) != 0L)
+         if ((active1 & 0x10L) != 0L)
          {
-            jjmatchedKind = 69;
+            jjmatchedKind = 68;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x200000000000L, active1, 0x2007820000c0L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x100000000000L, active1, 0x1003c1000060L, active2, 0L);
       case 115:
-         if ((active1 & 0x80000L) != 0L)
+         if ((active1 & 0x40000L) != 0L)
          {
-            jjmatchedKind = 83;
+            jjmatchedKind = 82;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x801480000L, active1, 0x80000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x401480000L, active1, 0x40000000000000L, active2, 0L);
       case 116:
-         if ((active0 & 0x800000000000L) != 0L)
+         if ((active0 & 0x400000000000L) != 0L)
          {
-            jjmatchedKind = 47;
+            jjmatchedKind = 46;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x20000000000L, active1, 0x40000000000100L, active2, 0x224L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x10000000000L, active1, 0x20000000000080L, active2, 0x112L);
       case 117:
-         return jjMoveStringLiteralDfa3_0(active0, 0x4020000000000000L, active1, 0x10004000400800L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x2010000000000000L, active1, 0x8002000200400L, active2, 0L);
       case 118:
-         return jjMoveStringLiteralDfa3_0(active0, 0x4000000000000L, active1, 0L, active2, 0x1L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x2000000000000L, active1, 0x8000000000000000L, active2, 0L);
       case 119:
-         if ((active1 & 0x80000000000L) != 0L)
+         if ((active1 & 0x40000000000L) != 0L)
          {
-            jjmatchedKind = 107;
+            jjmatchedKind = 106;
             jjmatchedPos = 2;
          }
          break;
       case 120:
-         if ((active0 & 0x80000000000000L) != 0L)
+         if ((active0 & 0x40000000000000L) != 0L)
          {
-            jjmatchedKind = 55;
+            jjmatchedKind = 54;
             jjmatchedPos = 2;
          }
          break;
       case 121:
-         if ((active1 & 0x2000000000L) != 0L)
+         if ((active1 & 0x1000000000L) != 0L)
          {
-            jjmatchedKind = 101;
+            jjmatchedKind = 100;
             jjmatchedPos = 2;
          }
          break;
@@ -720,275 +720,275 @@ private int jjMoveStringLiteralDfa3_0(lo
    switch(curChar)
    {
       case 49:
-         if ((active1 & 0x800000000000L) != 0L)
+         if ((active1 & 0x400000000000L) != 0L)
          {
-            jjmatchedKind = 111;
+            jjmatchedKind = 110;
             jjmatchedPos = 3;
          }
          break;
       case 50:
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x3000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x1800000000000L, active2, 0L);
       case 51:
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x4000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x2000000000000L, active2, 0L);
       case 53:
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x8000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x4000000000000L, active2, 0L);
       case 65:
-         if ((active1 & 0x40000000000000L) != 0L)
+         if ((active1 & 0x20000000000000L) != 0L)
          {
-            jjmatchedKind = 118;
+            jjmatchedKind = 117;
             jjmatchedPos = 3;
          }
-         else if ((active2 & 0x4L) != 0L)
+         else if ((active2 & 0x2L) != 0L)
          {
-            jjmatchedKind = 130;
+            jjmatchedKind = 129;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x8000000000000L, active1, 0x6000000400000100L, active2, 0x80L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x4000000000000L, active1, 0x3000000200000080L, active2, 0x40L);
       case 66:
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x200000000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x100000000L, active2, 0L);
       case 67:
-         if ((active0 & 0x800000000L) != 0L)
+         if ((active0 & 0x400000000L) != 0L)
          {
-            jjmatchedKind = 35;
+            jjmatchedKind = 34;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x1000000L, active1, 0x800000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x1000000L, active1, 0x400000L, active2, 0L);
       case 68:
-         if ((active0 & 0x100000000000L) != 0L)
+         if ((active0 & 0x80000000000L) != 0L)
          {
-            jjmatchedKind = 44;
+            jjmatchedKind = 43;
             jjmatchedPos = 3;
          }
-         else if ((active1 & 0x40000L) != 0L)
+         else if ((active1 & 0x20000L) != 0L)
          {
-            jjmatchedKind = 82;
+            jjmatchedKind = 81;
             jjmatchedPos = 3;
          }
-         else if ((active1 & 0x100000000000L) != 0L)
+         else if ((active1 & 0x80000000000L) != 0L)
          {
-            jjmatchedKind = 108;
+            jjmatchedKind = 107;
             jjmatchedPos = 3;
          }
-         else if ((active1 & 0x1000000000000000L) != 0L)
+         else if ((active1 & 0x800000000000000L) != 0L)
          {
-            jjmatchedKind = 124;
+            jjmatchedKind = 123;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x80000000L, active1, 0x84L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x42L, active2, 0L);
       case 69:
          if ((active0 & 0x80000L) != 0L)
          {
             jjmatchedKind = 19;
             jjmatchedPos = 3;
          }
-         else if ((active1 & 0x10000000000000L) != 0L)
+         else if ((active1 & 0x8000000000000L) != 0L)
          {
-            jjmatchedKind = 116;
+            jjmatchedKind = 115;
             jjmatchedPos = 3;
          }
-         else if ((active2 & 0x1L) != 0L)
+         else if ((active1 & 0x8000000000000000L) != 0L)
          {
-            jjmatchedKind = 128;
+            jjmatchedKind = 127;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x400001220200000L, active1, 0x180020100030000L, active2, 0x8L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x200000920200000L, active1, 0xc0010080018000L, active2, 0x4L);
       case 70:
          return jjMoveStringLiteralDfa4_0(active0, 0x100000L, active1, 0L, active2, 0L);
       case 71:
-         if ((active1 & 0x200L) != 0L)
+         if ((active1 & 0x100L) != 0L)
          {
-            jjmatchedKind = 73;
+            jjmatchedKind = 72;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x400L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x200L, active2, 0L);
       case 72:
-         if ((active2 & 0x200L) != 0L)
+         if ((active2 & 0x100L) != 0L)
          {
-            jjmatchedKind = 137;
+            jjmatchedKind = 136;
             jjmatchedPos = 3;
          }
          break;
       case 73:
-         return jjMoveStringLiteralDfa4_0(active0, 0x4020008000000L, active1, 0x4000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x2010008000000L, active1, 0x2000L, active2, 0L);
       case 76:
-         if ((active1 & 0x100000L) != 0L)
+         if ((active1 & 0x80000L) != 0L)
          {
-            jjmatchedKind = 84;
+            jjmatchedKind = 83;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x8000000000000000L, active1, 0x6002040L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x4000000000000000L, active1, 0x3001020L, active2, 0L);
       case 77:
-         if ((active0 & 0x2000000000L) != 0L)
+         if ((active0 & 0x1000000000L) != 0L)
          {
-            jjmatchedKind = 37;
+            jjmatchedKind = 36;
             jjmatchedPos = 3;
          }
          break;
       case 78:
-         return jjMoveStringLiteralDfa4_0(active0, 0x4020000000000000L, active1, 0x400000L, active2, 0x400L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x2010000000000000L, active1, 0x200000L, active2, 0x200L);
       case 79:
-         if ((active2 & 0x20L) != 0L)
+         if ((active2 & 0x10L) != 0L)
          {
-            jjmatchedKind = 133;
+            jjmatchedKind = 132;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x40000000000L, active1, 0x10020200000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x20000000000L, active1, 0x8010100000L, active2, 0L);
       case 80:
-         if ((active2 & 0x10L) != 0L)
+         if ((active2 & 0x8L) != 0L)
          {
-            jjmatchedKind = 132;
+            jjmatchedKind = 131;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x800010000000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x400008000000000L, active1, 0L, active2, 0L);
       case 82:
-         if ((active1 & 0x800000000L) != 0L)
+         if ((active1 & 0x400000000L) != 0L)
          {
-            jjmatchedKind = 99;
+            jjmatchedKind = 98;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x4000000000L, active1, 0x4000001800L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x2000000000L, active1, 0x2000000c00L, active2, 0L);
       case 83:
-         return jjMoveStringLiteralDfa4_0(active0, 0x400012000000L, active1, 0x20000099000000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x200012000000L, active1, 0x1000004c800000L, active2, 0L);
       case 84:
-         return jjMoveStringLiteralDfa4_0(active0, 0x2000000000400000L, active1, 0x1040000000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x1000000000400000L, active1, 0x820000000L, active2, 0L);
       case 85:
-         return jjMoveStringLiteralDfa4_0(active0, 0x1002080100800000L, active1, 0x208000008000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x801040080800000L, active1, 0x104000004000L, active2, 0L);
       case 86:
-         return jjMoveStringLiteralDfa4_0(active0, 0x200000000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x100000000000L, active1, 0L, active2, 0L);
       case 89:
-         if ((active2 & 0x2L) != 0L)
+         if ((active2 & 0x1L) != 0L)
          {
-            jjmatchedKind = 129;
+            jjmatchedKind = 128;
             jjmatchedPos = 3;
          }
          break;
       case 97:
-         if ((active1 & 0x40000000000000L) != 0L)
+         if ((active1 & 0x20000000000000L) != 0L)
          {
-            jjmatchedKind = 118;
+            jjmatchedKind = 117;
             jjmatchedPos = 3;
          }
-         else if ((active2 & 0x4L) != 0L)
+         else if ((active2 & 0x2L) != 0L)
          {
-            jjmatchedKind = 130;
+            jjmatchedKind = 129;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x8000000000000L, active1, 0x6000000400000100L, active2, 0x80L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x4000000000000L, active1, 0x3000000200000080L, active2, 0x40L);
       case 98:
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x200000000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x100000000L, active2, 0L);
       case 99:
-         if ((active0 & 0x800000000L) != 0L)
+         if ((active0 & 0x400000000L) != 0L)
          {
-            jjmatchedKind = 35;
+            jjmatchedKind = 34;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x1000000L, active1, 0x800000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x1000000L, active1, 0x400000L, active2, 0L);
       case 100:
-         if ((active0 & 0x100000000000L) != 0L)
+         if ((active0 & 0x80000000000L) != 0L)
          {
-            jjmatchedKind = 44;
+            jjmatchedKind = 43;
             jjmatchedPos = 3;
          }
-         else if ((active1 & 0x40000L) != 0L)
+         else if ((active1 & 0x20000L) != 0L)
          {
-            jjmatchedKind = 82;
+            jjmatchedKind = 81;
             jjmatchedPos = 3;
          }
-         else if ((active1 & 0x100000000000L) != 0L)
+         else if ((active1 & 0x80000000000L) != 0L)
          {
-            jjmatchedKind = 108;
+            jjmatchedKind = 107;
             jjmatchedPos = 3;
          }
-         else if ((active1 & 0x1000000000000000L) != 0L)
+         else if ((active1 & 0x800000000000000L) != 0L)
          {
-            jjmatchedKind = 124;
+            jjmatchedKind = 123;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x80000000L, active1, 0x84L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x42L, active2, 0L);
       case 101:
          if ((active0 & 0x80000L) != 0L)
          {
             jjmatchedKind = 19;
             jjmatchedPos = 3;
          }
-         else if ((active1 & 0x10000000000000L) != 0L)
+         else if ((active1 & 0x8000000000000L) != 0L)
          {
-            jjmatchedKind = 116;
+            jjmatchedKind = 115;
             jjmatchedPos = 3;
          }
-         else if ((active2 & 0x1L) != 0L)
+         else if ((active1 & 0x8000000000000000L) != 0L)
          {
-            jjmatchedKind = 128;
+            jjmatchedKind = 127;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x400001220200000L, active1, 0x180020100030000L, active2, 0x8L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x200000920200000L, active1, 0xc0010080018000L, active2, 0x4L);
       case 102:
          return jjMoveStringLiteralDfa4_0(active0, 0x100000L, active1, 0L, active2, 0L);
       case 103:
-         if ((active1 & 0x200L) != 0L)
+         if ((active1 & 0x100L) != 0L)
          {
-            jjmatchedKind = 73;
+            jjmatchedKind = 72;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x400L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x200L, active2, 0L);
       case 104:
-         if ((active2 & 0x200L) != 0L)
+         if ((active2 & 0x100L) != 0L)
          {
-            jjmatchedKind = 137;
+            jjmatchedKind = 136;
             jjmatchedPos = 3;
          }
          break;
       case 105:
-         return jjMoveStringLiteralDfa4_0(active0, 0x4020008000000L, active1, 0x4000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x2010008000000L, active1, 0x2000L, active2, 0L);
       case 108:
-         if ((active1 & 0x100000L) != 0L)
+         if ((active1 & 0x80000L) != 0L)
          {
-            jjmatchedKind = 84;
+            jjmatchedKind = 83;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x8000000000000000L, active1, 0x6002040L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x4000000000000000L, active1, 0x3001020L, active2, 0L);
       case 109:
-         if ((active0 & 0x2000000000L) != 0L)
+         if ((active0 & 0x1000000000L) != 0L)
          {
-            jjmatchedKind = 37;
+            jjmatchedKind = 36;
             jjmatchedPos = 3;
          }
          break;
       case 110:
-         return jjMoveStringLiteralDfa4_0(active0, 0x4020000000000000L, active1, 0x400000L, active2, 0x400L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x2010000000000000L, active1, 0x200000L, active2, 0x200L);
       case 111:
-         if ((active2 & 0x20L) != 0L)
+         if ((active2 & 0x10L) != 0L)
          {
-            jjmatchedKind = 133;
+            jjmatchedKind = 132;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x40000000000L, active1, 0x10020200000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x20000000000L, active1, 0x8010100000L, active2, 0L);
       case 112:
-         if ((active2 & 0x10L) != 0L)
+         if ((active2 & 0x8L) != 0L)
          {
-            jjmatchedKind = 132;
+            jjmatchedKind = 131;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x800010000000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x400008000000000L, active1, 0L, active2, 0L);
       case 114:
-         if ((active1 & 0x800000000L) != 0L)
+         if ((active1 & 0x400000000L) != 0L)
          {
-            jjmatchedKind = 99;
+            jjmatchedKind = 98;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x4000000000L, active1, 0x4000001800L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x2000000000L, active1, 0x2000000c00L, active2, 0L);
       case 115:
-         return jjMoveStringLiteralDfa4_0(active0, 0x400012000000L, active1, 0x20000099000000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x200012000000L, active1, 0x1000004c800000L, active2, 0L);
       case 116:
-         return jjMoveStringLiteralDfa4_0(active0, 0x2000000000400000L, active1, 0x1040000000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x1000000000400000L, active1, 0x820000000L, active2, 0L);
       case 117:
-         return jjMoveStringLiteralDfa4_0(active0, 0x1002080100800000L, active1, 0x208000008000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x801040080800000L, active1, 0x104000004000L, active2, 0L);
       case 118:
-         return jjMoveStringLiteralDfa4_0(active0, 0x200000000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x100000000000L, active1, 0L, active2, 0L);
       case 121:
-         if ((active2 & 0x2L) != 0L)
+         if ((active2 & 0x1L) != 0L)
          {
-            jjmatchedKind = 129;
+            jjmatchedKind = 128;
             jjmatchedPos = 3;
          }
          break;
@@ -1008,145 +1008,145 @@ private int jjMoveStringLiteralDfa4_0(lo
    switch(curChar)
    {
       case 49:
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x8000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x4000000000000L, active2, 0L);
       case 50:
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x1000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x800000000000L, active2, 0L);
       case 53:
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x2000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x1000000000000L, active2, 0L);
       case 56:
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x4000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x2000000000000L, active2, 0L);
       case 65:
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x44802040L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x22401020L, active2, 0L);
       case 67:
          return jjMoveStringLiteralDfa5_0(active0, 0xa00000L, active1, 0L, active2, 0L);
       case 68:
-         if ((active0 & 0x1000000000L) != 0L)
+         if ((active0 & 0x800000000L) != 0L)
          {
-            jjmatchedKind = 36;
+            jjmatchedKind = 35;
             jjmatchedPos = 4;
          }
-         else if ((active0 & 0x4000000000000000L) != 0L)
+         else if ((active0 & 0x2000000000000000L) != 0L)
          {
-            jjmatchedKind = 62;
+            jjmatchedKind = 61;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x400000L) != 0L)
+         else if ((active1 & 0x200000L) != 0L)
          {
-            jjmatchedKind = 86;
+            jjmatchedKind = 85;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x20000000L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x10000000L, active2, 0L);
       case 69:
-         if ((active0 & 0x4000000000L) != 0L)
+         if ((active0 & 0x2000000000L) != 0L)
          {
-            jjmatchedKind = 38;
+            jjmatchedKind = 37;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x4L) != 0L)
+         else if ((active1 & 0x2L) != 0L)
          {
-            jjmatchedKind = 66;
+            jjmatchedKind = 65;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x8000000L) != 0L)
+         else if ((active1 & 0x4000000L) != 0L)
          {
-            jjmatchedKind = 91;
+            jjmatchedKind = 90;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x10000000L) != 0L)
+         else if ((active1 & 0x8000000L) != 0L)
          {
-            jjmatchedKind = 92;
+            jjmatchedKind = 91;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x20000000000000L) != 0L)
+         else if ((active1 & 0x10000000000000L) != 0L)
          {
-            jjmatchedKind = 117;
+            jjmatchedKind = 116;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0xa000000110000000L, active1, 0x202000000L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x5000000090000000L, active1, 0x101000000L, active2, 0L);
       case 70:
-         if ((active0 & 0x200000000L) != 0L)
+         if ((active0 & 0x100000000L) != 0L)
          {
-            jjmatchedKind = 33;
+            jjmatchedKind = 32;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x400000000L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x200000000L, active2, 0L);
       case 71:
-         if ((active2 & 0x400L) != 0L)
+         if ((active2 & 0x200L) != 0L)
          {
-            jjmatchedKind = 138;
+            jjmatchedKind = 137;
             jjmatchedPos = 4;
          }
          break;
       case 72:
-         if ((active0 & 0x10000000000L) != 0L)
+         if ((active0 & 0x8000000000L) != 0L)
          {
-            jjmatchedKind = 40;
+            jjmatchedKind = 39;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x1000000000L) != 0L)
+         else if ((active1 & 0x800000000L) != 0L)
          {
-            jjmatchedKind = 100;
+            jjmatchedKind = 99;
             jjmatchedPos = 4;
          }
          break;
       case 73:
-         if ((active1 & 0x800L) != 0L)
+         if ((active1 & 0x400L) != 0L)
          {
-            jjmatchedKind = 75;
+            jjmatchedKind = 74;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x1000L) != 0L)
+         else if ((active1 & 0x800L) != 0L)
          {
-            jjmatchedKind = 76;
+            jjmatchedKind = 75;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x200080500000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x100000500000L, active1, 0L, active2, 0L);
       case 76:
-         return jjMoveStringLiteralDfa5_0(active0, 0x800000000000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x400000000000000L, active1, 0L, active2, 0L);
       case 77:
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x8400L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x4200L, active2, 0L);
       case 78:
-         if ((active0 & 0x40000000000L) != 0L)
+         if ((active0 & 0x20000000000L) != 0L)
          {
-            jjmatchedKind = 42;
+            jjmatchedKind = 41;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x4000000000000L, active1, 0x10100000000L, active2, 0x8L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x2000000000000L, active1, 0x8080000000L, active2, 0x4L);
       case 79:
-         return jjMoveStringLiteralDfa5_0(active0, 0x20000000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x10000000000L, active1, 0L, active2, 0L);
       case 80:
-         if ((active0 & 0x2000000000000L) != 0L)
+         if ((active0 & 0x1000000000000L) != 0L)
          {
-            jjmatchedKind = 49;
+            jjmatchedKind = 48;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x1000000000000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x800000000000000L, active1, 0L, active2, 0L);
       case 82:
          if ((active0 & 0x20000000L) != 0L)
          {
             jjmatchedKind = 29;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x200000L) != 0L)
+         else if ((active1 & 0x100000L) != 0L)
          {
-            jjmatchedKind = 85;
+            jjmatchedKind = 84;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x2000000000000000L) != 0L)
+         else if ((active1 & 0x1000000000000000L) != 0L)
          {
-            jjmatchedKind = 125;
+            jjmatchedKind = 124;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x8000001000000L, active1, 0x80000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x4000001000000L, active1, 0x40000000000000L, active2, 0L);
       case 83:
-         if ((active0 & 0x80000000000L) != 0L)
+         if ((active0 & 0x40000000000L) != 0L)
          {
-            jjmatchedKind = 43;
+            jjmatchedKind = 42;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x4000000000L) != 0L)
+         else if ((active1 & 0x2000000000L) != 0L)
          {
-            jjmatchedKind = 102;
+            jjmatchedKind = 101;
             jjmatchedPos = 4;
          }
          break;
@@ -1156,167 +1156,167 @@ private int jjMoveStringLiteralDfa4_0(lo
             jjmatchedKind = 27;
             jjmatchedPos = 4;
          }
-         else if ((active0 & 0x20000000000000L) != 0L)
+         else if ((active0 & 0x10000000000000L) != 0L)
          {
-            jjmatchedKind = 53;
+            jjmatchedKind = 52;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x80L) != 0L)
+         else if ((active1 & 0x40L) != 0L)
          {
-            jjmatchedKind = 71;
+            jjmatchedKind = 70;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x400002000000L, active1, 0x4100008081024100L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x200002000000L, active1, 0x2080004040812080L, active2, 0L);
       case 85:
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x200000000000L, active2, 0x80L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x100000000000L, active2, 0x40L);
       case 86:
-         if ((active0 & 0x400000000000000L) != 0L)
+         if ((active0 & 0x200000000000000L) != 0L)
          {
-            jjmatchedKind = 58;
+            jjmatchedKind = 57;
             jjmatchedPos = 4;
          }
          break;
       case 88:
-         if ((active1 & 0x10000L) != 0L)
+         if ((active1 & 0x8000L) != 0L)
          {
-            jjmatchedKind = 80;
+            jjmatchedKind = 79;
             jjmatchedPos = 4;
          }
          break;
       case 90:
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x20000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x10000000000L, active2, 0L);
       case 97:
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x44802040L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x22401020L, active2, 0L);
       case 99:
          return jjMoveStringLiteralDfa5_0(active0, 0xa00000L, active1, 0L, active2, 0L);
       case 100:
-         if ((active0 & 0x1000000000L) != 0L)
+         if ((active0 & 0x800000000L) != 0L)
          {
-            jjmatchedKind = 36;
+            jjmatchedKind = 35;
             jjmatchedPos = 4;
          }
-         else if ((active0 & 0x4000000000000000L) != 0L)
+         else if ((active0 & 0x2000000000000000L) != 0L)
          {
-            jjmatchedKind = 62;
+            jjmatchedKind = 61;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x400000L) != 0L)
+         else if ((active1 & 0x200000L) != 0L)
          {
-            jjmatchedKind = 86;
+            jjmatchedKind = 85;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x20000000L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x10000000L, active2, 0L);
       case 101:
-         if ((active0 & 0x4000000000L) != 0L)
+         if ((active0 & 0x2000000000L) != 0L)
          {
-            jjmatchedKind = 38;
+            jjmatchedKind = 37;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x4L) != 0L)
+         else if ((active1 & 0x2L) != 0L)
          {
-            jjmatchedKind = 66;
+            jjmatchedKind = 65;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x8000000L) != 0L)
+         else if ((active1 & 0x4000000L) != 0L)
          {
-            jjmatchedKind = 91;
+            jjmatchedKind = 90;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x10000000L) != 0L)
+         else if ((active1 & 0x8000000L) != 0L)
          {
-            jjmatchedKind = 92;
+            jjmatchedKind = 91;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x20000000000000L) != 0L)
+         else if ((active1 & 0x10000000000000L) != 0L)
          {
-            jjmatchedKind = 117;
+            jjmatchedKind = 116;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0xa000000110000000L, active1, 0x202000000L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x5000000090000000L, active1, 0x101000000L, active2, 0L);
       case 102:
-         if ((active0 & 0x200000000L) != 0L)
+         if ((active0 & 0x100000000L) != 0L)
          {
-            jjmatchedKind = 33;
+            jjmatchedKind = 32;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x400000000L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x200000000L, active2, 0L);
       case 103:
-         if ((active2 & 0x400L) != 0L)
+         if ((active2 & 0x200L) != 0L)
          {
-            jjmatchedKind = 138;
+            jjmatchedKind = 137;
             jjmatchedPos = 4;
          }
          break;
       case 104:
-         if ((active0 & 0x10000000000L) != 0L)
+         if ((active0 & 0x8000000000L) != 0L)
          {
-            jjmatchedKind = 40;
+            jjmatchedKind = 39;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x1000000000L) != 0L)
+         else if ((active1 & 0x800000000L) != 0L)
          {
-            jjmatchedKind = 100;
+            jjmatchedKind = 99;
             jjmatchedPos = 4;
          }
          break;
       case 105:
-         if ((active1 & 0x800L) != 0L)
+         if ((active1 & 0x400L) != 0L)
          {
-            jjmatchedKind = 75;
+            jjmatchedKind = 74;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x1000L) != 0L)
+         else if ((active1 & 0x800L) != 0L)
          {
-            jjmatchedKind = 76;
+            jjmatchedKind = 75;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x200080500000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x100000500000L, active1, 0L, active2, 0L);
       case 108:
-         return jjMoveStringLiteralDfa5_0(active0, 0x800000000000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x400000000000000L, active1, 0L, active2, 0L);
       case 109:
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x8400L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x4200L, active2, 0L);
       case 110:
-         if ((active0 & 0x40000000000L) != 0L)
+         if ((active0 & 0x20000000000L) != 0L)
          {
-            jjmatchedKind = 42;
+            jjmatchedKind = 41;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x4000000000000L, active1, 0x10100000000L, active2, 0x8L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x2000000000000L, active1, 0x8080000000L, active2, 0x4L);
       case 111:
-         return jjMoveStringLiteralDfa5_0(active0, 0x20000000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x10000000000L, active1, 0L, active2, 0L);
       case 112:
-         if ((active0 & 0x2000000000000L) != 0L)
+         if ((active0 & 0x1000000000000L) != 0L)
          {
-            jjmatchedKind = 49;
+            jjmatchedKind = 48;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x1000000000000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x800000000000000L, active1, 0L, active2, 0L);
       case 114:
          if ((active0 & 0x20000000L) != 0L)
          {
             jjmatchedKind = 29;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x200000L) != 0L)
+         else if ((active1 & 0x100000L) != 0L)
          {
-            jjmatchedKind = 85;
+            jjmatchedKind = 84;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x2000000000000000L) != 0L)
+         else if ((active1 & 0x1000000000000000L) != 0L)
          {
-            jjmatchedKind = 125;
+            jjmatchedKind = 124;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x8000001000000L, active1, 0x80000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x4000001000000L, active1, 0x40000000000000L, active2, 0L);
       case 115:
-         if ((active0 & 0x80000000000L) != 0L)
+         if ((active0 & 0x40000000000L) != 0L)
          {
-            jjmatchedKind = 43;
+            jjmatchedKind = 42;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x4000000000L) != 0L)
+         else if ((active1 & 0x2000000000L) != 0L)
          {
-            jjmatchedKind = 102;
+            jjmatchedKind = 101;
             jjmatchedPos = 4;
          }
          break;
@@ -1326,35 +1326,35 @@ private int jjMoveStringLiteralDfa4_0(lo
             jjmatchedKind = 27;
             jjmatchedPos = 4;
          }
-         else if ((active0 & 0x20000000000000L) != 0L)
+         else if ((active0 & 0x10000000000000L) != 0L)
          {
-            jjmatchedKind = 53;
+            jjmatchedKind = 52;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x80L) != 0L)
+         else if ((active1 & 0x40L) != 0L)
          {
-            jjmatchedKind = 71;
+            jjmatchedKind = 70;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x400002000000L, active1, 0x4100008081024100L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x200002000000L, active1, 0x2080004040812080L, active2, 0L);
       case 117:
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x200000000000L, active2, 0x80L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x100000000000L, active2, 0x40L);
       case 118:
-         if ((active0 & 0x400000000000000L) != 0L)
+         if ((active0 & 0x200000000000000L) != 0L)
          {
-            jjmatchedKind = 58;
+            jjmatchedKind = 57;
             jjmatchedPos = 4;
          }
          break;
       case 120:
-         if ((active1 & 0x10000L) != 0L)
+         if ((active1 & 0x8000L) != 0L)
          {
-            jjmatchedKind = 80;
+            jjmatchedKind = 79;
             jjmatchedPos = 4;
          }
          break;
       case 122:
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x20000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x10000000000L, active2, 0L);
       default :
          break;
    }
@@ -1371,100 +1371,100 @@ private int jjMoveStringLiteralDfa5_0(lo
    switch(curChar)
    {
       case 50:
-         if ((active1 & 0x8000000000000L) != 0L)
+         if ((active1 & 0x4000000000000L) != 0L)
          {
-            jjmatchedKind = 115;
+            jjmatchedKind = 114;
             jjmatchedPos = 5;
          }
          break;
       case 52:
-         if ((active1 & 0x1000000000000L) != 0L)
+         if ((active1 & 0x800000000000L) != 0L)
          {
-            jjmatchedKind = 112;
+            jjmatchedKind = 111;
             jjmatchedPos = 5;
          }
-         else if ((active1 & 0x4000000000000L) != 0L)
+         else if ((active1 & 0x2000000000000L) != 0L)
          {
-            jjmatchedKind = 114;
+            jjmatchedKind = 113;
             jjmatchedPos = 5;
          }
          break;
       case 54:
-         if ((active1 & 0x2000000000000L) != 0L)
+         if ((active1 & 0x1000000000000L) != 0L)
          {
-            jjmatchedKind = 113;
+            jjmatchedKind = 112;
             jjmatchedPos = 5;
          }
          break;
       case 65:
-         return jjMoveStringLiteralDfa6_0(active0, 0x8000000000000L, active1, 0x80000400L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x4000000000000L, active1, 0x40000200L, active2, 0L);
       case 67:
-         return jjMoveStringLiteralDfa6_0(active0, 0x200000000000L, active1, 0x4000000L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x100000000000L, active1, 0x2000000L, active2, 0L);
       case 68:
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x10100000000L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x8080000000L, active2, 0L);
       case 69:
-         if ((active0 & 0x800000000000000L) != 0L)
+         if ((active0 & 0x400000000000000L) != 0L)
          {
-            jjmatchedKind = 59;
+            jjmatchedKind = 58;
             jjmatchedPos = 5;
          }
-         else if ((active1 & 0x100000000000000L) != 0L)
+         else if ((active1 & 0x80000000000000L) != 0L)
          {
-            jjmatchedKind = 120;
+            jjmatchedKind = 119;
             jjmatchedPos = 5;
          }
-         else if ((active1 & 0x4000000000000000L) != 0L)
+         else if ((active1 & 0x2000000000000000L) != 0L)
          {
-            jjmatchedKind = 126;
+            jjmatchedKind = 125;
             jjmatchedPos = 5;
          }
-         return jjMoveStringLiteralDfa6_0(active0, 0x800000L, active1, 0x802002c000L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x800000L, active1, 0x4010016000L, active2, 0L);
       case 70:
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x200000000L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x100000000L, active2, 0L);
       case 71:
-         if ((active0 & 0x4000000000000L) != 0L)
+         if ((active0 & 0x2000000000000L) != 0L)
          {
-            jjmatchedKind = 50;
+            jjmatchedKind = 49;
             jjmatchedPos = 5;
          }
          break;
       case 73:
-         return jjMoveStringLiteralDfa6_0(active0, 0x1000000L, active1, 0x200040000000L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x1000000L, active1, 0x100020000000L, active2, 0L);
       case 76:
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0L, active2, 0x80L);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0L, active2, 0x40L);
       case 78:
-         if ((active1 & 0x2000000L) != 0L)
+         if ((active1 & 0x1000000L) != 0L)
          {
-            jjmatchedKind = 89;
+            jjmatchedKind = 88;
             jjmatchedPos = 5;
          }
-         return jjMoveStringLiteralDfa6_0(active0, 0x20080400000L, active1, 0x2040L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x10000400000L, active1, 0x1020L, active2, 0L);
       case 79:
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x20000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x10000000000L, active2, 0L);
       case 82:
-         if ((active0 & 0x2000000000000000L) != 0L)
+         if ((active0 & 0x1000000000000000L) != 0L)
          {
-            jjmatchedKind = 61;
+            jjmatchedKind = 60;
             jjmatchedPos = 5;
          }
-         else if ((active1 & 0x1000000L) != 0L)
+         else if ((active1 & 0x800000L) != 0L)
          {
-            jjmatchedKind = 88;
+            jjmatchedKind = 87;
             jjmatchedPos = 5;
          }
          return jjMoveStringLiteralDfa6_0(active0, 0x2000000L, active1, 0L, active2, 0L);
       case 83:
-         if ((active0 & 0x100000000L) != 0L)
+         if ((active0 & 0x80000000L) != 0L)
          {
-            jjmatchedKind = 32;
+            jjmatchedKind = 31;
             jjmatchedPos = 5;
          }
-         else if ((active0 & 0x400000000000L) != 0L)
+         else if ((active0 & 0x200000000000L) != 0L)
          {
-            jjmatchedKind = 46;
+            jjmatchedKind = 45;
             jjmatchedPos = 5;
          }
-         return jjMoveStringLiteralDfa6_0(active0, 0x8000000000000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x4000000000000000L, active1, 0L, active2, 0L);
       case 84:
          if ((active0 & 0x200000L) != 0L)
          {
@@ -1476,22 +1476,22 @@ private int jjMoveStringLiteralDfa5_0(lo
             jjmatchedKind = 28;
             jjmatchedPos = 5;
          }
-         else if ((active1 & 0x800000L) != 0L)
+         else if ((active1 & 0x400000L) != 0L)
          {
-            jjmatchedKind = 87;
+            jjmatchedKind = 86;
             jjmatchedPos = 5;
          }
-         else if ((active1 & 0x80000000000000L) != 0L)
+         else if ((active1 & 0x40000000000000L) != 0L)
          {
-            jjmatchedKind = 119;
+            jjmatchedKind = 118;
             jjmatchedPos = 5;
          }
-         else if ((active2 & 0x8L) != 0L)
+         else if ((active2 & 0x4L) != 0L)
          {
-            jjmatchedKind = 131;
+            jjmatchedKind = 130;
             jjmatchedPos = 5;
          }
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x400000000L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x200000000L, active2, 0L);
       case 88:
          if ((active0 & 0x100000L) != 0L)
          {
@@ -1500,78 +1500,78 @@ private int jjMoveStringLiteralDfa5_0(lo
          }
          break;
       case 89:
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x100L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x80L, active2, 0L);
       case 95:
-         return jjMoveStringLiteralDfa6_0(active0, 0x1000000000000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x800000000000000L, active1, 0L, active2, 0L);
       case 97:
-         return jjMoveStringLiteralDfa6_0(active0, 0x8000000000000L, active1, 0x80000400L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x4000000000000L, active1, 0x40000200L, active2, 0L);
       case 99:
-         return jjMoveStringLiteralDfa6_0(active0, 0x200000000000L, active1, 0x4000000L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x100000000000L, active1, 0x2000000L, active2, 0L);
       case 100:
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x10100000000L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x8080000000L, active2, 0L);
       case 101:
-         if ((active0 & 0x800000000000000L) != 0L)
+         if ((active0 & 0x400000000000000L) != 0L)
          {
-            jjmatchedKind = 59;
+            jjmatchedKind = 58;
             jjmatchedPos = 5;
          }
-         else if ((active1 & 0x100000000000000L) != 0L)
+         else if ((active1 & 0x80000000000000L) != 0L)
          {
-            jjmatchedKind = 120;
+            jjmatchedKind = 119;
             jjmatchedPos = 5;
          }
-         else if ((active1 & 0x4000000000000000L) != 0L)
+         else if ((active1 & 0x2000000000000000L) != 0L)
          {
-            jjmatchedKind = 126;
+            jjmatchedKind = 125;
             jjmatchedPos = 5;
          }
-         return jjMoveStringLiteralDfa6_0(active0, 0x800000L, active1, 0x802002c000L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x800000L, active1, 0x4010016000L, active2, 0L);
       case 102:
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x200000000L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x100000000L, active2, 0L);
       case 103:
-         if ((active0 & 0x4000000000000L) != 0L)
+         if ((active0 & 0x2000000000000L) != 0L)
          {
-            jjmatchedKind = 50;
+            jjmatchedKind = 49;
             jjmatchedPos = 5;
          }
          break;
       case 105:
-         return jjMoveStringLiteralDfa6_0(active0, 0x1000000L, active1, 0x200040000000L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x1000000L, active1, 0x100020000000L, active2, 0L);
       case 108:
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0L, active2, 0x80L);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0L, active2, 0x40L);
       case 110:
-         if ((active1 & 0x2000000L) != 0L)
+         if ((active1 & 0x1000000L) != 0L)
          {
-            jjmatchedKind = 89;
+            jjmatchedKind = 88;
             jjmatchedPos = 5;
          }
-         return jjMoveStringLiteralDfa6_0(active0, 0x20080400000L, active1, 0x2040L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x10000400000L, active1, 0x1020L, active2, 0L);
       case 111:
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x20000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x10000000000L, active2, 0L);
       case 114:
-         if ((active0 & 0x2000000000000000L) != 0L)
+         if ((active0 & 0x1000000000000000L) != 0L)
          {
-            jjmatchedKind = 61;
+            jjmatchedKind = 60;
             jjmatchedPos = 5;
          }
-         else if ((active1 & 0x1000000L) != 0L)
+         else if ((active1 & 0x800000L) != 0L)
          {
-            jjmatchedKind = 88;
+            jjmatchedKind = 87;
             jjmatchedPos = 5;
          }
          return jjMoveStringLiteralDfa6_0(active0, 0x2000000L, active1, 0L, active2, 0L);
       case 115:
-         if ((active0 & 0x100000000L) != 0L)
+         if ((active0 & 0x80000000L) != 0L)
          {
-            jjmatchedKind = 32;
+            jjmatchedKind = 31;
             jjmatchedPos = 5;
          }
-         else if ((active0 & 0x400000000000L) != 0L)
+         else if ((active0 & 0x200000000000L) != 0L)
          {
-            jjmatchedKind = 46;
+            jjmatchedKind = 45;
             jjmatchedPos = 5;
          }
-         return jjMoveStringLiteralDfa6_0(active0, 0x8000000000000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x4000000000000000L, active1, 0L, active2, 0L);
       case 116:
          if ((active0 & 0x200000L) != 0L)
          {
@@ -1583,22 +1583,22 @@ private int jjMoveStringLiteralDfa5_0(lo
             jjmatchedKind = 28;
             jjmatchedPos = 5;
          }
-         else if ((active1 & 0x800000L) != 0L)
+         else if ((active1 & 0x400000L) != 0L)
          {
-            jjmatchedKind = 87;
+            jjmatchedKind = 86;
             jjmatchedPos = 5;
          }
-         else if ((active1 & 0x80000000000000L) != 0L)
+         else if ((active1 & 0x40000000000000L) != 0L)
          {
-            jjmatchedKind = 119;
+            jjmatchedKind = 118;
             jjmatchedPos = 5;
          }
-         else if ((active2 & 0x8L) != 0L)
+         else if ((active2 & 0x4L) != 0L)
          {
-            jjmatchedKind = 131;
+            jjmatchedKind = 130;
             jjmatchedPos = 5;
          }
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x400000000L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x200000000L, active2, 0L);
       case 120:
          if ((active0 & 0x100000L) != 0L)
          {
@@ -1607,7 +1607,7 @@ private int jjMoveStringLiteralDfa5_0(lo
          }
          break;
       case 121:
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x100L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x80L, active2, 0L);
       default :
          break;
    }
@@ -1624,161 +1624,161 @@ private int jjMoveStringLiteralDfa6_0(lo
    switch(curChar)
    {
       case 65:
-         return jjMoveStringLiteralDfa7_0(active0, 0x20000000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa7_0(active0, 0x10000000000L, active1, 0L, active2, 0L);
       case 66:
          return jjMoveStringLiteralDfa7_0(active0, 0x1000000L, active1, 0L, active2, 0L);
       case 67:
-         return jjMoveStringLiteralDfa7_0(active0, 0x9000000000400000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa7_0(active0, 0x4800000000400000L, active1, 0L, active2, 0L);
       case 68:
          if ((active0 & 0x800000L) != 0L)
          {
             jjmatchedKind = 23;
             jjmatchedPos = 6;
          }
-         else if ((active1 & 0x200000000000L) != 0L)
+         else if ((active1 & 0x100000000000L) != 0L)
          {
-            jjmatchedKind = 109;
+            jjmatchedKind = 108;
             jjmatchedPos = 6;
          }
          break;
       case 69:
-         if ((active0 & 0x200000000000L) != 0L)
+         if ((active0 & 0x100000000000L) != 0L)
          {
-            jjmatchedKind = 45;
+            jjmatchedKind = 44;
             jjmatchedPos = 6;
          }
-         else if ((active1 & 0x4000000L) != 0L)
+         else if ((active1 & 0x2000000L) != 0L)
          {
-            jjmatchedKind = 90;
+            jjmatchedKind = 89;
             jjmatchedPos = 6;
          }
-         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x400000000L, active2, 0L);
+         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x200000000L, active2, 0L);
       case 71:
-         if ((active1 & 0x40L) != 0L)
+         if ((active1 & 0x20L) != 0L)
          {
-            jjmatchedKind = 70;
+            jjmatchedKind = 69;
             jjmatchedPos = 6;
          }

[... 918 lines stripped ...]