jena-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject svn commit: r1177969 [4/4] - in /incubator/jena/Jena2/ARQ/trunk: ./ Grammar/ src/main/java/com/hp/hpl/jena/sparql/expr/ src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/ src/main/java/com/hp/hpl/jena/sparql/lang/arq/ src/main/java/com/hp/hpl/jena/sp...
Date Sat, 01 Oct 2011 12:06:42 GMT
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/sparql_11/SPARQLParser11TokenManager.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/sparql_11/SPARQLParser11TokenManager.java?rev=1177969&r1=1177968&r2=1177969&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/sparql_11/SPARQLParser11TokenManager.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/sparql_11/SPARQLParser11TokenManager.java Sat Oct  1 12:06:41 2011
@@ -61,79 +61,79 @@ private int jjMoveStringLiteralDfa0_0()
          jjmatchedKind = 1;
          return jjMoveNfa_0(0, 0);
       case 33:
-         jjmatchedKind = 168;
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x800000000L);
+         jjmatchedKind = 170;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x2000000000L);
       case 38:
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x100000000000L);
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x400000000000L);
       case 40:
-         jjmatchedKind = 151;
+         jjmatchedKind = 153;
          return jjMoveNfa_0(0, 0);
       case 41:
-         jjmatchedKind = 152;
+         jjmatchedKind = 154;
          return jjMoveNfa_0(0, 0);
       case 42:
-         jjmatchedKind = 175;
+         jjmatchedKind = 177;
          return jjMoveNfa_0(0, 0);
       case 43:
-         jjmatchedKind = 173;
+         jjmatchedKind = 175;
          return jjMoveNfa_0(0, 0);
       case 44:
-         jjmatchedKind = 160;
+         jjmatchedKind = 162;
          return jjMoveNfa_0(0, 0);
       case 45:
-         jjmatchedKind = 174;
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x20000000000000L);
+         jjmatchedKind = 176;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x80000000000000L);
       case 46:
-         jjmatchedKind = 161;
+         jjmatchedKind = 163;
          return jjMoveNfa_0(0, 0);
       case 47:
-         jjmatchedKind = 176;
+         jjmatchedKind = 178;
          return jjMoveNfa_0(0, 0);
       case 58:
-         jjmatchedKind = 170;
+         jjmatchedKind = 172;
          return jjMoveNfa_0(0, 0);
       case 59:
-         jjmatchedKind = 159;
+         jjmatchedKind = 161;
          return jjMoveNfa_0(0, 0);
       case 60:
-         jjmatchedKind = 165;
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x40004000000000L);
+         jjmatchedKind = 167;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x100010000000000L);
       case 61:
-         jjmatchedKind = 162;
+         jjmatchedKind = 164;
          return jjMoveNfa_0(0, 0);
       case 62:
-         jjmatchedKind = 164;
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x8000000000L);
+         jjmatchedKind = 166;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x20000000000L);
       case 63:
-         jjmatchedKind = 183;
+         jjmatchedKind = 185;
          return jjMoveNfa_0(0, 0);
       case 64:
-         jjmatchedKind = 178;
+         jjmatchedKind = 180;
          return jjMoveNfa_0(0, 0);
       case 65:
-         return jjMoveStringLiteralDfa1_0(0x108804204000000L, 0x200000000040000L, 0x4L);
+         return jjMoveStringLiteralDfa1_0(0x108804204000000L, 0x800000000040000L, 0x10L);
       case 66:
          return jjMoveStringLiteralDfa1_0(0x20000800c0080000L, 0x2L, 0x0L);
       case 67:
-         return jjMoveStringLiteralDfa1_0(0x4010000002000000L, 0x980000010480000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x4010000002000000L, 0x2600000010480000L, 0x0L);
       case 68:
-         return jjMoveStringLiteralDfa1_0(0x401400000L, 0x4004000200000080L, 0x2L);
+         return jjMoveStringLiteralDfa1_0(0x401400000L, 0x10000800000080L, 0x9L);
       case 69:
          return jjMoveStringLiteralDfa1_0(0x200000000000L, 0x8000000L, 0x0L);
       case 70:
-         return jjMoveStringLiteralDfa1_0(0x1000001000000000L, 0x800000100000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x1000001000000000L, 0x2000000100000L, 0x0L);
       case 71:
          return jjMoveStringLiteralDfa1_0(0x801008000000000L, 0x0L, 0x0L);
       case 72:
-         return jjMoveStringLiteralDfa1_0(0x2000000000000L, 0x400000000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x2000000000000L, 0x1000000000L, 0x0L);
       case 73:
-         return jjMoveStringLiteralDfa1_0(0x8000000000000000L, 0x8002000000007c05L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x8000000000000000L, 0x8000000007c05L, 0x2L);
       case 76:
-         return jjMoveStringLiteralDfa1_0(0x8000000L, 0x40000004000300L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x8000000L, 0x100000004000300L, 0x0L);
       case 77:
-         return jjMoveStringLiteralDfa1_0(0x60040000000000L, 0x1400010900000000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x60040000000000L, 0x5000042400000000L, 0x0L);
       case 78:
-         return jjMoveStringLiteralDfa1_0(0x400800000000L, 0x8000000000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x400800000000L, 0x20000000000L, 0x0L);
       case 79:
          return jjMoveStringLiteralDfa1_0(0x10030000000L, 0x0L, 0x0L);
       case 80:
@@ -141,49 +141,49 @@ private int jjMoveStringLiteralDfa0_0()
       case 82:
          return jjMoveStringLiteralDfa1_0(0x800000L, 0x228000L, 0x0L);
       case 83:
-         return jjMoveStringLiteralDfa1_0(0x684100000200000L, 0x20003e1061810070L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x684100000200000L, 0x8000f841e1810070L, 0x0L);
       case 84:
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x406000000000L, 0x1L);
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x1018000000000L, 0x4L);
       case 85:
-         return jjMoveStringLiteralDfa1_0(0x20100000000L, 0x2000008L, 0x10L);
+         return jjMoveStringLiteralDfa1_0(0x20100000000L, 0x2000008L, 0x40L);
       case 87:
-         return jjMoveStringLiteralDfa1_0(0x2000000000L, 0x0L, 0x8L);
+         return jjMoveStringLiteralDfa1_0(0x2000000000L, 0x0L, 0x20L);
       case 89:
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x80000000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x200000000L, 0x0L);
       case 91:
-         jjmatchedKind = 156;
+         jjmatchedKind = 158;
          return jjMoveNfa_0(0, 0);
       case 93:
-         jjmatchedKind = 157;
+         jjmatchedKind = 159;
          return jjMoveNfa_0(0, 0);
       case 94:
-         jjmatchedKind = 180;
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x2000000000000L);
+         jjmatchedKind = 182;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x8000000000000L);
       case 97:
          jjmatchedKind = 18;
-         return jjMoveStringLiteralDfa1_0(0x108804204000000L, 0x200000000040000L, 0x4L);
+         return jjMoveStringLiteralDfa1_0(0x108804204000000L, 0x800000000040000L, 0x10L);
       case 98:
          return jjMoveStringLiteralDfa1_0(0x20000800c0080000L, 0x2L, 0x0L);
       case 99:
-         return jjMoveStringLiteralDfa1_0(0x4010000002000000L, 0x980000010480000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x4010000002000000L, 0x2600000010480000L, 0x0L);
       case 100:
-         return jjMoveStringLiteralDfa1_0(0x401400000L, 0x4004000200000080L, 0x2L);
+         return jjMoveStringLiteralDfa1_0(0x401400000L, 0x10000800000080L, 0x9L);
       case 101:
          return jjMoveStringLiteralDfa1_0(0x200000000000L, 0x8000000L, 0x0L);
       case 102:
-         return jjMoveStringLiteralDfa1_0(0x1000001000000000L, 0x800000100000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x1000001000000000L, 0x2000000100000L, 0x0L);
       case 103:
          return jjMoveStringLiteralDfa1_0(0x801008000000000L, 0x0L, 0x0L);
       case 104:
-         return jjMoveStringLiteralDfa1_0(0x2000000000000L, 0x400000000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x2000000000000L, 0x1000000000L, 0x0L);
       case 105:
-         return jjMoveStringLiteralDfa1_0(0x8000000000000000L, 0x8002000000007c05L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x8000000000000000L, 0x8000000007c05L, 0x2L);
       case 108:
-         return jjMoveStringLiteralDfa1_0(0x8000000L, 0x40000004000300L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x8000000L, 0x100000004000300L, 0x0L);
       case 109:
-         return jjMoveStringLiteralDfa1_0(0x60040000000000L, 0x1400010900000000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x60040000000000L, 0x5000042400000000L, 0x0L);
       case 110:
-         return jjMoveStringLiteralDfa1_0(0x400800000000L, 0x8000000000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x400800000000L, 0x20000000000L, 0x0L);
       case 111:
          return jjMoveStringLiteralDfa1_0(0x10030000000L, 0x0L, 0x0L);
       case 112:
@@ -191,26 +191,26 @@ private int jjMoveStringLiteralDfa0_0()
       case 114:
          return jjMoveStringLiteralDfa1_0(0x800000L, 0x228000L, 0x0L);
       case 115:
