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/04/26 17:24:05 UTC

svn commit: r1330901 [3/3] - in /incubator/jena/Jena2/ARQ/trunk: Grammar/ src/main/java/com/hp/hpl/jena/sparql/lang/arq/ src/main/java/com/hp/hpl/jena/sparql/lang/sparql_11/

Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/arq/ARQParserTokenManager.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/arq/ARQParserTokenManager.java?rev=1330901&r1=1330900&r2=1330901&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/arq/ARQParserTokenManager.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/arq/ARQParserTokenManager.java Thu Apr 26 15:24:05 2012
@@ -117,7 +117,7 @@ private int jjMoveStringLiteralDfa0_0()
       case 67:
          return jjMoveStringLiteralDfa1_0(0x80000002000000L, 0x1024000182L, 0x260L, 0x0L);
       case 68:
-         return jjMoveStringLiteralDfa1_0(0x801400000L, 0x8000080000004000L, 0x9000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x801400000L, 0xa000080000004000L, 0x9000L, 0x0L);
       case 69:
          return jjMoveStringLiteralDfa1_0(0x1000000000000L, 0x800000000L, 0x0L, 0x0L);
       case 70:
@@ -169,7 +169,7 @@ private int jjMoveStringLiteralDfa0_0()
       case 99:
          return jjMoveStringLiteralDfa1_0(0x80000002000000L, 0x1024000182L, 0x260L, 0x0L);
       case 100:
-         return jjMoveStringLiteralDfa1_0(0x801400000L, 0x8000080000004000L, 0x9000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x801400000L, 0xa000080000004000L, 0x9000L, 0x0L);
       case 101:
          return jjMoveStringLiteralDfa1_0(0x1000000000000L, 0x800000000L, 0x0L, 0x0L);
       case 102:
@@ -272,7 +272,7 @@ private int jjMoveStringLiteralDfa1_0(lo
          }
          break;
       case 65:
-         return jjMoveStringLiteralDfa2_0(active0, 0x2210001100080000L, active1, 0x100008000181c180L, active2, 0L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x2210001100080000L, active1, 0x300008000181c180L, active2, 0L, active3, 0L);
       case 66:
          return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x2000000L, active2, 0L, active3, 0L);
       case 67:
@@ -351,7 +351,7 @@ private int jjMoveStringLiteralDfa1_0(lo
          }
          break;
       case 97:
-         return jjMoveStringLiteralDfa2_0(active0, 0x2210001100080000L, active1, 0x100008000181c180L, active2, 0L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x2210001100080000L, active1, 0x300008000181c180L, active2, 0L, active3, 0L);
       case 98:
          return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x2000000L, active2, 0L, active3, 0L);
       case 99:
@@ -559,7 +559,7 @@ private int jjMoveStringLiteralDfa2_0(lo
             jjmatchedKind = 49;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x820000000000L, active1, 0x4000L, active2, 0x22400L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x820000000000L, active1, 0x2000000000004000L, active2, 0x22400L);
       case 85:
          return jjMoveStringLiteralDfa3_0(active0, 0x80000000000000L, active1, 0x800100010020001L, active2, 0L);
       case 86:
@@ -693,7 +693,7 @@ private int jjMoveStringLiteralDfa2_0(lo
             jjmatchedKind = 49;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x820000000000L, active1, 0x4000L, active2, 0x22400L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x820000000000L, active1, 0x2000000000004000L, active2, 0x22400L);
       case 117:
          return jjMoveStringLiteralDfa3_0(active0, 0x80000000000000L, active1, 0x800100010020001L, active2, 0L);
       case 118:
@@ -748,7 +748,12 @@ private int jjMoveStringLiteralDfa3_0(lo
       case 53:
          return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x400000000000000L, active2, 0L);
       case 65:
-         if ((active2 & 0x400L) != 0L)
+         if ((active1 & 0x2000000000000000L) != 0L)
+         {
+            jjmatchedKind = 125;
+            jjmatchedPos = 3;
+         }
+         else if ((active2 & 0x400L) != 0L)
          {
             jjmatchedKind = 138;
             jjmatchedPos = 3;
@@ -883,7 +888,12 @@ private int jjMoveStringLiteralDfa3_0(lo
          }
          break;
       case 97:
-         if ((active2 & 0x400L) != 0L)
+         if ((active1 & 0x2000000000000000L) != 0L)
+         {
+            jjmatchedKind = 125;
+            jjmatchedPos = 3;
+         }
+         else if ((active2 & 0x400L) != 0L)
          {
             jjmatchedKind = 138;
             jjmatchedPos = 3;
@@ -3737,7 +3747,7 @@ public static final String[] lexStateNam
    "DEFAULT",
 };
 static final long[] jjtoToken = {
-   0xfffffffffffcfe01L, 0xdfffffffffffffffL, 0xffffffff1ff7ffffL, 0x7fL, 
+   0xfffffffffffcfe01L, 0xffffffffffffffffL, 0xffffffff1ff7ffffL, 0x7fL, 
 };
 static final long[] jjtoSkip = {
    0x7eL, 0x0L, 0x0L, 0x0L, 

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=1330901&r1=1330900&r2=1330901&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 Thu Apr 26 15:24:05 2012
@@ -117,7 +117,7 @@ private int jjMoveStringLiteralDfa0_0()
       case 67:
          return jjMoveStringLiteralDfa1_0(0x8020000002000000L, 0x6000000040900000L, 0x2L);
       case 68:
-         return jjMoveStringLiteralDfa1_0(0x801400000L, 0x100002000000100L, 0x90L);
+         return jjMoveStringLiteralDfa1_0(0x801400000L, 0x140002000000100L, 0x90L);
       case 69:
          return jjMoveStringLiteralDfa1_0(0x400000000000L, 0x20000000L, 0x0L);
       case 70:
@@ -169,7 +169,7 @@ private int jjMoveStringLiteralDfa0_0()
       case 99:
          return jjMoveStringLiteralDfa1_0(0x8020000002000000L, 0x6000000040900000L, 0x2L);
       case 100:
-         return jjMoveStringLiteralDfa1_0(0x801400000L, 0x100002000000100L, 0x90L);
+         return jjMoveStringLiteralDfa1_0(0x801400000L, 0x140002000000100L, 0x90L);
       case 101:
          return jjMoveStringLiteralDfa1_0(0x400000000000L, 0x20000000L, 0x0L);
       case 102:
@@ -267,7 +267,7 @@ private int jjMoveStringLiteralDfa1_0(lo
          }
          break;
       case 65:
-         return jjMoveStringLiteralDfa2_0(active0, 0x884001100080000L, active1, 0x20002000060700L, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x884001100080000L, active1, 0x60002000060700L, active2, 0L);
       case 66:
          return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x80000L, active2, 0L);
       case 67:
@@ -346,7 +346,7 @@ private int jjMoveStringLiteralDfa1_0(lo
          }
          break;
       case 97:
-         return jjMoveStringLiteralDfa2_0(active0, 0x884001100080000L, active1, 0x20002000060700L, active2, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x884001100080000L, active1, 0x60002000060700L, active2, 0L);
       case 98:
          return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x80000L, active2, 0L);
       case 99:
@@ -549,7 +549,7 @@ private int jjMoveStringLiteralDfa2_0(lo
             jjmatchedKind = 47;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x20000000000L, active1, 0x100L, active2, 0x224L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x20000000000L, active1, 0x40000000000100L, active2, 0x224L);
       case 85:
          return jjMoveStringLiteralDfa3_0(active0, 0x4020000000000000L, active1, 0x10004000400800L, active2, 0L);
       case 86:
@@ -678,7 +678,7 @@ private int jjMoveStringLiteralDfa2_0(lo
             jjmatchedKind = 47;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x20000000000L, active1, 0x100L, active2, 0x224L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x20000000000L, active1, 0x40000000000100L, active2, 0x224L);
       case 117:
          return jjMoveStringLiteralDfa3_0(active0, 0x4020000000000000L, active1, 0x10004000400800L, active2, 0L);
       case 118:
@@ -733,7 +733,12 @@ private int jjMoveStringLiteralDfa3_0(lo
       case 53:
          return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x8000000000000L, active2, 0L);
       case 65:
-         if ((active2 & 0x4L) != 0L)
+         if ((active1 & 0x40000000000000L) != 0L)
+         {
+            jjmatchedKind = 118;
+            jjmatchedPos = 3;
+         }
+         else if ((active2 & 0x4L) != 0L)
          {
             jjmatchedKind = 130;
             jjmatchedPos = 3;
@@ -858,7 +863,12 @@ private int jjMoveStringLiteralDfa3_0(lo
          }
          break;
       case 97:
-         if ((active2 & 0x4L) != 0L)
+         if ((active1 & 0x40000000000000L) != 0L)
+         {
+            jjmatchedKind = 118;
+            jjmatchedPos = 3;
+         }
+         else if ((active2 & 0x4L) != 0L)
          {
             jjmatchedKind = 130;
             jjmatchedPos = 3;
@@ -3652,7 +3662,7 @@ public static final String[] lexStateNam
    "DEFAULT",
 };
 static final long[] jjtoToken = {
-   0xfffffffffffcfe01L, 0xffbfffffffffffffL, 0x3fffffffff1ff7ffL, 0x0L, 
+   0xfffffffffffcfe01L, 0xffffffffffffffffL, 0x3fffffffff1ff7ffL, 0x0L, 
 };
 static final long[] jjtoSkip = {
    0x7eL, 0x0L, 0x0L, 0x0L,