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 2011/09/30 23:29:06 UTC
svn commit: r1177842 [1/3] - 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...
Author: andy
Date: Fri Sep 30 21:29:06 2011
New Revision: 1177842
URL: http://svn.apache.org/viewvc?rev=1177842&view=rev
Log:
Add REPLACE and UUID (ARQ syntax)
Added:
incubator/jena/Jena2/ARQ/trunk/Q.arq
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrReplace.java (with props)
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/E_UUID.java (with props)
Modified:
incubator/jena/Jena2/ARQ/trunk/.classpath
incubator/jena/Jena2/ARQ/trunk/ChangeLog.txt
incubator/jena/Jena2/ARQ/trunk/Grammar/arq.jj
incubator/jena/Jena2/ARQ/trunk/Grammar/grammar
incubator/jena/Jena2/ARQ/trunk/Grammar/master.jj
incubator/jena/Jena2/ARQ/trunk/Grammar/tokens.txt
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/RegexJava.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/XSDFuncOp.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/.classpath
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/.classpath?rev=1177842&r1=1177841&r2=1177842&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/.classpath (original)
+++ incubator/jena/Jena2/ARQ/trunk/.classpath Fri Sep 30 21:29:06 2011
@@ -1,8 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry excluding="**/.svn/" kind="src" path="src-examples"/>
- <classpathentry kind="src" path="src/test/java"/>
<classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="src/test/java"/>
+ <classpathentry excluding="**/.svn/" kind="src" path="src-examples"/>
+ <classpathentry kind="output" path="classes"/>
+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.4/commons-codec-1.4.jar" sourcepath="M2_REPO/commons-codec/commons-codec/1.4/commons-codec-1.4-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-sources.jar"/>
@@ -21,5 +23,4 @@
<classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0.1/stax-api-1.0.1.jar"/>
<classpathentry kind="var" path="M2_REPO/org/codehaus/woodstox/wstx-asl/3.2.9/wstx-asl-3.2.9.jar" sourcepath="M2_REPO/org/codehaus/woodstox/wstx-asl/3.2.9/wstx-asl-3.2.9-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.7.1/xercesImpl-2.7.1.jar"/>
- <classpathentry kind="output" path="classes"/>
</classpath>
Modified: incubator/jena/Jena2/ARQ/trunk/ChangeLog.txt
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/ChangeLog.txt?rev=1177842&r1=1177841&r2=1177842&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/ChangeLog.txt (original)
+++ incubator/jena/Jena2/ARQ/trunk/ChangeLog.txt Fri Sep 30 21:29:06 2011
@@ -3,7 +3,9 @@ ChangeLog for ARQ
==== ARQ 2.8.9
-+ Remove ALQR from ARQ. LARQ is now a separate Jena module.
++ Add function UUID
++ Add function REPLACE (see fn:string-replace in XPath/XQuery F&O)
++ Remove LARQ from ARQ. LARQ is now a separate Jena module.
+ Fix reuse of query objects (aggregation used shared state) (JENA-121)
+ Spill to disk update (enable with ARQ.spillOnDiskUpdateThreshold) (JENA-45)
+ External sort (enable with ARQ.spillOnDiskSortingThreshold) (JENA-44)
Modified: incubator/jena/Jena2/ARQ/trunk/Grammar/arq.jj
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/Grammar/arq.jj?rev=1177842&r1=1177841&r2=1177842&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/Grammar/arq.jj (original)
+++ incubator/jena/Jena2/ARQ/trunk/Grammar/arq.jj Fri Sep 30 21:29:06 2011
@@ -1305,6 +1305,7 @@ Expr BuiltInCall() : { Expr expr ; Expr
| <CONCAT> a = ExpressionList() { return new E_StrConcat(a) ; }
| expr = SubstringExpression() { return expr ; }
| <STRLEN> <LPAREN> expr1 = Expression() <RPAREN> { return new E_StrLength(expr1) ; }
+ | expr = StrReplaceExpression() { return expr ; }
| <UCASE> <LPAREN> expr1 = Expression() <RPAREN> { return new E_StrUpperCase(expr1) ; }
| <LCASE> <LPAREN> expr1 = Expression() <RPAREN> { return new E_StrLowerCase(expr1) ; }
| <ENCODE_FOR_URI> <LPAREN> expr1 = Expression() <RPAREN> { return new E_StrEncodeForURI(expr1) ; }
@@ -1323,12 +1324,14 @@ Expr BuiltInCall() : { Expr expr ; Expr
| <TIMEZONE> <LPAREN> expr1 = Expression() <RPAREN> { return new E_DateTimeTimezone(expr1) ; }
| <TZ> <LPAREN> expr1 = Expression() <RPAREN> { return new E_DateTimeTZ(expr1) ; }
| <NOW> <NIL> { return new E_Now() ; }
+ | <UUID> <NIL> { return new E_UUID() ; }
| <MD5> <LPAREN> expr1 = Expression() <RPAREN> { return new E_MD5(expr1) ; }
| <SHA1> <LPAREN> expr1 = Expression() <RPAREN> { return new E_SHA1(expr1) ; }
| <SHA224> <LPAREN> expr1 = Expression() <RPAREN> { return new E_SHA224(expr1) ; }
| <SHA256> <LPAREN> expr1 = Expression() <RPAREN> { return new E_SHA256(expr1) ; }
| <SHA384> <LPAREN> expr1 = Expression() <RPAREN> { return new E_SHA384(expr1) ; }
| <SHA512> <LPAREN> expr1 = Expression() <RPAREN> { return new E_SHA512(expr1) ; }
+ | <VERSION> <NIL> { return new E_Version(); }
| <COALESCE> a = ExpressionList()
{ return new E_Coalesce(a) ; }
| <IF> <LPAREN> expr = Expression() <COMMA>
@@ -1380,6 +1383,18 @@ Expr SubstringExpression() :
<RPAREN>
{ return new E_StrSubstring(expr1, expr2, expr3) ; }
}
+Expr StrReplaceExpression() :
+{ Expr expr1 ; Expr expr2 = null ; Expr expr3 = null ; Expr expr4 = null ;}
+{
+ <REPLACE>
+ <LPAREN>
+ expr1 = Expression()
+ <COMMA> expr2 = Expression()
+ <COMMA> expr3 = Expression()
+ ( <COMMA> expr4 = Expression() ) ?
+ <RPAREN>
+ { return new E_StrReplace(expr1,expr2,expr3,expr4) ; }
+}
Expr ExistsFunc() : { Element el ; }
{
<EXISTS>
@@ -1654,6 +1669,7 @@ TOKEN [IGNORE_CASE] :
| < CONCAT: "CONCAT" >
| < SUBSTR: "SUBSTR" >
| < STRLEN: "STRLEN" >
+| < REPLACE: "REPLACE" >
| < UCASE: "UCASE" >
| < LCASE: "LCASE" >
| < ENCODE_FOR_URI: "ENCODE_FOR_URI" >
@@ -1669,6 +1685,7 @@ TOKEN [IGNORE_CASE] :
| < TIMEZONE: "TIMEZONE" >
| < TZ: "TZ" >
| < NOW: "NOW" >
+| < UUID: "UUID" >
| < VERSION: "VERSION" >
| < MD5: "MD5" >
| < SHA1: "SHA1" >
Modified: incubator/jena/Jena2/ARQ/trunk/Grammar/grammar
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/Grammar/grammar?rev=1177842&r1=1177841&r2=1177842&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/Grammar/grammar (original)
+++ incubator/jena/Jena2/ARQ/trunk/Grammar/grammar Fri Sep 30 21:29:06 2011
@@ -14,7 +14,7 @@ function grammar
## NAME="$(echo $N | tr '[:lower:]' '[:upper:]')"
## DIR1="$(echo $N | tr '[:upper:]' '[:lower:]')"
- DIR="../src/com/hp/hpl/jena/sparql/lang/$PKG"
+ DIR="../src/main/java/com/hp/hpl/jena/sparql/lang/$PKG"
(cd "$DIR" ; rm -f TokenMgrError.java ParseException.java Token.java JavaCharStream.java )
Modified: incubator/jena/Jena2/ARQ/trunk/Grammar/master.jj
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/Grammar/master.jj?rev=1177842&r1=1177841&r2=1177842&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/Grammar/master.jj (original)
+++ incubator/jena/Jena2/ARQ/trunk/Grammar/master.jj Fri Sep 30 21:29:06 2011
@@ -1594,7 +1594,7 @@ Expr BrackettedExpression() : { Expr exp
<LPAREN> expr = Expression() <RPAREN> { return expr ; }
}
-Expr BuiltInCall() : { Expr expr ; Expr expr1 = null ; Expr expr2 = null ;
+Expr BuiltInCall() : { Expr expr ; Expr expr1 = null ; Expr expr2 = null ;
Node gn ; Token t ; ExprList a ; }
{
<STR> <LPAREN> expr = Expression() <RPAREN>
@@ -1640,6 +1640,10 @@ Expr BuiltInCall() : { Expr expr ; Expr
| expr = SubstringExpression() { return expr ; }
| <STRLEN> <LPAREN> expr1 = Expression() <RPAREN> { return new E_StrLength(expr1) ; }
+
+#ifdef ARQ
+ | expr = StrReplaceExpression() { return expr ; }
+#endif
| <UCASE> <LPAREN> expr1 = Expression() <RPAREN> { return new E_StrUpperCase(expr1) ; }
@@ -1672,7 +1676,9 @@ Expr BuiltInCall() : { Expr expr ; Expr
| <TZ> <LPAREN> expr1 = Expression() <RPAREN> { return new E_DateTimeTZ(expr1) ; }
| <NOW> <NIL> { return new E_Now() ; }
-
+#ifdef ARQ
+ | <UUID> <NIL> { return new E_UUID() ; }
+#endif
| <MD5> <LPAREN> expr1 = Expression() <RPAREN> { return new E_MD5(expr1) ; }
| <SHA1> <LPAREN> expr1 = Expression() <RPAREN> { return new E_SHA1(expr1) ; }
@@ -1685,7 +1691,7 @@ Expr BuiltInCall() : { Expr expr ; Expr
| <SHA512> <LPAREN> expr1 = Expression() <RPAREN> { return new E_SHA512(expr1) ; }
-#if 0
+#if ARQ
| <VERSION> <NIL> { return new E_Version(); }
#endif
@@ -1761,6 +1767,21 @@ Expr SubstringExpression() :
{ return new E_StrSubstring(expr1, expr2, expr3) ; }
}
+#ifdef ARQ
+Expr StrReplaceExpression() :
+{ Expr expr1 ; Expr expr2 = null ; Expr expr3 = null ; Expr expr4 = null ;}
+{
+ <REPLACE>
+ <LPAREN>
+ expr1 = Expression()
+ <COMMA> expr2 = Expression()
+ <COMMA> expr3 = Expression()
+ ( <COMMA> expr4 = Expression() ) ?
+ <RPAREN>
+ { return new E_StrReplace(expr1,expr2,expr3,expr4) ; }
+}
+#endif
+
Expr ExistsFunc() : { Element el ; }
{
<EXISTS>
@@ -1775,7 +1796,6 @@ Expr NotExistsFunc() : { Element el ; }
{ return createExprNotExists(el) ; }
}
-
Expr Aggregate() : { Aggregator agg = null ; String sep = null ;
boolean distinct = false ;
Expr expr = null ; Expr expr2 = null ;
@@ -2108,12 +2128,15 @@ TOKEN [IGNORE_CASE] :
| < CONCAT: "CONCAT" >
| < SUBSTR: "SUBSTR" >
| < STRLEN: "STRLEN" >
+#ifdef ARQ
+| < REPLACE: "REPLACE" >
+#endif
| < UCASE: "UCASE" >
| < LCASE: "LCASE" >
| < ENCODE_FOR_URI: "ENCODE_FOR_URI" >
| < CONTAINS: "CONTAINS" >
-| < STRSTARTS: "strSTARTS" >
-| < STRENDS: "strENDS" >
+| < STRSTARTS: "strSTARTS" >
+| < STRENDS: "strENDS" >
| < YEAR: "YEAR" >
| < MONTH: "MONTH" >
| < DAY: "DAY" >
@@ -2123,8 +2146,8 @@ TOKEN [IGNORE_CASE] :
| < TIMEZONE: "TIMEZONE" >
| < TZ: "TZ" >
| < NOW: "NOW" >
-
#ifdef ARQ
+| < UUID: "UUID" >
| < VERSION: "VERSION" >
#endif
Modified: incubator/jena/Jena2/ARQ/trunk/Grammar/tokens.txt
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/Grammar/tokens.txt?rev=1177842&r1=1177841&r2=1177842&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/Grammar/tokens.txt (original)
+++ incubator/jena/Jena2/ARQ/trunk/Grammar/tokens.txt Fri Sep 30 21:29:06 2011
@@ -115,6 +115,7 @@
[<CONCAT>] ::= 'CONCAT'
[<SUBSTR>] ::= 'SUBSTR'
[<STRLEN>] ::= 'STRLEN'
+[<REPLACE>] ::= 'REPLACE'
[<UCASE>] ::= 'UCASE'
[<LCASE>] ::= 'LCASE'
[<ENCODE_FOR_URI>] ::= 'ENCODE_FOR_URI'
@@ -130,6 +131,7 @@
[<TIMEZONE>] ::= 'TIMEZONE'
[<TZ>] ::= 'TZ'
[<NOW>] ::= 'NOW'
+[<UUID>] ::= 'UUID'
[<VERSION>] ::= 'VERSION'
[<MD5>] ::= 'MD5'
[<SHA1>] ::= 'SHA1'
Added: incubator/jena/Jena2/ARQ/trunk/Q.arq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/Q.arq?rev=1177842&view=auto
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/Q.arq (added)
+++ incubator/jena/Jena2/ARQ/trunk/Q.arq Fri Sep 30 21:29:06 2011
@@ -0,0 +1,6 @@
+SELECT *
+{
+?s ?p ?o .
+BIND( REPLACE(?o, "a", "A") AS ?o2 )
+BIND( UUID() AS ?o3 )
+}
\ No newline at end of file
Added: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrReplace.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrReplace.java?rev=1177842&view=auto
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrReplace.java (added)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrReplace.java Fri Sep 30 21:29:06 2011
@@ -0,0 +1,82 @@
+/**
+ * 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 java.util.List ;
+import java.util.regex.Pattern ;
+
+import com.hp.hpl.jena.sparql.expr.nodevalue.XSDFuncOp ;
+import com.hp.hpl.jena.sparql.sse.Tags ;
+
+public class E_StrReplace extends ExprFunctionN
+{
+ private static final String symbol = Tags.tagReplace ;
+ private Pattern pattern = null ;
+
+ public E_StrReplace(Expr expr1, Expr expr2, Expr expr3, Expr expr4)
+ {
+ super(symbol, expr1, expr2, expr3, expr4) ;
+
+
+ if ( isString(expr2) && (expr4 == null || isString(expr4) ) )
+ {
+ int flags = 0 ;
+ if ( expr4 != null && expr4.isConstant() && expr4.getConstant().isString() )
+ flags = RegexJava.makeMask(expr4.getConstant().getString()) ;
+ pattern = Pattern.compile(expr2.getConstant().getString(), flags) ;
+ }
+ }
+
+ private static boolean isString(Expr expr) { return expr.isConstant() && expr.getConstant().isString() ; }
+
+ @Override
+ protected NodeValue eval(List<NodeValue> args)
+ {
+ if ( pattern != null )
+ return XSDFuncOp.strReplace(args.get(0), pattern, args.get(2)) ;
+
+ if ( args.size() == 3 )
+ return XSDFuncOp.strReplace(args.get(0), args.get(1), args.get(2)) ;
+ return XSDFuncOp.strReplace(args.get(0), args.get(1), args.get(2), args.get(3)) ;
+ }
+
+ @Override
+ protected Expr copy(ExprList newArgs)
+ {
+ if ( newArgs.size() == 3 )
+ return new E_StrReplace(newArgs.get(0), newArgs.get(1), newArgs.get(2), null) ;
+ return new E_StrReplace(newArgs.get(0), newArgs.get(1), newArgs.get(2), newArgs.get(3)) ;
+ }
+
+
+
+// @Override
+// public NodeValue eval(NodeValue x, NodeValue y, NodeValue z)
+// {
+// if ( pattern == null )
+// return XSDFuncOp.strReplace(x, y, z) ;
+// return XSDFuncOp.strReplace(x, pattern, z) ;
+// }
+//
+// @Override
+// public Expr copy(Expr arg1, Expr arg2, Expr arg3)
+// {
+// return new E_StrReplace(arg1, arg2, arg3) ;
+// }
+}
Propchange: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/E_StrReplace.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/E_UUID.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/E_UUID.java?rev=1177842&view=auto
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/E_UUID.java (added)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/E_UUID.java Fri Sep 30 21:29:06 2011
@@ -0,0 +1,53 @@
+/**
+ * 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.graph.Node ;
+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.function.FunctionEnv ;
+import com.hp.hpl.jena.sparql.sse.Tags ;
+
+public class E_UUID extends ExprFunction0
+{
+ static private String fName = Tags.tagUUID ;
+ static UUIDFactory factory = new UUID_V4_Gen() ;
+ //static UUIDFactory factory = new UUID_V1_Gen() ;
+
+ public E_UUID()
+ {
+ super(fName) ;
+ }
+
+ @Override
+ public Expr copy()
+ {
+ return new E_UUID() ;
+ }
+
+ @Override
+ public NodeValue eval(FunctionEnv env)
+ {
+ JenaUUID uuid = factory.generate() ;
+ // uuid.asUUID()
+ Node n = Node.createURI(uuid.asURI()) ;
+ return NodeValue.makeNode(n) ;
+ }
+}
Propchange: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/E_UUID.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/RegexJava.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/RegexJava.java?rev=1177842&r1=1177841&r2=1177842&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/RegexJava.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/RegexJava.java Fri Sep 30 21:29:06 2011
@@ -52,7 +52,7 @@ public class RegexJava implements RegexE
}
- private int makeMask(String modifiers)
+ public static int makeMask(String modifiers)
{
if ( modifiers == null )
return 0 ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/XSDFuncOp.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/XSDFuncOp.java?rev=1177842&r1=1177841&r2=1177842&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/XSDFuncOp.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/XSDFuncOp.java Fri Sep 30 21:29:06 2011
@@ -29,6 +29,7 @@ import java.text.DecimalFormat ;
import java.util.HashSet ;
import java.util.List ;
import java.util.Set ;
+import java.util.regex.Pattern ;
import org.openjena.atlas.lib.StrUtils ;
import org.openjena.atlas.logging.Log ;
@@ -39,10 +40,7 @@ import com.hp.hpl.jena.datatypes.xsd.XSD
import com.hp.hpl.jena.datatypes.xsd.XSDDuration ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.sparql.ARQInternalErrorException ;
-import com.hp.hpl.jena.sparql.expr.Expr ;
-import com.hp.hpl.jena.sparql.expr.ExprEvalException ;
-import com.hp.hpl.jena.sparql.expr.ExprEvalTypeException ;
-import com.hp.hpl.jena.sparql.expr.NodeValue ;
+import com.hp.hpl.jena.sparql.expr.* ;
import com.hp.hpl.jena.sparql.util.DateTimeStruct ;
/**
* Implementation of XQuery/XPath functions and operators.
@@ -415,6 +413,33 @@ public class XSDFuncOp
return NodeValue.makeInteger(len) ;
}
+ public static NodeValue strReplace(NodeValue nvStr, NodeValue nvPattern, NodeValue nvReplacement, NodeValue nvFlags)
+ {
+ String pat = checkAndGetString("replace", nvPattern).getLiteralLexicalForm() ;
+ int flags = 0 ;
+ if ( nvFlags != null )
+ {
+ String flagsStr = checkAndGetString("replace", nvFlags).getLiteralLexicalForm() ;
+ flags = RegexJava.makeMask(flagsStr) ;
+ }
+
+ return strReplace(nvStr, Pattern.compile(pat, flags), nvReplacement) ;
+ }
+
+ public static NodeValue strReplace(NodeValue nvStr, Pattern pattern, NodeValue nvReplacement)
+ {
+ String n = checkAndGetString("replace", nvStr).getLiteralLexicalForm() ;
+ String rep = checkAndGetString("replace", nvReplacement).getLiteralLexicalForm() ;
+ String x = pattern.matcher(n).replaceAll(rep) ;
+ return NodeValue.makeString(x) ;
+ }
+
+
+ public static NodeValue strReplace(NodeValue nvStr, NodeValue nvPattern, NodeValue nvReplacement)
+ {
+ return strReplace(nvStr, nvPattern, nvReplacement, null) ;
+ }
+
public static NodeValue substring(NodeValue v1, NodeValue v2)
{
return substring(v1, v2, null) ;
@@ -444,7 +469,6 @@ public class XSDFuncOp
if ( start < 0 )
length = length-start ; // Address to end of string.
}
-
int finish = start + length ;
@@ -1310,5 +1334,5 @@ public class XSDFuncOp
idx++ ;
sb.append(indicator) ;
}
- }
+ }
}
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=1177842&r1=1177841&r2=1177842&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 Fri Sep 30 21:29:06 2011
@@ -210,6 +210,7 @@ public class ARQParser extends ARQParser
case CONCAT:
case SUBSTR:
case STRLEN:
+ case REPLACE:
case UCASE:
case LCASE:
case ENCODE_FOR_URI:
@@ -225,6 +226,8 @@ public class ARQParser extends ARQParser
case TIMEZONE:
case TZ:
case NOW:
+ case UUID:
+ case VERSION:
case MD5:
case SHA1:
case SHA224:
@@ -294,6 +297,7 @@ public class ARQParser extends ARQParser
case CONCAT:
case SUBSTR:
case STRLEN:
+ case REPLACE:
case UCASE:
case LCASE:
case ENCODE_FOR_URI:
@@ -309,6 +313,8 @@ public class ARQParser extends ARQParser
case TIMEZONE:
case TZ:
case NOW:
+ case UUID:
+ case VERSION:
case MD5:
case SHA1:
case SHA224:
@@ -364,6 +370,7 @@ public class ARQParser extends ARQParser
case CONCAT:
case SUBSTR:
case STRLEN:
+ case REPLACE:
case UCASE:
case LCASE:
case ENCODE_FOR_URI:
@@ -379,6 +386,8 @@ public class ARQParser extends ARQParser
case TIMEZONE:
case TZ:
case NOW:
+ case UUID:
+ case VERSION:
case MD5:
case SHA1:
case SHA224:
@@ -489,6 +498,7 @@ public class ARQParser extends ARQParser
case CONCAT:
case SUBSTR:
case STRLEN:
+ case REPLACE:
case UCASE:
case LCASE:
case ENCODE_FOR_URI:
@@ -504,6 +514,8 @@ public class ARQParser extends ARQParser
case TIMEZONE:
case TZ:
case NOW:
+ case UUID:
+ case VERSION:
case MD5:
case SHA1:
case SHA224:
@@ -848,6 +860,7 @@ public class ARQParser extends ARQParser
case CONCAT:
case SUBSTR:
case STRLEN:
+ case REPLACE:
case UCASE:
case LCASE:
case ENCODE_FOR_URI:
@@ -863,6 +876,8 @@ public class ARQParser extends ARQParser
case TIMEZONE:
case TZ:
case NOW:
+ case UUID:
+ case VERSION:
case MD5:
case SHA1:
case SHA224:
@@ -911,6 +926,7 @@ public class ARQParser extends ARQParser
case CONCAT:
case SUBSTR:
case STRLEN:
+ case REPLACE:
case UCASE:
case LCASE:
case ENCODE_FOR_URI:
@@ -926,6 +942,8 @@ public class ARQParser extends ARQParser
case TIMEZONE:
case TZ:
case NOW:
+ case UUID:
+ case VERSION:
case MD5:
case SHA1:
case SHA224:
@@ -1007,6 +1025,7 @@ public class ARQParser extends ARQParser
case CONCAT:
case SUBSTR:
case STRLEN:
+ case REPLACE:
case UCASE:
case LCASE:
case ENCODE_FOR_URI:
@@ -1022,6 +1041,8 @@ public class ARQParser extends ARQParser
case TIMEZONE:
case TZ:
case NOW:
+ case UUID:
+ case VERSION:
case MD5:
case SHA1:
case SHA224:
@@ -1088,6 +1109,7 @@ public class ARQParser extends ARQParser
case CONCAT:
case SUBSTR:
case STRLEN:
+ case REPLACE:
case UCASE:
case LCASE:
case ENCODE_FOR_URI:
@@ -1103,6 +1125,8 @@ public class ARQParser extends ARQParser
case TIMEZONE:
case TZ:
case NOW:
+ case UUID:
+ case VERSION:
case MD5:
case SHA1:
case SHA224:
@@ -1175,6 +1199,7 @@ public class ARQParser extends ARQParser
case CONCAT:
case SUBSTR:
case STRLEN:
+ case REPLACE:
case UCASE:
case LCASE:
case ENCODE_FOR_URI:
@@ -1190,6 +1215,8 @@ public class ARQParser extends ARQParser
case TIMEZONE:
case TZ:
case NOW:
+ case UUID:
+ case VERSION:
case MD5:
case SHA1:
case SHA224:
@@ -1230,6 +1257,7 @@ public class ARQParser extends ARQParser
case CONCAT:
case SUBSTR:
case STRLEN:
+ case REPLACE:
case UCASE:
case LCASE:
case ENCODE_FOR_URI:
@@ -1245,6 +1273,8 @@ public class ARQParser extends ARQParser
case TIMEZONE:
case TZ:
case NOW:
+ case UUID:
+ case VERSION:
case MD5:
case SHA1:
case SHA224:
@@ -2551,6 +2581,7 @@ public class ARQParser extends ARQParser
case CONCAT:
case SUBSTR:
case STRLEN:
+ case REPLACE:
case UCASE:
case LCASE:
case ENCODE_FOR_URI:
@@ -2566,6 +2597,8 @@ public class ARQParser extends ARQParser
case TIMEZONE:
case TZ:
case NOW:
+ case UUID:
+ case VERSION:
case MD5:
case SHA1:
case SHA224:
@@ -3937,6 +3970,7 @@ public class ARQParser extends ARQParser
case CONCAT:
case SUBSTR:
case STRLEN:
+ case REPLACE:
case UCASE:
case LCASE:
case ENCODE_FOR_URI:
@@ -3952,6 +3986,8 @@ public class ARQParser extends ARQParser
case TIMEZONE:
case TZ:
case NOW:
+ case UUID:
+ case VERSION:
case MD5:
case SHA1:
case SHA224:
@@ -4021,6 +4057,7 @@ public class ARQParser extends ARQParser
case CONCAT:
case SUBSTR:
case STRLEN:
+ case REPLACE:
case UCASE:
case LCASE:
case ENCODE_FOR_URI:
@@ -4036,6 +4073,8 @@ public class ARQParser extends ARQParser
case TIMEZONE:
case TZ:
case NOW:
+ case UUID:
+ case VERSION:
case MD5:
case SHA1:
case SHA224:
@@ -4230,6 +4269,10 @@ public class ARQParser extends ARQParser
jj_consume_token(RPAREN);
{if (true) return new E_StrLength(expr1) ;}
break;
+ case REPLACE:
+ expr = StrReplaceExpression();
+ {if (true) return expr ;}
+ break;
case UCASE:
jj_consume_token(UCASE);
jj_consume_token(LPAREN);
@@ -4339,6 +4382,11 @@ public class ARQParser extends ARQParser
jj_consume_token(NIL);
{if (true) return new E_Now() ;}
break;
+ case UUID:
+ jj_consume_token(UUID);
+ jj_consume_token(NIL);
+ {if (true) return new E_UUID() ;}
+ break;
case MD5:
jj_consume_token(MD5);
jj_consume_token(LPAREN);
@@ -4381,6 +4429,11 @@ public class ARQParser extends ARQParser
jj_consume_token(RPAREN);
{if (true) return new E_SHA512(expr1) ;}
break;
+ case VERSION:
+ jj_consume_token(VERSION);
+ jj_consume_token(NIL);
+ {if (true) return new E_Version();}
+ break;
case COALESCE:
jj_consume_token(COALESCE);
a = ExpressionList();
@@ -4522,6 +4575,29 @@ public class ARQParser extends ARQParser
throw new Error("Missing return statement in function");
}
+ final public Expr StrReplaceExpression() throws ParseException {
+ Expr expr1 ; Expr expr2 = null ; Expr expr3 = null ; Expr expr4 = null ;
+ jj_consume_token(REPLACE);
+ jj_consume_token(LPAREN);
+ expr1 = Expression();
+ jj_consume_token(COMMA);
+ expr2 = Expression();
+ jj_consume_token(COMMA);
+ expr3 = Expression();
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case COMMA:
+ jj_consume_token(COMMA);
+ expr4 = Expression();
+ break;
+ default:
+ jj_la1[146] = jj_gen;
+ ;
+ }
+ jj_consume_token(RPAREN);
+ {if (true) return new E_StrReplace(expr1,expr2,expr3,expr4) ;}
+ throw new Error("Missing return statement in function");
+ }
+
final public Expr ExistsFunc() throws ParseException {
Element el ;
jj_consume_token(EXISTS);
@@ -4556,7 +4632,7 @@ public class ARQParser extends ARQParser
distinct = true ;
break;
default:
- jj_la1[146] = jj_gen;
+ jj_la1[147] = jj_gen;
;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -4604,6 +4680,7 @@ public class ARQParser extends ARQParser
case CONCAT:
case SUBSTR:
case STRLEN:
+ case REPLACE:
case UCASE:
case LCASE:
case ENCODE_FOR_URI:
@@ -4619,6 +4696,8 @@ public class ARQParser extends ARQParser
case TIMEZONE:
case TZ:
case NOW:
+ case UUID:
+ case VERSION:
case MD5:
case SHA1:
case SHA224:
@@ -4647,7 +4726,7 @@ public class ARQParser extends ARQParser
expr = Expression();
break;
default:
- jj_la1[147] = jj_gen;
+ jj_la1[148] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -4664,7 +4743,7 @@ public class ARQParser extends ARQParser
distinct = true ;
break;
default:
- jj_la1[148] = jj_gen;
+ jj_la1[149] = jj_gen;
;
}
expr = Expression();
@@ -4680,7 +4759,7 @@ public class ARQParser extends ARQParser
distinct = true ;
break;
default:
- jj_la1[149] = jj_gen;
+ jj_la1[150] = jj_gen;
;
}
expr = Expression();
@@ -4696,7 +4775,7 @@ public class ARQParser extends ARQParser
distinct = true ;
break;
default:
- jj_la1[150] = jj_gen;
+ jj_la1[151] = jj_gen;
;
}
expr = Expression();
@@ -4712,7 +4791,7 @@ public class ARQParser extends ARQParser
distinct = true ;
break;
default:
- jj_la1[151] = jj_gen;
+ jj_la1[152] = jj_gen;
;
}
expr = Expression();
@@ -4728,7 +4807,7 @@ public class ARQParser extends ARQParser
distinct = true ;
break;
default:
- jj_la1[152] = jj_gen;
+ jj_la1[153] = jj_gen;
;
}
expr = Expression();
@@ -4744,7 +4823,7 @@ public class ARQParser extends ARQParser
distinct = true ;
break;
default:
- jj_la1[153] = jj_gen;
+ jj_la1[154] = jj_gen;
;
}
expr = Expression();
@@ -4765,7 +4844,7 @@ public class ARQParser extends ARQParser
ordered.add(expr2) ;
break;
default:
- jj_la1[154] = jj_gen;
+ jj_la1[155] = jj_gen;
;
}
} else {
@@ -4778,21 +4857,21 @@ public class ARQParser extends ARQParser
ordered.add(expr2) ;
break;
default:
- jj_la1[155] = jj_gen;
+ jj_la1[156] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
}
break;
default:
- jj_la1[156] = jj_gen;
+ jj_la1[157] = jj_gen;
;
}
jj_consume_token(RPAREN);
agg = AggregatorFactory.createGroupConcat(distinct, expr, sep, ordered) ;
break;
default:
- jj_la1[157] = jj_gen;
+ jj_la1[158] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -4818,7 +4897,7 @@ public class ARQParser extends ARQParser
a = ArgList();
break;
default:
- jj_la1[158] = jj_gen;
+ jj_la1[159] = jj_gen;
;
}
if ( a == null )
@@ -4844,13 +4923,13 @@ public class ARQParser extends ARQParser
uri = IRIref();
break;
default:
- jj_la1[159] = jj_gen;
+ jj_la1[160] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
break;
default:
- jj_la1[160] = jj_gen;
+ jj_la1[161] = jj_gen;
;
}
{if (true) return createLiteral(lex, lang, uri) ;}
@@ -4876,7 +4955,7 @@ public class ARQParser extends ARQParser
n = NumericLiteralNegative();
break;
default:
- jj_la1[161] = jj_gen;
+ jj_la1[162] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -4900,7 +4979,7 @@ public class ARQParser extends ARQParser
{if (true) return createLiteralDouble(t.image) ;}
break;
default:
- jj_la1[162] = jj_gen;
+ jj_la1[163] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -4923,7 +5002,7 @@ public class ARQParser extends ARQParser
{if (true) return createLiteralDouble(t.image) ;}
break;
default:
- jj_la1[163] = jj_gen;
+ jj_la1[164] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -4946,7 +5025,7 @@ public class ARQParser extends ARQParser
{if (true) return createLiteralDouble(t.image) ;}
break;
default:
- jj_la1[164] = jj_gen;
+ jj_la1[165] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -4964,7 +5043,7 @@ public class ARQParser extends ARQParser
{if (true) return XSD_FALSE ;}
break;
default:
- jj_la1[165] = jj_gen;
+ jj_la1[166] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -4991,7 +5070,7 @@ public class ARQParser extends ARQParser
lex = stripQuotes3(t.image) ;
break;
default:
- jj_la1[166] = jj_gen;
+ jj_la1[167] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -5013,7 +5092,7 @@ public class ARQParser extends ARQParser
{if (true) return iri ;}
break;
default:
- jj_la1[167] = jj_gen;
+ jj_la1[168] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -5032,7 +5111,7 @@ public class ARQParser extends ARQParser
{if (true) return resolvePName(t.image, t.beginLine, t.beginColumn) ;}
break;
default:
- jj_la1[168] = jj_gen;
+ jj_la1[169] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -5052,7 +5131,7 @@ public class ARQParser extends ARQParser
{if (true) return createBNode(t.beginLine, t.beginColumn) ;}
break;
default:
- jj_la1[169] = jj_gen;
+ jj_la1[170] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -5094,158 +5173,25 @@ public class ARQParser extends ARQParser
finally { jj_save(3, xla); }
}
- private boolean jj_3R_42() {
- if (jj_scan_token(SAMPLE)) return true;
- if (jj_scan_token(LPAREN)) return true;
- return false;
- }
-
- private boolean jj_3_3() {
- if (jj_scan_token(DOT)) return true;
- if (jj_3R_36()) return true;
- return false;
- }
-
- private boolean jj_3R_41() {
- if (jj_scan_token(AVG)) return true;
- if (jj_scan_token(LPAREN)) return true;
- return false;
- }
-
- private boolean jj_3R_40() {
- if (jj_scan_token(MAX)) return true;
- if (jj_scan_token(LPAREN)) return true;
- return false;
- }
-
- private boolean jj_3R_82() {
- if (jj_scan_token(STRING_LITERAL_LONG2)) return true;
- return false;
- }
-
- private boolean jj_3R_39() {
- if (jj_scan_token(MIN)) return true;
- if (jj_scan_token(LPAREN)) return true;
- return false;
- }
-
- private boolean jj_3R_81() {
- if (jj_scan_token(STRING_LITERAL_LONG1)) return true;
- return false;
- }
-
- private boolean jj_3R_61() {
- if (jj_scan_token(NIL)) return true;
- return false;
- }
-
- private boolean jj_3R_80() {
- if (jj_scan_token(STRING_LITERAL2)) return true;
- return false;
- }
-
- private boolean jj_3R_38() {
- if (jj_scan_token(SUM)) return true;
- if (jj_scan_token(LPAREN)) return true;
- return false;
- }
-
- private boolean jj_3R_79() {
- if (jj_scan_token(STRING_LITERAL1)) return true;
- return false;
- }
-
- private boolean jj_3R_60() {
- if (jj_3R_66()) return true;
- return false;
- }
-
- private boolean jj_3R_59() {
- if (jj_3R_65()) return true;
- return false;
- }
-
- private boolean jj_3R_69() {
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_79()) {
- jj_scanpos = xsp;
- if (jj_3R_80()) {
- jj_scanpos = xsp;
- if (jj_3R_81()) {
- jj_scanpos = xsp;
- if (jj_3R_82()) return true;
- }
- }
- }
- return false;
- }
-
- private boolean jj_3R_58() {
- if (jj_3R_64()) return true;
- return false;
- }
-
- private boolean jj_3R_57() {
- if (jj_3R_63()) return true;
- return false;
- }
-
- private boolean jj_3R_53() {
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_56()) {
- jj_scanpos = xsp;
- if (jj_3R_57()) {
- jj_scanpos = xsp;
- if (jj_3R_58()) {
- jj_scanpos = xsp;
- if (jj_3R_59()) {
- jj_scanpos = xsp;
- if (jj_3R_60()) {
- jj_scanpos = xsp;
- if (jj_3R_61()) return true;
- }
- }
- }
- }
- }
- return false;
- }
-
- private boolean jj_3R_56() {
- if (jj_3R_62()) return true;
- return false;
- }
-
private boolean jj_3R_74() {
if (jj_scan_token(FALSE)) return true;
return false;
}
- private boolean jj_3R_49() {
- if (jj_3R_53()) return true;
- return false;
- }
-
private boolean jj_3R_37() {
if (jj_scan_token(COUNT)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_52() {
- Token xsp;
- xsp = jj_scanpos;
- if (jj_scan_token(13)) {
- jj_scanpos = xsp;
- if (jj_scan_token(14)) return true;
- }
+ private boolean jj_3R_73() {
+ if (jj_scan_token(TRUE)) return true;
return false;
}
- private boolean jj_3R_73() {
- if (jj_scan_token(TRUE)) return true;
+ private boolean jj_3_3() {
+ if (jj_scan_token(DOT)) return true;
+ if (jj_3R_36()) return true;
return false;
}
@@ -5294,6 +5240,11 @@ public class ARQParser extends ARQParser
return false;
}
+ private boolean jj_3R_61() {
+ if (jj_scan_token(NIL)) return true;
+ return false;
+ }
+
private boolean jj_3R_94() {
if (jj_scan_token(INTEGER_NEGATIVE)) return true;
return false;
@@ -5312,13 +5263,28 @@ public class ARQParser extends ARQParser
return false;
}
+ private boolean jj_3R_60() {
+ if (jj_3R_66()) return true;
+ return false;
+ }
+
+ private boolean jj_3R_59() {
+ if (jj_3R_65()) return true;
+ return false;
+ }
+
+ private boolean jj_3R_58() {
+ if (jj_3R_64()) return true;
+ return false;
+ }
+
private boolean jj_3R_93() {
if (jj_scan_token(DOUBLE_POSITIVE)) return true;
return false;
}
- private boolean jj_3R_48() {
- if (jj_3R_52()) return true;
+ private boolean jj_3R_57() {
+ if (jj_3R_63()) return true;
return false;
}
@@ -5327,6 +5293,33 @@ public class ARQParser extends ARQParser
return false;
}
+ private boolean jj_3R_53() {
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_56()) {
+ jj_scanpos = xsp;
+ if (jj_3R_57()) {
+ jj_scanpos = xsp;
+ if (jj_3R_58()) {
+ jj_scanpos = xsp;
+ if (jj_3R_59()) {
+ jj_scanpos = xsp;
+ if (jj_3R_60()) {
+ jj_scanpos = xsp;
+ if (jj_3R_61()) return true;
+ }
+ }
+ }
+ }
+ }
+ return false;
+ }
+
+ private boolean jj_3R_56() {
+ if (jj_3R_62()) return true;
+ return false;
+ }
+
private boolean jj_3R_91() {
if (jj_scan_token(INTEGER_POSITIVE)) return true;
return false;
@@ -5345,12 +5338,17 @@ public class ARQParser extends ARQParser
return false;
}
- private boolean jj_3R_46() {
+ private boolean jj_3R_49() {
+ if (jj_3R_53()) return true;
+ return false;
+ }
+
+ private boolean jj_3R_52() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_48()) {
+ if (jj_scan_token(13)) {
jj_scanpos = xsp;
- if (jj_3R_49()) return true;
+ if (jj_scan_token(14)) return true;
}
return false;
}
@@ -5398,6 +5396,21 @@ public class ARQParser extends ARQParser
return false;
}
+ private boolean jj_3R_48() {
+ if (jj_3R_52()) return true;
+ return false;
+ }
+
+ private boolean jj_3R_46() {
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_48()) {
+ jj_scanpos = xsp;
+ if (jj_3R_49()) return true;
+ }
+ return false;
+ }
+
private boolean jj_3R_64() {
Token xsp;
xsp = jj_scanpos;
@@ -5411,29 +5424,13 @@ public class ARQParser extends ARQParser
return false;
}
- private boolean jj_3_1() {
- if (jj_3R_35()) return true;
- return false;
- }
-
private boolean jj_3R_63() {
if (jj_3R_69()) return true;
return false;
}
- private boolean jj_3R_54() {
- if (jj_scan_token(LPAREN)) return true;
- return false;
- }
-
- private boolean jj_3_2() {
- if (jj_scan_token(DOT)) return true;
- if (jj_3R_36()) return true;
- return false;
- }
-
- private boolean jj_3R_55() {
- if (jj_scan_token(LBRACKET)) return true;
+ private boolean jj_3_1() {
+ if (jj_3R_35()) return true;
return false;
}
@@ -5442,8 +5439,8 @@ public class ARQParser extends ARQParser
return false;
}
- private boolean jj_3R_51() {
- if (jj_3R_55()) return true;
+ private boolean jj_3R_54() {
+ if (jj_scan_token(LPAREN)) return true;
return false;
}
@@ -5452,18 +5449,9 @@ public class ARQParser extends ARQParser
return false;
}
- private boolean jj_3R_47() {
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_50()) {
- jj_scanpos = xsp;
- if (jj_3R_51()) return true;
- }
- return false;
- }
-
- private boolean jj_3R_50() {
- if (jj_3R_54()) return true;
+ private boolean jj_3_2() {
+ if (jj_scan_token(DOT)) return true;
+ if (jj_3R_36()) return true;
return false;
}
@@ -5487,6 +5475,11 @@ public class ARQParser extends ARQParser
return false;
}
+ private boolean jj_3R_55() {
+ if (jj_scan_token(LBRACKET)) return true;
+ return false;
+ }
+
private boolean jj_3R_86() {
if (jj_scan_token(PNAME_LN)) return true;
return false;
@@ -5508,28 +5501,28 @@ public class ARQParser extends ARQParser
return false;
}
- private boolean jj_3R_45() {
- if (jj_3R_47()) return true;
+ private boolean jj_3R_51() {
+ if (jj_3R_55()) return true;
return false;
}
- private boolean jj_3R_68() {
- if (jj_3R_78()) return true;
+ private boolean jj_3R_47() {
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_50()) {
+ jj_scanpos = xsp;
+ if (jj_3R_51()) return true;
+ }
return false;
}
- private boolean jj_3R_44() {
- if (jj_3R_46()) return true;
+ private boolean jj_3R_50() {
+ if (jj_3R_54()) return true;
return false;
}
- private boolean jj_3R_36() {
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_44()) {
- jj_scanpos = xsp;
- if (jj_3R_45()) return true;
- }
+ private boolean jj_3R_68() {
+ if (jj_3R_78()) return true;
return false;
}
@@ -5554,6 +5547,92 @@ public class ARQParser extends ARQParser
return false;
}
+ private boolean jj_3R_42() {
+ if (jj_scan_token(SAMPLE)) return true;
+ if (jj_scan_token(LPAREN)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_41() {
+ if (jj_scan_token(AVG)) return true;
+ if (jj_scan_token(LPAREN)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_40() {
+ if (jj_scan_token(MAX)) return true;
+ if (jj_scan_token(LPAREN)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_82() {
+ if (jj_scan_token(STRING_LITERAL_LONG2)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_39() {
+ if (jj_scan_token(MIN)) return true;
+ if (jj_scan_token(LPAREN)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_81() {
+ if (jj_scan_token(STRING_LITERAL_LONG1)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_80() {
+ if (jj_scan_token(STRING_LITERAL2)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_38() {
+ if (jj_scan_token(SUM)) return true;
+ if (jj_scan_token(LPAREN)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_79() {
+ if (jj_scan_token(STRING_LITERAL1)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_45() {
+ if (jj_3R_47()) return true;
+ return false;
+ }
+
+ private boolean jj_3R_69() {
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_79()) {
+ jj_scanpos = xsp;
+ if (jj_3R_80()) {
+ jj_scanpos = xsp;
+ if (jj_3R_81()) {
+ jj_scanpos = xsp;
+ if (jj_3R_82()) return true;
+ }
+ }
+ }
+ return false;
+ }
+
+ private boolean jj_3R_44() {
+ if (jj_3R_46()) return true;
+ return false;
+ }
+
+ private boolean jj_3R_36() {
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_44()) {
+ jj_scanpos = xsp;
+ if (jj_3R_45()) return true;
+ }
+ return false;
+ }
+
/** Generated Token Manager. */
public ARQParserTokenManager token_source;
JavaCharStream jj_input_stream;
@@ -5565,7 +5644,7 @@ public class ARQParser extends ARQParser
private Token jj_scanpos, jj_lastpos;
private int jj_la;
private int jj_gen;
- final private int[] jj_la1 = new int[170];
+ final private int[] jj_la1 = new int[171];
static private int[] jj_la1_0;
static private int[] jj_la1_1;
static private int[] jj_la1_2;
@@ -5583,25 +5662,25 @@ public class ARQParser extends ARQParser
jj_la1_init_6();
}
private static void jj_la1_init_0() {
- jj_la1_0 = new int[] {0x7200000,0x180000,0x180000,0x0,0xc00000,0xc00000,0xe00,0x0,0x6e00,0x6e00,0x6e00,0x0,0x0,0x7e00,0x0,0x6e00,0x6e00,0x0,0x0,0x0,0xe00,0x0,0x0,0x0,0x20000000,0x18000000,0x6e00,0x0,0x6e00,0xe00,0x6e00,0x0,0x6e00,0x6e00,0x10000000,0x8000000,0x18000000,0x6000,0x0,0xe00,0x0,0x80000000,0xe00,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xe00,0x0,0x0,0x0,0xe00,0x0,0xe00,0xe00,0x0,0xe00,0x0,0x0,0x7e00,0x0,0x0,0x7e00,0x7e00,0x0,0x200000,0x7e00,0x0,0x0,0x7e00,0x7e00,0x0,0x0,0x0,0x0,0xe00,0x400000,0x0,0x0,0x0,0x0,0x7e00,0x0,0x7e00,0x0,0x46e00,0x46e00,0x0,0x46e00,0x7e00,0x46e00,0x0,0x46e00,0x46e00,0x46e00,0x0,0x0,0x0,0x0,0x40e00,0x0,0x0,0x0,0x0,0x40e00,0x0,0x40e00,0x40e00,0x40e00,0x40e00,0x0,0x7e00,0x7e00,0x7e00,0x6e00,0x6000,0x1e00,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x6e00,0x6e00,0x0,0x0,0x0,0x0,0x400000,0x6e00,0x400000,0x400000,0x400000,0x400000,0x400000,0x400000,0x0,0x0,0x0,0x0,0x0,0x8000,0x8000,0x0,0x0,0x0,0x0,0x0,0x0,0xe00,0xc00
,0x1000,};
+ jj_la1_0 = new int[] {0x7200000,0x180000,0x180000,0x0,0xc00000,0xc00000,0xe00,0x0,0x6e00,0x6e00,0x6e00,0x0,0x0,0x7e00,0x0,0x6e00,0x6e00,0x0,0x0,0x0,0xe00,0x0,0x0,0x0,0x20000000,0x18000000,0x6e00,0x0,0x6e00,0xe00,0x6e00,0x0,0x6e00,0x6e00,0x10000000,0x8000000,0x18000000,0x6000,0x0,0xe00,0x0,0x80000000,0xe00,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xe00,0x0,0x0,0x0,0xe00,0x0,0xe00,0xe00,0x0,0xe00,0x0,0x0,0x7e00,0x0,0x0,0x7e00,0x7e00,0x0,0x200000,0x7e00,0x0,0x0,0x7e00,0x7e00,0x0,0x0,0x0,0x0,0xe00,0x400000,0x0,0x0,0x0,0x0,0x7e00,0x0,0x7e00,0x0,0x46e00,0x46e00,0x0,0x46e00,0x7e00,0x46e00,0x0,0x46e00,0x46e00,0x46e00,0x0,0x0,0x0,0x0,0x40e00,0x0,0x0,0x0,0x0,0x40e00,0x0,0x40e00,0x40e00,0x40e00,0x40e00,0x0,0x7e00,0x7e00,0x7e00,0x6e00,0x6000,0x1e00,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x6e00,0x6e00,0x0,0x0,0x0,0x0,0x0,0x400000,0x6e00,0x400000,0x400000,0x400000,0x400000,0x400000,0x400000,0x0,0x0,0x0,0x0,0x0,0x8000,0x8000,0x0,0x0,0x0,0x0,0x0,0x0,0xe00,0
xc00,0x1000,};
}
private static void jj_la1_init_1() {
- jj_la1_1 = new int[] {0x0,0x0,0x0,0x10,0x0,0x0,0x80018000,0x20000,0xb7c18000,0xb7c18000,0xb7c18000,0x10,0x10,0x0,0x30,0x0,0x0,0x10,0x20,0x10,0x8,0x20,0x40000,0x80000,0x0,0x0,0x80018000,0x20000,0x80018000,0x80018000,0x80018006,0x6,0x80018000,0x80018006,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10,0x10,0x8,0x80,0x80,0x88,0x88,0x0,0x80,0x0,0x0,0x0,0x0,0x0,0x0,0x4001bd80,0x0,0x0,0x0,0x0,0x4001bd80,0x0,0x200,0x80018000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10000,0x10000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xb7c18000,0xb7c18000,0x0,0x80018000,0x0,0x0,0x0,0xb7c18000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x37c00000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
+ jj_la1_1 = new int[] {0x0,0x0,0x0,0x10,0x0,0x0,0x80018000,0x20000,0xb7c18000,0xb7c18000,0xb7c18000,0x10,0x10,0x0,0x30,0x0,0x0,0x10,0x20,0x10,0x8,0x20,0x40000,0x80000,0x0,0x0,0x80018000,0x20000,0x80018000,0x80018000,0x80018006,0x6,0x80018000,0x80018006,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10,0x10,0x8,0x80,0x80,0x88,0x88,0x0,0x80,0x0,0x0,0x0,0x0,0x0,0x0,0x4001bd80,0x0,0x0,0x0,0x0,0x4001bd80,0x0,0x200,0x80018000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10000,0x10000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xb7c18000,0xb7c18000,0x0,0x80018000,0x0,0x0,0x0,0x0,0xb7c18000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x37c00000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
}
private static void jj_la1_init_2() {
- jj_la1_2 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0xffffff3d,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,0xffffff3d,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
+ jj_la1_2 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0xffffff3d,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,0x1fefff,0x0,0x1fefff,0x1fefff,0x1fefff,0x0,0x0,0x180000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7efff,0x0,0x7efff,0x7efff,0x7efff,0x0,0x7efff,0x7efff,0x0,0x0,0x0,0x0,0x0,0x180000,0x0,0x0,0x180000,0x0,0xffc00000,0xffc00000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x400000,0xc00000,0x0,0x0,0x800000,0x400000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x180000,0x0,0x0,0x180000,0x180000,0x0,0x0,0x180000,0x0,0x0,0x180000,0x180000,0x0,0x0,0x0,0x0,0x7efff,0x0,0x0,0x0,0x0,0x0,0x180000,0x0,0x180000,0x0,0x0,0x0,0x0,0x0,0x180000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x180000,0x180000,0x180000,0x0,0x0,0x180000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1fefff,0x1fefff,0x0,0x7efff,0x0,0x0,0x0,0x1fefff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x180000,0x0,0x0,0x0,0x0,};
+ jj_la1_3 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x7fffff,0x0,0x7fffff,0x7fffff,0x7fffff,0x0,0x0,0x600000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1fffff,0x0,0x1fffff,0x1fffff,0x1fffff,0x0,0x1fffff,0x1fffff,0x0,0x0,0x0,0x0,0x0,0x600000,0x0,0x0,0x600000,0x0,0xff000000,0xff000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000000,0x3000000,0x0,0x0,0x2000000,0x1000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x600000,0x0,0x0,0x600000,0x600000,0x0,0x0,0x600000,0x0,0x0,0x600000,0x600000,0x0,0x0,0x0,0x0,0x1fffff,0x0,0x0,0x0,0x0,0x0,0x600000,0x0,0x600000,0x0,0x0,0x0,0x0,0x0,0x600000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x600000,0x600000,0x600000,0x0,0x0,0x600000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7fffff,0x7fffff,0x0,0x1fffff,0x0,0x0,0x0,0x0,0x7fffff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x600000,0x0,0x0,0x0,0x0,};
}
private static void jj_la1_init_4() {
- jj_la1_4 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x1e1ff000,0x0,0x3e1ff000,0x3e1ff000,0x3e1ff000,0x0,0x0,0xbe1ff000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20000000,0x0,0x20000000,0x20000000,0x20000000,0x0,0x20000000,0x20000000,0x0,0x0,0x0,0x0,0xa0000000,0x1e1ff000,0xa0000000,0x0,0x1e1ff000,0x0,0x213,0x213,0x8,0x0,0x20,0x8,0x8,0x8,0x8,0x8,0x8,0x200,0x0,0x0,0x400,0x0,0x0,0x0,0x20,0x20,0x0,0x0,0x0,0x0,0x80,0x180,0x180,0xbe1ff000,0x0,0x0,0xbe1ff000,0xbe1ff000,0x0,0x0,0xbe1ff000,0x0,0x0,0xbe1ff000,0xbe1ff000,0x0,0x0,0x8,0x0,0x20000000,0x0,0x0,0xa0000000,0x0,0xa0000000,0xbe1ff000,0x0,0xbe1ff000,0x0,0x0,0x0,0x0,0x0,0xbe1ff000,0x20000000,0x0,0x20000000,0x20000000,0x0,0x0,0x0,0x0,0x0,0x20000000,0x1000,0x0,0x1000,0x0,0x20000000,0x0,0x0,0x20000000,0x0,0x0,0x20000000,0xbe1ff000,0xbe1ff000,0x9e1ff000,0x0,0x0,0x9e1ff000,0x0,0x0,0x0,0x0,0x1f8000,0x1f8000,0x0,0x0,0x1f8000,0x0,0x0,0x3e1ff000,0x3e1ff000,0xa0000000,0x0,0x0,0x0,0x0,0x3e1ff000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x
0,0xa0000000,0x0,0x0,0x1ff000,0x7000,0x38000,0x1c0000,0x0,0x1e000000,0x0,0x0,0x0,};
+ jj_la1_4 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x787fc000,0x0,0xf87fc000,0xf87fc000,0xf87fc000,0x0,0x0,0xf87fc000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80000000,0x0,0x80000000,0x80000000,0x80000000,0x0,0x80000000,0x80000000,0x0,0x0,0x0,0x0,0x80000000,0x787fc000,0x80000000,0x0,0x787fc000,0x0,0x84f,0x84f,0x20,0x0,0x80,0x20,0x20,0x20,0x20,0x20,0x20,0x800,0x0,0x0,0x1000,0x0,0x0,0x0,0x80,0x80,0x0,0x0,0x0,0x0,0x200,0x600,0x600,0xf87fc000,0x0,0x0,0xf87fc000,0xf87fc000,0x0,0x0,0xf87fc000,0x0,0x0,0xf87fc000,0xf87fc000,0x0,0x0,0x20,0x0,0x80000000,0x0,0x0,0x80000000,0x0,0x80000000,0xf87fc000,0x0,0xf87fc000,0x0,0x0,0x0,0x0,0x0,0xf87fc000,0x80000000,0x0,0x80000000,0x80000000,0x0,0x0,0x0,0x0,0x0,0x80000000,0x4000,0x0,0x4000,0x0,0x80000000,0x0,0x0,0x80000000,0x0,0x0,0x80000000,0xf87fc000,0xf87fc000,0x787fc000,0x0,0x0,0x787fc000,0x0,0x0,0x0,0x0,0x7e0000,0x7e0000,0x0,0x0,0x7e0000,0x0,0x0,0xf87fc000,0xf87fc000,0x80000000,0x0,0x0,0x0,0x0,0x0,0xf87fc000,0x0,0x0,0x0,0x0,0x0,0x0,
0x0,0x0,0x0,0x0,0x80000000,0x0,0x0,0x7fc000,0x1c000,0xe0000,0x700000,0x0,0x78000000,0x0,0x0,0x0,};
}
private static void jj_la1_init_5() {
- jj_la1_5 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x200000,0x0,0x0,0x14,0x1,0x0,0x200000,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,0x20,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x14,0x0,0x80,0x14,0x14,0x80,0x0,0x14,0x1,0x80,0x14,0x14,0x80,0x1,0x0,0x0,0x0,0x0,0x40,0x0,0x40,0x0,0x14,0x80,0x14,0x20,0x0,0x0,0x40,0x0,0x14,0x8004000,0x20,0x8004000,0x8004000,0x0,0x4000000,0x8400000,0x8400000,0x40280001,0x8004000,0x2,0x42,0x40,0x40280001,0x4000,0x4000000,0x8000000,0x8000000,0x0,0x8000000,0x4,0x14,0x14,0x10,0x0,0x0,0x10,0x20000,0x40000,0x3f00,0x3f00,0x180000,0x0,0x600000,0x600000,0x180000,0x600000,0x600000,0x184000,0x0,0x0,0x0,0x40,0x40,0x0,0x384000,0x0,0x0,0x0,0x0,0x0,0x0,0x20,0x20,0x20,0x0,0x0,0x800000,0x800000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10,};
+ jj_la1_5 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800000,0x0,0x0,0x52,0x4,0x0,0x800000,0x0,0x4,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x2,0x0,0x0,0x80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x52,0x0,0x200,0x52,0x52,0x200,0x0,0x52,0x4,0x200,0x52,0x52,0x200,0x4,0x0,0x0,0x0,0x0,0x100,0x2,0x100,0x2,0x52,0x200,0x52,0x80,0x0,0x0,0x100,0x0,0x52,0x20010000,0x80,0x20010000,0x20010000,0x0,0x10000000,0x21000000,0x21000000,0xa00004,0x20010000,0x8,0x108,0x100,0xa00004,0x10000,0x10000000,0x20000000,0x20000000,0x0,0x20000000,0x10,0x52,0x52,0x42,0x0,0x0,0x42,0x80000,0x100000,0xfc00,0xfc00,0x600000,0x0,0x1800000,0x1800000,0x600000,0x1800000,0x1800000,0x610000,0x0,0x2,0x0,0x100,0x100,0x100,0x0,0xe10000,0x0,0x0,0x0,0x0,0x0,0x0,0x80,0x80,0x80,0x0,0x2,0x2000000,0x2000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40,};
}
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,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,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,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,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,0x0,0x0,0x0,0x0,0x0,0x0,};
}
final private JJCalls[] jj_2_rtns = new JJCalls[4];
private boolean jj_rescan = false;
@@ -5618,7 +5697,7 @@ public class ARQParser extends ARQParser
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 170; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 171; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
@@ -5633,7 +5712,7 @@ public class ARQParser extends ARQParser
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 170; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 171; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
@@ -5644,7 +5723,7 @@ public class ARQParser extends ARQParser
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 170; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 171; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
@@ -5655,7 +5734,7 @@ public class ARQParser extends ARQParser
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 170; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 171; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
@@ -5665,7 +5744,7 @@ public class ARQParser extends ARQParser
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 170; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 171; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
@@ -5675,7 +5754,7 @@ public class ARQParser extends ARQParser
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 170; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 171; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
@@ -5787,12 +5866,12 @@ public class ARQParser extends ARQParser
/** Generate ParseException. */
public ParseException generateParseException() {
jj_expentries.clear();
- boolean[] la1tokens = new boolean[198];
+ boolean[] la1tokens = new boolean[200];
if (jj_kind >= 0) {
la1tokens[jj_kind] = true;
jj_kind = -1;
}
- for (int i = 0; i < 170; i++) {
+ for (int i = 0; i < 171; i++) {
if (jj_la1[i] == jj_gen) {
for (int j = 0; j < 32; j++) {
if ((jj_la1_0[i] & (1<<j)) != 0) {
@@ -5819,7 +5898,7 @@ public class ARQParser extends ARQParser
}
}
}
- for (int i = 0; i < 198; i++) {
+ for (int i = 0; i < 200; 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=1177842&r1=1177841&r2=1177842&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 Fri Sep 30 21:29:06 2011
@@ -202,215 +202,219 @@ public interface ARQParserConstants {
/** RegularExpression Id. */
int STRLEN = 92;
/** RegularExpression Id. */
- int UCASE = 93;
+ int REPLACE = 93;
/** RegularExpression Id. */
- int LCASE = 94;
+ int UCASE = 94;
/** RegularExpression Id. */
- int ENCODE_FOR_URI = 95;
+ int LCASE = 95;
/** RegularExpression Id. */
- int CONTAINS = 96;
+ int ENCODE_FOR_URI = 96;
/** RegularExpression Id. */
- int STRSTARTS = 97;
+ int CONTAINS = 97;
/** RegularExpression Id. */
- int STRENDS = 98;
+ int STRSTARTS = 98;
/** RegularExpression Id. */
- int YEAR = 99;
+ int STRENDS = 99;
/** RegularExpression Id. */
- int MONTH = 100;
+ int YEAR = 100;
/** RegularExpression Id. */
- int DAY = 101;
+ int MONTH = 101;
/** RegularExpression Id. */
- int HOURS = 102;
+ int DAY = 102;
/** RegularExpression Id. */
- int MINUTES = 103;
+ int HOURS = 103;
/** RegularExpression Id. */
- int SECONDS = 104;
+ int MINUTES = 104;
/** RegularExpression Id. */
- int TIMEZONE = 105;
+ int SECONDS = 105;
/** RegularExpression Id. */
- int TZ = 106;
+ int TIMEZONE = 106;
/** RegularExpression Id. */
- int NOW = 107;
+ int TZ = 107;
/** RegularExpression Id. */
- int VERSION = 108;
+ int NOW = 108;
/** RegularExpression Id. */
- int MD5 = 109;
+ int UUID = 109;
/** RegularExpression Id. */
- int SHA1 = 110;
+ int VERSION = 110;
/** RegularExpression Id. */
- int SHA224 = 111;
+ int MD5 = 111;
/** RegularExpression Id. */
- int SHA256 = 112;
+ int SHA1 = 112;
/** RegularExpression Id. */
- int SHA384 = 113;
+ int SHA224 = 113;
/** RegularExpression Id. */
- int SHA512 = 114;
+ int SHA256 = 114;
/** RegularExpression Id. */
- int TRUE = 115;
+ int SHA384 = 115;
/** RegularExpression Id. */
- int FALSE = 116;
+ int SHA512 = 116;
/** RegularExpression Id. */
- int DATA = 117;
+ int TRUE = 117;
/** RegularExpression Id. */
- int INSERT = 118;
+ int FALSE = 118;
/** RegularExpression Id. */
- int DELETE = 119;
+ int DATA = 119;
/** RegularExpression Id. */
- int INSERT_DATA = 120;
+ int INSERT = 120;
/** RegularExpression Id. */
- int DELETE_DATA = 121;
+ int DELETE = 121;
/** RegularExpression Id. */
- int DELETE_WHERE = 122;
+ int INSERT_DATA = 122;
/** RegularExpression Id. */
- int MODIFY = 123;
+ int DELETE_DATA = 123;
/** RegularExpression Id. */
- int LOAD = 124;
+ int DELETE_WHERE = 124;
/** RegularExpression Id. */
- int CLEAR = 125;
+ int MODIFY = 125;
/** RegularExpression Id. */
- int CREATE = 126;
+ int LOAD = 126;
/** RegularExpression Id. */
- int ADD = 127;
+ int CLEAR = 127;
/** RegularExpression Id. */
- int MOVE = 128;
+ int CREATE = 128;
/** RegularExpression Id. */
- int COPY = 129;
+ int ADD = 129;
/** RegularExpression Id. */
- int META = 130;
+ int MOVE = 130;
/** RegularExpression Id. */
- int SILENT = 131;
+ int COPY = 131;
/** RegularExpression Id. */
- int DROP = 132;
+ int META = 132;
/** RegularExpression Id. */
- int INTO = 133;
+ int SILENT = 133;
/** RegularExpression Id. */
- int TO = 134;
+ int DROP = 134;
/** RegularExpression Id. */
- int DFT = 135;
+ int INTO = 135;
/** RegularExpression Id. */
- int ALL = 136;
+ int TO = 136;
/** RegularExpression Id. */
- int WITH = 137;
+ int DFT = 137;
/** RegularExpression Id. */
- int USING = 138;
+ int ALL = 138;
/** RegularExpression Id. */
- int DIGITS = 139;
+ int WITH = 139;
/** RegularExpression Id. */
- int INTEGER = 140;
+ int USING = 140;
/** RegularExpression Id. */
- int DECIMAL = 141;
+ int DIGITS = 141;
/** RegularExpression Id. */
- int DOUBLE = 142;
+ int INTEGER = 142;
/** RegularExpression Id. */
- int INTEGER_POSITIVE = 143;
+ int DECIMAL = 143;
/** RegularExpression Id. */
- int DECIMAL_POSITIVE = 144;
+ int DOUBLE = 144;
/** RegularExpression Id. */
- int DOUBLE_POSITIVE = 145;
+ int INTEGER_POSITIVE = 145;
/** RegularExpression Id. */
- int INTEGER_NEGATIVE = 146;
+ int DECIMAL_POSITIVE = 146;
/** RegularExpression Id. */
- int DECIMAL_NEGATIVE = 147;
+ int DOUBLE_POSITIVE = 147;
/** RegularExpression Id. */
- int DOUBLE_NEGATIVE = 148;
+ int INTEGER_NEGATIVE = 148;
/** RegularExpression Id. */
- int EXPONENT = 149;
+ int DECIMAL_NEGATIVE = 149;
/** RegularExpression Id. */
- int QUOTE_3D = 150;
+ int DOUBLE_NEGATIVE = 150;
/** RegularExpression Id. */
- int QUOTE_3S = 151;
+ int EXPONENT = 151;
/** RegularExpression Id. */
- int ECHAR = 152;
+ int QUOTE_3D = 152;
/** RegularExpression Id. */
- int STRING_LITERAL1 = 153;
+ int QUOTE_3S = 153;
/** RegularExpression Id. */
- int STRING_LITERAL2 = 154;
+ int ECHAR = 154;
/** RegularExpression Id. */
- int STRING_LITERAL_LONG1 = 155;
+ int STRING_LITERAL1 = 155;
/** RegularExpression Id. */
- int STRING_LITERAL_LONG2 = 156;
+ int STRING_LITERAL2 = 156;
/** RegularExpression Id. */
- int LPAREN = 157;
+ int STRING_LITERAL_LONG1 = 157;
/** RegularExpression Id. */
- int RPAREN = 158;
+ int STRING_LITERAL_LONG2 = 158;
/** RegularExpression Id. */
- int NIL = 159;
+ int LPAREN = 159;
/** RegularExpression Id. */
- int LBRACE = 160;
+ int RPAREN = 160;
/** RegularExpression Id. */
- int RBRACE = 161;
+ int NIL = 161;
/** RegularExpression Id. */
- int LBRACKET = 162;
+ int LBRACE = 162;
/** RegularExpression Id. */
- int RBRACKET = 163;
+ int RBRACE = 163;
/** RegularExpression Id. */
- int ANON = 164;
+ int LBRACKET = 164;
/** RegularExpression Id. */
- int SEMICOLON = 165;
+ int RBRACKET = 165;
/** RegularExpression Id. */
- int COMMA = 166;
+ int ANON = 166;
/** RegularExpression Id. */
- int DOT = 167;
+ int SEMICOLON = 167;
/** RegularExpression Id. */
- int EQ = 168;
+ int COMMA = 168;
/** RegularExpression Id. */
- int NE = 169;
+ int DOT = 169;
/** RegularExpression Id. */
- int GT = 170;
+ int EQ = 170;
/** RegularExpression Id. */
- int LT = 171;
+ int NE = 171;
/** RegularExpression Id. */
- int LE = 172;
+ int GT = 172;
/** RegularExpression Id. */
- int GE = 173;
+ int LT = 173;
/** RegularExpression Id. */
- int BANG = 174;
+ int LE = 174;
/** RegularExpression Id. */
- int TILDE = 175;
+ int GE = 175;
/** RegularExpression Id. */
- int COLON = 176;
+ int BANG = 176;
/** RegularExpression Id. */
- int SC_OR = 177;
+ int TILDE = 177;
/** RegularExpression Id. */
- int SC_AND = 178;
+ int COLON = 178;
/** RegularExpression Id. */
- int PLUS = 179;
+ int SC_OR = 179;
/** RegularExpression Id. */
- int MINUS = 180;
+ int SC_AND = 180;
/** RegularExpression Id. */
- int STAR = 181;
+ int PLUS = 181;
/** RegularExpression Id. */
- int SLASH = 182;
+ int MINUS = 182;
/** RegularExpression Id. */
- int DATATYPE = 183;
+ int STAR = 183;
/** RegularExpression Id. */
- int AT = 184;
+ int SLASH = 184;
/** RegularExpression Id. */
- int ASSIGN = 185;
+ int DATATYPE = 185;
/** RegularExpression Id. */
- int VBAR = 186;
+ int AT = 186;
/** RegularExpression Id. */
- int CARAT = 187;
+ int ASSIGN = 187;
/** RegularExpression Id. */
- int FPATH = 188;
+ int VBAR = 188;
/** RegularExpression Id. */
- int RPATH = 189;
+ int CARAT = 189;
/** RegularExpression Id. */
- int QMARK = 190;
+ int FPATH = 190;
/** RegularExpression Id. */
- int PN_CHARS_BASE = 191;
+ int RPATH = 191;
/** RegularExpression Id. */
- int PN_CHARS_U = 192;
+ int QMARK = 192;
/** RegularExpression Id. */
- int PN_CHARS = 193;
+ int PN_CHARS_BASE = 193;
/** RegularExpression Id. */
- int PN_PREFIX = 194;
+ int PN_CHARS_U = 194;
/** RegularExpression Id. */
- int PN_LOCAL = 195;
+ int PN_CHARS = 195;
/** RegularExpression Id. */
- int VARNAME = 196;
+ int PN_PREFIX = 196;
/** RegularExpression Id. */
- int UNKNOWN = 197;
+ int PN_LOCAL = 197;
+ /** RegularExpression Id. */
+ int VARNAME = 198;
+ /** RegularExpression Id. */
+ int UNKNOWN = 199;
/** Lexical state. */
int DEFAULT = 0;
@@ -510,6 +514,7 @@ public interface ARQParserConstants {
"\"CONCAT\"",
"\"SUBSTR\"",
"\"STRLEN\"",
+ "\"REPLACE\"",
"\"UCASE\"",
"\"LCASE\"",
"\"ENCODE_FOR_URI\"",
@@ -525,6 +530,7 @@ public interface ARQParserConstants {
"\"TIMEZONE\"",
"\"TZ\"",
"\"NOW\"",
+ "\"UUID\"",
"\"VERSION\"",
"\"MD5\"",
"\"SHA1\"",