-         return jjMoveStringLiteralDfa1_0(0x684100000200000L, 0x20003e1061810070L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x684100000200000L, 0x8000f841e1810070L, 0x0L);
       case 116:
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x406000000000L, 0x1L);
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x1018000000000L, 0x4L);
       case 117:
-         return jjMoveStringLiteralDfa1_0(0x20100000000L, 0x2000008L, 0x10L);
+         return jjMoveStringLiteralDfa1_0(0x20100000000L, 0x2000008L, 0x40L);
       case 119:
-         return jjMoveStringLiteralDfa1_0(0x2000000000L, 0x0L, 0x8L);
+         return jjMoveStringLiteralDfa1_0(0x2000000000L, 0x0L, 0x20L);
       case 121:
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x80000000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x200000000L, 0x0L);
       case 123:
-         jjmatchedKind = 154;
+         jjmatchedKind = 156;
          return jjMoveNfa_0(0, 0);
       case 124:
-         jjmatchedKind = 179;
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x80000000000L);
+         jjmatchedKind = 181;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x200000000000L);
       case 125:
-         jjmatchedKind = 155;
+         jjmatchedKind = 157;
          return jjMoveNfa_0(0, 0);
       case 126:
-         jjmatchedKind = 169;
+         jjmatchedKind = 171;
          return jjMoveNfa_0(0, 0);
       default :
          return jjMoveNfa_0(0, 0);
@@ -225,53 +225,53 @@ private int jjMoveStringLiteralDfa1_0(lo
    switch(curChar)
    {
       case 38:
-         if ((active2 & 0x100000000000L) != 0L)
+         if ((active2 & 0x400000000000L) != 0L)
          {
-            jjmatchedKind = 172;
+            jjmatchedKind = 174;
             jjmatchedPos = 1;
          }
          break;
       case 45:
-         if ((active2 & 0x40000000000000L) != 0L)
+         if ((active2 & 0x100000000000000L) != 0L)
          {
-            jjmatchedKind = 182;
+            jjmatchedKind = 184;
             jjmatchedPos = 1;
          }
          break;
       case 61:
-         if ((active2 & 0x800000000L) != 0L)
+         if ((active2 & 0x2000000000L) != 0L)
          {
-            jjmatchedKind = 163;
+            jjmatchedKind = 165;
             jjmatchedPos = 1;
          }
-         else if ((active2 & 0x4000000000L) != 0L)
+         else if ((active2 & 0x10000000000L) != 0L)
          {
-            jjmatchedKind = 166;
+            jjmatchedKind = 168;
             jjmatchedPos = 1;
          }
-         else if ((active2 & 0x8000000000L) != 0L)
+         else if ((active2 & 0x20000000000L) != 0L)
          {
-            jjmatchedKind = 167;
+            jjmatchedKind = 169;
             jjmatchedPos = 1;
          }
          break;
       case 62:
-         if ((active2 & 0x20000000000000L) != 0L)
+         if ((active2 & 0x80000000000000L) != 0L)
          {
-            jjmatchedKind = 181;
+            jjmatchedKind = 183;
             jjmatchedPos = 1;
          }
          break;
       case 65:
-         return jjMoveStringLiteralDfa2_0(active0, 0x442000800080000L, active1, 0x800200030380L, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x442000800080000L, active1, 0x2000800030380L, active2, 0L);
       case 66:
          return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x40000L, active2, 0L);
       case 67:
          return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x6000000L, active2, 0L);
       case 68:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x200010000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x800040000000000L, active2, 0L);
       case 69:
