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/02/07 15:48:32 UTC
svn commit: r1241478 [1/2] - 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/function/library/
src/main/java/com/hp/hpl...
Author: andy
Date: Tue Feb 7 14:48:32 2012
New Revision: 1241478
URL: http://svn.apache.org/viewvc?rev=1241478&view=rev
Log:
Add StrUUID() to go with UUID() -- also afn:struuid, afn:uuid versions.
Added:
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrUUID.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/function/library/struuid.java
Modified:
incubator/jena/Jena2/ARQ/trunk/ChangeLog.txt
incubator/jena/Jena2/ARQ/trunk/Grammar/arq.jj
incubator/jena/Jena2/ARQ/trunk/Grammar/master.jj
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeFunctions.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/function/library/uuid.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/arq/ARQParser.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/arq/ARQParserConstants.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/arq/ARQParserTokenManager.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/Tags.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/builders/BuilderExpr.java
Modified: incubator/jena/Jena2/ARQ/trunk/ChangeLog.txt
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/ChangeLog.txt?rev=1241478&r1=1241477&r2=1241478&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/ChangeLog.txt (original)
+++ incubator/jena/Jena2/ARQ/trunk/ChangeLog.txt Tue Feb 7 14:48:32 2012
@@ -4,6 +4,8 @@ ChangeLog for ARQ
==== ARQ 2.9.1
++ Add function "StrUUID" which returns a UUID str8ing (c.f. "UUID" for a UUID as a URI of form <urn:uuid:....>)
+ Also available as afn:struuid() and afn:uuid() for strict syntax.
+ Add UpdateExecutionFactory.createRemote(...) for remote execution of SPARQL Update (JENA-197)
+ Allow users to specify query parameters in SERVICE
Allow the context to include a set of parameters add to SERVICE requests
Modified: incubator/jena/Jena2/ARQ/trunk/Grammar/arq.jj
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/Grammar/arq.jj?rev=1241478&r1=1241477&r2=1241478&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/Grammar/arq.jj (original)
+++ incubator/jena/Jena2/ARQ/trunk/Grammar/arq.jj Tue Feb 7 14:48:32 2012
@@ -1322,6 +1322,7 @@ Expr BuiltInCall() : { Expr expr ; Expr
| <TZ> <LPAREN> expr1 = Expression() <RPAREN> { return new E_DateTimeTZ(expr1) ; }
| <NOW> <NIL> { return new E_Now() ; }
| <UUID> <NIL> { return new E_UUID() ; }
+ | <STRUUID> <NIL> { return new E_StrUUID() ; }
| <MD5> <LPAREN> expr1 = Expression() <RPAREN> { return new E_MD5(expr1) ; }
| <SHA1> <LPAREN> expr1 = Expression() <RPAREN> { return new E_SHA1(expr1) ; }
| <SHA256> <LPAREN> expr1 = Expression() <RPAREN> { return new E_SHA256(expr1) ; }
@@ -1684,6 +1685,7 @@ TOKEN [IGNORE_CASE] :
| < TZ: "TZ" >
| < NOW: "NOW" >
| < UUID: "UUID" >
+| < STRUUID: "STRUUID" >
| < VERSION: "VERSION" >
| < MD5: "MD5" >
| < SHA1: "SHA1" >
Modified: incubator/jena/Jena2/ARQ/trunk/Grammar/master.jj
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/Grammar/master.jj?rev=1241478&r1=1241477&r2=1241478&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/Grammar/master.jj (original)
+++ incubator/jena/Jena2/ARQ/trunk/Grammar/master.jj Tue Feb 7 14:48:32 2012
@@ -1673,6 +1673,7 @@ Expr BuiltInCall() : { Expr expr ; Expr
| <NOW> <NIL> { return new E_Now() ; }
#ifdef ARQ
| <UUID> <NIL> { return new E_UUID() ; }
+ | <STRUUID> <NIL> { return new E_StrUUID() ; }
#endif
| <MD5> <LPAREN> expr1 = Expression() <RPAREN> { return new E_MD5(expr1) ; }
@@ -2141,6 +2142,7 @@ TOKEN [IGNORE_CASE] :
| < NOW: "NOW" >
#ifdef ARQ
| < UUID: "UUID" >
+| < STRUUID: "STRUUID" >
| < VERSION: "VERSION" >
#endif
Added: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrUUID.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrUUID.java?rev=1241478&view=auto
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrUUID.java (added)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrUUID.java Tue Feb 7 14:48:32 2012
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.hp.hpl.jena.sparql.expr;
+
+import com.hp.hpl.jena.sparql.expr.nodevalue.NodeFunctions ;
+import com.hp.hpl.jena.sparql.function.FunctionEnv ;
+import com.hp.hpl.jena.sparql.sse.Tags ;
+
+public class E_StrUUID extends ExprFunction0
+{
+ static private String fName = Tags.tagUUID ;
+
+ public E_StrUUID()
+ {
+ super(fName) ;
+ }
+
+ @Override
+ public Expr copy()
+ {
+ return new E_StrUUID() ;
+ }
+
+ @Override
+ public NodeValue eval(FunctionEnv env)
+ {
+ return NodeFunctions.struuid();
+ }
+}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeFunctions.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeFunctions.java?rev=1241478&r1=1241477&r2=1241478&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeFunctions.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeFunctions.java Tue Feb 7 14:48:32 2012
@@ -18,6 +18,7 @@
package com.hp.hpl.jena.sparql.expr.nodevalue;
import java.util.Iterator ;
+import java.util.UUID ;
import org.openjena.atlas.logging.Log ;
@@ -27,9 +28,6 @@ import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.iri.IRI ;
import com.hp.hpl.jena.iri.IRIFactory ;
import com.hp.hpl.jena.iri.Violation ;
-import com.hp.hpl.jena.shared.uuid.JenaUUID ;
-import com.hp.hpl.jena.shared.uuid.UUIDFactory ;
-import com.hp.hpl.jena.shared.uuid.UUID_V4_Gen ;
import com.hp.hpl.jena.sparql.expr.ExprEvalException ;
import com.hp.hpl.jena.sparql.expr.ExprTypeException ;
import com.hp.hpl.jena.sparql.expr.NodeValue ;
@@ -359,15 +357,40 @@ public class NodeFunctions
return Node.createURI(iri.toString()) ;
}
- private static UUIDFactory factory = new UUID_V4_Gen() ;
+ // The Jena version can vbe slow to inityailise (but is pure java)
+
+ //private static UUIDFactory factory = new UUID_V4_Gen() ;
+// private static UUIDFactory factory = new UUID_V1_Gen() ;
+// public static NodeValue uuid()
+// {
+// JenaUUID uuid = factory.generate() ;
+// Node n = Node.createURI(uuid.asURN()) ;
+// return NodeValue.makeNode(n) ;
+// }
+//
+// public static NodeValue struuid()
+// {
+// JenaUUID uuid = factory.generate() ;
+// return NodeValue.makeString(uuid.asString()) ;
+// }
+
+ public static NodeValue struuid()
+ {
+ return NodeValue.makeString(uuidString()) ;
+ }
+
public static NodeValue uuid()
{
- JenaUUID uuid = factory.generate() ;
- // uuid.asUUID()
- Node n = Node.createURI(uuid.asURI()) ;
+ String str = "urn:uuid:"+uuidString() ;
+ Node n = Node.createURI(str) ;
return NodeValue.makeNode(n) ;
}
+ private static String uuidString()
+ {
+ return UUID.randomUUID().toString() ;
+ }
+
private static String simpleLiteralOrXSDString(Node n)
{
if ( ! n.isLiteral() ) return null ;
Added: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/function/library/struuid.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/function/library/struuid.java?rev=1241478&view=auto
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/function/library/struuid.java (added)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/function/library/struuid.java Tue Feb 7 14:48:32 2012
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.hp.hpl.jena.sparql.function.library;
+
+import com.hp.hpl.jena.sparql.expr.NodeValue ;
+import com.hp.hpl.jena.sparql.expr.nodevalue.NodeFunctions ;
+import com.hp.hpl.jena.sparql.function.FunctionBase0 ;
+
+/** Function that returns a UUID as a string*/
+
+public class struuid extends FunctionBase0
+{
+ public struuid() {}
+
+ @Override
+ public NodeValue exec()
+ {
+ return NodeFunctions.struuid() ;
+ }
+}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/function/library/uuid.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/function/library/uuid.java?rev=1241478&r1=1241477&r2=1241478&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/function/library/uuid.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/function/library/uuid.java Tue Feb 7 14:48:32 2012
@@ -18,8 +18,6 @@
package com.hp.hpl.jena.sparql.function.library;
-//import org.apache.commons.logging.*;
-
import com.hp.hpl.jena.sparql.expr.NodeValue ;
import com.hp.hpl.jena.sparql.expr.nodevalue.NodeFunctions ;
import com.hp.hpl.jena.sparql.function.FunctionBase0 ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/arq/ARQParser.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/arq/ARQParser.java?rev=1241478&r1=1241477&r2=1241478&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/arq/ARQParser.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/arq/ARQParser.java Tue Feb 7 14:48:32 2012
@@ -229,6 +229,7 @@ public class ARQParser extends ARQParser
case TZ:
case NOW:
case UUID:
+ case STRUUID:
case VERSION:
case MD5:
case SHA1:
@@ -317,6 +318,7 @@ public class ARQParser extends ARQParser
case TZ:
case NOW:
case UUID:
+ case STRUUID:
case VERSION:
case MD5:
case SHA1:
@@ -463,6 +465,7 @@ public class ARQParser extends ARQParser
case TZ:
case NOW:
case UUID:
+ case STRUUID:
case VERSION:
case MD5:
case SHA1:
@@ -834,6 +837,7 @@ public class ARQParser extends ARQParser
case TZ:
case NOW:
case UUID:
+ case STRUUID:
case VERSION:
case MD5:
case SHA1:
@@ -908,6 +912,7 @@ public class ARQParser extends ARQParser
case TZ:
case NOW:
case UUID:
+ case STRUUID:
case VERSION:
case MD5:
case SHA1:
@@ -1015,6 +1020,7 @@ public class ARQParser extends ARQParser
case TZ:
case NOW:
case UUID:
+ case STRUUID:
case VERSION:
case MD5:
case SHA1:
@@ -1108,6 +1114,7 @@ public class ARQParser extends ARQParser
case TZ:
case NOW:
case UUID:
+ case STRUUID:
case VERSION:
case MD5:
case SHA1:
@@ -1207,6 +1214,7 @@ public class ARQParser extends ARQParser
case TZ:
case NOW:
case UUID:
+ case STRUUID:
case VERSION:
case MD5:
case SHA1:
@@ -1273,6 +1281,7 @@ public class ARQParser extends ARQParser
case TZ:
case NOW:
case UUID:
+ case STRUUID:
case VERSION:
case MD5:
case SHA1:
@@ -2605,6 +2614,7 @@ public class ARQParser extends ARQParser
case TZ:
case NOW:
case UUID:
+ case STRUUID:
case VERSION:
case MD5:
case SHA1:
@@ -3995,6 +4005,7 @@ public class ARQParser extends ARQParser
case TZ:
case NOW:
case UUID:
+ case STRUUID:
case VERSION:
case MD5:
case SHA1:
@@ -4090,6 +4101,7 @@ public class ARQParser extends ARQParser
case TZ:
case NOW:
case UUID:
+ case STRUUID:
case VERSION:
case MD5:
case SHA1:
@@ -4420,6 +4432,11 @@ public class ARQParser extends ARQParser
jj_consume_token(NIL);
{if (true) return new E_UUID() ;}
break;
+ case STRUUID:
+ jj_consume_token(STRUUID);
+ jj_consume_token(NIL);
+ {if (true) return new E_StrUUID() ;}
+ break;
case MD5:
jj_consume_token(MD5);
jj_consume_token(LPAREN);
@@ -4725,6 +4742,7 @@ public class ARQParser extends ARQParser
case TZ:
case NOW:
case UUID:
+ case STRUUID:
case VERSION:
case MD5:
case SHA1:
@@ -5201,101 +5219,101 @@ public class ARQParser extends ARQParser
}
private boolean jj_3R_79() {
- if (jj_scan_token(COALESCE)) return true;
- if (jj_3R_97()) return true;
- return false;
- }
-
- private boolean jj_3R_78() {
if (jj_scan_token(VERSION)) return true;
if (jj_scan_token(NIL)) return true;
return false;
}
- private boolean jj_3R_77() {
+ private boolean jj_3R_78() {
if (jj_scan_token(SHA512)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_148() {
+ private boolean jj_3R_149() {
if (jj_scan_token(STRING_LITERAL_LONG2)) return true;
return false;
}
- private boolean jj_3R_76() {
+ private boolean jj_3R_77() {
if (jj_scan_token(SHA384)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_147() {
+ private boolean jj_3R_148() {
if (jj_scan_token(STRING_LITERAL_LONG1)) return true;
return false;
}
- private boolean jj_3R_75() {
+ private boolean jj_3R_76() {
if (jj_scan_token(SHA256)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_146() {
+ private boolean jj_3R_147() {
if (jj_scan_token(STRING_LITERAL2)) return true;
return false;
}
- private boolean jj_3R_127() {
- if (jj_scan_token(NIL)) return true;
- return false;
- }
-
- private boolean jj_3R_74() {
+ private boolean jj_3R_75() {
if (jj_scan_token(SHA1)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_145() {
+ private boolean jj_3R_146() {
if (jj_scan_token(STRING_LITERAL1)) return true;
return false;
}
- private boolean jj_3R_73() {
- if (jj_scan_token(MD5)) return true;
- if (jj_scan_token(LPAREN)) return true;
+ private boolean jj_3R_128() {
+ if (jj_scan_token(NIL)) return true;
return false;
}
- private boolean jj_3R_126() {
- if (jj_3R_132()) return true;
+ private boolean jj_3R_74() {
+ if (jj_scan_token(MD5)) return true;
+ if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_72() {
- if (jj_scan_token(UUID)) return true;
+ private boolean jj_3R_73() {
+ if (jj_scan_token(STRUUID)) return true;
if (jj_scan_token(NIL)) return true;
return false;
}
- private boolean jj_3R_135() {
+ private boolean jj_3R_136() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_145()) {
- jj_scanpos = xsp;
if (jj_3R_146()) {
jj_scanpos = xsp;
if (jj_3R_147()) {
jj_scanpos = xsp;
- if (jj_3R_148()) return true;
+ if (jj_3R_148()) {
+ jj_scanpos = xsp;
+ if (jj_3R_149()) return true;
}
}
}
return false;
}
- private boolean jj_3R_125() {
- if (jj_3R_131()) return true;
+ private boolean jj_3R_127() {
+ if (jj_3R_133()) return true;
+ return false;
+ }
+
+ private boolean jj_3R_72() {
+ if (jj_scan_token(UUID)) return true;
+ if (jj_scan_token(NIL)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_126() {
+ if (jj_3R_132()) return true;
return false;
}
@@ -5305,8 +5323,8 @@ public class ARQParser extends ARQParser
return false;
}
- private boolean jj_3R_124() {
- if (jj_3R_130()) return true;
+ private boolean jj_3R_125() {
+ if (jj_3R_131()) return true;
return false;
}
@@ -5316,8 +5334,8 @@ public class ARQParser extends ARQParser
return false;
}
- private boolean jj_3R_123() {
- if (jj_3R_129()) return true;
+ private boolean jj_3R_124() {
+ if (jj_3R_130()) return true;
return false;
}
@@ -5327,16 +5345,19 @@ public class ARQParser extends ARQParser
return false;
}
- private boolean jj_3R_122() {
- if (jj_3R_128()) return true;
+ private boolean jj_3R_141() {
+ if (jj_scan_token(FALSE)) return true;
return false;
}
- private boolean jj_3R_119() {
+ private boolean jj_3R_123() {
+ if (jj_3R_129()) return true;
+ return false;
+ }
+
+ private boolean jj_3R_120() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_122()) {
- jj_scanpos = xsp;
if (jj_3R_123()) {
jj_scanpos = xsp;
if (jj_3R_124()) {
@@ -5345,7 +5366,9 @@ public class ARQParser extends ARQParser
jj_scanpos = xsp;
if (jj_3R_126()) {
jj_scanpos = xsp;
- if (jj_3R_127()) return true;
+ if (jj_3R_127()) {
+ jj_scanpos = xsp;
+ if (jj_3R_128()) return true;
}
}
}
@@ -5360,44 +5383,39 @@ public class ARQParser extends ARQParser
return false;
}
- private boolean jj_3R_140() {
- if (jj_scan_token(FALSE)) return true;
- return false;
- }
-
private boolean jj_3R_67() {
if (jj_scan_token(MINUTES)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_115() {
- if (jj_3R_119()) return true;
+ private boolean jj_3R_140() {
+ if (jj_scan_token(TRUE)) return true;
return false;
}
- private boolean jj_3R_66() {
- if (jj_scan_token(HOURS)) return true;
- if (jj_scan_token(LPAREN)) return true;
+ private boolean jj_3R_132() {
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_140()) {
+ jj_scanpos = xsp;
+ if (jj_3R_141()) return true;
+ }
return false;
}
- private boolean jj_3R_139() {
- if (jj_scan_token(TRUE)) return true;
+ private boolean jj_3R_116() {
+ if (jj_3R_120()) return true;
return false;
}
- private boolean jj_3R_131() {
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_139()) {
- jj_scanpos = xsp;
- if (jj_3R_140()) return true;
- }
+ private boolean jj_3R_66() {
+ if (jj_scan_token(HOURS)) return true;
+ if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_118() {
+ private boolean jj_3R_119() {
Token xsp;
xsp = jj_scanpos;
if (jj_scan_token(13)) {
@@ -5425,11 +5443,16 @@ public class ARQParser extends ARQParser
return false;
}
- private boolean jj_3R_162() {
+ private boolean jj_3R_163() {
if (jj_scan_token(DOUBLE_NEGATIVE)) return true;
return false;
}
+ private boolean jj_3R_162() {
+ if (jj_scan_token(DECIMAL_NEGATIVE)) return true;
+ return false;
+ }
+
private boolean jj_3R_62() {
if (jj_scan_token(STRAFTER)) return true;
if (jj_scan_token(LPAREN)) return true;
@@ -5437,23 +5460,18 @@ public class ARQParser extends ARQParser
}
private boolean jj_3R_161() {
- if (jj_scan_token(DECIMAL_NEGATIVE)) return true;
- return false;
- }
-
- private boolean jj_3R_160() {
if (jj_scan_token(INTEGER_NEGATIVE)) return true;
return false;
}
- private boolean jj_3R_151() {
+ private boolean jj_3R_152() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_160()) {
- jj_scanpos = xsp;
if (jj_3R_161()) {
jj_scanpos = xsp;
- if (jj_3R_162()) return true;
+ if (jj_3R_162()) {
+ jj_scanpos = xsp;
+ if (jj_3R_163()) return true;
}
}
return false;
@@ -5471,57 +5489,57 @@ public class ARQParser extends ARQParser
return false;
}
- private boolean jj_3R_159() {
+ private boolean jj_3R_160() {
if (jj_scan_token(DOUBLE_POSITIVE)) return true;
return false;
}
- private boolean jj_3R_59() {
- if (jj_scan_token(STRSTARTS)) return true;
- if (jj_scan_token(LPAREN)) return true;
- return false;
- }
-
- private boolean jj_3R_158() {
+ private boolean jj_3R_159() {
if (jj_scan_token(DECIMAL_POSITIVE)) return true;
return false;
}
- private boolean jj_3R_114() {
- if (jj_3R_118()) return true;
+ private boolean jj_3R_59() {
+ if (jj_scan_token(STRSTARTS)) return true;
+ if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_157() {
+ private boolean jj_3R_158() {
if (jj_scan_token(INTEGER_POSITIVE)) return true;
return false;
}
- private boolean jj_3R_150() {
+ private boolean jj_3R_151() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_157()) {
- jj_scanpos = xsp;
if (jj_3R_158()) {
jj_scanpos = xsp;
- if (jj_3R_159()) return true;
+ if (jj_3R_159()) {
+ jj_scanpos = xsp;
+ if (jj_3R_160()) return true;
}
}
return false;
}
+ private boolean jj_3R_115() {
+ if (jj_3R_119()) return true;
+ return false;
+ }
+
private boolean jj_3R_58() {
if (jj_scan_token(CONTAINS)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_103() {
+ private boolean jj_3R_104() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_114()) {
+ if (jj_3R_115()) {
jj_scanpos = xsp;
- if (jj_3R_115()) return true;
+ if (jj_3R_116()) return true;
}
return false;
}
@@ -5538,6 +5556,11 @@ public class ARQParser extends ARQParser
return false;
}
+ private boolean jj_3R_157() {
+ if (jj_scan_token(DOUBLE)) return true;
+ return false;
+ }
+
private boolean jj_3R_55() {
if (jj_scan_token(UCASE)) return true;
if (jj_scan_token(LPAREN)) return true;
@@ -5545,52 +5568,47 @@ public class ARQParser extends ARQParser
}
private boolean jj_3R_156() {
- if (jj_scan_token(DOUBLE)) return true;
+ if (jj_scan_token(DECIMAL)) return true;
return false;
}
private boolean jj_3R_54() {
- if (jj_3R_99()) return true;
+ if (jj_3R_100()) return true;
return false;
}
private boolean jj_3R_155() {
- if (jj_scan_token(DECIMAL)) return true;
- return false;
- }
-
- private boolean jj_3R_53() {
- if (jj_scan_token(STRLEN)) return true;
- if (jj_scan_token(LPAREN)) return true;
- return false;
- }
-
- private boolean jj_3R_154() {
if (jj_scan_token(INTEGER)) return true;
return false;
}
- private boolean jj_3R_149() {
+ private boolean jj_3R_150() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_154()) {
- jj_scanpos = xsp;
if (jj_3R_155()) {
jj_scanpos = xsp;
- if (jj_3R_156()) return true;
+ if (jj_3R_156()) {
+ jj_scanpos = xsp;
+ if (jj_3R_157()) return true;
}
}
return false;
}
+ private boolean jj_3R_53() {
+ if (jj_scan_token(STRLEN)) return true;
+ if (jj_scan_token(LPAREN)) return true;
+ return false;
+ }
+
private boolean jj_3R_52() {
- if (jj_3R_98()) return true;
+ if (jj_3R_99()) return true;
return false;
}
private boolean jj_3R_51() {
if (jj_scan_token(CONCAT)) return true;
- if (jj_3R_97()) return true;
+ if (jj_3R_98()) return true;
return false;
}
@@ -5600,6 +5618,11 @@ public class ARQParser extends ARQParser
return false;
}
+ private boolean jj_3R_139() {
+ if (jj_3R_152()) return true;
+ return false;
+ }
+
private boolean jj_3R_49() {
if (jj_scan_token(FLOOR)) return true;
if (jj_scan_token(LPAREN)) return true;
@@ -5628,41 +5651,36 @@ public class ARQParser extends ARQParser
return false;
}
- private boolean jj_3R_136() {
- if (jj_3R_149()) return true;
- return false;
- }
-
private boolean jj_3R_46() {
if (jj_scan_token(RAND)) return true;
if (jj_scan_token(NIL)) return true;
return false;
}
- private boolean jj_3R_96() {
+ private boolean jj_3R_97() {
if (jj_scan_token(NIL)) return true;
return false;
}
- private boolean jj_3_1() {
- if (jj_3R_35()) return true;
- return false;
- }
-
- private boolean jj_3R_130() {
+ private boolean jj_3R_131() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_136()) {
- jj_scanpos = xsp;
if (jj_3R_137()) {
jj_scanpos = xsp;
- if (jj_3R_138()) return true;
+ if (jj_3R_138()) {
+ jj_scanpos = xsp;
+ if (jj_3R_139()) return true;
}
}
return false;
}
- private boolean jj_3R_95() {
+ private boolean jj_3_1() {
+ if (jj_3R_35()) return true;
+ return false;
+ }
+
+ private boolean jj_3R_96() {
if (jj_scan_token(LPAREN)) return true;
return false;
}
@@ -5671,9 +5689,9 @@ public class ARQParser extends ARQParser
if (jj_scan_token(BNODE)) return true;
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_95()) {
+ if (jj_3R_96()) {
jj_scanpos = xsp;
- if (jj_3R_96()) return true;
+ if (jj_3R_97()) return true;
}
return false;
}
@@ -5696,14 +5714,14 @@ public class ARQParser extends ARQParser
return false;
}
- private boolean jj_3R_41() {
- if (jj_scan_token(DTYPE)) return true;
- if (jj_scan_token(LPAREN)) return true;
+ private boolean jj_3R_130() {
+ if (jj_3R_136()) return true;
return false;
}
- private boolean jj_3R_129() {
- if (jj_3R_135()) return true;
+ private boolean jj_3R_41() {
+ if (jj_scan_token(DTYPE)) return true;
+ if (jj_scan_token(LPAREN)) return true;
return false;
}
@@ -5713,7 +5731,7 @@ public class ARQParser extends ARQParser
return false;
}
- private boolean jj_3R_120() {
+ private boolean jj_3R_121() {
if (jj_scan_token(LPAREN)) return true;
return false;
}
@@ -5731,7 +5749,7 @@ public class ARQParser extends ARQParser
}
private boolean jj_3R_37() {
- if (jj_3R_94()) return true;
+ if (jj_3R_95()) return true;
return false;
}
@@ -5846,7 +5864,10 @@ public class ARQParser extends ARQParser
jj_scanpos = xsp;
if (jj_3R_90()) {
jj_scanpos = xsp;
- if (jj_3R_91()) return true;
+ if (jj_3R_91()) {
+ jj_scanpos = xsp;
+ if (jj_3R_92()) return true;
+ }
}
}
}
@@ -5904,27 +5925,27 @@ public class ARQParser extends ARQParser
return false;
}
- private boolean jj_3R_121() {
+ private boolean jj_3R_122() {
if (jj_scan_token(LBRACKET)) return true;
return false;
}
- private boolean jj_3R_117() {
- if (jj_3R_121()) return true;
+ private boolean jj_3R_118() {
+ if (jj_3R_122()) return true;
return false;
}
- private boolean jj_3R_116() {
- if (jj_3R_120()) return true;
+ private boolean jj_3R_117() {
+ if (jj_3R_121()) return true;
return false;
}
- private boolean jj_3R_104() {
+ private boolean jj_3R_105() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_116()) {
+ if (jj_3R_117()) {
jj_scanpos = xsp;
- if (jj_3R_117()) return true;
+ if (jj_3R_118()) return true;
}
return false;
}
@@ -5935,12 +5956,12 @@ public class ARQParser extends ARQParser
return false;
}
- private boolean jj_3R_93() {
- if (jj_3R_104()) return true;
+ private boolean jj_3R_94() {
+ if (jj_3R_105()) return true;
return false;
}
- private boolean jj_3R_111() {
+ private boolean jj_3R_112() {
if (jj_scan_token(GROUP_CONCAT)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
@@ -5949,25 +5970,25 @@ public class ARQParser extends ARQParser
private boolean jj_3R_36() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_92()) {
+ if (jj_3R_93()) {
jj_scanpos = xsp;
- if (jj_3R_93()) return true;
+ if (jj_3R_94()) return true;
}
return false;
}
- private boolean jj_3R_92() {
- if (jj_3R_103()) return true;
+ private boolean jj_3R_93() {
+ if (jj_3R_104()) return true;
return false;
}
- private boolean jj_3R_110() {
+ private boolean jj_3R_111() {
if (jj_scan_token(SAMPLE)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_109() {
+ private boolean jj_3R_110() {
if (jj_scan_token(AVG)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
@@ -5979,35 +6000,33 @@ public class ARQParser extends ARQParser
return false;
}
- private boolean jj_3R_108() {
+ private boolean jj_3R_109() {
if (jj_scan_token(MAX)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_107() {
+ private boolean jj_3R_108() {
if (jj_scan_token(MIN)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_106() {
+ private boolean jj_3R_107() {
if (jj_scan_token(SUM)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_105() {
+ private boolean jj_3R_106() {
if (jj_scan_token(COUNT)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_94() {
+ private boolean jj_3R_95() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_105()) {
- jj_scanpos = xsp;
if (jj_3R_106()) {
jj_scanpos = xsp;
if (jj_3R_107()) {
@@ -6018,7 +6037,9 @@ public class ARQParser extends ARQParser
jj_scanpos = xsp;
if (jj_3R_110()) {
jj_scanpos = xsp;
- if (jj_3R_111()) return true;
+ if (jj_3R_111()) {
+ jj_scanpos = xsp;
+ if (jj_3R_112()) return true;
}
}
}
@@ -6028,45 +6049,45 @@ public class ARQParser extends ARQParser
return false;
}
- private boolean jj_3R_112() {
+ private boolean jj_3R_113() {
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_102() {
+ private boolean jj_3R_103() {
if (jj_scan_token(NOT)) return true;
if (jj_scan_token(EXISTS)) return true;
return false;
}
- private boolean jj_3R_97() {
+ private boolean jj_3R_98() {
Token xsp;
xsp = jj_scanpos;
- if (jj_scan_token(163)) {
+ if (jj_scan_token(164)) {
jj_scanpos = xsp;
- if (jj_3R_112()) return true;
+ if (jj_3R_113()) return true;
}
return false;
}
- private boolean jj_3R_101() {
+ private boolean jj_3R_102() {
if (jj_scan_token(EXISTS)) return true;
- if (jj_3R_113()) return true;
+ if (jj_3R_114()) return true;
return false;
}
- private boolean jj_3R_99() {
+ private boolean jj_3R_100() {
if (jj_scan_token(REPLACE)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_113() {
+ private boolean jj_3R_114() {
if (jj_scan_token(LBRACE)) return true;
return false;
}
- private boolean jj_3R_98() {
+ private boolean jj_3R_99() {
if (jj_scan_token(SUBSTR)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
@@ -6078,146 +6099,152 @@ public class ARQParser extends ARQParser
return false;
}
- private boolean jj_3R_100() {
+ private boolean jj_3R_101() {
if (jj_scan_token(REGEX)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_143() {
+ private boolean jj_3R_144() {
if (jj_scan_token(IRIref)) return true;
return false;
}
- private boolean jj_3R_91() {
- if (jj_3R_102()) return true;
+ private boolean jj_3R_92() {
+ if (jj_3R_103()) return true;
return false;
}
- private boolean jj_3R_90() {
- if (jj_3R_101()) return true;
+ private boolean jj_3R_91() {
+ if (jj_3R_102()) return true;
return false;
}
- private boolean jj_3R_142() {
+ private boolean jj_3R_143() {
if (jj_scan_token(ANON)) return true;
return false;
}
- private boolean jj_3R_89() {
- if (jj_3R_100()) return true;
+ private boolean jj_3R_90() {
+ if (jj_3R_101()) return true;
return false;
}
- private boolean jj_3R_88() {
+ private boolean jj_3R_89() {
if (jj_scan_token(IS_NUMERIC)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_141() {
+ private boolean jj_3R_142() {
if (jj_scan_token(BLANK_NODE_LABEL)) return true;
return false;
}
- private boolean jj_3R_132() {
+ private boolean jj_3R_133() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_141()) {
+ if (jj_3R_142()) {
jj_scanpos = xsp;
- if (jj_3R_142()) return true;
+ if (jj_3R_143()) return true;
}
return false;
}
- private boolean jj_3R_87() {
+ private boolean jj_3R_88() {
if (jj_scan_token(IS_LITERAL)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_86() {
+ private boolean jj_3R_87() {
if (jj_scan_token(IS_BLANK)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_153() {
+ private boolean jj_3R_154() {
if (jj_scan_token(PNAME_NS)) return true;
return false;
}
- private boolean jj_3R_85() {
+ private boolean jj_3R_86() {
if (jj_scan_token(IS_URI)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_152() {
+ private boolean jj_3R_153() {
if (jj_scan_token(PNAME_LN)) return true;
return false;
}
- private boolean jj_3R_84() {
+ private boolean jj_3R_85() {
if (jj_scan_token(IS_IRI)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_144() {
+ private boolean jj_3R_145() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_152()) {
+ if (jj_3R_153()) {
jj_scanpos = xsp;
- if (jj_3R_153()) return true;
+ if (jj_3R_154()) return true;
}
return false;
}
- private boolean jj_3R_83() {
+ private boolean jj_3R_84() {
if (jj_scan_token(SAME_TERM)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_82() {
+ private boolean jj_3R_83() {
if (jj_scan_token(STRDT)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_134() {
- if (jj_3R_144()) return true;
+ private boolean jj_3R_135() {
+ if (jj_3R_145()) return true;
return false;
}
- private boolean jj_3R_81() {
+ private boolean jj_3R_82() {
if (jj_scan_token(STRLANG)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_133() {
- if (jj_3R_143()) return true;
+ private boolean jj_3R_134() {
+ if (jj_3R_144()) return true;
return false;
}
- private boolean jj_3R_128() {
+ private boolean jj_3R_129() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_133()) {
+ if (jj_3R_134()) {
jj_scanpos = xsp;
- if (jj_3R_134()) return true;
+ if (jj_3R_135()) return true;
}
return false;
}
- private boolean jj_3R_80() {
+ private boolean jj_3R_81() {
if (jj_scan_token(IF)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
+ private boolean jj_3R_80() {
+ if (jj_scan_token(COALESCE)) return true;
+ if (jj_3R_98()) return true;
+ return false;
+ }
+
/** Generated Token Manager. */
public ARQParserTokenManager token_source;
JavaCharStream jj_input_stream;
@@ -6256,16 +6283,16 @@ public class ARQParser extends ARQParser
jj_la1_2 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xffffff3d,0xffffff3d,0xffffff3d,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xffffff3d,0x0,0xffffff3d,0xffffff3d,0xffffff3d,0x0,0xffffff3d,0xffffff3d,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xffffff3d,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2,0x2,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xffffff3d,0xffffff3d,0x0,0xffffff3d,0x0,0x0,0x0,0x0,0xffffff3d,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
}
private static void jj_la1_init_3() {
- jj_la1_3 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x1800000,0x0,0x1f7ffff,0x1f7ffff,0x1f7ffff,0x0,0x0,0x1800000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x77ffff,0x0,0x77ffff,0x77ffff,0x77ffff,0x0,0x77ffff,0x77ffff,0x0,0x0,0x0,0x0,0x0,0x1800000,0x0,0x0,0x1800000,0x0,0xfc000000,0xfc000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000000,0xc000000,0x0,0x0,0x8000000,0x4000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1800000,0x0,0x0,0x1800000,0x1800000,0x0,0x0,0x1800000,0x0,0x0,0x1800000,0x1800000,0x0,0x0,0x0,0x0,0x77ffff,0x0,0x0,0x0,0x0,0x0,0x1800000,0x0,0x1800000,0x0,0x0,0x0,0x0,0x0,0x1800000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1800000,0x1800000,0x1800000,0x0,0x0,0x1800000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1f7ffff,0x1f7ffff,0x0,0x77ffff,0x0,0x0,0x0,0x0,0x1f7ffff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1800000,0x0,0x0,0x0,0x0,};
+ jj_la1_3 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x3000000,0x0,0x3efffff,0x3efffff,0x3efffff,0x0,0x0,0x3000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xefffff,0x0,0xefffff,0xefffff,0xefffff,0x0,0xefffff,0xefffff,0x0,0x0,0x0,0x0,0x0,0x3000000,0x0,0x0,0x3000000,0x0,0xf8000000,0xf8000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8000000,0x18000000,0x0,0x0,0x10000000,0x8000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3000000,0x0,0x0,0x3000000,0x3000000,0x0,0x0,0x3000000,0x0,0x0,0x3000000,0x3000000,0x0,0x0,0x0,0x0,0xefffff,0x0,0x0,0x0,0x0,0x0,0x3000000,0x0,0x3000000,0x0,0x0,0x0,0x0,0x0,0x3000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3000000,0x3000000,0x3000000,0x0,0x0,0x3000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3efffff,0x3efffff,0x0,0xefffff,0x0,0x0,0x0,0x0,0x3efffff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3000000,0x0,0x0,0x0,0x0,};
}
private static void jj_la1_init_4() {
- jj_la1_4 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0xe1ff0000,0x0,0xe1ff0000,0xe1ff0000,0xe1ff0000,0x0,0x0,0xe1ff0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xe1ff0000,0x0,0x0,0xe1ff0000,0x0,0x213f,0x213f,0x80,0x0,0x200,0x80,0x80,0x80,0x80,0x80,0x80,0x2000,0x0,0x0,0x4000,0x0,0x0,0x0,0x200,0x200,0x0,0x0,0x0,0x0,0x800,0x1800,0x1800,0xe1ff0000,0x0,0x0,0xe1ff0000,0xe1ff0000,0x0,0x0,0xe1ff0000,0x0,0x0,0xe1ff0000,0xe1ff0000,0x0,0x0,0x80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xe1ff0000,0x0,0xe1ff0000,0x0,0x0,0x0,0x0,0x0,0xe1ff0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10000,0x0,0x10000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xe1ff0000,0xe1ff0000,0xe1ff0000,0x0,0x0,0xe1ff0000,0x0,0x0,0x0,0x0,0x1f80000,0x1f80000,0x0,0x0,0x1f80000,0x0,0x0,0xe1ff0000,0xe1ff0000,0x0,0x0,0x0,0x0,0x0,0x0,0xe1ff0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1ff0000,0x70000,0x380000,0x1c00000,0x0,0xe0000000,0x0,0x0,0x0,};
+ jj_la1_4 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0xc3fe0000,0x0,0xc3fe0000,0xc3fe0000,0xc3fe0000,0x0,0x0,0xc3fe0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc3fe0000,0x0,0x0,0xc3fe0000,0x0,0x427f,0x427f,0x100,0x0,0x400,0x100,0x100,0x100,0x100,0x100,0x100,0x4000,0x0,0x0,0x8000,0x0,0x0,0x0,0x400,0x400,0x0,0x0,0x0,0x0,0x1000,0x3000,0x3000,0xc3fe0000,0x0,0x0,0xc3fe0000,0xc3fe0000,0x0,0x0,0xc3fe0000,0x0,0x0,0xc3fe0000,0xc3fe0000,0x0,0x0,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc3fe0000,0x0,0xc3fe0000,0x0,0x0,0x0,0x0,0x0,0xc3fe0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20000,0x0,0x20000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc3fe0000,0xc3fe0000,0xc3fe0000,0x0,0x0,0xc3fe0000,0x0,0x0,0x0,0x0,0x3f00000,0x3f00000,0x0,0x0,0x3f00000,0x0,0x0,0xc3fe0000,0xc3fe0000,0x0,0x0,0x0,0x0,0x0,0x0,0xc3fe0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3fe0000,0xe0000,0x700000,0x3800000,0x0,0xc0000000,0x0,0x0,0x0,};
}
private static void jj_la1_init_5() {
- jj_la1_5 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x3,0x3,0x2000003,0x0,0x0,0x14b,0x10,0x0,0x2000000,0x0,0x10,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x2,0x2,0x2,0x0,0x2,0x2,0x0,0x0,0x0,0x0,0xa,0x1,0xa,0x0,0x1,0x200,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x14b,0x0,0x800,0x14b,0x14b,0x800,0x0,0x14b,0x10,0x800,0x14b,0x14b,0x800,0x10,0x0,0x0,0x2,0x0,0x400,0xa,0x400,0xa,0x14b,0x800,0x14b,0x200,0x0,0x0,0x400,0x0,0x14b,0x80040002,0x200,0x80040002,0x80040002,0x0,0x40000000,0x84000000,0x84000000,0x2800010,0x80040002,0x20,0x420,0x400,0x2800010,0x40002,0x40000000,0x80000000,0x80000002,0x0,0x80000000,0x42,0x14b,0x14b,0x109,0x0,0x0,0x109,0x200000,0x400000,0x3f000,0x3f000,0x1800000,0x0,0x6000000,0x6000000,0x1800000,0x6000000,0x6000000,0x1840003,0x3,0xa,0x0,0x400,0x400,0x400,0x0,0x3840003,0x0,0x0,0x0,0x0,0x0,0x0,0x200,0x200,0x200,0x0,0xa,0x8000000,0x8000000,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x100,};
+ jj_la1_5 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x3,0x0,0x7,0x7,0x4000007,0x0,0x0,0x297,0x20,0x0,0x4000000,0x0,0x20,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4,0x0,0x4,0x4,0x4,0x0,0x4,0x4,0x0,0x0,0x0,0x0,0x14,0x3,0x14,0x0,0x3,0x400,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x297,0x0,0x1000,0x297,0x297,0x1000,0x0,0x297,0x20,0x1000,0x297,0x297,0x1000,0x20,0x0,0x0,0x4,0x0,0x800,0x14,0x800,0x14,0x297,0x1000,0x297,0x400,0x0,0x0,0x800,0x0,0x297,0x80004,0x400,0x80004,0x80004,0x0,0x80000000,0x8000000,0x8000000,0x5000020,0x80004,0x40,0x840,0x800,0x5000020,0x80004,0x80000000,0x0,0x4,0x0,0x0,0x84,0x297,0x297,0x213,0x0,0x0,0x213,0x400000,0x800000,0x7e000,0x7e000,0x3000000,0x0,0xc000000,0xc000000,0x3000000,0xc000000,0xc000000,0x3080007,0x7,0x14,0x0,0x800,0x800,0x800,0x0,0x7080007,0x0,0x0,0x0,0x0,0x0,0x0,0x400,0x400,0x400,0x0,0x14,0x10000000,0x10000000,0x0,0x0,0x0,0x0,0x0,0x3,0x0,0x0,0x200,};
}
private static void jj_la1_init_6() {
- jj_la1_6 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4,0x0,0x0,0x0,0x0,0x4,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
+ jj_la1_6 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1,0x1,0x0,0x0,0x1,0x1,0x8,0x1,0x0,0x0,0x0,0x8,0x0,0x0,0x1,0x1,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
}
final private JJCalls[] jj_2_rtns = new JJCalls[4];
private boolean jj_rescan = false;
@@ -6451,7 +6478,7 @@ public class ARQParser extends ARQParser
/** Generate ParseException. */
public ParseException generateParseException() {
jj_expentries.clear();
- boolean[] la1tokens = new boolean[206];
+ boolean[] la1tokens = new boolean[207];
if (jj_kind >= 0) {
la1tokens[jj_kind] = true;
jj_kind = -1;
@@ -6483,7 +6510,7 @@ public class ARQParser extends ARQParser
}
}
}
- for (int i = 0; i < 206; i++) {
+ for (int i = 0; i < 207; i++) {
if (la1tokens[i]) {
jj_expentry = new int[1];
jj_expentry[0] = i;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/arq/ARQParserConstants.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/arq/ARQParserConstants.java?rev=1241478&r1=1241477&r2=1241478&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/arq/ARQParserConstants.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/arq/ARQParserConstants.java Tue Feb 7 14:48:32 2012
@@ -240,193 +240,195 @@ public interface ARQParserConstants {
/** RegularExpression Id. */
int UUID = 111;
/** RegularExpression Id. */
- int VERSION = 112;
+ int STRUUID = 112;
/** RegularExpression Id. */
- int MD5 = 113;
+ int VERSION = 113;
/** RegularExpression Id. */
- int SHA1 = 114;
+ int MD5 = 114;
/** RegularExpression Id. */
- int SHA224 = 115;
+ int SHA1 = 115;
/** RegularExpression Id. */
- int SHA256 = 116;
+ int SHA224 = 116;
/** RegularExpression Id. */
- int SHA384 = 117;
+ int SHA256 = 117;
/** RegularExpression Id. */
- int SHA512 = 118;
+ int SHA384 = 118;
/** RegularExpression Id. */
- int TRUE = 119;
+ int SHA512 = 119;
/** RegularExpression Id. */
- int FALSE = 120;
+ int TRUE = 120;
/** RegularExpression Id. */
- int DATA = 121;
+ int FALSE = 121;
/** RegularExpression Id. */
- int INSERT = 122;
+ int DATA = 122;
/** RegularExpression Id. */
- int DELETE = 123;
+ int INSERT = 123;
/** RegularExpression Id. */
- int INSERT_DATA = 124;
+ int DELETE = 124;
/** RegularExpression Id. */
- int DELETE_DATA = 125;
+ int INSERT_DATA = 125;
/** RegularExpression Id. */
- int DELETE_WHERE = 126;
+ int DELETE_DATA = 126;
/** RegularExpression Id. */
- int MODIFY = 127;
+ int DELETE_WHERE = 127;
/** RegularExpression Id. */
- int LOAD = 128;
+ int MODIFY = 128;
/** RegularExpression Id. */
- int CLEAR = 129;
+ int LOAD = 129;
/** RegularExpression Id. */
- int CREATE = 130;
+ int CLEAR = 130;
/** RegularExpression Id. */
- int ADD = 131;
+ int CREATE = 131;
/** RegularExpression Id. */
- int MOVE = 132;
+ int ADD = 132;
/** RegularExpression Id. */
- int COPY = 133;
+ int MOVE = 133;
/** RegularExpression Id. */
- int META = 134;
+ int COPY = 134;
/** RegularExpression Id. */
- int SILENT = 135;
+ int META = 135;
/** RegularExpression Id. */
- int DROP = 136;
+ int SILENT = 136;
/** RegularExpression Id. */
- int INTO = 137;
+ int DROP = 137;
/** RegularExpression Id. */
- int TO = 138;
+ int INTO = 138;
/** RegularExpression Id. */
- int DFT = 139;
+ int TO = 139;
/** RegularExpression Id. */
- int ALL = 140;
+ int DFT = 140;
/** RegularExpression Id. */
- int WITH = 141;
+ int ALL = 141;
/** RegularExpression Id. */
- int USING = 142;
+ int WITH = 142;
/** RegularExpression Id. */
- int DIGITS = 143;
+ int USING = 143;
/** RegularExpression Id. */
- int INTEGER = 144;
+ int DIGITS = 144;
/** RegularExpression Id. */
- int DECIMAL = 145;
+ int INTEGER = 145;
/** RegularExpression Id. */
- int DOUBLE = 146;
+ int DECIMAL = 146;
/** RegularExpression Id. */
- int INTEGER_POSITIVE = 147;
+ int DOUBLE = 147;
/** RegularExpression Id. */
- int DECIMAL_POSITIVE = 148;
+ int INTEGER_POSITIVE = 148;
/** RegularExpression Id. */
- int DOUBLE_POSITIVE = 149;
+ int DECIMAL_POSITIVE = 149;
/** RegularExpression Id. */
- int INTEGER_NEGATIVE = 150;
+ int DOUBLE_POSITIVE = 150;
/** RegularExpression Id. */
- int DECIMAL_NEGATIVE = 151;
+ int INTEGER_NEGATIVE = 151;
/** RegularExpression Id. */
- int DOUBLE_NEGATIVE = 152;
+ int DECIMAL_NEGATIVE = 152;
/** RegularExpression Id. */
- int EXPONENT = 153;
+ int DOUBLE_NEGATIVE = 153;
/** RegularExpression Id. */
- int QUOTE_3D = 154;
+ int EXPONENT = 154;
/** RegularExpression Id. */
- int QUOTE_3S = 155;
+ int QUOTE_3D = 155;
/** RegularExpression Id. */
- int ECHAR = 156;
+ int QUOTE_3S = 156;
/** RegularExpression Id. */
- int STRING_LITERAL1 = 157;
+ int ECHAR = 157;
/** RegularExpression Id. */
- int STRING_LITERAL2 = 158;
+ int STRING_LITERAL1 = 158;
/** RegularExpression Id. */
- int STRING_LITERAL_LONG1 = 159;
+ int STRING_LITERAL2 = 159;
/** RegularExpression Id. */
- int STRING_LITERAL_LONG2 = 160;
+ int STRING_LITERAL_LONG1 = 160;
/** RegularExpression Id. */
- int LPAREN = 161;
+ int STRING_LITERAL_LONG2 = 161;
/** RegularExpression Id. */
- int RPAREN = 162;
+ int LPAREN = 162;
/** RegularExpression Id. */
- int NIL = 163;
+ int RPAREN = 163;
/** RegularExpression Id. */
- int LBRACE = 164;
+ int NIL = 164;
/** RegularExpression Id. */
- int RBRACE = 165;
+ int LBRACE = 165;
/** RegularExpression Id. */
- int LBRACKET = 166;
+ int RBRACE = 166;
/** RegularExpression Id. */
- int RBRACKET = 167;
+ int LBRACKET = 167;
/** RegularExpression Id. */
- int ANON = 168;
+ int RBRACKET = 168;
/** RegularExpression Id. */
- int SEMICOLON = 169;
+ int ANON = 169;
/** RegularExpression Id. */
- int COMMA = 170;
+ int SEMICOLON = 170;
/** RegularExpression Id. */
- int DOT = 171;
+ int COMMA = 171;
/** RegularExpression Id. */
- int EQ = 172;
+ int DOT = 172;
/** RegularExpression Id. */
- int NE = 173;
+ int EQ = 173;
/** RegularExpression Id. */
- int GT = 174;
+ int NE = 174;
/** RegularExpression Id. */
- int LT = 175;
+ int GT = 175;
/** RegularExpression Id. */
- int LE = 176;
+ int LT = 176;
/** RegularExpression Id. */
- int GE = 177;
+ int LE = 177;
/** RegularExpression Id. */
- int BANG = 178;
+ int GE = 178;
/** RegularExpression Id. */
- int TILDE = 179;
+ int BANG = 179;
/** RegularExpression Id. */
- int COLON = 180;
+ int TILDE = 180;
/** RegularExpression Id. */
- int SC_OR = 181;
+ int COLON = 181;
/** RegularExpression Id. */
- int SC_AND = 182;
+ int SC_OR = 182;
/** RegularExpression Id. */
- int PLUS = 183;
+ int SC_AND = 183;
/** RegularExpression Id. */
- int MINUS = 184;
+ int PLUS = 184;
/** RegularExpression Id. */
- int STAR = 185;
+ int MINUS = 185;
/** RegularExpression Id. */
- int SLASH = 186;
+ int STAR = 186;
/** RegularExpression Id. */
- int DATATYPE = 187;
+ int SLASH = 187;
/** RegularExpression Id. */
- int AT = 188;
+ int DATATYPE = 188;
/** RegularExpression Id. */
- int ASSIGN = 189;
+ int AT = 189;
/** RegularExpression Id. */
- int VBAR = 190;
+ int ASSIGN = 190;
/** RegularExpression Id. */
- int CARAT = 191;
+ int VBAR = 191;
/** RegularExpression Id. */
- int FPATH = 192;
+ int CARAT = 192;
/** RegularExpression Id. */
- int RPATH = 193;
+ int FPATH = 193;
/** RegularExpression Id. */
- int QMARK = 194;
+ int RPATH = 194;
/** RegularExpression Id. */
- int HEX = 195;
+ int QMARK = 195;
/** RegularExpression Id. */
- int PERCENT = 196;
+ int HEX = 196;
/** RegularExpression Id. */
- int PN_LOCAL_ESC = 197;
+ int PERCENT = 197;
/** RegularExpression Id. */
- int PN_CHARS_BASE = 198;
+ int PN_LOCAL_ESC = 198;
/** RegularExpression Id. */
- int PN_CHARS_U = 199;
+ int PN_CHARS_BASE = 199;
/** RegularExpression Id. */
- int PN_CHARS = 200;
+ int PN_CHARS_U = 200;
/** RegularExpression Id. */
- int PN_PREFIX = 201;
+ int PN_CHARS = 201;
/** RegularExpression Id. */
- int PLX = 202;
+ int PN_PREFIX = 202;
/** RegularExpression Id. */
- int PN_LOCAL = 203;
+ int PLX = 203;
/** RegularExpression Id. */
- int VARNAME = 204;
+ int PN_LOCAL = 204;
/** RegularExpression Id. */
- int UNKNOWN = 205;
+ int VARNAME = 205;
+ /** RegularExpression Id. */
+ int UNKNOWN = 206;
/** Lexical state. */
int DEFAULT = 0;
@@ -545,6 +547,7 @@ public interface ARQParserConstants {
"\"TZ\"",
"\"NOW\"",
"\"UUID\"",
+ "\"STRUUID\"",
"\"VERSION\"",
"\"MD5\"",
"\"SHA1\"",