-         return jjMoveStringLiteralDfa2_0(active0, 0x4100401a00000L, active1, 0x1004001080088000L, active2, 0x2L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x4100401a00000L, active1, 0x4010004200088000L, active2, 0x8L);
       case 70:
          if ((active1 & 0x1L) != 0L)
          {
@@ -282,38 +282,38 @@ private int jjMoveStringLiteralDfa1_0(lo
       case 71:
          return jjMoveStringLiteralDfa2_0(active0, 0x8000000000000L, active1, 0L, active2, 0L);
       case 72:
-         return jjMoveStringLiteralDfa2_0(active0, 0x2000000000L, active1, 0x3e0000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x2000000000L, active1, 0xf80000000000L, active2, 0L);
       case 73:
-         return jjMoveStringLiteralDfa2_0(active0, 0x10200c0088400000L, active1, 0x2000002800000000L, active2, 0x8L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x10200c0088400000L, active1, 0x800000a000000000L, active2, 0x20L);
       case 76:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x80000000100000L, active2, 0x4L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x200000000100000L, active2, 0x10L);
       case 78:
          if ((active0 & 0x8000000000000000L) != 0L)
          {
             jjmatchedKind = 63;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_0(active0, 0x24100000000L, active1, 0x8002000008000002L, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x24100000000L, active1, 0x8000008000002L, active2, 0x2L);
       case 79:
-         if ((active2 & 0x1L) != 0L)
+         if ((active2 & 0x4L) != 0L)
          {
-            jjmatchedKind = 128;
+            jjmatchedKind = 130;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_0(active0, 0x6010400002000000L, active1, 0xc40008510600000L, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x6010400002000000L, active1, 0x3100021410600000L, active2, 0L);
       case 80:
          return jjMoveStringLiteralDfa2_0(active0, 0x10000000000L, active1, 0L, active2, 0L);
       case 82:
-         return jjMoveStringLiteralDfa2_0(active0, 0x801009020100000L, active1, 0x410040000000000cL, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x801009020100000L, active1, 0x40100000000000cL, active2, 0x1L);
       case 83:
          if ((active0 & 0x800000000000L) != 0L)
          {
             jjmatchedKind = 47;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_0(active0, 0x204000000L, active1, 0x7c00L, active2, 0x10L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x204000000L, active1, 0x7c00L, active2, 0x40L);
       case 84:
-         return jjMoveStringLiteralDfa2_0(active0, 0x200000000000000L, active1, 0x61000070L, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x200000000000000L, active1, 0x1e1000070L, active2, 0L);
       case 85:
          return jjMoveStringLiteralDfa2_0(active0, 0x80000000000000L, active1, 0x800000L, active2, 0L);
       case 86:
@@ -328,29 +328,29 @@ private int jjMoveStringLiteralDfa1_0(lo
          }
          break;
       case 90:
-         if ((active1 & 0x4000000000L) != 0L)
+         if ((active1 & 0x10000000000L) != 0L)
          {
-            jjmatchedKind = 102;
+            jjmatchedKind = 104;
             jjmatchedPos = 1;
          }
          break;
       case 94:
-         if ((active2 & 0x2000000000000L) != 0L)
+         if ((active2 & 0x8000000000000L) != 0L)
          {
-            jjmatchedKind = 177;
+            jjmatchedKind = 179;
             jjmatchedPos = 1;
          }
          break;
       case 97:
-         return jjMoveStringLiteralDfa2_0(active0, 0x442000800080000L, active1, 0x800200030380L, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x442000800080000L, active1, 0x2000800030380L, active2, 0L);
       case 98:
          return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x40000L, active2, 0L);
       case 99:
          return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x6000000L, active2, 0L);
       case 100:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x200010000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x800040000000000L, active2, 0L);
       case 101:
-         return jjMoveStringLiteralDfa2_0(active0, 0x4100401a00000L, active1, 0x1004001080088000L, active2, 0x2L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x4100401a00000L, active1, 0x4010004200088000L, active2, 0x8L);
       case 102:
          if ((active1 & 0x1L) != 0L)
          {
@@ -361,38 +361,38 @@ private int jjMoveStringLiteralDfa1_0(lo
       case 103:
          return jjMoveStringLiteralDfa2_0(active0, 0x8000000000000L, active1, 0L, active2, 0L);
       case 104:
-         return jjMoveStringLiteralDfa2_0(active0, 0x2000000000L, active1, 0x3e0000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x2000000000L, active1, 0xf80000000000L, active2, 0L);
       case 105:
-         return jjMoveStringLiteralDfa2_0(active0, 0x10200c0088400000L, active1, 0x2000002800000000L, active2, 0x8L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x10200c0088400000L, active1, 0x800000a000000000L, active2, 0x20L);
       case 108:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x80000000100000L, active2, 0x4L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x200000000100000L, active2, 0x10L);
       case 110:
          if ((active0 & 0x8000000000000000L) != 0L)
          {
             jjmatchedKind = 63;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_0(active0, 0x24100000000L, active1, 0x8002000008000002L, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x24100000000L, active1, 0x8000008000002L, active2, 0x2L);
       case 111:
-         if ((active2 & 0x1L) != 0L)
+         if ((active2 & 0x4L) != 0L)
          {
-            jjmatchedKind = 128;
+            jjmatchedKind = 130;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_0(active0, 0x6010400002000000L, active1, 0xc40008510600000L, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x6010400002000000L, active1, 0x3100021410600000L, active2, 0L);
       case 112:
          return jjMoveStringLiteralDfa2_0(active0, 0x10000000000L, active1, 0L, active2, 0L);
       case 114:
-         return jjMoveStringLiteralDfa2_0(active0, 0x801009020100000L, active1, 0x410040000000000cL, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x801009020100000L, active1, 0x40100000000000cL, active2, 0x1L);
       case 115:
          if ((active0 & 0x800000000000L) != 0L)
          {
             jjmatchedKind = 47;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_0(active0, 0x204000000L, active1, 0x7c00L, active2, 0x10L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x204000000L, active1, 0x7c00L, active2, 0x40L);
       case 116:
-         return jjMoveStringLiteralDfa2_0(active0, 0x200000000000000L, active1, 0x61000070L, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x200000000000000L, active1, 0x1e1000070L, active2, 0L);
       case 117:
          return jjMoveStringLiteralDfa2_0(active0, 0x80000000000000L, active1, 0x800000L, active2, 0L);
       case 118:
@@ -407,16 +407,16 @@ private int jjMoveStringLiteralDfa1_0(lo
          }
          break;
       case 122:
-         if ((active1 & 0x4000000000L) != 0L)
+         if ((active1 & 0x10000000000L) != 0L)
          {
-            jjmatchedKind = 102;
+            jjmatchedKind = 104;
             jjmatchedPos = 1;
          }
          break;
       case 124:
-         if ((active2 & 0x80000000000L) != 0L)
+         if ((active2 & 0x200000000000L) != 0L)
          {
-            jjmatchedKind = 171;
+            jjmatchedKind = 173;
             jjmatchedPos = 1;
          }
          break;
@@ -436,14 +436,14 @@ private int jjMoveStringLiteralDfa2_0(lo
    switch(curChar)
    {
       case 53:
-         if ((active1 & 0x10000000000L) != 0L)
+         if ((active1 & 0x40000000000L) != 0L)
          {
-            jjmatchedKind = 104;
+            jjmatchedKind = 106;
             jjmatchedPos = 2;
          }
          break;
       case 65:
-         return jjMoveStringLiteralDfa3_0(active0, 0x4000008000000000L, active1, 0x403e0086000000L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x4000008000000000L, active1, 0x100f80206000000L, active2, 0L);
       case 66:
          return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x801000L, active2, 0L);
       case 67:
@@ -452,23 +452,23 @@ private int jjMoveStringLiteralDfa2_0(lo
             jjmatchedKind = 33;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x1008000000L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x4008000000L, active2, 0L);
       case 68:
          if ((active0 & 0x4000000000L) != 0L)
          {
             jjmatchedKind = 38;
             jjmatchedPos = 2;
          }
-         else if ((active1 & 0x200000000000000L) != 0L)
+         else if ((active1 & 0x800000000000000L) != 0L)
          {
-            jjmatchedKind = 121;
+            jjmatchedKind = 123;
             jjmatchedPos = 2;
          }
          return jjMoveStringLiteralDfa3_0(active0, 0x200000120800000L, active1, 0L, active2, 0L);
       case 69:
-         return jjMoveStringLiteralDfa3_0(active0, 0x2000100000L, active1, 0x180000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x2000100000L, active1, 0x600000000000000L, active2, 0L);
       case 70:
-         return jjMoveStringLiteralDfa3_0(active0, 0x10000000L, active1, 0L, active2, 0x2L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x10000000L, active1, 0L, active2, 0x8L);
       case 71:
          if ((active0 & 0x8000000000000L) != 0L)
          {
@@ -492,7 +492,7 @@ private int jjMoveStringLiteralDfa2_0(lo
             jjmatchedKind = 67;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x220000000000L, active1, 0x80800L, active2, 0x10L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x220000000000L, active1, 0x80800L, active2, 0x40L);
       case 75:
          if ((active0 & 0x4000000L) != 0L)
          {
@@ -501,59 +501,59 @@ private int jjMoveStringLiteralDfa2_0(lo
          }
          break;
       case 76:
-         if ((active2 & 0x4L) != 0L)
+         if ((active2 & 0x10L) != 0L)
          {
-            jjmatchedKind = 130;
+            jjmatchedKind = 132;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x1000000000200000L, active1, 0x2004800000002000L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x1000000000200000L, active1, 0x8012000000002000L, active2, 0L);
       case 77:
          if ((active0 & 0x80000000000000L) != 0L)
          {
             jjmatchedKind = 55;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x400000808000000L, active1, 0x2000010000L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x400000808000000L, active1, 0x8000010000L, active2, 0L);
       case 78:
          if ((active0 & 0x20000000000000L) != 0L)
          {
             jjmatchedKind = 53;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0xc0082000000L, active1, 0x910424300L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0xc0082000000L, active1, 0x2410424300L, active2, 0L);
       case 79:
-         return jjMoveStringLiteralDfa3_0(active0, 0x801001000000000L, active1, 0x4000000000100002L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x801001000000000L, active1, 0x100002L, active2, 0x1L);
       case 80:
-         return jjMoveStringLiteralDfa3_0(active0, 0x4000000000000L, active1, 0x800000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x4000000000000L, active1, 0x2000000000000000L, active2, 0L);
       case 82:
          if ((active1 & 0x10L) != 0L)
          {
             jjmatchedKind = 68;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x100000000000L, active1, 0x61000060L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x100000000000L, active1, 0x1e1000060L, active2, 0L);
       case 83:
          if ((active1 & 0x40000L) != 0L)
          {
             jjmatchedKind = 82;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x401480000L, active1, 0x2000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x401480000L, active1, 0x8000000000000L, active2, 0L);
       case 84:
          if ((active0 & 0x400000000000L) != 0L)
          {
             jjmatchedKind = 46;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x10000000000L, active1, 0x9000000000000080L, active2, 0x8L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x10000000000L, active1, 0x4000000000000080L, active2, 0x22L);
       case 85:
-         return jjMoveStringLiteralDfa3_0(active0, 0x2010000000000000L, active1, 0x400400200400L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x2010000000000000L, active1, 0x1001000200400L, active2, 0L);
       case 86:
-         return jjMoveStringLiteralDfa3_0(active0, 0x2000000000000L, active1, 0x400000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x2000000000000L, active1, 0x1000000000000000L, active2, 0L);
       case 87:
-         if ((active1 & 0x8000000000L) != 0L)
+         if ((active1 & 0x20000000000L) != 0L)
          {
-            jjmatchedKind = 103;
+            jjmatchedKind = 105;
             jjmatchedPos = 2;
          }
          break;
@@ -565,14 +565,14 @@ private int jjMoveStringLiteralDfa2_0(lo
          }
          break;
       case 89:
-         if ((active1 & 0x200000000L) != 0L)
+         if ((active1 & 0x800000000L) != 0L)
          {
-            jjmatchedKind = 97;
+            jjmatchedKind = 99;
             jjmatchedPos = 2;
          }
          break;
       case 97:
-         return jjMoveStringLiteralDfa3_0(active0, 0x4000008000000000L, active1, 0x403e0086000000L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x4000008000000000L, active1, 0x100f80206000000L, active2, 0L);
       case 98:
          return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x801000L, active2, 0L);
       case 99:
@@ -581,23 +581,23 @@ private int jjMoveStringLiteralDfa2_0(lo
             jjmatchedKind = 33;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x1008000000L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x4008000000L, active2, 0L);
       case 100:
          if ((active0 & 0x4000000000L) != 0L)
          {
             jjmatchedKind = 38;
             jjmatchedPos = 2;
          }
-         else if ((active1 & 0x200000000000000L) != 0L)
+         else if ((active1 & 0x800000000000000L) != 0L)
          {
-            jjmatchedKind = 121;
+            jjmatchedKind = 123;
             jjmatchedPos = 2;
          }
          return jjMoveStringLiteralDfa3_0(active0, 0x200000120800000L, active1, 0L, active2, 0L);
       case 101:
-         return jjMoveStringLiteralDfa3_0(active0, 0x2000100000L, active1, 0x180000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x2000100000L, active1, 0x600000000000000L, active2, 0L);
       case 102:
-         return jjMoveStringLiteralDfa3_0(active0, 0x10000000L, active1, 0L, active2, 0x2L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x10000000L, active1, 0L, active2, 0x8L);
       case 103:
          if ((active0 & 0x8000000000000L) != 0L)
          {
@@ -621,7 +621,7 @@ private int jjMoveStringLiteralDfa2_0(lo
             jjmatchedKind = 67;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x220000000000L, active1, 0x80800L, active2, 0x10L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x220000000000L, active1, 0x80800L, active2, 0x40L);
       case 107:
          if ((active0 & 0x4000000L) != 0L)
          {
@@ -630,59 +630,59 @@ private int jjMoveStringLiteralDfa2_0(lo
          }
          break;
       case 108:
-         if ((active2 & 0x4L) != 0L)
+         if ((active2 & 0x10L) != 0L)
          {
-            jjmatchedKind = 130;
+            jjmatchedKind = 132;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x1000000000200000L, active1, 0x2004800000002000L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x1000000000200000L, active1, 0x8012000000002000L, active2, 0L);
       case 109:
          if ((active0 & 0x80000000000000L) != 0L)
          {
             jjmatchedKind = 55;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x400000808000000L, active1, 0x2000010000L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x400000808000000L, active1, 0x8000010000L, active2, 0L);
       case 110:
          if ((active0 & 0x20000000000000L) != 0L)
          {
             jjmatchedKind = 53;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0xc0082000000L, active1, 0x910424300L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0xc0082000000L, active1, 0x2410424300L, active2, 0L);
       case 111:
-         return jjMoveStringLiteralDfa3_0(active0, 0x801001000000000L, active1, 0x4000000000100002L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x801001000000000L, active1, 0x100002L, active2, 0x1L);
       case 112:
-         return jjMoveStringLiteralDfa3_0(active0, 0x4000000000000L, active1, 0x800000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x4000000000000L, active1, 0x2000000000000000L, active2, 0L);
       case 114:
          if ((active1 & 0x10L) != 0L)
          {
             jjmatchedKind = 68;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x100000000000L, active1, 0x61000060L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x100000000000L, active1, 0x1e1000060L, active2, 0L);
       case 115:
          if ((active1 & 0x40000L) != 0L)
          {
             jjmatchedKind = 82;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x401480000L, active1, 0x2000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x401480000L, active1, 0x8000000000000L, active2, 0L);
       case 116:
          if ((active0 & 0x400000000000L) != 0L)
          {
             jjmatchedKind = 46;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x10000000000L, active1, 0x9000000000000080L, active2, 0x8L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x10000000000L, active1, 0x4000000000000080L, active2, 0x22L);
       case 117:
-         return jjMoveStringLiteralDfa3_0(active0, 0x2010000000000000L, active1, 0x400400200400L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x2010000000000000L, active1, 0x1001000200400L, active2, 0L);
       case 118:
-         return jjMoveStringLiteralDfa3_0(active0, 0x2000000000000L, active1, 0x400000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x2000000000000L, active1, 0x1000000000000000L, active2, 0L);
       case 119:
-         if ((active1 & 0x8000000000L) != 0L)
+         if ((active1 & 0x20000000000L) != 0L)
          {
-            jjmatchedKind = 103;
+            jjmatchedKind = 105;
             jjmatchedPos = 2;
          }
          break;
@@ -694,9 +694,9 @@ private int jjMoveStringLiteralDfa2_0(lo
          }
          break;
       case 121:
-         if ((active1 & 0x200000000L) != 0L)
+         if ((active1 & 0x800000000L) != 0L)
          {
-            jjmatchedKind = 97;
+            jjmatchedKind = 99;
             jjmatchedPos = 2;
          }
          break;
@@ -716,25 +716,27 @@ private int jjMoveStringLiteralDfa3_0(lo
    switch(curChar)
    {
       case 49:
-         if ((active1 & 0x20000000000L) != 0L)
+         if ((active1 & 0x80000000000L) != 0L)
          {
-            jjmatchedKind = 105;
+            jjmatchedKind = 107;
             jjmatchedPos = 3;
          }
          break;
       case 50:
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0xc0000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x300000000000L, active2, 0L);
       case 51:
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x100000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x400000000000L, active2, 0L);
       case 53:
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x200000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x800000000000L, active2, 0L);
       case 65:
-         if ((active1 & 0x1000000000000000L) != 0L)
+         if ((active1 & 0x4000000000000000L) != 0L)
          {
-            jjmatchedKind = 124;
+            jjmatchedKind = 126;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x4000000000000L, active1, 0x180000000000080L, active2, 0x2L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x4000000000000L, active1, 0x600000100000080L, active2, 0x8L);
+      case 66:
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x80000000L, active2, 0L);
       case 67:
          if ((active0 & 0x400000000L) != 0L)
          {
@@ -753,9 +755,9 @@ private int jjMoveStringLiteralDfa3_0(lo
             jjmatchedKind = 81;
             jjmatchedPos = 3;
          }
-         else if ((active1 & 0x40000000000000L) != 0L)
+         else if ((active1 & 0x100000000000000L) != 0L)
          {
-            jjmatchedKind = 118;
+            jjmatchedKind = 120;
             jjmatchedPos = 3;
          }
          return jjMoveStringLiteralDfa4_0(active0, 0x80000000L, active1, 0x42L, active2, 0L);
@@ -765,17 +767,17 @@ private int jjMoveStringLiteralDfa3_0(lo
             jjmatchedKind = 19;
             jjmatchedPos = 3;
          }
-         else if ((active1 & 0x400000000000L) != 0L)
+         else if ((active1 & 0x1000000000000L) != 0L)
          {
-            jjmatchedKind = 110;
+            jjmatchedKind = 112;
             jjmatchedPos = 3;
          }
-         else if ((active1 & 0x400000000000000L) != 0L)
+         else if ((active1 & 0x1000000000000000L) != 0L)
          {
-            jjmatchedKind = 122;
+            jjmatchedKind = 124;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x200000920200000L, active1, 0x2006002040018000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x200000920200000L, active1, 0x8018008040018000L, active2, 0L);
       case 70:
          return jjMoveStringLiteralDfa4_0(active0, 0x100000L, active1, 0L, active2, 0L);
       case 71:
@@ -786,9 +788,9 @@ private int jjMoveStringLiteralDfa3_0(lo
          }
          return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x200L, active2, 0L);
       case 72:
-         if ((active2 & 0x8L) != 0L)
+         if ((active2 & 0x20L) != 0L)
          {
-            jjmatchedKind = 131;
+            jjmatchedKind = 133;
             jjmatchedPos = 3;
          }
          break;
@@ -809,50 +811,52 @@ private int jjMoveStringLiteralDfa3_0(lo
          }
          break;
       case 78:
-         return jjMoveStringLiteralDfa4_0(active0, 0x2010000000000000L, active1, 0x200000L, active2, 0x10L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x2010000000000000L, active1, 0x200000L, active2, 0x40L);
       case 79:
-         if ((active1 & 0x8000000000000000L) != 0L)
+         if ((active2 & 0x2L) != 0L)
          {
-            jjmatchedKind = 127;
+            jjmatchedKind = 129;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x20000000000L, active1, 0x1008100000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x20000000000L, active1, 0x4008100000L, active2, 0L);
       case 80:
-         if ((active1 & 0x4000000000000000L) != 0L)
+         if ((active2 & 0x1L) != 0L)
          {
-            jjmatchedKind = 126;
+            jjmatchedKind = 128;
             jjmatchedPos = 3;
          }
          return jjMoveStringLiteralDfa4_0(active0, 0x400008000000000L, active1, 0L, active2, 0L);
       case 82:
-         if ((active1 & 0x80000000L) != 0L)
+         if ((active1 & 0x200000000L) != 0L)
          {
-            jjmatchedKind = 95;
+            jjmatchedKind = 97;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x2000000000L, active1, 0x400000c00L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x2000000000L, active1, 0x1000000c00L, active2, 0L);
       case 83:
-         return jjMoveStringLiteralDfa4_0(active0, 0x200012000000L, active1, 0x800026800000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x200012000000L, active1, 0x2000026800000L, active2, 0L);
       case 84:
-         return jjMoveStringLiteralDfa4_0(active0, 0x1000000000400000L, active1, 0x110000000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x1000000000400000L, active1, 0x410000000L, active2, 0L);
       case 85:
-         return jjMoveStringLiteralDfa4_0(active0, 0x801040000800000L, active1, 0x800004000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x801040000800000L, active1, 0x2000004000L, active2, 0L);
       case 86:
          return jjMoveStringLiteralDfa4_0(active0, 0x100000000000L, active1, 0L, active2, 0L);
       case 89:
-         if ((active1 & 0x800000000000000L) != 0L)
+         if ((active1 & 0x2000000000000000L) != 0L)
          {
-            jjmatchedKind = 123;
+            jjmatchedKind = 125;
             jjmatchedPos = 3;
          }
          break;
       case 97:
-         if ((active1 & 0x1000000000000000L) != 0L)
+         if ((active1 & 0x4000000000000000L) != 0L)
          {
-            jjmatchedKind = 124;
+            jjmatchedKind = 126;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x4000000000000L, active1, 0x180000000000080L, active2, 0x2L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x4000000000000L, active1, 0x600000100000080L, active2, 0x8L);
+      case 98:
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x80000000L, active2, 0L);
       case 99:
          if ((active0 & 0x400000000L) != 0L)
          {
@@ -871,9 +875,9 @@ private int jjMoveStringLiteralDfa3_0(lo
             jjmatchedKind = 81;
             jjmatchedPos = 3;
          }
-         else if ((active1 & 0x40000000000000L) != 0L)
+         else if ((active1 & 0x100000000000000L) != 0L)
          {
-            jjmatchedKind = 118;
+            jjmatchedKind = 120;
             jjmatchedPos = 3;
          }
          return jjMoveStringLiteralDfa4_0(active0, 0x80000000L, active1, 0x42L, active2, 0L);
@@ -883,17 +887,17 @@ private int jjMoveStringLiteralDfa3_0(lo
             jjmatchedKind = 19;
             jjmatchedPos = 3;
          }
-         else if ((active1 & 0x400000000000L) != 0L)
+         else if ((active1 & 0x1000000000000L) != 0L)
          {
-            jjmatchedKind = 110;
+            jjmatchedKind = 112;
             jjmatchedPos = 3;
          }
-         else if ((active1 & 0x400000000000000L) != 0L)
+         else if ((active1 & 0x1000000000000000L) != 0L)
          {
-            jjmatchedKind = 122;
+            jjmatchedKind = 124;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x200000920200000L, active1, 0x2006002040018000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x200000920200000L, active1, 0x8018008040018000L, active2, 0L);
       case 102:
          return jjMoveStringLiteralDfa4_0(active0, 0x100000L, active1, 0L, active2, 0L);
       case 103:
@@ -904,9 +908,9 @@ private int jjMoveStringLiteralDfa3_0(lo
          }
          return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x200L, active2, 0L);
       case 104:
-         if ((active2 & 0x8L) != 0L)
+         if ((active2 & 0x20L) != 0L)
          {
-            jjmatchedKind = 131;
+            jjmatchedKind = 133;
             jjmatchedPos = 3;
          }
          break;
@@ -927,40 +931,40 @@ private int jjMoveStringLiteralDfa3_0(lo
          }
          break;
       case 110:
-         return jjMoveStringLiteralDfa4_0(active0, 0x2010000000000000L, active1, 0x200000L, active2, 0x10L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x2010000000000000L, active1, 0x200000L, active2, 0x40L);
       case 111:
-         if ((active1 & 0x8000000000000000L) != 0L)
+         if ((active2 & 0x2L) != 0L)
          {
-            jjmatchedKind = 127;
+            jjmatchedKind = 129;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x20000000000L, active1, 0x1008100000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x20000000000L, active1, 0x4008100000L, active2, 0L);
       case 112:
-         if ((active1 & 0x4000000000000000L) != 0L)
+         if ((active2 & 0x1L) != 0L)
          {
-            jjmatchedKind = 126;
+            jjmatchedKind = 128;
             jjmatchedPos = 3;
          }
          return jjMoveStringLiteralDfa4_0(active0, 0x400008000000000L, active1, 0L, active2, 0L);
       case 114:
-         if ((active1 & 0x80000000L) != 0L)
+         if ((active1 & 0x200000000L) != 0L)
          {
-            jjmatchedKind = 95;
+            jjmatchedKind = 97;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x2000000000L, active1, 0x400000c00L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x2000000000L, active1, 0x1000000c00L, active2, 0L);
       case 115:
-         return jjMoveStringLiteralDfa4_0(active0, 0x200012000000L, active1, 0x800026800000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x200012000000L, active1, 0x2000026800000L, active2, 0L);
       case 116:
-         return jjMoveStringLiteralDfa4_0(active0, 0x1000000000400000L, active1, 0x110000000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x1000000000400000L, active1, 0x410000000L, active2, 0L);
       case 117:
-         return jjMoveStringLiteralDfa4_0(active0, 0x801040000800000L, active1, 0x800004000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x801040000800000L, active1, 0x2000004000L, active2, 0L);
       case 118:
          return jjMoveStringLiteralDfa4_0(active0, 0x100000000000L, active1, 0L, active2, 0L);
       case 121:
-         if ((active1 & 0x800000000000000L) != 0L)
+         if ((active1 & 0x2000000000000000L) != 0L)
          {
-            jjmatchedKind = 123;
+            jjmatchedKind = 125;
             jjmatchedPos = 3;
          }
          break;
@@ -980,13 +984,13 @@ private int jjMoveStringLiteralDfa4_0(lo
    switch(curChar)
    {
       case 49:
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x200000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x800000000000L, active2, 0L);
       case 50:
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x40000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x100000000000L, active2, 0L);
       case 53:
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x80000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x200000000000L, active2, 0L);
       case 56:
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x100000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x400000000000L, active2, 0L);
       case 65:
          return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x10401020L, active2, 0L);
       case 67:
@@ -1029,23 +1033,23 @@ private int jjMoveStringLiteralDfa4_0(lo
             jjmatchedKind = 90;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x800000000000L) != 0L)
+         else if ((active1 & 0x2000000000000L) != 0L)
          {
-            jjmatchedKind = 111;
+            jjmatchedKind = 113;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x5000000010000000L, active1, 0x1000000L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x5000000010000000L, active1, 0x81000000L, active2, 0L);
       case 70:
          if ((active0 & 0x100000000L) != 0L)
          {
             jjmatchedKind = 32;
             jjmatchedPos = 4;
          }
-         break;
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x100000000L, active2, 0L);
       case 71:
-         if ((active2 & 0x10L) != 0L)
+         if ((active2 & 0x40L) != 0L)
          {
-            jjmatchedKind = 132;
+            jjmatchedKind = 134;
             jjmatchedPos = 4;
          }
          break;
@@ -1055,9 +1059,9 @@ private int jjMoveStringLiteralDfa4_0(lo
             jjmatchedKind = 39;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x100000000L) != 0L)
+         else if ((active1 & 0x400000000L) != 0L)
          {
-            jjmatchedKind = 96;
+            jjmatchedKind = 98;
             jjmatchedPos = 4;
          }
          break;
@@ -1083,7 +1087,7 @@ private int jjMoveStringLiteralDfa4_0(lo
             jjmatchedKind = 41;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x2000000000000L, active1, 0x2000001040000000L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x2000000000000L, active1, 0x8000004040000000L, active2, 0L);
       case 79:
          return jjMoveStringLiteralDfa5_0(active0, 0x10000000000L, active1, 0L, active2, 0L);
       case 80:
@@ -1104,21 +1108,21 @@ private int jjMoveStringLiteralDfa4_0(lo
             jjmatchedKind = 84;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x80000000000000L) != 0L)
+         else if ((active1 & 0x200000000000000L) != 0L)
          {
-            jjmatchedKind = 119;
+            jjmatchedKind = 121;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x4000001000000L, active1, 0x2000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x4000001000000L, active1, 0x8000000000000L, active2, 0L);
       case 83:
          if ((active0 & 0x40000000000L) != 0L)
          {
             jjmatchedKind = 42;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x400000000L) != 0L)
+         else if ((active1 & 0x1000000000L) != 0L)
          {
-            jjmatchedKind = 98;
+            jjmatchedKind = 100;
             jjmatchedPos = 4;
          }
          break;
@@ -1138,9 +1142,9 @@ private int jjMoveStringLiteralDfa4_0(lo
             jjmatchedKind = 70;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x200002000000L, active1, 0x104000820812080L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x200002000000L, active1, 0x410002020812080L, active2, 0L);
       case 85:
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0L, active2, 0x2L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0L, active2, 0x8L);
       case 86:
          if ((active0 & 0x200000000000000L) != 0L)
          {
@@ -1156,7 +1160,7 @@ private int jjMoveStringLiteralDfa4_0(lo
          }
          break;
       case 90:
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x2000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x8000000000L, active2, 0L);
       case 97:
          return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x10401020L, active2, 0L);
       case 99:
@@ -1199,23 +1203,23 @@ private int jjMoveStringLiteralDfa4_0(lo
             jjmatchedKind = 90;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x800000000000L) != 0L)
+         else if ((active1 & 0x2000000000000L) != 0L)
          {
-            jjmatchedKind = 111;
+            jjmatchedKind = 113;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x5000000010000000L, active1, 0x1000000L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x5000000010000000L, active1, 0x81000000L, active2, 0L);
       case 102:
          if ((active0 & 0x100000000L) != 0L)
          {
             jjmatchedKind = 32;
             jjmatchedPos = 4;
          }
-         break;
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x100000000L, active2, 0L);
       case 103:
-         if ((active2 & 0x10L) != 0L)
+         if ((active2 & 0x40L) != 0L)
          {
-            jjmatchedKind = 132;
+            jjmatchedKind = 134;
             jjmatchedPos = 4;
          }
          break;
@@ -1225,9 +1229,9 @@ private int jjMoveStringLiteralDfa4_0(lo
             jjmatchedKind = 39;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x100000000L) != 0L)
+         else if ((active1 & 0x400000000L) != 0L)
          {
-            jjmatchedKind = 96;
+            jjmatchedKind = 98;
             jjmatchedPos = 4;
          }
          break;
@@ -1253,7 +1257,7 @@ private int jjMoveStringLiteralDfa4_0(lo
             jjmatchedKind = 41;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x2000000000000L, active1, 0x2000001040000000L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x2000000000000L, active1, 0x8000004040000000L, active2, 0L);
       case 111:
          return jjMoveStringLiteralDfa5_0(active0, 0x10000000000L, active1, 0L, active2, 0L);
       case 112:
@@ -1274,21 +1278,21 @@ private int jjMoveStringLiteralDfa4_0(lo
             jjmatchedKind = 84;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x80000000000000L) != 0L)
+         else if ((active1 & 0x200000000000000L) != 0L)
          {
-            jjmatchedKind = 119;
+            jjmatchedKind = 121;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x4000001000000L, active1, 0x2000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x4000001000000L, active1, 0x8000000000000L, active2, 0L);
       case 115:
          if ((active0 & 0x40000000000L) != 0L)
          {
             jjmatchedKind = 42;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x400000000L) != 0L)
+         else if ((active1 & 0x1000000000L) != 0L)
          {
-            jjmatchedKind = 98;
+            jjmatchedKind = 100;
             jjmatchedPos = 4;
          }
          break;
@@ -1308,9 +1312,9 @@ private int jjMoveStringLiteralDfa4_0(lo
             jjmatchedKind = 70;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x200002000000L, active1, 0x104000820812080L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x200002000000L, active1, 0x410002020812080L, active2, 0L);
       case 117:
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0L, active2, 0x2L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0L, active2, 0x8L);
       case 118:
          if ((active0 & 0x200000000000000L) != 0L)
          {
@@ -1326,7 +1330,7 @@ private int jjMoveStringLiteralDfa4_0(lo
          }
          break;
       case 122:
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x2000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x8000000000L, active2, 0L);
       default :
          break;
    }
@@ -1343,28 +1347,28 @@ private int jjMoveStringLiteralDfa5_0(lo
    switch(curChar)
    {
       case 50:
-         if ((active1 & 0x200000000000L) != 0L)
+         if ((active1 & 0x800000000000L) != 0L)
          {
-            jjmatchedKind = 109;
+            jjmatchedKind = 111;
             jjmatchedPos = 5;
          }
          break;
       case 52:
-         if ((active1 & 0x40000000000L) != 0L)
+         if ((active1 & 0x100000000000L) != 0L)
          {
-            jjmatchedKind = 106;
+            jjmatchedKind = 108;
             jjmatchedPos = 5;
          }
-         else if ((active1 & 0x100000000000L) != 0L)
+         else if ((active1 & 0x400000000000L) != 0L)
          {
-            jjmatchedKind = 108;
+            jjmatchedKind = 110;
             jjmatchedPos = 5;
          }
          break;
       case 54:
-         if ((active1 & 0x80000000000L) != 0L)
+         if ((active1 & 0x200000000000L) != 0L)
          {
-            jjmatchedKind = 107;
+            jjmatchedKind = 109;
             jjmatchedPos = 5;
          }
          break;
@@ -1373,24 +1377,26 @@ private int jjMoveStringLiteralDfa5_0(lo
       case 67:
          return jjMoveStringLiteralDfa6_0(active0, 0x100000000000L, active1, 0L, active2, 0L);
       case 68:
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x1040000000L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x4040000000L, active2, 0L);
       case 69:
          if ((active0 & 0x400000000000000L) != 0L)
          {
             jjmatchedKind = 58;
             jjmatchedPos = 5;
          }
-         else if ((active1 & 0x4000000000000L) != 0L)
+         else if ((active1 & 0x10000000000000L) != 0L)
          {
-            jjmatchedKind = 114;
+            jjmatchedKind = 116;
             jjmatchedPos = 5;
          }
-         else if ((active1 & 0x100000000000000L) != 0L)
+         else if ((active1 & 0x400000000000000L) != 0L)
          {
-            jjmatchedKind = 120;
+            jjmatchedKind = 122;
             jjmatchedPos = 5;
          }
-         return jjMoveStringLiteralDfa6_0(active0, 0x800000L, active1, 0x808016000L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x800000L, active1, 0x2008016000L, active2, 0L);
+      case 70:
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x80000000L, active2, 0L);
       case 71:
          if ((active0 & 0x2000000000000L) != 0L)
          {
@@ -1401,7 +1407,7 @@ private int jjMoveStringLiteralDfa5_0(lo
       case 73:
          return jjMoveStringLiteralDfa6_0(active0, 0x1000000L, active1, 0x10000000L, active2, 0L);
       case 76:
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0L, active2, 0x2L);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0L, active2, 0x8L);
       case 78:
          if ((active1 & 0x1000000L) != 0L)
          {
@@ -1410,7 +1416,7 @@ private int jjMoveStringLiteralDfa5_0(lo
          }
          return jjMoveStringLiteralDfa6_0(active0, 0x10080400000L, active1, 0x1020L, active2, 0L);
       case 79:
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x2000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x8000000000L, active2, 0L);
       case 82:
          if ((active0 & 0x1000000000000000L) != 0L)
          {
@@ -1446,17 +1452,17 @@ private int jjMoveStringLiteralDfa5_0(lo
             jjmatchedKind = 86;
             jjmatchedPos = 5;
          }
-         else if ((active1 & 0x2000000000000L) != 0L)
+         else if ((active1 & 0x8000000000000L) != 0L)
          {
-            jjmatchedKind = 113;
+            jjmatchedKind = 115;
             jjmatchedPos = 5;
          }
-         else if ((active1 & 0x2000000000000000L) != 0L)
+         else if ((active1 & 0x8000000000000000L) != 0L)
          {
-            jjmatchedKind = 125;
+            jjmatchedKind = 127;
             jjmatchedPos = 5;
          }
-         break;
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x100000000L, active2, 0L);
       case 88:
          if ((active0 & 0x100000L) != 0L)
          {
@@ -1473,24 +1479,26 @@ private int jjMoveStringLiteralDfa5_0(lo
       case 99:
          return jjMoveStringLiteralDfa6_0(active0, 0x100000000000L, active1, 0L, active2, 0L);
       case 100:
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x1040000000L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x4040000000L, active2, 0L);
       case 101:
          if ((active0 & 0x400000000000000L) != 0L)
          {
             jjmatchedKind = 58;
             jjmatchedPos = 5;
          }
-         else if ((active1 & 0x4000000000000L) != 0L)
+         else if ((active1 & 0x10000000000000L) != 0L)
          {
-            jjmatchedKind = 114;
+            jjmatchedKind = 116;
             jjmatchedPos = 5;
          }
-         else if ((active1 & 0x100000000000000L) != 0L)
+         else if ((active1 & 0x400000000000000L) != 0L)
          {
-            jjmatchedKind = 120;
+            jjmatchedKind = 122;
             jjmatchedPos = 5;
          }
-         return jjMoveStringLiteralDfa6_0(active0, 0x800000L, active1, 0x808016000L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x800000L, active1, 0x2008016000L, active2, 0L);
+      case 102:
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x80000000L, active2, 0L);
       case 103:
          if ((active0 & 0x2000000000000L) != 0L)
          {
@@ -1501,7 +1509,7 @@ private int jjMoveStringLiteralDfa5_0(lo
       case 105:
          return jjMoveStringLiteralDfa6_0(active0, 0x1000000L, active1, 0x10000000L, active2, 0L);
       case 108:
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0L, active2, 0x2L);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0L, active2, 0x8L);
       case 110:
          if ((active1 & 0x1000000L) != 0L)
          {
@@ -1510,7 +1518,7 @@ private int jjMoveStringLiteralDfa5_0(lo
          }
          return jjMoveStringLiteralDfa6_0(active0, 0x10080400000L, active1, 0x1020L, active2, 0L);
       case 111:
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x2000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x8000000000L, active2, 0L);
       case 114:
          if ((active0 & 0x1000000000000000L) != 0L)
          {
@@ -1546,17 +1554,17 @@ private int jjMoveStringLiteralDfa5_0(lo
             jjmatchedKind = 86;
             jjmatchedPos = 5;
          }
-         else if ((active1 & 0x2000000000000L) != 0L)
+         else if ((active1 & 0x8000000000000L) != 0L)
          {
-            jjmatchedKind = 113;
+            jjmatchedKind = 115;
             jjmatchedPos = 5;
          }
-         else if ((active1 & 0x2000000000000000L) != 0L)
+         else if ((active1 & 0x8000000000000000L) != 0L)
          {
-            jjmatchedKind = 125;
+            jjmatchedKind = 127;
             jjmatchedPos = 5;
          }
-         break;
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x100000000L, active2, 0L);
       case 120:
          if ((active0 & 0x100000L) != 0L)
          {
@@ -1600,7 +1608,7 @@ private int jjMoveStringLiteralDfa6_0(lo
             jjmatchedKind = 44;
             jjmatchedPos = 6;
          }
-         break;
+         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x100000000L, active2, 0L);
       case 71:
          if ((active1 & 0x20L) != 0L)
          {
@@ -1616,7 +1624,9 @@ private int jjMoveStringLiteralDfa6_0(lo
          }
          break;
       case 78:
-         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x2010000000L, active2, 0L);
+         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x8010000000L, active2, 0L);
+      case 79:
+         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x80000000L, active2, 0L);
       case 80:
          return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x80L, active2, 0L);
       case 82:
@@ -1627,21 +1637,21 @@ private int jjMoveStringLiteralDfa6_0(lo
             jjmatchedKind = 94;
             jjmatchedPos = 6;
          }
-         else if ((active1 & 0x800000000L) != 0L)
+         else if ((active1 & 0x2000000000L) != 0L)
          {
-            jjmatchedKind = 99;
+            jjmatchedKind = 101;
             jjmatchedPos = 6;
          }
-         else if ((active1 & 0x1000000000L) != 0L)
+         else if ((active1 & 0x4000000000L) != 0L)
          {
-            jjmatchedKind = 100;
+            jjmatchedKind = 102;
             jjmatchedPos = 6;
          }
          break;
       case 84:
-         if ((active2 & 0x2L) != 0L)
+         if ((active2 & 0x8L) != 0L)
          {
-            jjmatchedKind = 129;
+            jjmatchedKind = 131;
             jjmatchedPos = 6;
          }
          return jjMoveStringLiteralDfa7_0(active0, 0x4000000000000L, active1, 0x200L, active2, 0L);
@@ -1668,7 +1678,7 @@ private int jjMoveStringLiteralDfa6_0(lo
             jjmatchedKind = 44;
             jjmatchedPos = 6;
          }
-         break;
+         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x100000000L, active2, 0L);
       case 103:
          if ((active1 & 0x20L) != 0L)
          {
@@ -1684,7 +1694,9 @@ private int jjMoveStringLiteralDfa6_0(lo
          }
          break;
       case 110:
-         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x2010000000L, active2, 0L);
+         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x8010000000L, active2, 0L);
+      case 111:
+         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x80000000L, active2, 0L);
       case 112:
          return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x80L, active2, 0L);
       case 114:
@@ -1695,21 +1707,21 @@ private int jjMoveStringLiteralDfa6_0(lo
             jjmatchedKind = 94;
             jjmatchedPos = 6;
          }
-         else if ((active1 & 0x800000000L) != 0L)
+         else if ((active1 & 0x2000000000L) != 0L)
          {
-            jjmatchedKind = 99;
+            jjmatchedKind = 101;
             jjmatchedPos = 6;
          }
-         else if ((active1 & 0x1000000000L) != 0L)
+         else if ((active1 & 0x4000000000L) != 0L)
          {
-            jjmatchedKind = 100;
+            jjmatchedKind = 102;
             jjmatchedPos = 6;
          }
          break;
       case 116:
-         if ((active2 & 0x2L) != 0L)
+         if ((active2 & 0x8L) != 0L)
          {
-            jjmatchedKind = 129;
+            jjmatchedKind = 131;
             jjmatchedPos = 6;
          }
          return jjMoveStringLiteralDfa7_0(active0, 0x4000000000000L, active1, 0x200L, active2, 0L);
@@ -1750,9 +1762,9 @@ private int jjMoveStringLiteralDfa7_0(lo
             jjmatchedKind = 71;
             jjmatchedPos = 7;
          }
-         else if ((active1 & 0x2000000000L) != 0L)
+         else if ((active1 & 0x8000000000L) != 0L)
          {
-            jjmatchedKind = 101;
+            jjmatchedKind = 103;
             jjmatchedPos = 7;
          }
          break;
@@ -1776,6 +1788,13 @@ private int jjMoveStringLiteralDfa7_0(lo
          break;
       case 79:
          return jjMoveStringLiteralDfa8_0(active0, 0x804000000000000L, active1, 0L);
+      case 82:
+         if ((active1 & 0x100000000L) != 0L)
+         {
+            jjmatchedKind = 96;
+            jjmatchedPos = 7;
+         }
+         return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x80000000L);
       case 83:
          if ((active0 & 0x80000000L) != 0L)
          {
@@ -1815,9 +1834,9 @@ private int jjMoveStringLiteralDfa7_0(lo
             jjmatchedKind = 71;
             jjmatchedPos = 7;
          }
-         else if ((active1 & 0x2000000000L) != 0L)
+         else if ((active1 & 0x8000000000L) != 0L)
          {
-            jjmatchedKind = 101;
+            jjmatchedKind = 103;
             jjmatchedPos = 7;
          }
          break;
@@ -1841,6 +1860,13 @@ private int jjMoveStringLiteralDfa7_0(lo
          break;
       case 111:
          return jjMoveStringLiteralDfa8_0(active0, 0x804000000000000L, active1, 0L);
+      case 114:
+         if ((active1 & 0x100000000L) != 0L)
+         {
+            jjmatchedKind = 96;
+            jjmatchedPos = 7;
+         }
+         return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x80000000L);
       case 115:
          if ((active0 & 0x80000000L) != 0L)
          {
@@ -1882,6 +1908,13 @@ private int jjMoveStringLiteralDfa8_0(lo
             jjmatchedPos = 8;
          }
          break;
+      case 69:
+         if ((active1 & 0x80000000L) != 0L)
+         {
+            jjmatchedKind = 95;
+            jjmatchedPos = 8;
+         }
+         break;
       case 72:
          return jjMoveStringLiteralDfa9_0(active0, 0L, active1, 0x200L);
       case 76:
@@ -1923,6 +1956,13 @@ private int jjMoveStringLiteralDfa8_0(lo
             jjmatchedPos = 8;
          }
          break;
+      case 101:
+         if ((active1 & 0x80000000L) != 0L)
+         {
+            jjmatchedKind = 95;
+            jjmatchedPos = 8;
+         }
+         break;
       case 104:
          return jjMoveStringLiteralDfa9_0(active0, 0L, active1, 0x200L);
       case 108:
@@ -2169,8 +2209,8 @@ private int jjMoveNfa_0(int startState, 
                case 0:
                   if ((0x3ff000000000000L & l) != 0L)
                   {
-                     if (kind > 134)
-                        kind = 134;
+                     if (kind > 136)
+                        kind = 136;
                      jjCheckNAddStates(0, 6);
                   }
                   else if (curChar == 45)
@@ -2318,8 +2358,8 @@ private int jjMoveNfa_0(int startState, 
                      jjstateSet[jjnewStateCnt++] = 32;
                   break;
                case 40:
-                  if ((0x8400000000L & l) != 0L && kind > 146)
-                     kind = 146;
+                  if ((0x8400000000L & l) != 0L && kind > 148)
+                     kind = 148;
                   break;
                case 41:
                   if (curChar == 39)
@@ -2334,8 +2374,8 @@ private int jjMoveNfa_0(int startState, 
                      jjCheckNAddStates(26, 28);
                   break;
                case 45:
-                  if (curChar == 39 && kind > 147)
-                     kind = 147;
+                  if (curChar == 39 && kind > 149)
+                     kind = 149;
                   break;
                case 46:
                   if (curChar == 34)
@@ -2350,8 +2390,8 @@ private int jjMoveNfa_0(int startState, 
                      jjCheckNAddStates(23, 25);
                   break;
                case 50:
-                  if (curChar == 34 && kind > 148)
-                     kind = 148;
+                  if (curChar == 34 && kind > 150)
+                     kind = 150;
                   break;
                case 51:
                   if (curChar == 39)
@@ -2375,8 +2415,8 @@ private int jjMoveNfa_0(int startState, 
                      jjAddStates(42, 43);
                   break;
                case 58:
-                  if (curChar == 39 && kind > 149)
-                     kind = 149;
+                  if (curChar == 39 && kind > 151)
+                     kind = 151;
                   break;
                case 59:
                   if (curChar == 39)
@@ -2412,8 +2452,8 @@ private int jjMoveNfa_0(int startState, 
                      jjAddStates(48, 49);
                   break;
                case 69:
-                  if (curChar == 34 && kind > 150)
-                     kind = 150;
+                  if (curChar == 34 && kind > 152)
+                     kind = 152;
                   break;
                case 70:
                   if (curChar == 34)
@@ -2448,8 +2488,8 @@ private int jjMoveNfa_0(int startState, 
                      jjCheckNAddStates(17, 19);
                   break;
                case 78:
-                  if (curChar == 41 && kind > 153)
-                     kind = 153;
+                  if (curChar == 41 && kind > 155)
+                     kind = 155;
                   break;
                case 79:
                   if (curChar == 10)
@@ -2580,15 +2620,15 @@ private int jjMoveNfa_0(int startState, 
                case 132:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 134)
-                     kind = 134;
+                  if (kind > 136)
+                     kind = 136;
                   jjCheckNAddStates(0, 6);
                   break;
                case 133:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 134)
-                     kind = 134;
+                  if (kind > 136)
+                     kind = 136;
                   jjCheckNAdd(133);
                   break;
                case 134:
@@ -2602,8 +2642,8 @@ private int jjMoveNfa_0(int startState, 
                case 136:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 135)
-                     kind = 135;
+                  if (kind > 137)
+                     kind = 137;
                   jjCheckNAdd(136);
                   break;
                case 137:
@@ -2625,8 +2665,8 @@ private int jjMoveNfa_0(int startState, 
                case 142:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 136)
-                     kind = 136;
+                  if (kind > 138)
+                     kind = 138;
                   jjCheckNAdd(142);
                   break;
                case 143:
@@ -2640,8 +2680,8 @@ private int jjMoveNfa_0(int startState, 
                case 146:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 136)
-                     kind = 136;
+                  if (kind > 138)
+                     kind = 138;
                   jjCheckNAdd(146);
                   break;
                case 147:
@@ -2659,8 +2699,8 @@ private int jjMoveNfa_0(int startState, 
                case 151:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 136)
-                     kind = 136;
+                  if (kind > 138)
+                     kind = 138;
                   jjCheckNAdd(151);
                   break;
                case 152:
@@ -2670,8 +2710,8 @@ private int jjMoveNfa_0(int startState, 
                case 153:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 137)
-                     kind = 137;
+                  if (kind > 139)
+                     kind = 139;
                   jjCheckNAdd(153);
                   break;
                case 154:
@@ -2685,8 +2725,8 @@ private int jjMoveNfa_0(int startState, 
                case 156:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 138)
-                     kind = 138;
+                  if (kind > 140)
+                     kind = 140;
                   jjCheckNAdd(156);
                   break;
                case 157:
@@ -2704,8 +2744,8 @@ private int jjMoveNfa_0(int startState, 
                case 161:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 139)
-                     kind = 139;
+                  if (kind > 141)
+                     kind = 141;
                   jjCheckNAdd(161);
                   break;
                case 162:
@@ -2731,8 +2771,8 @@ private int jjMoveNfa_0(int startState, 
                case 168:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 139)
-                     kind = 139;
+                  if (kind > 141)
+                     kind = 141;
                   jjCheckNAdd(168);
                   break;
                case 169:
@@ -2746,8 +2786,8 @@ private int jjMoveNfa_0(int startState, 
                case 172:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 139)
-                     kind = 139;
+                  if (kind > 141)
+                     kind = 141;
                   jjCheckNAdd(172);
                   break;
                case 173:
@@ -2757,8 +2797,8 @@ private int jjMoveNfa_0(int startState, 
                case 174:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 140)
-                     kind = 140;
+                  if (kind > 142)
+                     kind = 142;
                   jjCheckNAdd(174);
                   break;
                case 175:
@@ -2772,8 +2812,8 @@ private int jjMoveNfa_0(int startState, 
                case 177:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 141)
-                     kind = 141;
+                  if (kind > 143)
+                     kind = 143;
                   jjCheckNAdd(177);
                   break;
                case 178:
@@ -2791,8 +2831,8 @@ private int jjMoveNfa_0(int startState, 
                case 182:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 142)
-                     kind = 142;
+                  if (kind > 144)
+                     kind = 144;
                   jjCheckNAdd(182);
                   break;
                case 183:
@@ -2818,8 +2858,8 @@ private int jjMoveNfa_0(int startState, 
                case 189:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 142)
-                     kind = 142;
+                  if (kind > 144)
+                     kind = 144;
                   jjCheckNAdd(189);
                   break;
                case 190:
@@ -2833,8 +2873,8 @@ private int jjMoveNfa_0(int startState, 
                case 193:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 142)
-                     kind = 142;
+                  if (kind > 144)
+                     kind = 144;
                   jjCheckNAdd(193);
                   break;
                default : break;
@@ -2934,8 +2974,8 @@ private int jjMoveNfa_0(int startState, 
                   jjCheckNAddStates(29, 34);
                   break;
                case 28:
-                  if ((0x200000002L & l) != 0L && kind > 115)
-                     kind = 115;
+                  if ((0x200000002L & l) != 0L && kind > 117)
+                     kind = 117;
                   break;
                case 29:
                   if ((0x10000000100000L & l) != 0L)
@@ -2974,8 +3014,8 @@ private int jjMoveNfa_0(int startState, 
                      jjstateSet[jjnewStateCnt++] = 40;
                   break;
                case 40:
-                  if ((0x14404410000000L & l) != 0L && kind > 146)
-                     kind = 146;
+                  if ((0x14404410000000L & l) != 0L && kind > 148)
+                     kind = 148;
                   break;
                case 42:
                   if ((0xffffffffefffffffL & l) != 0L)
@@ -3036,8 +3076,8 @@ private int jjMoveNfa_0(int startState, 
                   jjCheckNAddStates(56, 61);
                   break;
                case 86:
-                  if (curChar == 93 && kind > 158)
-                     kind = 158;
+                  if (curChar == 93 && kind > 160)
+                     kind = 160;
                   break;
                case 89:
                   if ((0x7fffffe07fffffeL & l) != 0L)
@@ -3086,8 +3126,8 @@ private int jjMoveNfa_0(int startState, 
                   jjCheckNAddStates(69, 74);
                   break;
                case 106:
-                  if ((0x200000002L & l) != 0L && kind > 116)
-                     kind = 116;
+                  if ((0x200000002L & l) != 0L && kind > 118)
+                     kind = 118;
                   break;
                case 107:
                   if ((0x10000000100000L & l) != 0L)
@@ -3125,8 +3165,8 @@ private int jjMoveNfa_0(int startState, 
                   jjCheckNAddStates(78, 83);
                   break;
                case 121:
-                  if ((0x2000000020L & l) != 0L && kind > 117)
-                     kind = 117;
+                  if ((0x2000000020L & l) != 0L && kind > 119)
+                     kind = 119;
                   break;
                case 122:
                   if ((0x4000000040000L & l) != 0L)
@@ -3455,8 +3495,8 @@ null, null, null, null, null, null, null
 null, null, null, null, null, null, null, null, null, null, null, null, null, null, 
 null, null, null, null, null, null, null, null, null, null, null, null, null, null, 
 null, null, null, null, null, null, null, null, null, null, null, null, null, null, 
-null, null, null, null, null, null, null, null, null, null, null, null, "\50", 
-"\51", null, "\173", "\175", "\133", "\135", null, "\73", "\54", "\56", "\75", 
+null, null, null, null, null, null, null, null, null, null, null, null, null, null, 
+"\50", "\51", null, "\173", "\175", "\133", "\135", null, "\73", "\54", "\56", "\75", 
 "\41\75", "\76", "\74", "\74\75", "\76\75", "\41", "\176", "\72", "\174\174", "\46\46", 
 "\53", "\55", "\52", "\57", "\136\136", "\100", "\174", "\136", "\55\76", "\74\55", 
 "\77", null, null, null, null, null, null, null, };
@@ -3466,13 +3506,13 @@ public static final String[] lexStateNam
    "DEFAULT",
 };
 static final long[] jjtoToken = {
-   0xfffffffffffcfe01L, 0xfffeffffffffffffL, 0xfffffffffc7fdfL, 
+   0xfffffffffffcfe01L, 0xfffbffffffffffffL, 0x3fffffffff1ff7fL, 0x0L, 
 };
 static final long[] jjtoSkip = {
-   0x7eL, 0x0L, 0x0L, 
+   0x7eL, 0x0L, 0x0L, 0x0L, 
 };
 static final long[] jjtoSpecial = {
-   0x40L, 0x0L, 0x0L, 
+   0x40L, 0x0L, 0x0L, 0x0L, 
 };
 protected JavaCharStream input_stream;
 private final int[] jjrounds = new int[194];

Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/Tags.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/Tags.java?rev=1177969&r1=1177968&r2=1177969&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/Tags.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/Tags.java Sat Oct  1 12:06:41 2011
@@ -173,6 +173,8 @@ public class Tags
     public static final String tagStrLowercase  = "lcase" ;
     public static final String tagStrEnds       = "strends" ;
     public static final String tagStrStarts     = "strstarts" ;
+    public static final String tagStrBefore     = "strbefore" ;
+    public static final String tagStrAfter      = "strafter" ;
     public static final String tagStrContains   = "contains" ;
     public static final String tagStrEncodeForURI     = "encode_for_uri" ;
     public static final String tagConcat        = "concat" ;

Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/builders/BuilderExpr.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/builders/BuilderExpr.java?rev=1177969&r1=1177968&r2=1177969&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/builders/BuilderExpr.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/builders/BuilderExpr.java Sat Oct  1 12:06:41 2011
@@ -262,7 +262,9 @@ public class BuilderExpr
         dispatch.put(Tags.tagStrUppercase, buildStrUppercase) ;
         dispatch.put(Tags.tagStrLowercase, buildStrLowercase) ;
         dispatch.put(Tags.tagStrEnds, buildStrEnds) ;
-        dispatch.put(Tags.tagStrStarts, buildStrStarts) ;
+        dispatch.put(Tags.tagStrStarts, buildStrStarts) ;
+        dispatch.put(Tags.tagStrBefore, buildStrBefore) ;
+        dispatch.put(Tags.tagStrAfter, buildStrAfter) ;
         dispatch.put(Tags.tagStrContains, buildStrContains) ;
         dispatch.put(Tags.tagStrEncodeForURI, buildStrEncode) ;
         dispatch.put(Tags.tagConcat, buildConcat) ;
@@ -796,7 +798,7 @@ public class BuilderExpr
     {
         public Expr make(ItemList list)
         {
-            BuilderLib.checkLength(3, list, "ends: wanted 2 arguments: got: "+numArgs(list)) ;
+            BuilderLib.checkLength(3, list, "strends: wanted 2 arguments: got: "+numArgs(list)) ;
             Expr ex1 = buildExpr(list.get(1)) ;
             Expr ex2 = buildExpr(list.get(2)) ;
             return new E_StrEndsWith(ex1, ex2) ; 
@@ -807,12 +809,36 @@ public class BuilderExpr
     {
         public Expr make(ItemList list)
         {     
-            BuilderLib.checkLength(3, list, "starts: wanted 2 arguments: got: "+numArgs(list)) ;
+            BuilderLib.checkLength(3, list, "strstarts: wanted 2 arguments: got: "+numArgs(list)) ;
             Expr ex1 = buildExpr(list.get(1)) ;
             Expr ex2 = buildExpr(list.get(2)) ;
             return new E_StrStartsWith(ex1, ex2) ; 
         }
     } ;
+
+    final protected Build buildStrBefore = new Build()
+    {
+        public Expr make(ItemList list)
+        {     
+            BuilderLib.checkLength(3, list, "strbefore: wanted 2 arguments: got: "+numArgs(list)) ;
+            Expr ex1 = buildExpr(list.get(1)) ;
+            Expr ex2 = buildExpr(list.get(2)) ;
+            return new E_StrBefore(ex1, ex2) ; 
+        }
+    } ;
+    
+    final protected Build buildStrAfter = new Build()
+    {
+        public Expr make(ItemList list)
+        {     
+            BuilderLib.checkLength(3, list, "strafter: wanted 2 arguments: got: "+numArgs(list)) ;
+            Expr ex1 = buildExpr(list.get(1)) ;
+            Expr ex2 = buildExpr(list.get(2)) ;
+            return new E_StrAfter(ex1, ex2) ; 
+        }
+    } ;
+    
+
     
     final protected Build buildStrContains = new Build()
     {



Mime
View raw message