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 2016/03/13 18:27:47 UTC
[01/16] jena git commit: Initialize functions/property functions in
ARQ.init.
Repository: jena
Updated Branches:
refs/heads/master 085f2efb2 -> 0653392c2
Initialize functions/property functions in ARQ.init.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/afd4ed6b
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/afd4ed6b
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/afd4ed6b
Branch: refs/heads/master
Commit: afd4ed6b79d0570d9786c51371c417611a2b26f1
Parents: a3b7eec
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Mar 11 18:01:34 2016 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Mar 13 17:17:30 2016 +0000
----------------------------------------------------------------------
.../main/java/org/apache/jena/query/ARQ.java | 7 +++
.../jena/sparql/function/FunctionRegistry.java | 19 +++++---
.../pfunction/PropertyFunctionRegistry.java | 38 +++++-----------
.../pfunction/StandardPropertyFunctions.java | 46 ++++++++++++++++++++
4 files changed, 76 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/afd4ed6b/jena-arq/src/main/java/org/apache/jena/query/ARQ.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/query/ARQ.java b/jena-arq/src/main/java/org/apache/jena/query/ARQ.java
index af8439f..9391b6b 100644
--- a/jena-arq/src/main/java/org/apache/jena/query/ARQ.java
+++ b/jena-arq/src/main/java/org/apache/jena/query/ARQ.java
@@ -23,11 +23,13 @@ import org.apache.jena.sparql.SystemARQ ;
import org.apache.jena.sparql.algebra.optimize.TransformOrderByDistinctApplication ;
import org.apache.jena.sparql.core.assembler.AssemblerUtils ;
import org.apache.jena.sparql.engine.http.Service ;
+import org.apache.jena.sparql.function.FunctionRegistry ;
import org.apache.jena.sparql.lib.Metadata ;
import org.apache.jena.sparql.mgt.ARQMgt ;
import org.apache.jena.sparql.mgt.Explain ;
import org.apache.jena.sparql.mgt.Explain.InfoLevel ;
import org.apache.jena.sparql.mgt.SystemInfo ;
+import org.apache.jena.sparql.pfunction.PropertyFunctionRegistry ;
import org.apache.jena.sparql.util.Context ;
import org.apache.jena.sparql.util.MappingRegistry ;
import org.apache.jena.sparql.util.Symbol ;
@@ -575,6 +577,11 @@ public class ARQ
// Register RIOT details here, not earlier, to avoid
// initialization loops with RIOT.init() called directly.
RIOT.register() ;
+
+ // Initialise
+ FunctionRegistry.init() ;
+ PropertyFunctionRegistry.init() ;
+
JenaSystem.logLifecycle("ARQ.init - finish") ;
}
}
http://git-wip-us.apache.org/repos/asf/jena/blob/afd4ed6b/jena-arq/src/main/java/org/apache/jena/sparql/function/FunctionRegistry.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/function/FunctionRegistry.java b/jena-arq/src/main/java/org/apache/jena/sparql/function/FunctionRegistry.java
index 22593ad..75a9b63 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/function/FunctionRegistry.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/function/FunctionRegistry.java
@@ -34,22 +34,29 @@ public class FunctionRegistry //extends HashMap<String, Function>
// Extract a Registry class and do casting and initialization here.
Map<String, FunctionFactory> registry = new HashMap<>() ;
Set<String> attemptedLoads = new HashSet<>() ;
-
- public synchronized static FunctionRegistry standardRegistry()
+
+ public static FunctionRegistry standardRegistry()
{
+ FunctionRegistry reg = get(ARQ.getContext()) ;
+ return reg ;
+ }
+
+ public static void init() {
+ // Intialize if there is no registry already set
FunctionRegistry reg = new FunctionRegistry() ;
StandardFunctions.loadStdDefs(reg) ;
- return reg ;
+ set(ARQ.getContext(), reg) ;
}
- public synchronized static FunctionRegistry get()
+ public static FunctionRegistry get()
{
// Intialize if there is no registry already set
FunctionRegistry reg = get(ARQ.getContext()) ;
if ( reg == null )
{
- reg = standardRegistry() ;
- set(ARQ.getContext(), reg) ;
+ Log.warn(FunctionRegistry.class, "Standard function registry should already have been initialized");
+ init() ;
+ reg = get(ARQ.getContext()) ;
}
return reg ;
http://git-wip-us.apache.org/repos/asf/jena/blob/afd4ed6b/jena-arq/src/main/java/org/apache/jena/sparql/pfunction/PropertyFunctionRegistry.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/pfunction/PropertyFunctionRegistry.java b/jena-arq/src/main/java/org/apache/jena/sparql/pfunction/PropertyFunctionRegistry.java
index c0f218c..d0f6fae 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/pfunction/PropertyFunctionRegistry.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/pfunction/PropertyFunctionRegistry.java
@@ -17,19 +17,13 @@
*/
package org.apache.jena.sparql.pfunction;
-import java.util.HashMap ;
-import java.util.HashSet ;
-import java.util.Iterator ;
-import java.util.Map ;
-import java.util.Set ;
+import java.util.* ;
import org.apache.jena.atlas.logging.Log ;
import org.apache.jena.query.ARQ ;
import org.apache.jena.sparql.ARQConstants ;
import org.apache.jena.sparql.util.Context ;
import org.apache.jena.sparql.util.MappedLoader ;
-import org.apache.jena.sparql.vocabulary.ListPFunction ;
-import org.apache.jena.vocabulary.RDFS ;
public class PropertyFunctionRegistry
@@ -39,11 +33,17 @@ public class PropertyFunctionRegistry
Map<String, PropertyFunctionFactory> registry = new HashMap<>() ;
Set<String> attemptedLoads = new HashSet<>() ;
- public synchronized static PropertyFunctionRegistry standardRegistry()
+ public static PropertyFunctionRegistry standardRegistry()
{
+ PropertyFunctionRegistry reg = get(ARQ.getContext()) ;
+ return reg ;
+ }
+
+ public static void init() {
+ // Intialize if there is no registry already set
PropertyFunctionRegistry reg = new PropertyFunctionRegistry() ;
- reg.loadStdDefs() ;
- return reg ;
+ StandardPropertyFunctions.loadStdDefs(reg) ;
+ set(ARQ.getContext(), reg) ;
}
public static PropertyFunctionRegistry get(Context context)
@@ -145,22 +145,4 @@ public class PropertyFunctionRegistry
/** Iterate over URIs */
public Iterator<String> keys() { return registry.keySet().iterator() ; }
-
- @SuppressWarnings("deprecation")
- private void loadStdDefs()
- {
- put(ListPFunction.member.getURI() , org.apache.jena.sparql.pfunction.library.listMember.class) ;
- put(ListPFunction.index.getURI() , org.apache.jena.sparql.pfunction.library.listIndex.class) ;
- put(ListPFunction.length.getURI() , org.apache.jena.sparql.pfunction.library.listLength.class) ;
- put(ListPFunction.memberJ2.getURI() , org.apache.jena.sparql.pfunction.library.listMember.class) ;
- put(ListPFunction.indexJ2.getURI() , org.apache.jena.sparql.pfunction.library.listIndex.class) ;
- put(ListPFunction.lengthJ2.getURI() , org.apache.jena.sparql.pfunction.library.listLength.class) ;
-
- // (Very) old forms
- put(ListPFunction.listMember.getURI() , org.apache.jena.sparql.pfunction.library.listMember.class) ;
- put(ListPFunction.listIndex.getURI() , org.apache.jena.sparql.pfunction.library.listIndex.class) ;
- put(ListPFunction.listLength.getURI() , org.apache.jena.sparql.pfunction.library.listLength.class) ;
-
- put(RDFS.member.getURI(), org.apache.jena.sparql.pfunction.library.container.class) ;
- }
}
http://git-wip-us.apache.org/repos/asf/jena/blob/afd4ed6b/jena-arq/src/main/java/org/apache/jena/sparql/pfunction/StandardPropertyFunctions.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/pfunction/StandardPropertyFunctions.java b/jena-arq/src/main/java/org/apache/jena/sparql/pfunction/StandardPropertyFunctions.java
new file mode 100644
index 0000000..1ec7141
--- /dev/null
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/pfunction/StandardPropertyFunctions.java
@@ -0,0 +1,46 @@
+/*
+ * 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 org.apache.jena.sparql.pfunction;
+
+import org.apache.jena.sparql.vocabulary.ListPFunction ;
+import org.apache.jena.vocabulary.RDFS ;
+
+public class StandardPropertyFunctions {
+ @SuppressWarnings("deprecation")
+ public static void loadStdDefs(PropertyFunctionRegistry registry) {
+ add(registry, ListPFunction.member.getURI() , org.apache.jena.sparql.pfunction.library.listMember.class) ;
+ add(registry, ListPFunction.index.getURI() , org.apache.jena.sparql.pfunction.library.listIndex.class) ;
+ add(registry, ListPFunction.length.getURI() , org.apache.jena.sparql.pfunction.library.listLength.class) ;
+ add(registry, ListPFunction.memberJ2.getURI() , org.apache.jena.sparql.pfunction.library.listMember.class) ;
+ add(registry, ListPFunction.indexJ2.getURI() , org.apache.jena.sparql.pfunction.library.listIndex.class) ;
+ add(registry, ListPFunction.lengthJ2.getURI() , org.apache.jena.sparql.pfunction.library.listLength.class) ;
+
+ // (Very) old forms
+ add(registry, ListPFunction.listMember.getURI() , org.apache.jena.sparql.pfunction.library.listMember.class) ;
+ add(registry, ListPFunction.listIndex.getURI() , org.apache.jena.sparql.pfunction.library.listIndex.class) ;
+ add(registry, ListPFunction.listLength.getURI() , org.apache.jena.sparql.pfunction.library.listLength.class) ;
+
+ add(registry, RDFS.member.getURI(), org.apache.jena.sparql.pfunction.library.container.class) ;
+ }
+
+ private static void add(PropertyFunctionRegistry registry, String uri, Class<?> funcClass)
+ {
+ registry.put(uri, funcClass) ;
+ }
+}
[09/16] jena git commit: JENA-1156: Use standard SQL naming. Add
keywords to extended SPARQL.
Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/jena/blob/6e588daa/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParserTokenManager.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParserTokenManager.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParserTokenManager.java
index 942d0e2..cce1b21 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParserTokenManager.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParserTokenManager.java
@@ -11,6 +11,7 @@ package org.apache.jena.sparql.lang.arq ;
+
/** Token Manager. */
public class ARQParserTokenManager implements ARQParserConstants
{
@@ -45,160 +46,160 @@ private int jjMoveStringLiteralDfa0_0()
jjmatchedKind = 1;
return jjMoveNfa_0(0, 0);
case 33:
- jjmatchedKind = 180;
- return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x800000000000L, 0x0L);
+ jjmatchedKind = 185;
+ return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x10000000000000L, 0x0L);
case 38:
- return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x100000000000000L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x2000000000000000L, 0x0L);
case 40:
- jjmatchedKind = 163;
+ jjmatchedKind = 168;
return jjMoveNfa_0(0, 0);
case 41:
- jjmatchedKind = 164;
+ jjmatchedKind = 169;
return jjMoveNfa_0(0, 0);
case 42:
- jjmatchedKind = 187;
+ jjmatchedKind = 192;
return jjMoveNfa_0(0, 0);
case 43:
- jjmatchedKind = 185;
+ jjmatchedKind = 190;
return jjMoveNfa_0(0, 0);
case 44:
- jjmatchedKind = 172;
+ jjmatchedKind = 177;
return jjMoveNfa_0(0, 0);
case 45:
- jjmatchedKind = 186;
- return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x0L, 0x4L);
+ jjmatchedKind = 191;
+ return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x0L, 0x80L);
case 46:
- jjmatchedKind = 173;
+ jjmatchedKind = 178;
return jjMoveNfa_0(0, 0);
case 47:
- jjmatchedKind = 188;
+ jjmatchedKind = 193;
return jjMoveNfa_0(0, 0);
case 58:
- jjmatchedKind = 182;
- return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x8000000000000000L, 0x0L);
+ jjmatchedKind = 187;
+ return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x0L, 0x10L);
case 59:
- jjmatchedKind = 171;
+ jjmatchedKind = 176;
return jjMoveNfa_0(0, 0);
case 60:
- jjmatchedKind = 177;
- return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x4000000000000L, 0x8L);
+ jjmatchedKind = 182;
+ return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x80000000000000L, 0x100L);
case 61:
- jjmatchedKind = 174;
+ jjmatchedKind = 179;
return jjMoveNfa_0(0, 0);
case 62:
- jjmatchedKind = 176;
- return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x8000000000000L, 0x0L);
+ jjmatchedKind = 181;
+ return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x100000000000000L, 0x0L);
case 63:
- jjmatchedKind = 196;
+ jjmatchedKind = 201;
return jjMoveNfa_0(0, 0);
case 64:
- jjmatchedKind = 190;
+ jjmatchedKind = 195;
return jjMoveNfa_0(0, 0);
case 65:
- return jjMoveStringLiteralDfa1_0(0x422008408000000L, 0x1000000L, 0x4020L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x422008408000000L, 0x20000000L, 0x80400L, 0x0L);
case 66:
- return jjMoveStringLiteralDfa1_0(0x8000100080100000L, 0x8L, 0x0L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x100080100000L, 0x110L, 0x0L, 0x0L);
case 67:
- return jjMoveStringLiteralDfa1_0(0x40000004000000L, 0x8120000c1L, 0x98L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x40000004000000L, 0x10240001820L, 0x1300L, 0x0L);
case 68:
- return jjMoveStringLiteralDfa1_0(0x802800000L, 0x5000040000002000L, 0x2400L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x802800000L, 0x800000040000L, 0x4800aL, 0x0L);
case 69:
- return jjMoveStringLiteralDfa1_0(0x800000000000L, 0x400000000L, 0x0L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x800000000000L, 0x8000000000L, 0x0L, 0x0L);
case 70:
- return jjMoveStringLiteralDfa1_0(0x4000002000000000L, 0x800000004000000L, 0x0L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x2000000000L, 0x80000008L, 0x1L, 0x0L);
case 71:
- return jjMoveStringLiteralDfa1_0(0x2004010000000000L, 0x0L, 0x0L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x4010000000000L, 0x4L, 0x0L, 0x0L);
case 72:
- return jjMoveStringLiteralDfa1_0(0x8000000000000L, 0x80000000000L, 0x0L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x8000000000000L, 0x1000000000000L, 0x0L, 0x0L);
case 73:
- return jjMoveStringLiteralDfa1_0(0x0L, 0x20000000001f0016L, 0x800L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x0L, 0x3e002c0L, 0x10004L, 0x0L);
case 76:
- return jjMoveStringLiteralDfa1_0(0x400010000000L, 0x20000c000L, 0x4L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x400010000000L, 0x4000180000L, 0x80L, 0x0L);
case 77:
- return jjMoveStringLiteralDfa1_0(0x180080000000000L, 0x10120000000100L, 0x140L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x180080000000000L, 0x202400000002000L, 0x2800L, 0x0L);
case 78:
- return jjMoveStringLiteralDfa1_0(0x1001000000000L, 0x1000000000000L, 0x0L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x1001000000000L, 0x20000000000000L, 0x0L, 0x0L);
case 79:
return jjMoveStringLiteralDfa1_0(0x20060000000L, 0x0L, 0x0L, 0x0L);
case 80:
return jjMoveStringLiteralDfa1_0(0x200000L, 0x0L, 0x0L, 0x0L);
case 82:
- return jjMoveStringLiteralDfa1_0(0x1000000L, 0x88a00000L, 0x0L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x1000000L, 0x1114000000L, 0x0L, 0x0L);
case 83:
- return jjMoveStringLiteralDfa1_0(0x1a10200000400000L, 0x3e420f060401e00L, 0x200L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x3a10200000400000L, 0x7c841e0c0803c002L, 0x4000L, 0x0L);
case 84:
- return jjMoveStringLiteralDfa1_0(0x0L, 0x400c00000000000L, 0x1000L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x0L, 0x8018000000000000L, 0x20000L, 0x0L);
case 85:
- return jjMoveStringLiteralDfa1_0(0x40200000000L, 0x2000100000020L, 0x10000L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x40200000000L, 0x40002000000400L, 0x200000L, 0x0L);
case 86:
- return jjMoveStringLiteralDfa1_0(0x100000000L, 0x8000000000000L, 0x0L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0xc000000100000000L, 0x100000000000001L, 0x0L, 0x0L);
case 87:
- return jjMoveStringLiteralDfa1_0(0x4000000000L, 0x0L, 0x8000L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x4000000000L, 0x0L, 0x100000L, 0x0L);
case 89:
- return jjMoveStringLiteralDfa1_0(0x0L, 0x10000000000L, 0x0L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x0L, 0x200000000000L, 0x0L, 0x0L);
case 91:
- jjmatchedKind = 168;
+ jjmatchedKind = 173;
return jjMoveNfa_0(0, 0);
case 93:
- jjmatchedKind = 169;
+ jjmatchedKind = 174;
return jjMoveNfa_0(0, 0);
case 94:
- jjmatchedKind = 193;
- return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x2000000000000000L, 0x0L);
+ jjmatchedKind = 198;
+ return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x0L, 0x4L);
case 97:
jjmatchedKind = 19;
- return jjMoveStringLiteralDfa1_0(0x422008408000000L, 0x1000000L, 0x4020L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x422008408000000L, 0x20000000L, 0x80400L, 0x0L);
case 98:
- return jjMoveStringLiteralDfa1_0(0x8000100080100000L, 0x8L, 0x0L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x100080100000L, 0x110L, 0x0L, 0x0L);
case 99:
- return jjMoveStringLiteralDfa1_0(0x40000004000000L, 0x8120000c1L, 0x98L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x40000004000000L, 0x10240001820L, 0x1300L, 0x0L);
case 100:
- return jjMoveStringLiteralDfa1_0(0x802800000L, 0x5000040000002000L, 0x2400L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x802800000L, 0x800000040000L, 0x4800aL, 0x0L);
case 101:
- return jjMoveStringLiteralDfa1_0(0x800000000000L, 0x400000000L, 0x0L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x800000000000L, 0x8000000000L, 0x0L, 0x0L);
case 102:
- return jjMoveStringLiteralDfa1_0(0x4000002000000000L, 0x800000004000000L, 0x0L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x2000000000L, 0x80000008L, 0x1L, 0x0L);
case 103:
- return jjMoveStringLiteralDfa1_0(0x2004010000000000L, 0x0L, 0x0L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x4010000000000L, 0x4L, 0x0L, 0x0L);
case 104:
- return jjMoveStringLiteralDfa1_0(0x8000000000000L, 0x80000000000L, 0x0L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x8000000000000L, 0x1000000000000L, 0x0L, 0x0L);
case 105:
- return jjMoveStringLiteralDfa1_0(0x0L, 0x20000000001f0016L, 0x800L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x0L, 0x3e002c0L, 0x10004L, 0x0L);
case 108:
- return jjMoveStringLiteralDfa1_0(0x400010000000L, 0x20000c000L, 0x4L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x400010000000L, 0x4000180000L, 0x80L, 0x0L);
case 109:
- return jjMoveStringLiteralDfa1_0(0x180080000000000L, 0x10120000000100L, 0x140L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x180080000000000L, 0x202400000002000L, 0x2800L, 0x0L);
case 110:
- return jjMoveStringLiteralDfa1_0(0x1001000000000L, 0x1000000000000L, 0x0L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x1001000000000L, 0x20000000000000L, 0x0L, 0x0L);
case 111:
return jjMoveStringLiteralDfa1_0(0x20060000000L, 0x0L, 0x0L, 0x0L);
case 112:
return jjMoveStringLiteralDfa1_0(0x200000L, 0x0L, 0x0L, 0x0L);
case 114:
- return jjMoveStringLiteralDfa1_0(0x1000000L, 0x88a00000L, 0x0L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x1000000L, 0x1114000000L, 0x0L, 0x0L);
case 115:
- return jjMoveStringLiteralDfa1_0(0x1a10200000400000L, 0x3e420f060401e00L, 0x200L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x3a10200000400000L, 0x7c841e0c0803c002L, 0x4000L, 0x0L);
case 116:
- return jjMoveStringLiteralDfa1_0(0x0L, 0x400c00000000000L, 0x1000L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x0L, 0x8018000000000000L, 0x20000L, 0x0L);
case 117:
- return jjMoveStringLiteralDfa1_0(0x40200000000L, 0x2000100000020L, 0x10000L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x40200000000L, 0x40002000000400L, 0x200000L, 0x0L);
case 118:
- return jjMoveStringLiteralDfa1_0(0x100000000L, 0x8000000000000L, 0x0L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0xc000000100000000L, 0x100000000000001L, 0x0L, 0x0L);
case 119:
- return jjMoveStringLiteralDfa1_0(0x4000000000L, 0x0L, 0x8000L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x4000000000L, 0x0L, 0x100000L, 0x0L);
case 121:
- return jjMoveStringLiteralDfa1_0(0x0L, 0x10000000000L, 0x0L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x0L, 0x200000000000L, 0x0L, 0x0L);
case 123:
- jjmatchedKind = 166;
+ jjmatchedKind = 171;
return jjMoveNfa_0(0, 0);
case 124:
- jjmatchedKind = 192;
- return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x80000000000000L, 0x0L);
+ jjmatchedKind = 197;
+ return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x1000000000000000L, 0x0L);
case 125:
- jjmatchedKind = 167;
+ jjmatchedKind = 172;
return jjMoveNfa_0(0, 0);
case 126:
- jjmatchedKind = 181;
+ jjmatchedKind = 186;
return jjMoveNfa_0(0, 0);
case 65279:
jjmatchedKind = 9;
@@ -216,102 +217,102 @@ private int jjMoveStringLiteralDfa1_0(long active0, long active1, long active2,
switch(curChar)
{
case 38:
- if ((active2 & 0x100000000000000L) != 0L)
+ if ((active2 & 0x2000000000000000L) != 0L)
{
- jjmatchedKind = 184;
+ jjmatchedKind = 189;
jjmatchedPos = 1;
}
break;
case 45:
- if ((active3 & 0x8L) != 0L)
+ if ((active3 & 0x100L) != 0L)
{
- jjmatchedKind = 195;
+ jjmatchedKind = 200;
jjmatchedPos = 1;
}
break;
case 61:
- if ((active2 & 0x800000000000L) != 0L)
+ if ((active2 & 0x10000000000000L) != 0L)
{
- jjmatchedKind = 175;
+ jjmatchedKind = 180;
jjmatchedPos = 1;
}
- else if ((active2 & 0x4000000000000L) != 0L)
+ else if ((active2 & 0x80000000000000L) != 0L)
{
- jjmatchedKind = 178;
+ jjmatchedKind = 183;
jjmatchedPos = 1;
}
- else if ((active2 & 0x8000000000000L) != 0L)
+ else if ((active2 & 0x100000000000000L) != 0L)
{
- jjmatchedKind = 179;
+ jjmatchedKind = 184;
jjmatchedPos = 1;
}
- else if ((active2 & 0x8000000000000000L) != 0L)
+ else if ((active3 & 0x10L) != 0L)
{
- jjmatchedKind = 191;
+ jjmatchedKind = 196;
jjmatchedPos = 1;
}
break;
case 62:
- if ((active3 & 0x4L) != 0L)
+ if ((active3 & 0x80L) != 0L)
{
- jjmatchedKind = 194;
+ jjmatchedKind = 199;
jjmatchedPos = 1;
}
break;
case 65:
- return jjMoveStringLiteralDfa2_0(active0, 0x1108001100100000L, active1, 0x1800040000c0e0c0L, active2, 0L, active3, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0xc108001100100000L, active1, 0x8000181c1803L, active2, 0x3L, active3, 0L);
case 66:
- return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x1000000L, active2, 0L, active3, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x20000000L, active2, 0L, active3, 0L);
case 67:
- return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x300000000L, active2, 0L, active3, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x6000000000L, active2, 0L, active3, 0L);
case 68:
- return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x10000000000000L, active2, 0x20L, active3, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x200000000000000L, active2, 0x400L, active3, 0L);
case 69:
- return jjMoveStringLiteralDfa2_0(active0, 0x10600803400000L, active1, 0x4008210082200000L, active2, 0x2100L, active3, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x10600803400000L, active1, 0x104201044000000L, active2, 0x42008L, active3, 0L);
case 70:
- if ((active1 & 0x4L) != 0L)
+ if ((active1 & 0x80L) != 0L)
{
- jjmatchedKind = 66;
+ jjmatchedKind = 71;
jjmatchedPos = 1;
}
return jjMoveStringLiteralDfa2_0(active0, 0x20000000L, active1, 0L, active2, 0L, active3, 0L);
case 71:
return jjMoveStringLiteralDfa2_0(active0, 0x20000000000000L, active1, 0L, active2, 0L, active3, 0L);
case 72:
- return jjMoveStringLiteralDfa2_0(active0, 0x4000000000L, active1, 0x3e0000000000200L, active2, 0L, active3, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x4000000000L, active1, 0x7c00000000004000L, active2, 0L, active3, 0L);
case 73:
- return jjMoveStringLiteralDfa2_0(active0, 0x4080180010800000L, active1, 0x500000000000L, active2, 0x8200L, active3, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x80180010800000L, active1, 0xa000000000008L, active2, 0x104000L, active3, 0L);
case 76:
- return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x4000000L, active2, 0x4008L, active3, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x80000000L, active2, 0x80100L, active3, 0L);
case 78:
- if ((active1 & 0x2L) != 0L)
+ if ((active1 & 0x40L) != 0L)
{
- jjmatchedKind = 65;
+ jjmatchedKind = 70;
jjmatchedPos = 1;
}
- return jjMoveStringLiteralDfa2_0(active0, 0x48200000000L, active1, 0x2000000400000008L, active2, 0x800L, active3, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x48200000000L, active1, 0x8000000100L, active2, 0x10004L, active3, 0L);
case 79:
- if ((active2 & 0x1000L) != 0L)
+ if ((active2 & 0x20000L) != 0L)
{
- jjmatchedKind = 140;
+ jjmatchedKind = 145;
jjmatchedPos = 1;
}
- return jjMoveStringLiteralDfa2_0(active0, 0x8041000004000000L, active1, 0x10a0818000001L, active2, 0xc4L, active3, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x41000004000000L, active1, 0x21410300000030L, active2, 0x1880L, active3, 0L);
case 80:
return jjMoveStringLiteralDfa2_0(active0, 0x20000000000L, active1, 0L, active2, 0L, active3, 0L);
case 82:
- return jjMoveStringLiteralDfa2_0(active0, 0x2004012040200000L, active1, 0x400000000000030L, active2, 0x410L, active3, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x4012040200000L, active1, 0x8000000000000604L, active2, 0x8200L, active3, 0L);
case 83:
if ((active0 & 0x2000000000000L) != 0L)
{
jjmatchedKind = 49;
jjmatchedPos = 1;
}
- return jjMoveStringLiteralDfa2_0(active0, 0x408000000L, active1, 0x1f0000L, active2, 0x10000L, active3, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x408000000L, active1, 0x3e00000L, active2, 0x200000L, active3, 0L);
case 84:
- return jjMoveStringLiteralDfa2_0(active0, 0x800000000000000L, active1, 0x400f040001c00L, active2, 0L, active3, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x3800000000000000L, active1, 0x801e0800038000L, active2, 0L, active3, 0L);
case 85:
- return jjMoveStringLiteralDfa2_0(active0, 0x200000000000000L, active1, 0x2000020000100L, active2, 0L, active3, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x200000000000000L, active1, 0x40000400002000L, active2, 0L, active3, 0L);
case 86:
return jjMoveStringLiteralDfa2_0(active0, 0x400000000000000L, active1, 0L, active2, 0L, active3, 0L);
case 88:
@@ -324,73 +325,73 @@ private int jjMoveStringLiteralDfa1_0(long active0, long active1, long active2,
}
break;
case 90:
- if ((active1 & 0x800000000000L) != 0L)
+ if ((active1 & 0x10000000000000L) != 0L)
{
- jjmatchedKind = 111;
+ jjmatchedKind = 116;
jjmatchedPos = 1;
}
break;
case 94:
- if ((active2 & 0x2000000000000000L) != 0L)
+ if ((active3 & 0x4L) != 0L)
{
- jjmatchedKind = 189;
+ jjmatchedKind = 194;
jjmatchedPos = 1;
}
break;
case 97:
- return jjMoveStringLiteralDfa2_0(active0, 0x1108001100100000L, active1, 0x1800040000c0e0c0L, active2, 0L, active3, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0xc108001100100000L, active1, 0x8000181c1803L, active2, 0x3L, active3, 0L);
case 98:
- return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x1000000L, active2, 0L, active3, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x20000000L, active2, 0L, active3, 0L);
case 99:
- return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x300000000L, active2, 0L, active3, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x6000000000L, active2, 0L, active3, 0L);
case 100:
- return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x10000000000000L, active2, 0x20L, active3, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x200000000000000L, active2, 0x400L, active3, 0L);
case 101:
- return jjMoveStringLiteralDfa2_0(active0, 0x10600803400000L, active1, 0x4008210082200000L, active2, 0x2100L, active3, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x10600803400000L, active1, 0x104201044000000L, active2, 0x42008L, active3, 0L);
case 102:
- if ((active1 & 0x4L) != 0L)
+ if ((active1 & 0x80L) != 0L)
{
- jjmatchedKind = 66;
+ jjmatchedKind = 71;
jjmatchedPos = 1;
}
return jjMoveStringLiteralDfa2_0(active0, 0x20000000L, active1, 0L, active2, 0L, active3, 0L);
case 103:
return jjMoveStringLiteralDfa2_0(active0, 0x20000000000000L, active1, 0L, active2, 0L, active3, 0L);
case 104:
- return jjMoveStringLiteralDfa2_0(active0, 0x4000000000L, active1, 0x3e0000000000200L, active2, 0L, active3, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x4000000000L, active1, 0x7c00000000004000L, active2, 0L, active3, 0L);
case 105:
- return jjMoveStringLiteralDfa2_0(active0, 0x4080180010800000L, active1, 0x500000000000L, active2, 0x8200L, active3, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x80180010800000L, active1, 0xa000000000008L, active2, 0x104000L, active3, 0L);
case 108:
- return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x4000000L, active2, 0x4008L, active3, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x80000000L, active2, 0x80100L, active3, 0L);
case 110:
- if ((active1 & 0x2L) != 0L)
+ if ((active1 & 0x40L) != 0L)
{
- jjmatchedKind = 65;
+ jjmatchedKind = 70;
jjmatchedPos = 1;
}
- return jjMoveStringLiteralDfa2_0(active0, 0x48200000000L, active1, 0x2000000400000008L, active2, 0x800L, active3, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x48200000000L, active1, 0x8000000100L, active2, 0x10004L, active3, 0L);
case 111:
- if ((active2 & 0x1000L) != 0L)
+ if ((active2 & 0x20000L) != 0L)
{
- jjmatchedKind = 140;
+ jjmatchedKind = 145;
jjmatchedPos = 1;
}
- return jjMoveStringLiteralDfa2_0(active0, 0x8041000004000000L, active1, 0x10a0818000001L, active2, 0xc4L, active3, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x41000004000000L, active1, 0x21410300000030L, active2, 0x1880L, active3, 0L);
case 112:
return jjMoveStringLiteralDfa2_0(active0, 0x20000000000L, active1, 0L, active2, 0L, active3, 0L);
case 114:
- return jjMoveStringLiteralDfa2_0(active0, 0x2004012040200000L, active1, 0x400000000000030L, active2, 0x410L, active3, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x4012040200000L, active1, 0x8000000000000604L, active2, 0x8200L, active3, 0L);
case 115:
if ((active0 & 0x2000000000000L) != 0L)
{
jjmatchedKind = 49;
jjmatchedPos = 1;
}
- return jjMoveStringLiteralDfa2_0(active0, 0x408000000L, active1, 0x1f0000L, active2, 0x10000L, active3, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x408000000L, active1, 0x3e00000L, active2, 0x200000L, active3, 0L);
case 116:
- return jjMoveStringLiteralDfa2_0(active0, 0x800000000000000L, active1, 0x400f040001c00L, active2, 0L, active3, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x3800000000000000L, active1, 0x801e0800038000L, active2, 0L, active3, 0L);
case 117:
- return jjMoveStringLiteralDfa2_0(active0, 0x200000000000000L, active1, 0x2000020000100L, active2, 0L, active3, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x200000000000000L, active1, 0x40000400002000L, active2, 0L, active3, 0L);
case 118:
return jjMoveStringLiteralDfa2_0(active0, 0x400000000000000L, active1, 0L, active2, 0L, active3, 0L);
case 120:
@@ -403,16 +404,16 @@ private int jjMoveStringLiteralDfa1_0(long active0, long active1, long active2,
}
break;
case 122:
- if ((active1 & 0x800000000000L) != 0L)
+ if ((active1 & 0x10000000000000L) != 0L)
{
- jjmatchedKind = 111;
+ jjmatchedKind = 116;
jjmatchedPos = 1;
}
break;
case 124:
- if ((active2 & 0x80000000000000L) != 0L)
+ if ((active2 & 0x1000000000000000L) != 0L)
{
- jjmatchedKind = 183;
+ jjmatchedKind = 188;
jjmatchedPos = 1;
}
break;
@@ -432,39 +433,39 @@ private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long a
switch(curChar)
{
case 53:
- if ((active1 & 0x10000000000000L) != 0L)
+ if ((active1 & 0x200000000000000L) != 0L)
{
- jjmatchedKind = 116;
+ jjmatchedKind = 121;
jjmatchedPos = 2;
}
break;
case 65:
- return jjMoveStringLiteralDfa3_0(active0, 0x10000000000L, active1, 0x3e0010300000001L, active2, 0x4L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x10000000000L, active1, 0x7c00206000000020L, active2, 0x80L);
case 66:
- return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x20040000L, active2, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x400800000L, active2, 0L);
case 67:
if ((active0 & 0x400000000L) != 0L)
{
jjmatchedKind = 34;
jjmatchedPos = 2;
}
- return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x200400000000L, active2, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x4008000000000L, active2, 0L);
case 68:
if ((active0 & 0x8000000000L) != 0L)
{
jjmatchedKind = 39;
jjmatchedPos = 2;
}
- else if ((active2 & 0x20L) != 0L)
+ else if ((active2 & 0x400L) != 0L)
{
- jjmatchedKind = 133;
+ jjmatchedKind = 138;
jjmatchedPos = 2;
}
- return jjMoveStringLiteralDfa3_0(active0, 0x800000241000000L, active1, 0L, active2, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x3800000241000000L, active1, 0L, active2, 0L);
case 69:
- return jjMoveStringLiteralDfa3_0(active0, 0x4000200000L, active1, 0L, active2, 0x18L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x4000200000L, active1, 0L, active2, 0x300L);
case 70:
- return jjMoveStringLiteralDfa3_0(active0, 0x20000000L, active1, 0L, active2, 0x2000L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x20000000L, active1, 0L, active2, 0x40000L);
case 71:
if ((active0 & 0x20000000000000L) != 0L)
{
@@ -476,19 +477,19 @@ private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long a
jjmatchedKind = 58;
jjmatchedPos = 2;
}
- return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x200000L, active2, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x4000000L, active2, 0L);
case 73:
- if ((active1 & 0x10L) != 0L)
+ if ((active1 & 0x200L) != 0L)
{
- jjmatchedKind = 68;
+ jjmatchedKind = 73;
jjmatchedPos = 2;
}
- else if ((active1 & 0x20L) != 0L)
+ else if ((active1 & 0x400L) != 0L)
{
- jjmatchedKind = 69;
+ jjmatchedKind = 74;
jjmatchedPos = 2;
}
- return jjMoveStringLiteralDfa3_0(active0, 0x840000000000L, active1, 0x2000002020000L, active2, 0x10000L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x840000000000L, active1, 0x40000040400000L, active2, 0x200000L);
case 75:
if ((active0 & 0x8000000L) != 0L)
{
@@ -497,44 +498,44 @@ private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long a
}
break;
case 76:
- if ((active2 & 0x4000L) != 0L)
+ if ((active2 & 0x80000L) != 0L)
{
- jjmatchedKind = 142;
+ jjmatchedKind = 147;
jjmatchedPos = 2;
}
- return jjMoveStringLiteralDfa3_0(active0, 0x4000000100400000L, active1, 0x4800000000080180L, active2, 0x200L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x100400000L, active1, 0x1003008L, active2, 0x4009L);
case 77:
if ((active0 & 0x200000000000000L) != 0L)
{
jjmatchedKind = 57;
jjmatchedPos = 2;
}
- return jjMoveStringLiteralDfa3_0(active0, 0x1000001010000000L, active1, 0x400000400000L, active2, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x1010000000L, active1, 0x8000008000002L, active2, 0L);
case 78:
if ((active0 & 0x80000000000000L) != 0L)
{
jjmatchedKind = 55;
jjmatchedPos = 2;
}
- return jjMoveStringLiteralDfa3_0(active0, 0x180004000000L, active1, 0x12081090c000L, active2, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x180004000000L, active1, 0x2410212180000L, active2, 0L);
case 79:
- return jjMoveStringLiteralDfa3_0(active0, 0x2004002000000000L, active1, 0x4000208L, active2, 0x400L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x4002000000000L, active1, 0x80004104L, active2, 0x8000L);
case 80:
- return jjMoveStringLiteralDfa3_0(active0, 0x10000000000000L, active1, 0x80000000L, active2, 0x80L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x10000000000000L, active1, 0x1000000000L, active2, 0x1000L);
case 82:
- if ((active1 & 0x400L) != 0L)
+ if ((active1 & 0x8000L) != 0L)
{
- jjmatchedKind = 74;
+ jjmatchedKind = 79;
jjmatchedPos = 2;
}
- return jjMoveStringLiteralDfa3_0(active0, 0x200000000000L, active1, 0xc00f040001800L, active2, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0xc000200000000000L, active1, 0x1801e0800030001L, active2, 0L);
case 83:
- if ((active1 & 0x1000000L) != 0L)
+ if ((active1 & 0x20000000L) != 0L)
{
- jjmatchedKind = 88;
+ jjmatchedKind = 93;
jjmatchedPos = 2;
}
- return jjMoveStringLiteralDfa3_0(active0, 0x802900000L, active1, 0x2000000000000040L, active2, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x802900000L, active1, 0x800L, active2, 0x4L);
case 84:
if ((active0 & 0x400000000000L) != 0L)
{
@@ -546,15 +547,15 @@ private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long a
jjmatchedKind = 48;
jjmatchedPos = 2;
}
- return jjMoveStringLiteralDfa3_0(active0, 0x20000000000L, active1, 0x1000000000002000L, active2, 0x8900L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x20000000000L, active1, 0x40000L, active2, 0x112002L);
case 85:
- return jjMoveStringLiteralDfa3_0(active0, 0x8040000000000000L, active1, 0x400080008010000L, active2, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x40000000000000L, active1, 0x8001000100200010L, active2, 0L);
case 86:
- return jjMoveStringLiteralDfa3_0(active0, 0x8000000000000L, active1, 0L, active2, 0x40L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x8000000000000L, active1, 0L, active2, 0x800L);
case 87:
- if ((active1 & 0x1000000000000L) != 0L)
+ if ((active1 & 0x20000000000000L) != 0L)
{
- jjmatchedKind = 112;
+ jjmatchedKind = 117;
jjmatchedPos = 2;
}
break;
@@ -566,39 +567,39 @@ private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long a
}
break;
case 89:
- if ((active1 & 0x40000000000L) != 0L)
+ if ((active1 & 0x800000000000L) != 0L)
{
- jjmatchedKind = 106;
+ jjmatchedKind = 111;
jjmatchedPos = 2;
}
break;
case 97:
- return jjMoveStringLiteralDfa3_0(active0, 0x10000000000L, active1, 0x3e0010300000001L, active2, 0x4L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x10000000000L, active1, 0x7c00206000000020L, active2, 0x80L);
case 98:
- return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x20040000L, active2, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x400800000L, active2, 0L);
case 99:
if ((active0 & 0x400000000L) != 0L)
{
jjmatchedKind = 34;
jjmatchedPos = 2;
}
- return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x200400000000L, active2, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x4008000000000L, active2, 0L);
case 100:
if ((active0 & 0x8000000000L) != 0L)
{
jjmatchedKind = 39;
jjmatchedPos = 2;
}
- else if ((active2 & 0x20L) != 0L)
+ else if ((active2 & 0x400L) != 0L)
{
- jjmatchedKind = 133;
+ jjmatchedKind = 138;
jjmatchedPos = 2;
}
- return jjMoveStringLiteralDfa3_0(active0, 0x800000241000000L, active1, 0L, active2, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x3800000241000000L, active1, 0L, active2, 0L);
case 101:
- return jjMoveStringLiteralDfa3_0(active0, 0x4000200000L, active1, 0L, active2, 0x18L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x4000200000L, active1, 0L, active2, 0x300L);
case 102:
- return jjMoveStringLiteralDfa3_0(active0, 0x20000000L, active1, 0L, active2, 0x2000L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x20000000L, active1, 0L, active2, 0x40000L);
case 103:
if ((active0 & 0x20000000000000L) != 0L)
{
@@ -610,19 +611,19 @@ private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long a
jjmatchedKind = 58;
jjmatchedPos = 2;
}
- return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x200000L, active2, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x4000000L, active2, 0L);
case 105:
- if ((active1 & 0x10L) != 0L)
+ if ((active1 & 0x200L) != 0L)
{
- jjmatchedKind = 68;
+ jjmatchedKind = 73;
jjmatchedPos = 2;
}
- else if ((active1 & 0x20L) != 0L)
+ else if ((active1 & 0x400L) != 0L)
{
- jjmatchedKind = 69;
+ jjmatchedKind = 74;
jjmatchedPos = 2;
}
- return jjMoveStringLiteralDfa3_0(active0, 0x840000000000L, active1, 0x2000002020000L, active2, 0x10000L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x840000000000L, active1, 0x40000040400000L, active2, 0x200000L);
case 107:
if ((active0 & 0x8000000L) != 0L)
{
@@ -631,44 +632,44 @@ private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long a
}
break;
case 108:
- if ((active2 & 0x4000L) != 0L)
+ if ((active2 & 0x80000L) != 0L)
{
- jjmatchedKind = 142;
+ jjmatchedKind = 147;
jjmatchedPos = 2;
}
- return jjMoveStringLiteralDfa3_0(active0, 0x4000000100400000L, active1, 0x4800000000080180L, active2, 0x200L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x100400000L, active1, 0x1003008L, active2, 0x4009L);
case 109:
if ((active0 & 0x200000000000000L) != 0L)
{
jjmatchedKind = 57;
jjmatchedPos = 2;
}
- return jjMoveStringLiteralDfa3_0(active0, 0x1000001010000000L, active1, 0x400000400000L, active2, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x1010000000L, active1, 0x8000008000002L, active2, 0L);
case 110:
if ((active0 & 0x80000000000000L) != 0L)
{
jjmatchedKind = 55;
jjmatchedPos = 2;
}
- return jjMoveStringLiteralDfa3_0(active0, 0x180004000000L, active1, 0x12081090c000L, active2, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x180004000000L, active1, 0x2410212180000L, active2, 0L);
case 111:
- return jjMoveStringLiteralDfa3_0(active0, 0x2004002000000000L, active1, 0x4000208L, active2, 0x400L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x4002000000000L, active1, 0x80004104L, active2, 0x8000L);
case 112:
- return jjMoveStringLiteralDfa3_0(active0, 0x10000000000000L, active1, 0x80000000L, active2, 0x80L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x10000000000000L, active1, 0x1000000000L, active2, 0x1000L);
case 114:
- if ((active1 & 0x400L) != 0L)
+ if ((active1 & 0x8000L) != 0L)
{
- jjmatchedKind = 74;
+ jjmatchedKind = 79;
jjmatchedPos = 2;
}
- return jjMoveStringLiteralDfa3_0(active0, 0x200000000000L, active1, 0xc00f040001800L, active2, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0xc000200000000000L, active1, 0x1801e0800030001L, active2, 0L);
case 115:
- if ((active1 & 0x1000000L) != 0L)
+ if ((active1 & 0x20000000L) != 0L)
{
- jjmatchedKind = 88;
+ jjmatchedKind = 93;
jjmatchedPos = 2;
}
- return jjMoveStringLiteralDfa3_0(active0, 0x802900000L, active1, 0x2000000000000040L, active2, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x802900000L, active1, 0x800L, active2, 0x4L);
case 116:
if ((active0 & 0x400000000000L) != 0L)
{
@@ -680,15 +681,15 @@ private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long a
jjmatchedKind = 48;
jjmatchedPos = 2;
}
- return jjMoveStringLiteralDfa3_0(active0, 0x20000000000L, active1, 0x1000000000002000L, active2, 0x8900L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x20000000000L, active1, 0x40000L, active2, 0x112002L);
case 117:
- return jjMoveStringLiteralDfa3_0(active0, 0x8040000000000000L, active1, 0x400080008010000L, active2, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x40000000000000L, active1, 0x8001000100200010L, active2, 0L);
case 118:
- return jjMoveStringLiteralDfa3_0(active0, 0x8000000000000L, active1, 0L, active2, 0x40L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x8000000000000L, active1, 0L, active2, 0x800L);
case 119:
- if ((active1 & 0x1000000000000L) != 0L)
+ if ((active1 & 0x20000000000000L) != 0L)
{
- jjmatchedKind = 112;
+ jjmatchedKind = 117;
jjmatchedPos = 2;
}
break;
@@ -700,9 +701,9 @@ private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long a
}
break;
case 121:
- if ((active1 & 0x40000000000L) != 0L)
+ if ((active1 & 0x800000000000L) != 0L)
{
- jjmatchedKind = 106;
+ jjmatchedKind = 111;
jjmatchedPos = 2;
}
break;
@@ -722,108 +723,108 @@ private int jjMoveStringLiteralDfa3_0(long old0, long active0, long old1, long a
switch(curChar)
{
case 49:
- if ((active1 & 0x20000000000000L) != 0L)
+ if ((active1 & 0x400000000000000L) != 0L)
{
- jjmatchedKind = 117;
+ jjmatchedKind = 122;
jjmatchedPos = 3;
}
break;
case 50:
- return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0xc0000000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x1800000000000000L, active2, 0L);
case 51:
- return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x100000000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x2000000000000000L, active2, 0L);
case 53:
- return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x200000000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x4000000000000000L, active2, 0L);
case 65:
- if ((active1 & 0x1000000000000000L) != 0L)
+ if ((active2 & 0x2L) != 0L)
{
- jjmatchedKind = 124;
+ jjmatchedKind = 129;
jjmatchedPos = 3;
}
- else if ((active2 & 0x100L) != 0L)
+ else if ((active2 & 0x2000L) != 0L)
{
- jjmatchedKind = 136;
+ jjmatchedKind = 141;
jjmatchedPos = 3;
}
- return jjMoveStringLiteralDfa4_0(active0, 0x10000000000000L, active1, 0x8000002000L, active2, 0x2018L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x10000000000000L, active1, 0x100000040000L, active2, 0x40300L);
case 66:
- return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x4000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x80000000000L, active2, 0L);
case 67:
if ((active0 & 0x800000000L) != 0L)
{
jjmatchedKind = 35;
jjmatchedPos = 3;
}
- return jjMoveStringLiteralDfa4_0(active0, 0x2000000L, active1, 0x10000000L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x2000000L, active1, 0x200000000L, active2, 0L);
case 68:
if ((active0 & 0x100000000000L) != 0L)
{
jjmatchedKind = 44;
jjmatchedPos = 3;
}
- else if ((active1 & 0x800000L) != 0L)
+ else if ((active1 & 0x10000000L) != 0L)
{
- jjmatchedKind = 87;
+ jjmatchedKind = 92;
jjmatchedPos = 3;
}
- else if ((active1 & 0x2000000000000L) != 0L)
+ else if ((active1 & 0x40000000000000L) != 0L)
{
- jjmatchedKind = 113;
+ jjmatchedKind = 118;
jjmatchedPos = 3;
}
- else if ((active2 & 0x4L) != 0L)
+ else if ((active2 & 0x80L) != 0L)
{
- jjmatchedKind = 130;
+ jjmatchedKind = 135;
jjmatchedPos = 3;
}
- return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x1008L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x20100L, active2, 0L);
case 69:
if ((active0 & 0x100000L) != 0L)
{
jjmatchedKind = 20;
jjmatchedPos = 3;
}
- else if ((active1 & 0x400000000000000L) != 0L)
+ else if ((active1 & 0x8000000000000000L) != 0L)
{
- jjmatchedKind = 122;
+ jjmatchedKind = 127;
jjmatchedPos = 3;
}
- else if ((active2 & 0x40L) != 0L)
+ else if ((active2 & 0x800L) != 0L)
{
- jjmatchedKind = 134;
+ jjmatchedKind = 139;
jjmatchedPos = 3;
}
- return jjMoveStringLiteralDfa4_0(active0, 0x800001240400000L, active1, 0x6000402000600000L, active2, 0x200L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x3800001240400000L, active1, 0x804000c000000L, active2, 0x400cL);
case 70:
return jjMoveStringLiteralDfa4_0(active0, 0x200000L, active1, 0L, active2, 0L);
case 71:
- if ((active1 & 0x4000L) != 0L)
+ if ((active1 & 0x80000L) != 0L)
{
- jjmatchedKind = 78;
+ jjmatchedKind = 83;
jjmatchedPos = 3;
}
- return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x8000L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x100000L, active2, 0L);
case 72:
- if ((active2 & 0x8000L) != 0L)
+ if ((active2 & 0x100000L) != 0L)
{
- jjmatchedKind = 143;
+ jjmatchedKind = 148;
jjmatchedPos = 3;
}
break;
case 73:
- return jjMoveStringLiteralDfa4_0(active0, 0x8020010000000L, active1, 0x80000L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x4008020010000000L, active1, 0x1000000L, active2, 0L);
case 76:
- if ((active1 & 0x80L) != 0L)
+ if ((active1 & 0x1000L) != 0L)
{
- jjmatchedKind = 71;
+ jjmatchedKind = 76;
jjmatchedPos = 3;
}
- else if ((active1 & 0x2000000L) != 0L)
+ else if ((active1 & 0x40000000L) != 0L)
{
- jjmatchedKind = 89;
+ jjmatchedKind = 94;
jjmatchedPos = 3;
}
- return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0xc0040801L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x1800810020L, active2, 0L);
case 77:
if ((active0 & 0x2000000000L) != 0L)
{
@@ -832,138 +833,140 @@ private int jjMoveStringLiteralDfa3_0(long old0, long active0, long old1, long a
}
break;
case 78:
- return jjMoveStringLiteralDfa4_0(active0, 0x8040000000000000L, active1, 0x8000000L, active2, 0x10000L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x40000000000000L, active1, 0x100000010L, active2, 0x200000L);
case 79:
- if ((active2 & 0x800L) != 0L)
+ if ((active2 & 0x10000L) != 0L)
{
- jjmatchedKind = 139;
+ jjmatchedKind = 144;
jjmatchedPos = 3;
}
- return jjMoveStringLiteralDfa4_0(active0, 0x40000000000L, active1, 0x200404000000L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x40000000000L, active1, 0x4008080000000L, active2, 0L);
case 80:
- if ((active2 & 0x400L) != 0L)
+ if ((active2 & 0x8000L) != 0L)
{
- jjmatchedKind = 138;
+ jjmatchedKind = 143;
jjmatchedPos = 3;
}
- return jjMoveStringLiteralDfa4_0(active0, 0x1000010000000000L, active1, 0L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x10000000000L, active1, 0x2L, active2, 0L);
case 82:
- if ((active1 & 0x10000000000L) != 0L)
+ if ((active1 & 0x200000000000L) != 0L)
{
- jjmatchedKind = 104;
+ jjmatchedKind = 109;
jjmatchedPos = 3;
}
- return jjMoveStringLiteralDfa4_0(active0, 0x4000000000L, active1, 0x80000030200L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x4000000000L, active1, 0x1000000604000L, active2, 0L);
case 83:
- return jjMoveStringLiteralDfa4_0(active0, 0x800024000000L, active1, 0x808001320000000L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x800024000000L, active1, 0x100026400000000L, active2, 0x1L);
case 84:
- if ((active1 & 0x40L) != 0L)
+ if ((active1 & 0x800L) != 0L)
{
- jjmatchedKind = 70;
+ jjmatchedKind = 75;
jjmatchedPos = 3;
}
- return jjMoveStringLiteralDfa4_0(active0, 0x4000000000800000L, active1, 0x20800000100L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x800000L, active1, 0x410000002008L, active2, 0L);
case 85:
- return jjMoveStringLiteralDfa4_0(active0, 0x2004080101000000L, active1, 0x4100000100000L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x4080101000000L, active1, 0x82000002000004L, active2, 0L);
case 86:
return jjMoveStringLiteralDfa4_0(active0, 0x200000000000L, active1, 0L, active2, 0L);
case 89:
- if ((active2 & 0x80L) != 0L)
+ if ((active2 & 0x1000L) != 0L)
{
- jjmatchedKind = 135;
+ jjmatchedKind = 140;
jjmatchedPos = 3;
}
break;
+ case 95:
+ return jjMoveStringLiteralDfa4_0(active0, 0x8000000000000000L, active1, 0x1L, active2, 0L);
case 97:
- if ((active1 & 0x1000000000000000L) != 0L)
+ if ((active2 & 0x2L) != 0L)
{
- jjmatchedKind = 124;
+ jjmatchedKind = 129;
jjmatchedPos = 3;
}
- else if ((active2 & 0x100L) != 0L)
+ else if ((active2 & 0x2000L) != 0L)
{
- jjmatchedKind = 136;
+ jjmatchedKind = 141;
jjmatchedPos = 3;
}
- return jjMoveStringLiteralDfa4_0(active0, 0x10000000000000L, active1, 0x8000002000L, active2, 0x2018L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x10000000000000L, active1, 0x100000040000L, active2, 0x40300L);
case 98:
- return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x4000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x80000000000L, active2, 0L);
case 99:
if ((active0 & 0x800000000L) != 0L)
{
jjmatchedKind = 35;
jjmatchedPos = 3;
}
- return jjMoveStringLiteralDfa4_0(active0, 0x2000000L, active1, 0x10000000L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x2000000L, active1, 0x200000000L, active2, 0L);
case 100:
if ((active0 & 0x100000000000L) != 0L)
{
jjmatchedKind = 44;
jjmatchedPos = 3;
}
- else if ((active1 & 0x800000L) != 0L)
+ else if ((active1 & 0x10000000L) != 0L)
{
- jjmatchedKind = 87;
+ jjmatchedKind = 92;
jjmatchedPos = 3;
}
- else if ((active1 & 0x2000000000000L) != 0L)
+ else if ((active1 & 0x40000000000000L) != 0L)
{
- jjmatchedKind = 113;
+ jjmatchedKind = 118;
jjmatchedPos = 3;
}
- else if ((active2 & 0x4L) != 0L)
+ else if ((active2 & 0x80L) != 0L)
{
- jjmatchedKind = 130;
+ jjmatchedKind = 135;
jjmatchedPos = 3;
}
- return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x1008L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x20100L, active2, 0L);
case 101:
if ((active0 & 0x100000L) != 0L)
{
jjmatchedKind = 20;
jjmatchedPos = 3;
}
- else if ((active1 & 0x400000000000000L) != 0L)
+ else if ((active1 & 0x8000000000000000L) != 0L)
{
- jjmatchedKind = 122;
+ jjmatchedKind = 127;
jjmatchedPos = 3;
}
- else if ((active2 & 0x40L) != 0L)
+ else if ((active2 & 0x800L) != 0L)
{
- jjmatchedKind = 134;
+ jjmatchedKind = 139;
jjmatchedPos = 3;
}
- return jjMoveStringLiteralDfa4_0(active0, 0x800001240400000L, active1, 0x6000402000600000L, active2, 0x200L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x3800001240400000L, active1, 0x804000c000000L, active2, 0x400cL);
case 102:
return jjMoveStringLiteralDfa4_0(active0, 0x200000L, active1, 0L, active2, 0L);
case 103:
- if ((active1 & 0x4000L) != 0L)
+ if ((active1 & 0x80000L) != 0L)
{
- jjmatchedKind = 78;
+ jjmatchedKind = 83;
jjmatchedPos = 3;
}
- return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x8000L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x100000L, active2, 0L);
case 104:
- if ((active2 & 0x8000L) != 0L)
+ if ((active2 & 0x100000L) != 0L)
{
- jjmatchedKind = 143;
+ jjmatchedKind = 148;
jjmatchedPos = 3;
}
break;
case 105:
- return jjMoveStringLiteralDfa4_0(active0, 0x8020010000000L, active1, 0x80000L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x4008020010000000L, active1, 0x1000000L, active2, 0L);
case 108:
- if ((active1 & 0x80L) != 0L)
+ if ((active1 & 0x1000L) != 0L)
{
- jjmatchedKind = 71;
+ jjmatchedKind = 76;
jjmatchedPos = 3;
}
- else if ((active1 & 0x2000000L) != 0L)
+ else if ((active1 & 0x40000000L) != 0L)
{
- jjmatchedKind = 89;
+ jjmatchedKind = 94;
jjmatchedPos = 3;
}
- return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0xc0040801L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x1800810020L, active2, 0L);
case 109:
if ((active0 & 0x2000000000L) != 0L)
{
@@ -972,45 +975,45 @@ private int jjMoveStringLiteralDfa3_0(long old0, long active0, long old1, long a
}
break;
case 110:
- return jjMoveStringLiteralDfa4_0(active0, 0x8040000000000000L, active1, 0x8000000L, active2, 0x10000L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x40000000000000L, active1, 0x100000010L, active2, 0x200000L);
case 111:
- if ((active2 & 0x800L) != 0L)
+ if ((active2 & 0x10000L) != 0L)
{
- jjmatchedKind = 139;
+ jjmatchedKind = 144;
jjmatchedPos = 3;
}
- return jjMoveStringLiteralDfa4_0(active0, 0x40000000000L, active1, 0x200404000000L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x40000000000L, active1, 0x4008080000000L, active2, 0L);
case 112:
- if ((active2 & 0x400L) != 0L)
+ if ((active2 & 0x8000L) != 0L)
{
- jjmatchedKind = 138;
+ jjmatchedKind = 143;
jjmatchedPos = 3;
}
- return jjMoveStringLiteralDfa4_0(active0, 0x1000010000000000L, active1, 0L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x10000000000L, active1, 0x2L, active2, 0L);
case 114:
- if ((active1 & 0x10000000000L) != 0L)
+ if ((active1 & 0x200000000000L) != 0L)
{
- jjmatchedKind = 104;
+ jjmatchedKind = 109;
jjmatchedPos = 3;
}
- return jjMoveStringLiteralDfa4_0(active0, 0x4000000000L, active1, 0x80000030200L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x4000000000L, active1, 0x1000000604000L, active2, 0L);
case 115:
- return jjMoveStringLiteralDfa4_0(active0, 0x800024000000L, active1, 0x808001320000000L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x800024000000L, active1, 0x100026400000000L, active2, 0x1L);
case 116:
- if ((active1 & 0x40L) != 0L)
+ if ((active1 & 0x800L) != 0L)
{
- jjmatchedKind = 70;
+ jjmatchedKind = 75;
jjmatchedPos = 3;
}
- return jjMoveStringLiteralDfa4_0(active0, 0x4000000000800000L, active1, 0x20800000100L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x800000L, active1, 0x410000002008L, active2, 0L);
case 117:
- return jjMoveStringLiteralDfa4_0(active0, 0x2004080101000000L, active1, 0x4100000100000L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x4080101000000L, active1, 0x82000002000004L, active2, 0L);
case 118:
return jjMoveStringLiteralDfa4_0(active0, 0x200000000000L, active1, 0L, active2, 0L);
case 121:
- if ((active2 & 0x80L) != 0L)
+ if ((active2 & 0x1000L) != 0L)
{
- jjmatchedKind = 135;
+ jjmatchedKind = 140;
jjmatchedPos = 3;
}
break;
@@ -1030,15 +1033,15 @@ private int jjMoveStringLiteralDfa4_0(long old0, long active0, long old1, long a
switch(curChar)
{
case 49:
- return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x200000000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x4000000000000000L, active2, 0L);
case 50:
- return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x40000000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x800000000000000L, active2, 0L);
case 53:
- return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x80000000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x1000000000000000L, active2, 0L);
case 56:
- return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x100000000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x2000000000000000L, active2, 0L);
case 65:
- return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x890040800L, active2, 0L);
+ return jjMoveStringLiteralDfa5_0(active0, 0x4000000000000000L, active1, 0x11200810000L, active2, 0L);
case 67:
return jjMoveStringLiteralDfa5_0(active0, 0x1400000L, active1, 0L, active2, 0L);
case 68:
@@ -1047,55 +1050,55 @@ private int jjMoveStringLiteralDfa4_0(long old0, long active0, long old1, long a
jjmatchedKind = 36;
jjmatchedPos = 4;
}
- else if ((active0 & 0x8000000000000000L) != 0L)
+ else if ((active1 & 0x10L) != 0L)
{
- jjmatchedKind = 63;
+ jjmatchedKind = 68;
jjmatchedPos = 4;
}
- else if ((active1 & 0x8000000L) != 0L)
+ else if ((active1 & 0x100000000L) != 0L)
{
- jjmatchedKind = 91;
+ jjmatchedKind = 96;
jjmatchedPos = 4;
}
- return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x400000000L, active2, 0L);
+ return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x8000000000L, active2, 0L);
case 69:
if ((active0 & 0x4000000000L) != 0L)
{
jjmatchedKind = 38;
jjmatchedPos = 4;
}
- else if ((active1 & 0x8L) != 0L)
+ else if ((active1 & 0x100L) != 0L)
{
- jjmatchedKind = 67;
+ jjmatchedKind = 72;
jjmatchedPos = 4;
}
- else if ((active1 & 0x100000000L) != 0L)
+ else if ((active1 & 0x2000000000L) != 0L)
{
- jjmatchedKind = 96;
+ jjmatchedKind = 101;
jjmatchedPos = 4;
}
- else if ((active1 & 0x200000000L) != 0L)
+ else if ((active1 & 0x4000000000L) != 0L)
{
- jjmatchedKind = 97;
+ jjmatchedKind = 102;
jjmatchedPos = 4;
}
- else if ((active1 & 0x800000000000000L) != 0L)
+ else if ((active2 & 0x1L) != 0L)
{
- jjmatchedKind = 123;
+ jjmatchedKind = 128;
jjmatchedPos = 4;
}
- return jjMoveStringLiteralDfa5_0(active0, 0x4000000120000000L, active1, 0x4040000001L, active2, 0L);
+ return jjMoveStringLiteralDfa5_0(active0, 0x120000000L, active1, 0x80800000028L, active2, 0L);
case 70:
if ((active0 & 0x200000000L) != 0L)
{
jjmatchedKind = 33;
jjmatchedPos = 4;
}
- return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x8000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x100000000000L, active2, 0L);
case 71:
- if ((active2 & 0x10000L) != 0L)
+ if ((active2 & 0x200000L) != 0L)
{
- jjmatchedKind = 144;
+ jjmatchedKind = 149;
jjmatchedPos = 4;
}
break;
@@ -1105,40 +1108,40 @@ private int jjMoveStringLiteralDfa4_0(long old0, long active0, long old1, long a
jjmatchedKind = 40;
jjmatchedPos = 4;
}
- else if ((active1 & 0x20000000000L) != 0L)
+ else if ((active1 & 0x400000000000L) != 0L)
{
- jjmatchedKind = 105;
+ jjmatchedKind = 110;
jjmatchedPos = 4;
}
break;
case 73:
- if ((active1 & 0x100L) != 0L)
+ if ((active1 & 0x2000L) != 0L)
{
- jjmatchedKind = 72;
+ jjmatchedKind = 77;
jjmatchedPos = 4;
}
- else if ((active1 & 0x10000L) != 0L)
+ else if ((active1 & 0x200000L) != 0L)
{
- jjmatchedKind = 80;
+ jjmatchedKind = 85;
jjmatchedPos = 4;
}
- else if ((active1 & 0x20000L) != 0L)
+ else if ((active1 & 0x400000L) != 0L)
{
- jjmatchedKind = 81;
+ jjmatchedKind = 86;
jjmatchedPos = 4;
}
- return jjMoveStringLiteralDfa5_0(active0, 0x200000a00000L, active1, 0x8000000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa5_0(active0, 0x200000a00000L, active1, 0x100000000000000L, active2, 0L);
case 76:
- return jjMoveStringLiteralDfa5_0(active0, 0x1000000000000000L, active1, 0L, active2, 0L);
+ return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x2L, active2, 0L);
case 77:
- return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x108000L, active2, 0L);
+ return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x2100000L, active2, 0L);
case 78:
if ((active0 & 0x40000000000L) != 0L)
{
jjmatchedKind = 42;
jjmatchedPos = 4;
}
- return jjMoveStringLiteralDfa5_0(active0, 0x8000000000000L, active1, 0x202000000000L, active2, 0x200L);
+ return jjMoveStringLiteralDfa5_0(active0, 0x8000000000000L, active1, 0x4040000000000L, active2, 0x4000L);
case 79:
return jjMoveStringLiteralDfa5_0(active0, 0x20000000000L, active1, 0L, active2, 0L);
case 80:
@@ -1147,36 +1150,36 @@ private int jjMoveStringLiteralDfa4_0(long old0, long active0, long old1, long a
jjmatchedKind = 50;
jjmatchedPos = 4;
}
- return jjMoveStringLiteralDfa5_0(active0, 0x2000000000000000L, active1, 0L, active2, 0L);
+ return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x5L, active2, 0L);
case 82:
if ((active0 & 0x40000000L) != 0L)
{
jjmatchedKind = 30;
jjmatchedPos = 4;
}
- else if ((active1 & 0x4000000L) != 0L)
+ else if ((active1 & 0x80000000L) != 0L)
{
- jjmatchedKind = 90;
+ jjmatchedKind = 95;
jjmatchedPos = 4;
}
- else if ((active2 & 0x8L) != 0L)
+ else if ((active2 & 0x100L) != 0L)
{
- jjmatchedKind = 131;
+ jjmatchedKind = 136;
jjmatchedPos = 4;
}
- return jjMoveStringLiteralDfa5_0(active0, 0x10000002000000L, active1, 0x2000000000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa5_0(active0, 0x10000002000000L, active1, 0L, active2, 0x4L);
case 83:
if ((active0 & 0x80000000000L) != 0L)
{
jjmatchedKind = 43;
jjmatchedPos = 4;
}
- else if ((active1 & 0x80000000000L) != 0L)
+ else if ((active1 & 0x1000000000000L) != 0L)
{
- jjmatchedKind = 107;
+ jjmatchedKind = 112;
jjmatchedPos = 4;
}
- break;
+ return jjMoveStringLiteralDfa5_0(active0, 0x8000000000000000L, active1, 0L, active2, 0L);
case 84:
if ((active0 & 0x10000000L) != 0L)
{
@@ -1188,32 +1191,32 @@ private int jjMoveStringLiteralDfa4_0(long old0, long active0, long old1, long a
jjmatchedKind = 54;
jjmatchedPos = 4;
}
- else if ((active1 & 0x1000L) != 0L)
+ else if ((active1 & 0x20000L) != 0L)
{
- jjmatchedKind = 76;
+ jjmatchedKind = 81;
jjmatchedPos = 4;
}
- return jjMoveStringLiteralDfa5_0(active0, 0x800004000000L, active1, 0x4000101020482200L, active2, 0x10L);
+ return jjMoveStringLiteralDfa5_0(active0, 0x800004000000L, active1, 0x2020409044000L, active2, 0x208L);
case 85:
- return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x4000000000000L, active2, 0x2000L);
+ return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x80000000000000L, active2, 0x40000L);
case 86:
if ((active0 & 0x800000000000000L) != 0L)
{
jjmatchedKind = 59;
jjmatchedPos = 4;
}
- break;
+ return jjMoveStringLiteralDfa5_0(active0, 0x3000000000000000L, active1, 0L, active2, 0L);
case 88:
- if ((active1 & 0x200000L) != 0L)
+ if ((active1 & 0x4000000L) != 0L)
{
- jjmatchedKind = 85;
+ jjmatchedKind = 90;
jjmatchedPos = 4;
}
break;
case 90:
- return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x400000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x8000000000000L, active2, 0L);
case 97:
- return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x890040800L, active2, 0L);
+ return jjMoveStringLiteralDfa5_0(active0, 0x4000000000000000L, active1, 0x11200810000L, active2, 0L);
case 99:
return jjMoveStringLiteralDfa5_0(active0, 0x1400000L, active1, 0L, active2, 0L);
case 100:
@@ -1222,55 +1225,55 @@ private int jjMoveStringLiteralDfa4_0(long old0, long active0, long old1, long a
jjmatchedKind = 36;
jjmatchedPos = 4;
}
- else if ((active0 & 0x8000000000000000L) != 0L)
+ else if ((active1 & 0x10L) != 0L)
{
- jjmatchedKind = 63;
+ jjmatchedKind = 68;
jjmatchedPos = 4;
}
- else if ((active1 & 0x8000000L) != 0L)
+ else if ((active1 & 0x100000000L) != 0L)
{
- jjmatchedKind = 91;
+ jjmatchedKind = 96;
jjmatchedPos = 4;
}
- return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x400000000L, active2, 0L);
+ return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x8000000000L, active2, 0L);
case 101:
if ((active0 & 0x4000000000L) != 0L)
{
jjmatchedKind = 38;
jjmatchedPos = 4;
}
- else if ((active1 & 0x8L) != 0L)
+ else if ((active1 & 0x100L) != 0L)
{
- jjmatchedKind = 67;
+ jjmatchedKind = 72;
jjmatchedPos = 4;
}
- else if ((active1 & 0x100000000L) != 0L)
+ else if ((active1 & 0x2000000000L) != 0L)
{
- jjmatchedKind = 96;
+ jjmatchedKind = 101;
jjmatchedPos = 4;
}
- else if ((active1 & 0x200000000L) != 0L)
+ else if ((active1 & 0x4000000000L) != 0L)
{
- jjmatchedKind = 97;
+ jjmatchedKind = 102;
jjmatchedPos = 4;
}
- else if ((active1 & 0x800000000000000L) != 0L)
+ else if ((active2 & 0x1L) != 0L)
{
- jjmatchedKind = 123;
+ jjmatchedKind = 128;
jjmatchedPos = 4;
}
- return jjMoveStringLiteralDfa5_0(active0, 0x4000000120000000L, active1, 0x4040000001L, active2, 0L);
+ return jjMoveStringLiteralDfa5_0(active0, 0x120000000L, active1, 0x80800000028L, active2, 0L);
case 102:
if ((active0 & 0x200000000L) != 0L)
{
jjmatchedKind = 33;
jjmatchedPos = 4;
}
- return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x8000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x100000000000L, active2, 0L);
case 103:
- if ((active2 & 0x10000L) != 0L)
+ if ((active2 & 0x200000L) != 0L)
{
- jjmatchedKind = 144;
+ jjmatchedKind = 149;
jjmatchedPos = 4;
}
break;
@@ -1280,40 +1283,40 @@ private int jjMoveStringLiteralDfa4_0(long old0, long active0, long old1, long a
jjmatchedKind = 40;
jjmatchedPos = 4;
}
- else if ((active1 & 0x20000000000L) != 0L)
+ else if ((active1 & 0x400000000000L) != 0L)
{
- jjmatchedKind = 105;
+ jjmatchedKind = 110;
jjmatchedPos = 4;
}
break;
case 105:
- if ((active1 & 0x100L) != 0L)
+ if ((active1 & 0x2000L) != 0L)
{
- jjmatchedKind = 72;
+ jjmatchedKind = 77;
jjmatchedPos = 4;
}
- else if ((active1 & 0x10000L) != 0L)
+ else if ((active1 & 0x200000L) != 0L)
{
- jjmatchedKind = 80;
+ jjmatchedKind = 85;
jjmatchedPos = 4;
}
- else if ((active1 & 0x20000L) != 0L)
+ else if ((active1 & 0x400000L) != 0L)
{
- jjmatchedKind = 81;
+ jjmatchedKind = 86;
jjmatchedPos = 4;
}
- return jjMoveStringLiteralDfa5_0(active0, 0x200000a00000L, active1, 0x8000000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa5_0(active0, 0x200000a00000L, active1, 0x100000000000000L, active2, 0L);
case 108:
- return jjMoveStringLiteralDfa5_0(active0, 0x1000000000000000L, active1, 0L, active2, 0L);
+ return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x2L, active2, 0L);
case 109:
- return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x108000L, active2, 0L);
+ return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x2100000L, active2, 0L);
case 110:
if ((active0 & 0x40000000000L) != 0L)
{
jjmatchedKind = 42;
jjmatchedPos = 4;
}
- return jjMoveStringLiteralDfa5_0(active0, 0x8000000000000L, active1, 0x202000000000L, active2, 0x200L);
+ return jjMoveStringLiteralDfa5_0(active0, 0x8000000000000L, active1, 0x4040000000000L, active2, 0x4000L);
case 111:
return jjMoveStringLiteralDfa5_0(active0, 0x20000000000L, active1, 0L, active2, 0L);
case 112:
@@ -1322,36 +1325,36 @@ private int jjMoveStringLiteralDfa4_0(long old0, long active0, long old1, long a
jjmatchedKind = 50;
jjmatchedPos = 4;
}
- return jjMoveStringLiteralDfa5_0(active0, 0x2000000000000000L, active1, 0L, active2, 0L);
+ return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x5L, active2, 0L);
case 114:
if ((active0 & 0x40000000L) != 0L)
{
jjmatchedKind = 30;
jjmatchedPos = 4;
}
- else if ((active1 & 0x4000000L) != 0L)
+ else if ((active1 & 0x80000000L) != 0L)
{
- jjmatchedKind = 90;
+ jjmatchedKind = 95;
jjmatchedPos = 4;
}
- else if ((active2 & 0x8L) != 0L)
+ else if ((active2 & 0x100L) != 0L)
{
- jjmatchedKind = 131;
+ jjmatchedKind = 136;
jjmatchedPos = 4;
}
- return jjMoveStringLiteralDfa5_0(active0, 0x10000002000000L, active1, 0x2000000000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa5_0(active0, 0x10000002000000L, active1, 0L, active2, 0x4L);
case 115:
if ((active0 & 0x80000000000L) != 0L)
{
jjmatchedKind = 43;
jjmatchedPos = 4;
}
- else if ((active1 & 0x80000000000L) != 0L)
+ else if ((active1 & 0x1000000000000L) != 0L)
{
- jjmatchedKind = 107;
+ jjmatchedKind = 112;
jjmatchedPos = 4;
}
- break;
+ return jjMoveStringLiteralDfa5_0(active0, 0x8000000000000000L, active1, 0L, active2, 0L);
case 116:
if ((active0 & 0x10000000L) != 0L)
{
@@ -1363,30 +1366,30 @@ private int jjMoveStringLiteralDfa4_0(long old0, long active0, long old1, long a
jjmatchedKind = 54;
jjmatchedPos = 4;
}
- else if ((active1 & 0x1000L) != 0L)
+ else if ((active1 & 0x20000L) != 0L)
{
- jjmatchedKind = 76;
+ jjmatchedKind = 81;
jjmatchedPos = 4;
}
- return jjMoveStringLiteralDfa5_0(active0, 0x800004000000L, active1, 0x4000101020482200L, active2, 0x10L);
+ return jjMoveStringLiteralDfa5_0(active0, 0x800004000000L, active1, 0x2020409044000L, active2, 0x208L);
case 117:
- return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x4000000000000L, active2, 0x2000L);
+ return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x80000000000000L, active2, 0x40000L);
case 118:
if ((active0 & 0x800000000000000L) != 0L)
{
jjmatchedKind = 59;
jjmatchedPos = 4;
}
- break;
+ return jjMoveStringLiteralDfa5_0(active0, 0x3000000000000000L, active1, 0L, active2, 0L);
case 120:
- if ((active1 & 0x200000L) != 0L)
+ if ((active1 & 0x4000000L) != 0L)
{
- jjmatchedKind = 85;
+ jjmatchedKind = 90;
jjmatchedPos = 4;
}
break;
case 122:
- return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x400000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x8000000000000L, active2, 0L);
default :
break;
}
@@ -1403,56 +1406,56 @@ private int jjMoveStringLiteralDfa5_0(long old0, long active0, long old1, long a
switch(curChar)
{
case 50:
- if ((active1 & 0x200000000000000L) != 0L)
+ if ((active1 & 0x4000000000000000L) != 0L)
{
- jjmatchedKind = 121;
+ jjmatchedKind = 126;
jjmatchedPos = 5;
}
break;
case 52:
- if ((active1 & 0x40000000000000L) != 0L)
+ if ((active1 & 0x800000000000000L) != 0L)
{
- jjmatchedKind = 118;
+ jjmatchedKind = 123;
jjmatchedPos = 5;
}
- else if ((active1 & 0x100000000000000L) != 0L)
+ else if ((active1 & 0x2000000000000000L) != 0L)
{
- jjmatchedKind = 120;
+ jjmatchedKind = 125;
jjmatchedPos = 5;
}
break;
case 54:
- if ((active1 & 0x80000000000000L) != 0L)
+ if ((active1 & 0x1000000000000000L) != 0L)
{
- jjmatchedKind = 119;
+ jjmatchedKind = 124;
jjmatchedPos = 5;
}
break;
case 65:
- return jjMoveStringLiteralDfa6_0(active0, 0x10000000000000L, active1, 0x1000008000L, active2, 0L);
+ return jjMoveStringLiteralDfa6_0(active0, 0x8010000000000000L, active1, 0x20000100000L, active2, 0L);
case 67:
- return jjMoveStringLiteralDfa6_0(active0, 0x200000000000L, active1, 0x80000000L, active2, 0L);
+ return jjMoveStringLiteralDfa6_0(active0, 0x200000000000L, active1, 0x1000000000L, active2, 0L);
case 68:
- return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x202000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x4040000000000L, active2, 0L);
case 69:
- if ((active0 & 0x1000000000000000L) != 0L)
+ if ((active1 & 0x2L) != 0L)
{
- jjmatchedKind = 60;
+ jjmatchedKind = 65;
jjmatchedPos = 5;
}
- else if ((active1 & 0x4000000000000000L) != 0L)
+ else if ((active2 & 0x8L) != 0L)
{
- jjmatchedKind = 126;
+ jjmatchedKind = 131;
jjmatchedPos = 5;
}
- else if ((active2 & 0x10L) != 0L)
+ else if ((active2 & 0x200L) != 0L)
{
- jjmatchedKind = 132;
+ jjmatchedKind = 137;
jjmatchedPos = 5;
}
- return jjMoveStringLiteralDfa6_0(active0, 0x1000000L, active1, 0x100400580200L, active2, 0L);
+ return jjMoveStringLiteralDfa6_0(active0, 0x1000000L, active1, 0x200800b004000L, active2, 0L);
case 70:
- return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x4000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x80000000000L, active2, 0L);
case 71:
if ((active0 & 0x8000000000000L) != 0L)
{
@@ -1461,27 +1464,27 @@ private int jjMoveStringLiteralDfa5_0(long old0, long active0, long old1, long a
}
break;
case 73:
- return jjMoveStringLiteralDfa6_0(active0, 0x2000000L, active1, 0x4000800000000L, active2, 0L);
+ return jjMoveStringLiteralDfa6_0(active0, 0x2000000L, active1, 0x80010000000000L, active2, 0L);
case 76:
- return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0L, active2, 0x2000L);
+ return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0L, active2, 0x40000L);
case 78:
- if ((active1 & 0x40000000L) != 0L)
+ if ((active1 & 0x800000000L) != 0L)
{
- jjmatchedKind = 94;
+ jjmatchedKind = 99;
jjmatchedPos = 5;
}
- return jjMoveStringLiteralDfa6_0(active0, 0x20000800000L, active1, 0x40800L, active2, 0L);
+ return jjMoveStringLiteralDfa6_0(active0, 0x4000020000800000L, active1, 0x810000L, active2, 0L);
case 79:
- return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x8400000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x108000000000001L, active2, 0L);
case 82:
- if ((active0 & 0x4000000000000000L) != 0L)
+ if ((active1 & 0x8L) != 0L)
{
- jjmatchedKind = 62;
+ jjmatchedKind = 67;
jjmatchedPos = 5;
}
- else if ((active1 & 0x20000000L) != 0L)
+ else if ((active1 & 0x400000000L) != 0L)
{
- jjmatchedKind = 93;
+ jjmatchedKind = 98;
jjmatchedPos = 5;
}
return jjMoveStringLiteralDfa6_0(active0, 0x4000000L, active1, 0L, active2, 0L);
@@ -1496,7 +1499,7 @@ private int jjMoveStringLiteralDfa5_0(long old0, long active0, long old1, long a
jjmatchedKind = 47;
jjmatchedPos = 5;
}
- return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x1L, active2, 0L);
+ return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x20L, active2, 0L);
case 84:
if ((active0 & 0x400000L) != 0L)
{
@@ -1508,22 +1511,22 @@ private int jjMoveStringLiteralDfa5_0(long old0, long active0, long old1, long a
jjmatchedKind = 29;
jjmatchedPos = 5;
}
- else if ((active1 & 0x10000000L) != 0L)
+ else if ((active1 & 0x200000000L) != 0L)
{
- jjmatchedKind = 92;
+ jjmatchedKind = 97;
jjmatchedPos = 5;
}
- else if ((active1 & 0x2000000000000000L) != 0L)
+ else if ((active2 & 0x4L) != 0L)
{
- jjmatchedKind = 125;
+ jjmatchedKind = 130;
jjmatchedPos = 5;
}
- else if ((active2 & 0x200L) != 0L)
+ else if ((active2 & 0x4000L) != 0L)
{
- jjmatchedKind = 137;
+ jjmatchedKind = 142;
jjmatchedPos = 5;
}
- return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x8000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x100000000000L, active2, 0L);
case 88:
if ((active0 & 0x200000L) != 0L)
{
@@ -1532,34 +1535,34 @@ private int jjMoveStringLiteralDfa5_0(long old0, long active0, long old1, long a
}
break;
case 89:
- return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x2000L, active2, 0L);
+ return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x40000L, active2, 0L);
case 95:
- return jjMoveStringLiteralDfa6_0(active0, 0x2000000000000000L, active1, 0L, active2, 0L);
+ return jjMoveStringLiteralDfa6_0(active0, 0x3000000000000000L, active1, 0x4L, active2, 0L);
case 97:
- return jjMoveStringLiteralDfa6_0(active0, 0x10000000000000L, active1, 0x1000008000L, active2, 0L);
+ return jjMoveStringLiteralDfa6_0(active0, 0x8010000000000000L, active1, 0x20000100000L, active2, 0L);
case 99:
- return jjMoveStringLiteralDfa6_0(active0, 0x200000000000L, active1, 0x80000000L, active2, 0L);
+ return jjMoveStringLiteralDfa6_0(active0, 0x200000000000L, active1, 0x1000000000L, active2, 0L);
case 100:
- return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x202000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x4040000000000L, active2, 0L);
case 101:
- if ((active0 & 0x1000000000000000L) != 0L)
+ if ((active1 & 0x2L) != 0L)
{
- jjmatchedKind = 60;
+ jjmatchedKind = 65;
jjmatchedPos = 5;
}
- else if ((active1 & 0x4000000000000000L) != 0L)
+ else if ((active2 & 0x8L) != 0L)
{
- jjmatchedKind = 126;
+ jjmatchedKind = 131;
jjmatchedPos = 5;
}
- else if ((active2 & 0x10L) != 0L)
+ else if ((active2 & 0x200L) != 0L)
{
- jjmatchedKind = 132;
+ jjmatchedKind = 137;
jjmatchedPos = 5;
}
- return jjMoveStringLiteralDfa6_0(active0, 0x1000000L, active1, 0x100400580200L, active2, 0L);
+ return jjMoveStringLiteralDfa6_0(active0, 0x1000000L, active1, 0x200800b004000L, active2, 0L);
case 102:
- return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x4000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x80000000000L, active2, 0L);
case 103:
if ((active0 & 0x8000000000000L) != 0L)
{
@@ -1568,27 +1571,27 @@ private int jjMoveStringLiteralDfa5_0(long old0, long active0, long old1, long a
}
break;
case 105:
- return jjMoveStringLiteralDfa6_0(active0, 0x2000000L, active1, 0x4000800000000L, active2, 0L);
+ return jjMoveStringLiteralDfa6_0(active0, 0x2000000L, active1, 0x80010000000000L, active2, 0L);
case 108:
- return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0L, active2, 0x2000L);
+ return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0L, active2, 0x40000L);
case 110:
- if ((active1 & 0x40000000L) != 0L)
+ if ((active1 & 0x800000000L) != 0L)
{
- jjmatchedKind = 94;
+ jjmatchedKind = 99;
jjmatchedPos = 5;
}
- return jjMoveStringLiteralDfa6_0(active0, 0x20000800000L, active1, 0x40800L, active2, 0L);
+ return jjMoveStringLiteralDfa6_0(active0, 0x4000020000800000L, active1, 0x810000L, active2, 0L);
case 111:
- return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x8400000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x108000000000001L, active2, 0L);
case 114:
- if ((active0 & 0x4000000000000000L) != 0L)
+ if ((active1 & 0x8L) != 0L)
{
- jjmatchedKind = 62;
+ jjmatchedKind = 67;
jjmatchedPos = 5;
}
- else if ((active1 & 0x20000000L) != 0L)
+ else if ((active1 & 0x400000000L) != 0L)
{
- jjmatchedKind = 93;
+ jjmatchedKind = 98;
jjmatchedPos = 5;
}
return jjMoveStringLiteralDfa6_0(active0, 0x4000000L, active1, 0L, active2, 0L);
@@ -1603,7 +1606,7 @@ private int jjMoveStringLiteralDfa5_0(long old0, long active0, long old1, long a
jjmatchedKind = 47;
jjmatchedPos = 5;
}
- return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x1L, active2, 0L);
+ return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x20L, active2, 0L);
case 116:
if ((active0 & 0x400000L) != 0L)
{
@@ -1615,22 +1618,22 @@ private int jjMoveStringLiteralDfa5_0(long old0, long active0, long old1, long a
jjmatchedKind = 29;
jjmatchedPos = 5;
}
- else if ((active1 & 0x10000000L) != 0L)
+ else if ((active1 & 0x200000000L) != 0L)
{
- jjmatchedKind = 92;
+ jjmatchedKind = 97;
jjmatchedPos = 5;
}
- else if ((active1 & 0x2000000000000000L) != 0L)
+ else if ((active2 & 0x4L) != 0L)
{
- jjmatchedKind = 125;
+ jjmatchedKind = 130;
jjmatchedPos = 5;
}
- else if ((active2 & 0x200L) != 0L)
+ else if ((active2 & 0x4000L) != 0L)
{
- jjmatchedKind = 137;
+ jjmatchedKind = 142;
jjmatchedPos = 5;
}
- return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x8000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x100000000000L, active2, 0L);
case 120:
if ((active0 & 0x200000L) != 0L)
{
@@ -1639,7 +1642,7 @@ private int jjMoveStringLiteralDfa5_0(long old0, long active0, long old1, long a
}
break;
case 121:
- return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x2000L, active2, 0L);
+ return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x40000L, active2, 0L);
default :
break;
}
@@ -1660,16 +1663,16 @@ private int jjMoveStringLiteralDfa6_0(long old0, long active0, long old1, long a
case 66:
return jjMoveStringLiteralDfa7_0(active0, 0x2000000L, active1, 0L, active2, 0L);
case 67:
- return jjMoveStringLiteralDfa7_0(active0, 0x2000000000800000L, active1, 0x1L, active2, 0L);
+ return jjMoveStringLiteralDfa7_0(active0, 0x4000000000800000L, active1, 0x24L, active2, 0L);
case 68:
if ((active0 & 0x1000000L) != 0L)
{
jjmatchedKind = 24;
jjmatchedPos = 6;
}
- else if ((active1 & 0x4000000000000L) != 0L)
+ else if ((active1 & 0x80000000000000L) != 0L)
{
- jjmatchedKind = 114;
+ jjmatchedKind = 119;
jjmatchedPos = 6;
}
break;
@@ -1679,82 +1682,89 @@ private int jjMoveStringLiteralDfa6_0(long old0, long active0, long old1, long a
jjmatchedKind = 45;
jjmatchedPos = 6;
}
- else if ((active1 & 0x80000000L) != 0L)
+ else if ((active1 & 0x1000000000L) != 0L)
{
- jjmatchedKind = 95;
+ jjmatchedKind = 100;
jjmatchedPos = 6;
}
- return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x8000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x100000000000L, active2, 0L);
case 71:
- if ((active1 & 0x800L) != 0L)
+ if ((active1 & 0x10000L) != 0L)
{
- jjmatchedKind = 75;
+ jjmatchedKind = 80;
jjmatchedPos = 6;
}
break;
case 75:
- if ((active1 & 0x40000L) != 0L)
+ if ((active1 & 0x800000L) != 0L)
{
- jjmatchedKind = 82;
+ jjmatchedKind = 87;
jjmatchedPos = 6;
}
break;
+ case 77:
+ return jjMoveStringLiteralDfa7_0(active0, 0x8000000000000000L, active1, 0L, active2, 0L);
case 78:
- if ((active1 & 0x8000000000000L) != 0L)
+ if ((active1 & 0x100000000000000L) != 0L)
{
- jjmatchedKind = 115;
+ jjmatchedKind = 120;
jjmatchedPos = 6;
}
- return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x400800000000L, active2, 0L);
+ return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x8010000000000L, active2, 0L);
case 79:
- return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x4000000000L, active2,
<TRUNCATED>
[11/16] jena git commit: JENA-1156: Use standard SQL naming. Add
keywords to extended SPARQL.
Posted by an...@apache.org.
JENA-1156: Use standard SQL naming. Add keywords to extended SPARQL.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/6e588daa
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/6e588daa
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/6e588daa
Branch: refs/heads/master
Commit: 6e588daa7a9c94fe01f511c5f26aa071bd936b60
Parents: 69ef0a7
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Mar 12 21:38:59 2016 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Mar 13 17:22:25 2016 +0000
----------------------------------------------------------------------
jena-arq/Grammar/arq.jj | 20 +-
jena-arq/Grammar/master.jj | 27 +-
jena-arq/Grammar/sparql_11.jj | 8 +-
jena-arq/Grammar/tokens.txt | 7 +
.../expr/aggregate/AggregateRegistry.java | 4 +-
.../expr/aggregate/AggregatorFactory.java | 4 +
.../jena/sparql/expr/aggregate/lib/AggURI.java | 29 +
.../expr/aggregate/lib/StandardAggregates.java | 72 +
.../aggregate/lib/StandardCustomAggregates.java | 65 -
.../apache/jena/sparql/lang/arq/ARQParser.java | 1521 ++++++++++--------
.../sparql/lang/arq/ARQParserConstants.java | 313 ++--
.../sparql/lang/arq/ARQParserTokenManager.java | 1424 ++++++++--------
.../sparql/lang/sparql_11/SPARQLParser11.java | 17 +-
.../lang/sparql_11/SPARQLParser11Constants.java | 301 ++--
.../sparql_11/SPARQLParser11TokenManager.java | 1407 ++++++++--------
.../sparql/expr/TestStatisticsAggregates.java | 231 ++-
16 files changed, 3028 insertions(+), 2422 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/6e588daa/jena-arq/Grammar/arq.jj
----------------------------------------------------------------------
diff --git a/jena-arq/Grammar/arq.jj b/jena-arq/Grammar/arq.jj
index 1d30d0f..5169735 100644
--- a/jena-arq/Grammar/arq.jj
+++ b/jena-arq/Grammar/arq.jj
@@ -31,6 +31,7 @@ import org.apache.jena.sparql.syntax.* ;
import org.apache.jena.sparql.expr.* ;
import org.apache.jena.sparql.path.* ;
import org.apache.jena.sparql.expr.aggregate.* ;
+import org.apache.jena.sparql.expr.aggregate.lib.* ;
import org.apache.jena.update.* ;
import org.apache.jena.sparql.modify.request.* ;
import org.apache.jena.sparql.core.Quad ;
@@ -1463,6 +1464,18 @@ Expr Aggregate() : { Aggregator agg = null ; String sep = null ;
)?
<RPAREN>
{ agg = AggregatorFactory.createGroupConcat(distinct, expr, sep, ordered) ; }
+ | t = <STDEV> <LPAREN> ( <DISTINCT> { distinct = true ; } )? expr = Expression() <RPAREN>
+ { agg = AggregatorFactory.createCustom(AggURI.stdev, distinct, expr) ; }
+ | t = <STDEV_SAMP> <LPAREN> ( <DISTINCT> { distinct = true ; } )? expr = Expression() <RPAREN>
+ { agg = AggregatorFactory.createCustom(AggURI.stdev_samp, distinct, expr) ; }
+ | t = <STDEV_POP> <LPAREN> ( <DISTINCT> { distinct = true ; } )? expr = Expression() <RPAREN>
+ { agg = AggregatorFactory.createCustom(AggURI.stdev_pop, distinct, expr) ; }
+ | t = <VARIANCE> <LPAREN> ( <DISTINCT> { distinct = true ; } )? expr = Expression() <RPAREN>
+ { agg = AggregatorFactory.createCustom(AggURI.variance, distinct, expr) ; }
+ | t = <VAR_SAMP> <LPAREN> ( <DISTINCT> { distinct = true ; } )? expr = Expression() <RPAREN>
+ { agg = AggregatorFactory.createCustom(AggURI.var_samp, distinct, expr) ; }
+ | t = <VAR_POP> <LPAREN> ( <DISTINCT> { distinct = true ; } )? expr = Expression() <RPAREN>
+ { agg = AggregatorFactory.createCustom(AggURI.var_pop, distinct, expr) ; }
| t = <AGG>
{ String iri ; }
iri = iri()
@@ -1642,7 +1655,12 @@ TOKEN [IGNORE_CASE] :
| < MAX: "max" >
| < SUM: "sum" >
| < AVG: "avg" >
-| < STDDEV: "stdev" >
+| < STDEV: "stdev" >
+| < STDEV_SAMP: "stdev_samp" >
+| < STDEV_POP: "stdev_pop" >
+| < VARIANCE: "variance" >
+| < VAR_SAMP: "var_samp" >
+| < VAR_POP: "var_pop" >
| < SAMPLE: "sample" >
| < GROUP_CONCAT: "group_concat" >
| < FILTER: "filter" >
http://git-wip-us.apache.org/repos/asf/jena/blob/6e588daa/jena-arq/Grammar/master.jj
----------------------------------------------------------------------
diff --git a/jena-arq/Grammar/master.jj b/jena-arq/Grammar/master.jj
index c04d1ca..effbe1b 100644
--- a/jena-arq/Grammar/master.jj
+++ b/jena-arq/Grammar/master.jj
@@ -90,6 +90,7 @@ import org.apache.jena.sparql.expr.* ;
import org.apache.jena.sparql.path.* ;
import org.apache.jena.sparql.expr.aggregate.* ;
#ifdef UPDATE
+import org.apache.jena.sparql.expr.aggregate.lib.* ;
import org.apache.jena.update.* ;
import org.apache.jena.sparql.modify.request.* ;
#endif
@@ -2034,6 +2035,24 @@ Expr Aggregate() : { Aggregator agg = null ; String sep = null ;
{ agg = AggregatorFactory.createGroupConcat(distinct, expr, sep, ordered) ; }
#ifdef ARQ
+ | t = <STDEV> <LPAREN> ( <DISTINCT> { distinct = true ; } )? expr = Expression() <RPAREN>
+ { agg = AggregatorFactory.createCustom(AggURI.stdev, distinct, expr) ; }
+
+ | t = <STDEV_SAMP> <LPAREN> ( <DISTINCT> { distinct = true ; } )? expr = Expression() <RPAREN>
+ { agg = AggregatorFactory.createCustom(AggURI.stdev_samp, distinct, expr) ; }
+
+ | t = <STDEV_POP> <LPAREN> ( <DISTINCT> { distinct = true ; } )? expr = Expression() <RPAREN>
+ { agg = AggregatorFactory.createCustom(AggURI.stdev_pop, distinct, expr) ; }
+
+ | t = <VARIANCE> <LPAREN> ( <DISTINCT> { distinct = true ; } )? expr = Expression() <RPAREN>
+ { agg = AggregatorFactory.createCustom(AggURI.variance, distinct, expr) ; }
+
+ | t = <VAR_SAMP> <LPAREN> ( <DISTINCT> { distinct = true ; } )? expr = Expression() <RPAREN>
+ { agg = AggregatorFactory.createCustom(AggURI.var_samp, distinct, expr) ; }
+
+ | t = <VAR_POP> <LPAREN> ( <DISTINCT> { distinct = true ; } )? expr = Expression() <RPAREN>
+ { agg = AggregatorFactory.createCustom(AggURI.var_pop, distinct, expr) ; }
+
/* Explicit syntax (aggregate even if not registered) */
| t = <AGG>
{ String iri ; }
@@ -2301,7 +2320,13 @@ TOKEN [IGNORE_CASE] :
| < MAX: "max" >
| < SUM: "sum" >
| < AVG: "avg" >
-| < STDDEV: "stdev" >
+| < STDEV: "stdev" >
+| < STDEV_SAMP: "stdev_samp" >
+| < STDEV_POP: "stdev_pop" >
+| < VARIANCE: "variance" >
+| < VAR_SAMP: "var_samp" >
+| < VAR_POP: "var_pop" >
+
| < SAMPLE: "sample" >
| < GROUP_CONCAT: "group_concat" >
http://git-wip-us.apache.org/repos/asf/jena/blob/6e588daa/jena-arq/Grammar/sparql_11.jj
----------------------------------------------------------------------
diff --git a/jena-arq/Grammar/sparql_11.jj b/jena-arq/Grammar/sparql_11.jj
index 7f19c46..0da06d9 100644
--- a/jena-arq/Grammar/sparql_11.jj
+++ b/jena-arq/Grammar/sparql_11.jj
@@ -31,6 +31,7 @@ import org.apache.jena.sparql.syntax.* ;
import org.apache.jena.sparql.expr.* ;
import org.apache.jena.sparql.path.* ;
import org.apache.jena.sparql.expr.aggregate.* ;
+import org.apache.jena.sparql.expr.aggregate.lib.* ;
import org.apache.jena.update.* ;
import org.apache.jena.sparql.modify.request.* ;
public class SPARQLParser11 extends SPARQLParser11Base
@@ -1498,7 +1499,12 @@ TOKEN [IGNORE_CASE] :
| < MAX: "max" >
| < SUM: "sum" >
| < AVG: "avg" >
-| < STDDEV: "stdev" >
+| < STDEV: "stdev" >
+| < STDEV_SAMP: "stdev_samp" >
+| < STDEV_POP: "stdev_pop" >
+| < VARIANCE: "variance" >
+| < VAR_SAMP: "var_samp" >
+| < VAR_POP: "var_pop" >
| < SAMPLE: "sample" >
| < GROUP_CONCAT: "group_concat" >
| < FILTER: "filter" >
http://git-wip-us.apache.org/repos/asf/jena/blob/6e588daa/jena-arq/Grammar/tokens.txt
----------------------------------------------------------------------
diff --git a/jena-arq/Grammar/tokens.txt b/jena-arq/Grammar/tokens.txt
index 945d30e..a95d6a5 100644
--- a/jena-arq/Grammar/tokens.txt
+++ b/jena-arq/Grammar/tokens.txt
@@ -79,6 +79,13 @@
[<SAMPLE>] ::= 'SAMPLE'
[<GROUP_CONCAT>] ::= 'GROUP_CONCAT'
+[<STDEV>] ::= 'STDEV'
+[<STDEV_SAMP>] ::= 'STDEVP_SAMP'
+[<STDEV_POP>] ::= 'STDEV_POP'
+[<VARIANCE>] ::= 'VARIANCE'
+[<VAR_SAMP>] ::= 'VAR_SAMP'
+[<VAR_POP>] ::= 'VAR_POP'
+
[<SERVICE>] ::= 'SERVICE'
[<MINUS_P>] ::= 'MINUS'
[<DIFF>] ::= 'DIFF'
http://git-wip-us.apache.org/repos/asf/jena/blob/6e588daa/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggregateRegistry.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggregateRegistry.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggregateRegistry.java
index 0955398..4544abd 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggregateRegistry.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggregateRegistry.java
@@ -22,7 +22,7 @@ import java.util.HashMap ;
import java.util.Map ;
import org.apache.jena.graph.Node ;
-import org.apache.jena.sparql.expr.aggregate.lib.StandardCustomAggregates ;
+import org.apache.jena.sparql.expr.aggregate.lib.StandardAggregates ;
/** Registry of custom aggregates
* There is only a single global registry of aggregates - it affects parsing
@@ -34,7 +34,7 @@ public class AggregateRegistry {
private static Map<String, Node> noGroupValues = new HashMap<>() ;
public static void init() {
- StandardCustomAggregates.register();
+ StandardAggregates.register();
}
/**
http://git-wip-us.apache.org/repos/asf/jena/blob/6e588daa/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggregatorFactory.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggregatorFactory.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggregatorFactory.java
index d055929..71a437e 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggregatorFactory.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggregatorFactory.java
@@ -67,6 +67,10 @@ public class AggregatorFactory {
return createCustom(iri, a.distinct, ExprList.copy(a)) ;
}
+ public static Aggregator createCustom(String iri, boolean distinct, Expr expr) {
+ return createCustom(iri, distinct, new ExprList(expr)) ;
+ }
+
public static Aggregator createCustom(String iri, boolean distinct, ExprList exprs) {
if ( ! AggregateRegistry.isRegistered(iri) )
Log.warn(AggregatorFactory.class, "Not registered: custom aggregate <"+iri+">") ;
http://git-wip-us.apache.org/repos/asf/jena/blob/6e588daa/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/lib/AggURI.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/lib/AggURI.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/lib/AggURI.java
new file mode 100644
index 0000000..5b1d721
--- /dev/null
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/lib/AggURI.java
@@ -0,0 +1,29 @@
+/*
+ * 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 org.apache.jena.sparql.expr.aggregate.lib;
+
+public class AggURI {
+ // = stddev-samp except one element -> 0. ?????????????
+ public static final String stdev = StandardAggregates.BASE + "stdev";
+ public static final String stdev_samp = StandardAggregates.BASE + "stdev_samp";
+ public static final String stdev_pop = StandardAggregates.BASE + "stdev_pop";
+ public static final String variance = StandardAggregates.BASE + "variance";
+ public static final String var_samp = StandardAggregates.BASE + "var_samp";
+ public static final String var_pop = StandardAggregates.BASE + "var_pop";
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jena/blob/6e588daa/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/lib/StandardAggregates.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/lib/StandardAggregates.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/lib/StandardAggregates.java
new file mode 100644
index 0000000..cbb5882
--- /dev/null
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/lib/StandardAggregates.java
@@ -0,0 +1,72 @@
+/*
+ * 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 org.apache.jena.sparql.expr.aggregate.lib;
+
+import org.apache.jena.sparql.ARQConstants ;
+import org.apache.jena.sparql.expr.aggregate.AccumulatorFactory ;
+import org.apache.jena.sparql.expr.aggregate.AggregateRegistry ;
+
+/** Register custom aggregates in addition to the SPARQL defined ones.
+ * This includes the statistics aggregate functions as custom aggregates,
+ * as {@code <http://jena.apache.org/ARQ/function#stdev} etc.
+ * This is commonly abbreviated {@code afn:stdev}.
+ */
+public class StandardAggregates {
+
+ public static String BASE = ARQConstants.ARQAggregateLibraryURI ;
+ public static String BASE2 = ARQConstants.ARQFunctionLibraryURI ;
+
+ public static void register() {
+ // PGSQL names:
+// stddev(expression)
+// stddev_pop(expression)
+// stddev_samp(expression)
+// variance(expression)
+// var_pop(expression)
+// var_samp(expression)
+
+// | < STDEV: "stdev" >
+// | < STDEV_SAMP: "stdev_samp" >
+// | < STDEV_POP: "stdev_pop" >
+// | < VARIANCE: "variance" >
+// | < VAR_SAMP: "var_samp" >
+// | < VAR_POP: "var_pop" >
+
+ // The statistics aggregates
+ // = stddev-samp except one element -> 0. ?????????????
+ AccumulatorFactory f_Stdev = (agg, distinct) -> new AccStatStdDevSample(agg.getExpr(), distinct) ;
+ AccumulatorFactory f_StdevSamp = (agg, distinct) -> new AccStatStdDevSample(agg.getExpr(), distinct) ;
+ AccumulatorFactory f_StdevPop = (agg, distinct) -> new AccStatStdDevPopulation(agg.getExpr(), distinct) ;
+ AccumulatorFactory f_VarPop = (agg, distinct) -> new AccStatVarPopulation(agg.getExpr(), distinct) ;
+ AccumulatorFactory f_VarSamp = (agg, distinct) -> new AccStatVarSample(agg.getExpr(), distinct) ;
+
+ r(AggURI.stdev, f_Stdev) ;
+ r(AggURI.stdev_samp, f_StdevSamp) ;
+ r(AggURI.stdev_pop, f_StdevPop) ;
+ r(AggURI.variance, f_VarSamp) ;
+ r(AggURI.var_samp, f_VarSamp) ;
+ r(AggURI.var_pop, f_VarPop) ;
+ }
+
+ private static void r(String uri, AccumulatorFactory f) {
+ AggregateRegistry.register(uri, f, null) ;
+ // Again in the afn@ (not encouraged but easy to do)
+ AggregateRegistry.register(uri.replace("/aggregate", ""), f, null) ;
+ }
+}
http://git-wip-us.apache.org/repos/asf/jena/blob/6e588daa/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/lib/StandardCustomAggregates.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/lib/StandardCustomAggregates.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/lib/StandardCustomAggregates.java
deleted file mode 100644
index a581348..0000000
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/lib/StandardCustomAggregates.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * 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 org.apache.jena.sparql.expr.aggregate.lib;
-
-import org.apache.jena.sparql.ARQConstants ;
-import org.apache.jena.sparql.expr.aggregate.AccumulatorFactory ;
-import org.apache.jena.sparql.expr.aggregate.AggregateRegistry ;
-
-/** Register custom aggregates.
- * This includes the statistics aggregate functions as custom aggregates,
- * as {@code <http://jena.apache.org/ARQ/function#stdev} etc.
- * This is commonly abbreviated {@code afn:stdev}.
- */
-public class StandardCustomAggregates {
-
- public static String BASE = ARQConstants.ARQAggregateLibraryURI ;
- public static String BASE2 = ARQConstants.ARQFunctionLibraryURI ;
-
- public static void register() {
- // The statistics aggregates
- AccumulatorFactory f_VarP = (agg, distinct) -> new AccStatVarPopulation(agg.getExpr(), distinct) ;
- AccumulatorFactory f_Var = (agg, distinct) -> new AccStatVarSample(agg.getExpr(), distinct) ;
- AccumulatorFactory f_StdevP = (agg, distinct) -> new AccStatStdDevPopulation(agg.getExpr(), distinct) ;
- AccumulatorFactory f_Stdev = (agg, distinct) -> new AccStatStdDevSample(agg.getExpr(), distinct) ;
-
- AggregateRegistry.register(BASE+"stdevp", f_StdevP, null) ;
- AggregateRegistry.register(BASE+"stdev", f_Stdev, null) ;
- AggregateRegistry.register(BASE+"varp", f_VarP, null) ;
- AggregateRegistry.register(BASE+"var", f_Var, null) ;
-
- // Again in the afn@ (not encouraged but easy to do)
- AggregateRegistry.register(BASE2+"stdevp", f_StdevP, null) ;
- AggregateRegistry.register(BASE2+"stdev", f_Stdev, null) ;
- AggregateRegistry.register(BASE2+"varp", f_VarP, null) ;
- AggregateRegistry.register(BASE2+"var", f_Var, null) ;
-
- // DISTINCT versions as URIs.
- AccumulatorFactory f_VarP_d = (agg, distinct) -> new AccStatVarPopulation(agg.getExpr(), true) ;
- AccumulatorFactory f_Var_d = (agg, distinct) -> new AccStatVarSample(agg.getExpr(), true) ;
- AccumulatorFactory f_StdevP_d = (agg, distinct) -> new AccStatStdDevPopulation(agg.getExpr(), true) ;
- AccumulatorFactory f_Stdev_d = (agg, distinct) -> new AccStatStdDevSample(agg.getExpr(), true) ;
-
- AggregateRegistry.register(BASE+"varpd", f_VarP_d, null) ;
- AggregateRegistry.register(BASE+"vard", f_Var_d, null) ;
- AggregateRegistry.register(BASE+"stdevpd", f_StdevP_d, null) ;
- AggregateRegistry.register(BASE+"stdevd", f_Stdev_d, null) ;
-
- }
-}
http://git-wip-us.apache.org/repos/asf/jena/blob/6e588daa/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParser.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParser.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParser.java
index b5445d1..2057f49 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParser.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParser.java
@@ -7,6 +7,7 @@ import org.apache.jena.sparql.syntax.* ;
import org.apache.jena.sparql.expr.* ;
import org.apache.jena.sparql.path.* ;
import org.apache.jena.sparql.expr.aggregate.* ;
+import org.apache.jena.sparql.expr.aggregate.lib.* ;
import org.apache.jena.update.* ;
import org.apache.jena.sparql.modify.request.* ;
import org.apache.jena.sparql.core.Quad ;
@@ -173,6 +174,12 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
case MAX:
case SUM:
case AVG:
+ case STDEV:
+ case STDEV_SAMP:
+ case STDEV_POP:
+ case VARIANCE:
+ case VAR_SAMP:
+ case VAR_POP:
case SAMPLE:
case GROUP_CONCAT:
case BOUND:
@@ -264,6 +271,12 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
case MAX:
case SUM:
case AVG:
+ case STDEV:
+ case STDEV_SAMP:
+ case STDEV_POP:
+ case VARIANCE:
+ case VAR_SAMP:
+ case VAR_POP:
case SAMPLE:
case GROUP_CONCAT:
case BOUND:
@@ -413,6 +426,12 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
case MAX:
case SUM:
case AVG:
+ case STDEV:
+ case STDEV_SAMP:
+ case STDEV_POP:
+ case VARIANCE:
+ case VAR_SAMP:
+ case VAR_POP:
case SAMPLE:
case GROUP_CONCAT:
case BOUND:
@@ -751,6 +770,12 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
case MAX:
case SUM:
case AVG:
+ case STDEV:
+ case STDEV_SAMP:
+ case STDEV_POP:
+ case VARIANCE:
+ case VAR_SAMP:
+ case VAR_POP:
case SAMPLE:
case GROUP_CONCAT:
case BOUND:
@@ -828,6 +853,12 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
case MAX:
case SUM:
case AVG:
+ case STDEV:
+ case STDEV_SAMP:
+ case STDEV_POP:
+ case VARIANCE:
+ case VAR_SAMP:
+ case VAR_POP:
case SAMPLE:
case GROUP_CONCAT:
case BOUND:
@@ -938,6 +969,12 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
case MAX:
case SUM:
case AVG:
+ case STDEV:
+ case STDEV_SAMP:
+ case STDEV_POP:
+ case VARIANCE:
+ case VAR_SAMP:
+ case VAR_POP:
case SAMPLE:
case GROUP_CONCAT:
case BOUND:
@@ -1034,6 +1071,12 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
case MAX:
case SUM:
case AVG:
+ case STDEV:
+ case STDEV_SAMP:
+ case STDEV_POP:
+ case VARIANCE:
+ case VAR_SAMP:
+ case VAR_POP:
case SAMPLE:
case GROUP_CONCAT:
case BOUND:
@@ -1136,6 +1179,12 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
case MAX:
case SUM:
case AVG:
+ case STDEV:
+ case STDEV_SAMP:
+ case STDEV_POP:
+ case VARIANCE:
+ case VAR_SAMP:
+ case VAR_POP:
case SAMPLE:
case GROUP_CONCAT:
case BOUND:
@@ -1205,6 +1254,12 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
case MAX:
case SUM:
case AVG:
+ case STDEV:
+ case STDEV_SAMP:
+ case STDEV_POP:
+ case VARIANCE:
+ case VAR_SAMP:
+ case VAR_POP:
case SAMPLE:
case GROUP_CONCAT:
case BOUND:
@@ -2641,6 +2696,12 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
case MAX:
case SUM:
case AVG:
+ case STDEV:
+ case STDEV_SAMP:
+ case STDEV_POP:
+ case VARIANCE:
+ case VAR_SAMP:
+ case VAR_POP:
case SAMPLE:
case GROUP_CONCAT:
case BOUND:
@@ -4223,6 +4284,12 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
case MAX:
case SUM:
case AVG:
+ case STDEV:
+ case STDEV_SAMP:
+ case STDEV_POP:
+ case VARIANCE:
+ case VAR_SAMP:
+ case VAR_POP:
case SAMPLE:
case GROUP_CONCAT:
case BOUND:
@@ -4321,6 +4388,12 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
case MAX:
case SUM:
case AVG:
+ case STDEV:
+ case STDEV_SAMP:
+ case STDEV_POP:
+ case VARIANCE:
+ case VAR_SAMP:
+ case VAR_POP:
case SAMPLE:
case GROUP_CONCAT:
case BOUND:
@@ -4442,6 +4515,12 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
case MAX:
case SUM:
case AVG:
+ case STDEV:
+ case STDEV_SAMP:
+ case STDEV_POP:
+ case VARIANCE:
+ case VAR_SAMP:
+ case VAR_POP:
case SAMPLE:
case GROUP_CONCAT:
expr = Aggregate();
@@ -4986,6 +5065,12 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
case MAX:
case SUM:
case AVG:
+ case STDEV:
+ case STDEV_SAMP:
+ case STDEV_POP:
+ case VARIANCE:
+ case VAR_SAMP:
+ case VAR_POP:
case SAMPLE:
case GROUP_CONCAT:
case BOUND:
@@ -5207,6 +5292,102 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
jj_consume_token(RPAREN);
agg = AggregatorFactory.createGroupConcat(distinct, expr, sep, ordered) ;
break;
+ case STDEV:
+ t = jj_consume_token(STDEV);
+ jj_consume_token(LPAREN);
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case DISTINCT:
+ jj_consume_token(DISTINCT);
+ distinct = true ;
+ break;
+ default:
+ jj_la1[163] = jj_gen;
+ ;
+ }
+ expr = Expression();
+ jj_consume_token(RPAREN);
+ agg = AggregatorFactory.createCustom(AggURI.stdev, distinct, expr) ;
+ break;
+ case STDEV_SAMP:
+ t = jj_consume_token(STDEV_SAMP);
+ jj_consume_token(LPAREN);
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case DISTINCT:
+ jj_consume_token(DISTINCT);
+ distinct = true ;
+ break;
+ default:
+ jj_la1[164] = jj_gen;
+ ;
+ }
+ expr = Expression();
+ jj_consume_token(RPAREN);
+ agg = AggregatorFactory.createCustom(AggURI.stdev_samp, distinct, expr) ;
+ break;
+ case STDEV_POP:
+ t = jj_consume_token(STDEV_POP);
+ jj_consume_token(LPAREN);
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case DISTINCT:
+ jj_consume_token(DISTINCT);
+ distinct = true ;
+ break;
+ default:
+ jj_la1[165] = jj_gen;
+ ;
+ }
+ expr = Expression();
+ jj_consume_token(RPAREN);
+ agg = AggregatorFactory.createCustom(AggURI.stdev_pop, distinct, expr) ;
+ break;
+ case VARIANCE:
+ t = jj_consume_token(VARIANCE);
+ jj_consume_token(LPAREN);
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case DISTINCT:
+ jj_consume_token(DISTINCT);
+ distinct = true ;
+ break;
+ default:
+ jj_la1[166] = jj_gen;
+ ;
+ }
+ expr = Expression();
+ jj_consume_token(RPAREN);
+ agg = AggregatorFactory.createCustom(AggURI.variance, distinct, expr) ;
+ break;
+ case VAR_SAMP:
+ t = jj_consume_token(VAR_SAMP);
+ jj_consume_token(LPAREN);
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case DISTINCT:
+ jj_consume_token(DISTINCT);
+ distinct = true ;
+ break;
+ default:
+ jj_la1[167] = jj_gen;
+ ;
+ }
+ expr = Expression();
+ jj_consume_token(RPAREN);
+ agg = AggregatorFactory.createCustom(AggURI.var_samp, distinct, expr) ;
+ break;
+ case VAR_POP:
+ t = jj_consume_token(VAR_POP);
+ jj_consume_token(LPAREN);
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case DISTINCT:
+ jj_consume_token(DISTINCT);
+ distinct = true ;
+ break;
+ default:
+ jj_la1[168] = jj_gen;
+ ;
+ }
+ expr = Expression();
+ jj_consume_token(RPAREN);
+ agg = AggregatorFactory.createCustom(AggURI.var_pop, distinct, expr) ;
+ break;
case AGG:
t = jj_consume_token(AGG);
String iri ;
@@ -5216,7 +5397,7 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
agg = AggregatorFactory.createCustom(iri, a) ;
break;
default:
- jj_la1[163] = jj_gen;
+ jj_la1[169] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -5237,7 +5418,7 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
a = ArgList();
break;
default:
- jj_la1[164] = jj_gen;
+ jj_la1[170] = jj_gen;
;
}
if ( a == null )
@@ -5270,13 +5451,13 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
uri = iri();
break;
default:
- jj_la1[165] = jj_gen;
+ jj_la1[171] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
break;
default:
- jj_la1[166] = jj_gen;
+ jj_la1[172] = jj_gen;
;
}
{if (true) return createLiteral(lex, lang, uri) ;}
@@ -5302,7 +5483,7 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
n = NumericLiteralNegative();
break;
default:
- jj_la1[167] = jj_gen;
+ jj_la1[173] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -5326,7 +5507,7 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
{if (true) return createLiteralDouble(t.image) ;}
break;
default:
- jj_la1[168] = jj_gen;
+ jj_la1[174] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -5349,7 +5530,7 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
{if (true) return createLiteralDouble(t.image) ;}
break;
default:
- jj_la1[169] = jj_gen;
+ jj_la1[175] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -5372,7 +5553,7 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
{if (true) return createLiteralDouble(t.image) ;}
break;
default:
- jj_la1[170] = jj_gen;
+ jj_la1[176] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -5390,7 +5571,7 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
{if (true) return XSD_FALSE ;}
break;
default:
- jj_la1[171] = jj_gen;
+ jj_la1[177] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -5417,7 +5598,7 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
lex = stripQuotes3(t.image) ;
break;
default:
- jj_la1[172] = jj_gen;
+ jj_la1[178] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -5439,7 +5620,7 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
{if (true) return iri ;}
break;
default:
- jj_la1[173] = jj_gen;
+ jj_la1[179] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -5458,7 +5639,7 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
{if (true) return resolvePName(t.image, t.beginLine, t.beginColumn) ;}
break;
default:
- jj_la1[174] = jj_gen;
+ jj_la1[180] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -5477,7 +5658,7 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
{if (true) return createBNode(t.beginLine, t.beginColumn) ;}
break;
default:
- jj_la1[175] = jj_gen;
+ jj_la1[181] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -5526,210 +5707,603 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
finally { jj_save(4, xla); }
}
- private boolean jj_3R_70() {
- if (jj_scan_token(YEAR)) return true;
- if (jj_scan_token(LPAREN)) return true;
- return false;
- }
-
- private boolean jj_3R_69() {
- if (jj_scan_token(STRAFTER)) return true;
- if (jj_scan_token(LPAREN)) return true;
- return false;
- }
-
- private boolean jj_3R_171() {
- if (jj_scan_token(DOUBLE)) return true;
- return false;
- }
-
- private boolean jj_3R_170() {
- if (jj_scan_token(DECIMAL)) return true;
+ private boolean jj_3R_163() {
+ if (jj_3R_174()) return true;
return false;
}
- private boolean jj_3R_68() {
- if (jj_scan_token(STRBEFORE)) return true;
- if (jj_scan_token(LPAREN)) return true;
+ private boolean jj_3R_162() {
+ if (jj_3R_173()) return true;
return false;
}
- private boolean jj_3R_169() {
- if (jj_scan_token(INTEGER)) return true;
+ private boolean jj_3R_161() {
+ if (jj_3R_172()) return true;
return false;
}
- private boolean jj_3R_166() {
+ private boolean jj_3R_155() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_169()) {
+ if (jj_3R_161()) {
jj_scanpos = xsp;
- if (jj_3R_170()) {
+ if (jj_3R_162()) {
jj_scanpos = xsp;
- if (jj_3R_171()) return true;
+ if (jj_3R_163()) return true;
}
}
return false;
}
- private boolean jj_3R_67() {
- if (jj_scan_token(STRENDS)) return true;
- if (jj_scan_token(LPAREN)) return true;
- return false;
- }
-
- private boolean jj_3R_129() {
- if (jj_3R_135()) return true;
- return false;
- }
-
- private boolean jj_3R_66() {
- if (jj_scan_token(STRSTARTS)) return true;
- if (jj_scan_token(LPAREN)) return true;
- return false;
- }
-
- private boolean jj_3R_157() {
- if (jj_3R_168()) return true;
+ private boolean jj_3R_135() {
+ if (jj_3R_141()) return true;
return false;
}
private boolean jj_3R_115() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_129()) {
+ if (jj_3R_135()) {
jj_scanpos = xsp;
- if (jj_3R_130()) return true;
+ if (jj_3R_136()) return true;
}
return false;
}
- private boolean jj_3R_156() {
- if (jj_3R_167()) return true;
+ private boolean jj_3R_154() {
+ if (jj_3R_160()) return true;
return false;
}
- private boolean jj_3R_65() {
- if (jj_scan_token(CONTAINS)) return true;
+ private boolean jj_3R_130() {
+ if (jj_scan_token(AGG)) return true;
+ if (jj_3R_139()) return true;
+ return false;
+ }
+
+ private boolean jj_3R_129() {
+ if (jj_scan_token(VAR_POP)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_155() {
- if (jj_3R_166()) return true;
+ private boolean jj_3R_128() {
+ if (jj_scan_token(VAR_SAMP)) return true;
+ if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_64() {
- if (jj_scan_token(ENCODE_FOR_URI)) return true;
+ private boolean jj_3R_127() {
+ if (jj_scan_token(VARIANCE)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_63() {
- if (jj_scan_token(LCASE)) return true;
+ private boolean jj_3R_126() {
+ if (jj_scan_token(STDEV_POP)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_62() {
- if (jj_scan_token(UCASE)) return true;
+ private boolean jj_3R_125() {
+ if (jj_scan_token(STDEV_SAMP)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_149() {
+ private boolean jj_3_2() {
+ if (jj_scan_token(SEMICOLON)) return true;
+ if (jj_3R_42()) return true;
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_155()) {
+ if (jj_scan_token(135)) {
jj_scanpos = xsp;
- if (jj_3R_156()) {
+ if (jj_scan_token(136)) {
jj_scanpos = xsp;
- if (jj_3R_157()) return true;
+ if (jj_scan_token(143)) {
+ jj_scanpos = xsp;
+ if (jj_scan_token(138)) {
+ jj_scanpos = xsp;
+ if (jj_scan_token(139)) {
+ jj_scanpos = xsp;
+ if (jj_scan_token(140)) {
+ jj_scanpos = xsp;
+ if (jj_scan_token(137)) {
+ jj_scanpos = xsp;
+ if (jj_scan_token(148)) {
+ jj_scanpos = xsp;
+ if (jj_scan_token(131)) {
+ jj_scanpos = xsp;
+ if (jj_scan_token(130)) {
+ jj_scanpos = xsp;
+ if (jj_scan_token(149)) {
+ jj_scanpos = xsp;
+ if (jj_scan_token(132)) {
+ jj_scanpos = xsp;
+ if (jj_scan_token(133)) {
+ jj_scanpos = xsp;
+ if (jj_scan_token(134)) return true;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
}
}
return false;
}
- private boolean jj_3R_61() {
- if (jj_3R_109()) return true;
- return false;
- }
-
- private boolean jj_3R_60() {
- if (jj_scan_token(STRLEN)) return true;
+ private boolean jj_3R_124() {
+ if (jj_scan_token(STDEV)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_59() {
- if (jj_3R_108()) return true;
- return false;
- }
-
- private boolean jj_3R_58() {
- if (jj_scan_token(CONCAT)) return true;
- if (jj_3R_107()) return true;
+ private boolean jj_3_5() {
+ if (jj_scan_token(SEMICOLON)) return true;
+ if (jj_scan_token(SEPARATOR)) return true;
return false;
}
- private boolean jj_3R_57() {
- if (jj_scan_token(ROUND)) return true;
+ private boolean jj_3R_143() {
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_56() {
- if (jj_scan_token(FLOOR)) return true;
+ private boolean jj_3R_123() {
+ if (jj_scan_token(GROUP_CONCAT)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_55() {
- if (jj_scan_token(CEIL)) return true;
+ private boolean jj_3R_122() {
+ if (jj_scan_token(SAMPLE)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_54() {
- if (jj_scan_token(ABS)) return true;
+ private boolean jj_3R_121() {
+ if (jj_scan_token(AVG)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_53() {
- if (jj_scan_token(RAND)) return true;
- if (jj_scan_token(NIL)) return true;
+ private boolean jj_3R_120() {
+ if (jj_scan_token(MAX)) return true;
+ if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_106() {
- if (jj_scan_token(NIL)) return true;
+ private boolean jj_3R_119() {
+ if (jj_scan_token(MIN)) return true;
+ if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_148() {
- if (jj_3R_154()) return true;
+ private boolean jj_3R_118() {
+ 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_117() {
+ if (jj_scan_token(COUNT)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_52() {
- if (jj_scan_token(BNODE)) return true;
+ private boolean jj_3R_104() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_105()) {
+ if (jj_3R_117()) {
jj_scanpos = xsp;
- if (jj_3R_106()) return true;
- }
- return false;
- }
-
- private boolean jj_3R_51() {
+ if (jj_3R_118()) {
+ jj_scanpos = xsp;
+ if (jj_3R_119()) {
+ jj_scanpos = xsp;
+ if (jj_3R_120()) {
+ jj_scanpos = xsp;
+ if (jj_3R_121()) {
+ jj_scanpos = xsp;
+ if (jj_3R_122()) {
+ jj_scanpos = xsp;
+ if (jj_3R_123()) {
+ jj_scanpos = xsp;
+ if (jj_3R_124()) {
+ jj_scanpos = xsp;
+ if (jj_3R_125()) {
+ jj_scanpos = xsp;
+ if (jj_3R_126()) {
+ jj_scanpos = xsp;
+ if (jj_3R_127()) {
+ jj_scanpos = xsp;
+ if (jj_3R_128()) {
+ jj_scanpos = xsp;
+ if (jj_3R_129()) {
+ jj_scanpos = xsp;
+ if (jj_3R_130()) return true;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ return false;
+ }
+
+ private boolean jj_3R_144() {
+ if (jj_scan_token(LBRACKET)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_138() {
+ if (jj_3R_144()) return true;
+ return false;
+ }
+
+ private boolean jj_3R_116() {
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_137()) {
+ jj_scanpos = xsp;
+ if (jj_3R_138()) return true;
+ }
+ return false;
+ }
+
+ private boolean jj_3R_137() {
+ if (jj_3R_143()) return true;
+ return false;
+ }
+
+ private boolean jj_3R_112() {
+ if (jj_scan_token(NOT)) return true;
+ if (jj_scan_token(EXISTS)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_111() {
+ if (jj_scan_token(EXISTS)) return true;
+ if (jj_3R_132()) return true;
+ return false;
+ }
+
+ private boolean jj_3R_109() {
+ if (jj_scan_token(REPLACE)) return true;
+ if (jj_scan_token(LPAREN)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_108() {
+ if (jj_scan_token(SUBSTR)) return true;
+ if (jj_scan_token(LPAREN)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_110() {
+ if (jj_scan_token(REGEX)) return true;
+ if (jj_scan_token(LPAREN)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_100() {
+ if (jj_3R_112()) return true;
+ return false;
+ }
+
+ private boolean jj_3R_99() {
+ if (jj_3R_111()) return true;
+ return false;
+ }
+
+ private boolean jj_3R_98() {
+ if (jj_3R_110()) return true;
+ return false;
+ }
+
+ private boolean jj_3R_97() {
+ if (jj_scan_token(IS_NUMERIC)) return true;
+ if (jj_scan_token(LPAREN)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_96() {
+ if (jj_scan_token(IS_LITERAL)) return true;
+ if (jj_scan_token(LPAREN)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_95() {
+ if (jj_scan_token(IS_BLANK)) return true;
+ if (jj_scan_token(LPAREN)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_94() {
+ if (jj_scan_token(IS_URI)) return true;
+ if (jj_scan_token(LPAREN)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_93() {
+ if (jj_scan_token(IS_IRI)) return true;
+ if (jj_scan_token(LPAREN)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_92() {
+ if (jj_scan_token(SAME_TERM)) return true;
+ if (jj_scan_token(LPAREN)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_91() {
+ if (jj_scan_token(STRDT)) return true;
+ if (jj_scan_token(LPAREN)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_90() {
+ if (jj_scan_token(STRLANG)) return true;
+ if (jj_scan_token(LPAREN)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_89() {
+ if (jj_scan_token(IF)) return true;
+ if (jj_scan_token(LPAREN)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_88() {
+ if (jj_scan_token(CALL)) return true;
+ if (jj_scan_token(LPAREN)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_87() {
+ if (jj_scan_token(COALESCE)) return true;
+ if (jj_3R_107()) return true;
+ return false;
+ }
+
+ private boolean jj_3R_86() {
+ if (jj_scan_token(VERSION)) return true;
+ if (jj_scan_token(NIL)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_85() {
+ if (jj_scan_token(SHA512)) return true;
+ if (jj_scan_token(LPAREN)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_84() {
+ if (jj_scan_token(SHA384)) return true;
+ if (jj_scan_token(LPAREN)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_83() {
+ if (jj_scan_token(SHA256)) return true;
+ if (jj_scan_token(LPAREN)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_82() {
+ if (jj_scan_token(SHA1)) return true;
+ if (jj_scan_token(LPAREN)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_81() {
+ if (jj_scan_token(MD5)) return true;
+ if (jj_scan_token(LPAREN)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_80() {
+ if (jj_scan_token(STRUUID)) return true;
+ if (jj_scan_token(NIL)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_79() {
+ if (jj_scan_token(UUID)) return true;
+ if (jj_scan_token(NIL)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_78() {
+ if (jj_scan_token(NOW)) return true;
+ if (jj_scan_token(NIL)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_77() {
+ if (jj_scan_token(TZ)) return true;
+ if (jj_scan_token(LPAREN)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_76() {
+ if (jj_scan_token(TIMEZONE)) return true;
+ if (jj_scan_token(LPAREN)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_75() {
+ if (jj_scan_token(SECONDS)) return true;
+ if (jj_scan_token(LPAREN)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_74() {
+ if (jj_scan_token(MINUTES)) return true;
+ if (jj_scan_token(LPAREN)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_73() {
+ if (jj_scan_token(HOURS)) return true;
+ if (jj_scan_token(LPAREN)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_72() {
+ if (jj_scan_token(DAY)) return true;
+ if (jj_scan_token(LPAREN)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_71() {
+ if (jj_scan_token(MONTH)) return true;
+ if (jj_scan_token(LPAREN)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_70() {
+ if (jj_scan_token(YEAR)) return true;
+ if (jj_scan_token(LPAREN)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_69() {
+ if (jj_scan_token(STRAFTER)) return true;
+ if (jj_scan_token(LPAREN)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_68() {
+ if (jj_scan_token(STRBEFORE)) return true;
+ if (jj_scan_token(LPAREN)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_67() {
+ if (jj_scan_token(STRENDS)) return true;
+ if (jj_scan_token(LPAREN)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_66() {
+ if (jj_scan_token(STRSTARTS)) return true;
+ if (jj_scan_token(LPAREN)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_65() {
+ if (jj_scan_token(CONTAINS)) return true;
+ if (jj_scan_token(LPAREN)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_64() {
+ if (jj_scan_token(ENCODE_FOR_URI)) return true;
+ if (jj_scan_token(LPAREN)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_63() {
+ if (jj_scan_token(LCASE)) return true;
+ if (jj_scan_token(LPAREN)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_62() {
+ if (jj_scan_token(UCASE)) return true;
+ if (jj_scan_token(LPAREN)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_61() {
+ if (jj_3R_109()) return true;
+ return false;
+ }
+
+ private boolean jj_3R_60() {
+ if (jj_scan_token(STRLEN)) return true;
+ if (jj_scan_token(LPAREN)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_59() {
+ if (jj_3R_108()) return true;
+ return false;
+ }
+
+ private boolean jj_3R_58() {
+ if (jj_scan_token(CONCAT)) return true;
+ if (jj_3R_107()) return true;
+ return false;
+ }
+
+ private boolean jj_3R_57() {
+ if (jj_scan_token(ROUND)) return true;
+ if (jj_scan_token(LPAREN)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_56() {
+ if (jj_scan_token(FLOOR)) return true;
+ if (jj_scan_token(LPAREN)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_55() {
+ if (jj_scan_token(CEIL)) return true;
+ if (jj_scan_token(LPAREN)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_54() {
+ if (jj_scan_token(ABS)) return true;
+ if (jj_scan_token(LPAREN)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_106() {
+ if (jj_scan_token(NIL)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_53() {
+ if (jj_scan_token(RAND)) return true;
+ if (jj_scan_token(NIL)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_105() {
+ if (jj_scan_token(LPAREN)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_52() {
+ if (jj_scan_token(BNODE)) return true;
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_105()) {
+ jj_scanpos = xsp;
+ if (jj_3R_106()) return true;
+ }
+ return false;
+ }
+
+ private boolean jj_3R_51() {
if (jj_scan_token(URI)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
@@ -5747,14 +6321,14 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
return false;
}
- private boolean jj_3R_48() {
- if (jj_scan_token(DTYPE)) return true;
- if (jj_scan_token(LPAREN)) return true;
+ private boolean jj_3R_132() {
+ if (jj_scan_token(LBRACE)) return true;
return false;
}
- private boolean jj_3R_126() {
- if (jj_scan_token(LBRACE)) return true;
+ private boolean jj_3R_48() {
+ if (jj_scan_token(DTYPE)) return true;
+ if (jj_scan_token(LPAREN)) return true;
return false;
}
@@ -5782,6 +6356,11 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
return false;
}
+ private boolean jj_3R_44() {
+ if (jj_3R_104()) return true;
+ return false;
+ }
+
private boolean jj_3R_41() {
Token xsp;
xsp = jj_scanpos;
@@ -5921,250 +6500,62 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
}
}
}
- }
- }
- }
- }
- }
- }
- }
- }
- }
- }
- }
- }
- }
- }
- }
- }
- }
- }
- }
- }
- }
- }
- }
- }
- }
- }
- }
- }
- }
- }
- }
- }
- }
- return false;
- }
-
- private boolean jj_3R_44() {
- if (jj_3R_104()) return true;
- return false;
- }
-
- private boolean jj_3R_124() {
- if (jj_scan_token(AGG)) return true;
- if (jj_3R_133()) return true;
- return false;
- }
-
- private boolean jj_3_2() {
- if (jj_scan_token(SEMICOLON)) return true;
- if (jj_3R_42()) return true;
- Token xsp;
- xsp = jj_scanpos;
- if (jj_scan_token(130)) {
- jj_scanpos = xsp;
- if (jj_scan_token(131)) {
- jj_scanpos = xsp;
- if (jj_scan_token(138)) {
- jj_scanpos = xsp;
- if (jj_scan_token(133)) {
- jj_scanpos = xsp;
- if (jj_scan_token(134)) {
- jj_scanpos = xsp;
- if (jj_scan_token(135)) {
- jj_scanpos = xsp;
- if (jj_scan_token(132)) {
- jj_scanpos = xsp;
- if (jj_scan_token(143)) {
- jj_scanpos = xsp;
- if (jj_scan_token(126)) {
- jj_scanpos = xsp;
- if (jj_scan_token(125)) {
- jj_scanpos = xsp;
- if (jj_scan_token(144)) {
- jj_scanpos = xsp;
- if (jj_scan_token(127)) {
- jj_scanpos = xsp;
- if (jj_scan_token(128)) {
- jj_scanpos = xsp;
- if (jj_scan_token(129)) return true;
- }
- }
- }
- }
- }
- }
- }
- }
- }
- }
- }
- }
- }
- return false;
- }
-
- private boolean jj_3_5() {
- if (jj_scan_token(SEMICOLON)) return true;
- if (jj_scan_token(SEPARATOR)) return true;
- return false;
- }
-
- private boolean jj_3R_137() {
- if (jj_scan_token(LPAREN)) return true;
- return false;
- }
-
- private boolean jj_3R_123() {
- if (jj_scan_token(GROUP_CONCAT)) return true;
- if (jj_scan_token(LPAREN)) return true;
- return false;
- }
-
- private boolean jj_3R_122() {
- if (jj_scan_token(SAMPLE)) return true;
- if (jj_scan_token(LPAREN)) return true;
- return false;
- }
-
- private boolean jj_3R_121() {
- if (jj_scan_token(AVG)) return true;
- if (jj_scan_token(LPAREN)) return true;
- return false;
- }
-
- private boolean jj_3_1() {
- if (jj_3R_41()) return true;
- return false;
- }
-
- private boolean jj_3R_120() {
- if (jj_scan_token(MAX)) return true;
- if (jj_scan_token(LPAREN)) return true;
- return false;
- }
-
- private boolean jj_3R_119() {
- if (jj_scan_token(MIN)) return true;
- if (jj_scan_token(LPAREN)) return true;
- return false;
- }
-
- private boolean jj_3R_118() {
- if (jj_scan_token(SUM)) return true;
- if (jj_scan_token(LPAREN)) return true;
- return false;
- }
-
- private boolean jj_3R_117() {
- if (jj_scan_token(COUNT)) return true;
- if (jj_scan_token(LPAREN)) return true;
- return false;
- }
-
- private boolean jj_3R_104() {
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_117()) {
- jj_scanpos = xsp;
- if (jj_3R_118()) {
- jj_scanpos = xsp;
- if (jj_3R_119()) {
- jj_scanpos = xsp;
- if (jj_3R_120()) {
- jj_scanpos = xsp;
- if (jj_3R_121()) {
- jj_scanpos = xsp;
- if (jj_3R_122()) {
- jj_scanpos = xsp;
- if (jj_3R_123()) {
- jj_scanpos = xsp;
- if (jj_3R_124()) return true;
- }
- }
- }
- }
- }
- }
- }
- return false;
- }
-
- private boolean jj_3R_138() {
- if (jj_scan_token(LBRACKET)) return true;
- return false;
- }
-
- private boolean jj_3R_132() {
- if (jj_3R_138()) return true;
- return false;
- }
-
- private boolean jj_3R_131() {
- if (jj_3R_137()) return true;
- return false;
- }
-
- private boolean jj_3R_116() {
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_131()) {
- jj_scanpos = xsp;
- if (jj_3R_132()) return true;
- }
- return false;
- }
-
- private boolean jj_3R_112() {
- if (jj_scan_token(NOT)) return true;
- if (jj_scan_token(EXISTS)) return true;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
return false;
}
- private boolean jj_3R_111() {
- if (jj_scan_token(EXISTS)) return true;
- if (jj_3R_126()) return true;
+ private boolean jj_3_1() {
+ if (jj_3R_41()) return true;
return false;
}
private boolean jj_3R_114() {
- if (jj_3R_128()) return true;
+ if (jj_3R_134()) return true;
return false;
}
- private boolean jj_3R_128() {
+ private boolean jj_3R_134() {
if (jj_scan_token(PREFIX)) return true;
if (jj_scan_token(PNAME_NS)) return true;
- if (jj_3R_134()) return true;
+ if (jj_3R_140()) return true;
return false;
}
- private boolean jj_3R_127() {
+ private boolean jj_3R_133() {
if (jj_scan_token(BASE)) return true;
- if (jj_3R_134()) return true;
- return false;
- }
-
- private boolean jj_3R_109() {
- if (jj_scan_token(REPLACE)) return true;
- if (jj_scan_token(LPAREN)) return true;
- return false;
- }
-
- private boolean jj_3R_113() {
- if (jj_3R_127()) return true;
+ if (jj_3R_140()) return true;
return false;
}
@@ -6178,6 +6569,11 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
return false;
}
+ private boolean jj_3R_113() {
+ if (jj_3R_133()) return true;
+ return false;
+ }
+
private boolean jj_3R_42() {
Token xsp;
while (true) {
@@ -6187,14 +6583,18 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
return false;
}
- private boolean jj_3R_108() {
- if (jj_scan_token(SUBSTR)) return true;
- if (jj_scan_token(LPAREN)) return true;
+ private boolean jj_3R_103() {
+ if (jj_3R_116()) return true;
return false;
}
- private boolean jj_3R_103() {
- if (jj_3R_116()) return true;
+ private boolean jj_3R_140() {
+ if (jj_scan_token(IRIref)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_102() {
+ if (jj_3R_115()) return true;
return false;
}
@@ -6208,314 +6608,238 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
return false;
}
- private boolean jj_3R_102() {
- if (jj_3R_115()) return true;
- return false;
- }
-
private boolean jj_3_4() {
if (jj_scan_token(DOT)) return true;
if (jj_3R_43()) return true;
return false;
}
- private boolean jj_3R_110() {
- if (jj_scan_token(REGEX)) return true;
- if (jj_scan_token(LPAREN)) return true;
- return false;
- }
-
- private boolean jj_3R_134() {
- if (jj_scan_token(IRIref)) return true;
- return false;
- }
-
- private boolean jj_3R_161() {
+ private boolean jj_3R_167() {
if (jj_scan_token(ANON)) return true;
return false;
}
- private boolean jj_3R_100() {
- if (jj_3R_112()) return true;
- return false;
- }
-
- private boolean jj_3R_99() {
- if (jj_3R_111()) return true;
- return false;
- }
-
- private boolean jj_3R_98() {
- if (jj_3R_110()) return true;
- return false;
- }
-
- private boolean jj_3R_160() {
- if (jj_scan_token(BLANK_NODE_LABEL)) return true;
- return false;
- }
-
- private boolean jj_3R_151() {
+ private boolean jj_3R_157() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_160()) {
+ if (jj_3R_166()) {
jj_scanpos = xsp;
- if (jj_3R_161()) return true;
+ if (jj_3R_167()) return true;
}
return false;
}
- private boolean jj_3R_97() {
- if (jj_scan_token(IS_NUMERIC)) return true;
- if (jj_scan_token(LPAREN)) return true;
+ private boolean jj_3R_166() {
+ if (jj_scan_token(BLANK_NODE_LABEL)) return true;
return false;
}
- private boolean jj_3R_153() {
+ private boolean jj_3R_159() {
if (jj_scan_token(PNAME_NS)) return true;
return false;
- }
-
- private boolean jj_3R_96() {
- if (jj_scan_token(IS_LITERAL)) return true;
- if (jj_scan_token(LPAREN)) return true;
- return false;
- }
-
- private boolean jj_3R_95() {
- if (jj_scan_token(IS_BLANK)) return true;
- if (jj_scan_token(LPAREN)) return true;
- return false;
- }
-
- private boolean jj_3R_152() {
- if (jj_scan_token(PNAME_LN)) return true;
- return false;
- }
-
- private boolean jj_3R_125() {
- if (jj_scan_token(LPAREN)) return true;
- return false;
- }
-
- private boolean jj_3R_94() {
- if (jj_scan_token(IS_URI)) return true;
- if (jj_scan_token(LPAREN)) return true;
+ }
+
+ private boolean jj_3R_158() {
+ if (jj_scan_token(PNAME_LN)) return true;
return false;
}
- private boolean jj_3R_147() {
+ private boolean jj_3R_153() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_152()) {
+ if (jj_3R_158()) {
jj_scanpos = xsp;
- if (jj_3R_153()) return true;
+ if (jj_3R_159()) return true;
}
return false;
}
- private boolean jj_3R_93() {
- if (jj_scan_token(IS_IRI)) return true;
- if (jj_scan_token(LPAREN)) return true;
+ private boolean jj_3R_146() {
+ if (jj_3R_153()) return true;
return false;
}
- private boolean jj_3R_107() {
+ private boolean jj_3R_139() {
Token xsp;
xsp = jj_scanpos;
- if (jj_scan_token(165)) {
+ if (jj_3R_145()) {
jj_scanpos = xsp;
- if (jj_3R_125()) return true;
+ if (jj_3R_146()) return true;
}
return false;
}
- private boolean jj_3R_92() {
- if (jj_scan_token(SAME_TERM)) return true;
- if (jj_scan_token(LPAREN)) return true;
- return false;
- }
-
- private boolean jj_3R_140() {
- if (jj_3R_147()) return true;
+ private boolean jj_3R_145() {
+ if (jj_3R_140()) return true;
return false;
}
- private boolean jj_3R_91() {
- if (jj_scan_token(STRDT)) return true;
+ private boolean jj_3R_131() {
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_139() {
- if (jj_3R_134()) return true;
- return false;
- }
-
- private boolean jj_3R_133() {
+ private boolean jj_3R_107() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_139()) {
+ if (jj_scan_token(170)) {
jj_scanpos = xsp;
- if (jj_3R_140()) return true;
+ if (jj_3R_131()) return true;
}
return false;
}
- private boolean jj_3R_90() {
- if (jj_scan_token(STRLANG)) return true;
- if (jj_scan_token(LPAREN)) return true;
- return false;
- }
-
- private boolean jj_3R_89() {
- if (jj_scan_token(IF)) return true;
- if (jj_scan_token(LPAREN)) return true;
- return false;
- }
-
- private boolean jj_3R_165() {
+ private boolean jj_3R_171() {
if (jj_scan_token(STRING_LITERAL_LONG2)) return true;
return false;
}
- private boolean jj_3R_164() {
+ private boolean jj_3R_170() {
if (jj_scan_token(STRING_LITERAL_LONG1)) return true;
return false;
}
- private boolean jj_3R_163() {
+ private boolean jj_3R_169() {
if (jj_scan_token(STRING_LITERAL2)) return true;
return false;
}
- private boolean jj_3R_162() {
+ private boolean jj_3R_168() {
if (jj_scan_token(STRING_LITERAL1)) return true;
return false;
}
- private boolean jj_3R_154() {
+ private boolean jj_3R_160() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_162()) {
+ if (jj_3R_168()) {
jj_scanpos = xsp;
- if (jj_3R_163()) {
+ if (jj_3R_169()) {
jj_scanpos = xsp;
- if (jj_3R_164()) {
+ if (jj_3R_170()) {
jj_scanpos = xsp;
- if (jj_3R_165()) return true;
+ if (jj_3R_171()) return true;
}
}
}
return false;
}
- private boolean jj_3R_88() {
- if (jj_scan_token(CALL)) return true;
- if (jj_scan_token(LPAREN)) return true;
+ private boolean jj_3R_165() {
+ if (jj_scan_token(FALSE)) return true;
return false;
}
- private boolean jj_3R_87() {
- if (jj_scan_token(COALESCE)) return true;
- if (jj_3R_107()) return true;
+ private boolean jj_3R_156() {
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_164()) {
+ jj_scanpos = xsp;
+ if (jj_3R_165()) return true;
+ }
return false;
}
- private boolean jj_3R_146() {
- if (jj_scan_token(NIL)) return true;
+ private boolean jj_3R_164() {
+ if (jj_scan_token(TRUE)) return true;
return false;
}
- private boolean jj_3R_86() {
- if (jj_scan_token(VERSION)) return true;
- if (jj_scan_token(NIL)) return true;
+ private boolean jj_3R_183() {
+ if (jj_scan_token(DOUBLE_NEGATIVE)) return true;
return false;
}
- private boolean jj_3R_159() {
- if (jj_scan_token(FALSE)) return true;
+ private boolean jj_3R_182() {
+ if (jj_scan_token(DECIMAL_NEGATIVE)) return true;
return false;
}
- private boolean jj_3R_145() {
- if (jj_3R_151()) return true;
+ private boolean jj_3R_181() {
+ if (jj_scan_token(INTEGER_NEGATIVE)) return true;
return false;
}
- private boolean jj_3R_85() {
- if (jj_scan_token(SHA512)) return true;
- if (jj_scan_token(LPAREN)) return true;
+ private boolean jj_3R_174() {
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_181()) {
+ jj_scanpos = xsp;
+ if (jj_3R_182()) {
+ jj_scanpos = xsp;
+ if (jj_3R_183()) return true;
+ }
+ }
return false;
}
- private boolean jj_3R_144() {
- if (jj_3R_150()) return true;
+ private boolean jj_3R_152() {
+ if (jj_scan_token(NIL)) return true;
return false;
}
- private boolean jj_3R_84() {
- if (jj_scan_token(SHA384)) return true;
- if (jj_scan_token(LPAREN)) return true;
+ private boolean jj_3R_151() {
+ if (jj_3R_157()) return true;
return false;
}
- private boolean jj_3R_158() {
- if (jj_scan_token(TRUE)) return true;
+ private boolean jj_3R_180() {
+ if (jj_scan_token(DOUBLE_POSITIVE)) return true;
return false;
}
private boolean jj_3R_150() {
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_158()) {
- jj_scanpos = xsp;
- if (jj_3R_159()) return true;
- }
+ if (jj_3R_156()) return true;
return false;
}
- private boolean jj_3R_143() {
- if (jj_3R_149()) return true;
+ private boolean jj_3R_179() {
+ if (jj_scan_token(DECIMAL_POSITIVE)) return true;
return false;
}
- private boolean jj_3R_83() {
- if (jj_scan_token(SHA256)) return true;
- if (jj_scan_token(LPAREN)) return true;
+ private boolean jj_3R_149() {
+ if (jj_3R_155()) return true;
return false;
}
- private boolean jj_3R_142() {
- if (jj_3R_148()) return true;
+ private boolean jj_3R_148() {
+ if (jj_3R_154()) return true;
return false;
}
- private boolean jj_3R_82() {
- if (jj_scan_token(SHA1)) return true;
- if (jj_scan_token(LPAREN)) return true;
+ private boolean jj_3R_173() {
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_178()) {
+ jj_scanpos = xsp;
+ if (jj_3R_179()) {
+ jj_scanpos = xsp;
+ if (jj_3R_180()) return true;
+ }
+ }
return false;
}
- private boolean jj_3R_141() {
- if (jj_3R_133()) return true;
+ private boolean jj_3R_178() {
+ if (jj_scan_token(INTEGER_POSITIVE)) return true;
return false;
}
- private boolean jj_3R_136() {
+ private boolean jj_3R_142() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_141()) {
+ if (jj_3R_147()) {
jj_scanpos = xsp;
- if (jj_3R_142()) {
+ if (jj_3R_148()) {
jj_scanpos = xsp;
- if (jj_3R_143()) {
+ if (jj_3R_149()) {
jj_scanpos = xsp;
- if (jj_3R_144()) {
+ if (jj_3R_150()) {
jj_scanpos = xsp;
- if (jj_3R_145()) {
+ if (jj_3R_151()) {
jj_scanpos = xsp;
- if (jj_3R_146()) return true;
+ if (jj_3R_152()) return true;
}
}
}
@@ -6524,35 +6848,12 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
return false;
}
- private boolean jj_3R_81() {
- if (jj_scan_token(MD5)) return true;
- if (jj_scan_token(LPAREN)) return true;
- return false;
- }
-
- private boolean jj_3R_80() {
- if (jj_scan_token(STRUUID)) return true;
- if (jj_scan_token(NIL)) return true;
- return false;
- }
-
- private boolean jj_3R_177() {
- if (jj_scan_token(DOUBLE_NEGATIVE)) return true;
- return false;
- }
-
- private boolean jj_3R_79() {
- if (jj_scan_token(UUID)) return true;
- if (jj_scan_token(NIL)) return true;
- return false;
- }
-
- private boolean jj_3R_176() {
- if (jj_scan_token(DECIMAL_NEGATIVE)) return true;
+ private boolean jj_3R_147() {
+ if (jj_3R_139()) return true;
return false;
}
- private boolean jj_3R_135() {
+ private boolean jj_3R_141() {
Token xsp;
xsp = jj_scanpos;
if (jj_scan_token(14)) {
@@ -6562,18 +6863,17 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
return false;
}
- private boolean jj_3R_78() {
- if (jj_scan_token(NOW)) return true;
- if (jj_scan_token(NIL)) return true;
+ private boolean jj_3R_177() {
+ if (jj_scan_token(DOUBLE)) return true;
return false;
}
- private boolean jj_3R_175() {
- if (jj_scan_token(INTEGER_NEGATIVE)) return true;
+ private boolean jj_3R_176() {
+ if (jj_scan_token(DECIMAL)) return true;
return false;
}
- private boolean jj_3R_168() {
+ private boolean jj_3R_172() {
Token xsp;
xsp = jj_scanpos;
if (jj_3R_175()) {
@@ -6586,78 +6886,13 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
return false;
}
- private boolean jj_3R_77() {
- if (jj_scan_token(TZ)) return true;
- if (jj_scan_token(LPAREN)) return true;
- return false;
- }
-
- private boolean jj_3R_76() {
- if (jj_scan_token(TIMEZONE)) return true;
- if (jj_scan_token(LPAREN)) return true;
- return false;
- }
-
- private boolean jj_3R_130() {
- if (jj_3R_136()) return true;
- return false;
- }
-
- private boolean jj_3R_75() {
- if (jj_scan_token(SECONDS)) return true;
- if (jj_scan_token(LPAREN)) return true;
- return false;
- }
-
- private boolean jj_3R_74() {
- if (jj_scan_token(MINUTES)) return true;
- if (jj_scan_token(LPAREN)) return true;
- return false;
- }
-
- private boolean jj_3R_174() {
- if (jj_scan_token(DOUBLE_POSITIVE)) return true;
- return false;
- }
-
- private boolean jj_3R_73() {
- if (jj_scan_token(HOURS)) return true;
- if (jj_scan_token(LPAREN)) return true;
- return false;
- }
-
- private boolean jj_3R_173() {
- if (jj_scan_token(DECIMAL_POSITIVE)) return true;
- return false;
- }
-
- private boolean jj_3R_72() {
- if (jj_scan_token(DAY)) return true;
- if (jj_scan_token(LPAREN)) return true;
- return false;
- }
-
- private boolean jj_3R_172() {
- if (jj_scan_token(INTEGER_POSITIVE)) return true;
- return false;
- }
-
- private boolean jj_3R_167() {
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_172()) {
- jj_scanpos = xsp;
- if (jj_3R_173()) {
- jj_scanpos = xsp;
- if (jj_3R_174()) return true;
- }
- }
+ private boolean jj_3R_175() {
+ if (jj_scan_token(INTEGER)) return true;
return false;
}
- private boolean jj_3R_71() {
- if (jj_scan_token(MONTH)) return true;
- if (jj_scan_token(LPAREN)) return true;
+ private boolean jj_3R_136() {
+ if (jj_3R_142()) return true;
return false;
}
@@ -6672,7 +6907,7 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
private Token jj_scanpos, jj_lastpos;
private int jj_la;
private int jj_gen;
- final private int[] jj_la1 = new int[176];
+ final private int[] jj_la1 = new int[182];
static private int[] jj_la1_0;
static private int[] jj_la1_1;
static private int[] jj_la1_2;
@@ -6690,25 +6925,25 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
jj_la1_init_6();
}
private static void jj_la1_init_0() {
- jj_la1_0 = new int[] {0xe400000,0x200,0x300000,0x300000,0x0,0x1800000,0x1800000,0x1c00,0x0,0xdc00,0xdc00,0xdc00,0x0,0x0,0x0,0xdc00,0xdc00,0x0,0x0,0x0,0x1c00,0x0,0x0,0x0,0x40000000,0x30000000,0xdc00,0x0,0xdc00,0x1c00,0xdc00,0x0,0xdc00,0xdc00,0x20000000,0x10000000,0x30000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1c00,0x0,0x1c00,0x0,0xfc00,0x0,0x0,0xfc00,0xfc00,0xfc00,0x0,0x0,0xfc00,0x0,0xfc00,0x0,0x400000,0xfc00,0x0,0x0,0xfc00,0xfc00,0x0,0x0,0x0,0xc000,0x3c00,0xc000,0x0,0x0,0x3c00,0x0,0x3c00,0x0,0x1c00,0x800000,0x0,0x0,0x0,0x0,0x0,0xfc00,0x8dc00,0x0,0x8dc00,0x8dc00,0x0,0xfc00,0x88dc00,0x88dc00,0x0,0x88dc00,0x88dc00,0x0,0x0,0x0,0x0,0x0,0x881c00,0x0,0x0,0x0,0x0,0x881c00,0x0,0x81c00,0x81c00,0x81c00,0x81c00,0x0,0x0,0xfc00,0xfc00,0xfc00,0xfc00,0xfc00,0xdc00,0xfc00,0xc000,0x3c00,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xdc00,0xdc00,0x0,0x0,0x0,0x0,0x0,0x0,0x800000,0xdc00,0x800000,0x800000,0x800000,0x800000,0x800000,0x800000,0x0,0x0,0x0,0x0,0x0,0x10000,0
x10000,0x0,0x0,0x0,0x0,0x0,0x0,0x1c00,0x1800,0x2000,};
+ jj_la1_0 = new int[] {0xe400000,0x200,0x300000,0x300000,0x0,0x1800000,0x1800000,0x1c00,0x0,0xdc00,0xdc00,0xdc00,0x0,0x0,0x0,0xdc00,0xdc00,0x0,0x0,0x0,0x1c00,0x0,0x0,0x0,0x40000000,0x30000000,0xdc00,0x0,0xdc00,0x1c00,0xdc00,0x0,0xdc00,0xdc00,0x20000000,0x10000000,0x30000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1c00,0x0,0x1c00,0x0,0xfc00,0x0,0x0,0xfc00,0xfc00,0xfc00,0x0,0x0,0xfc00,0x0,0xfc00,0x0,0x400000,0xfc00,0x0,0x0,0xfc00,0xfc00,0x0,0x0,0x0,0xc000,0x3c00,0xc000,0x0,0x0,0x3c00,0x0,0x3c00,0x0,0x1c00,0x800000,0x0,0x0,0x0,0x0,0x0,0xfc00,0x8dc00,0x0,0x8dc00,0x8dc00,0x0,0xfc00,0x88dc00,0x88dc00,0x0,0x88dc00,0x88dc00,0x0,0x0,0x0,0x0,0x0,0x881c00,0x0,0x0,0x0,0x0,0x881c00,0x0,0x81c00,0x81c00,0x81c00,0x81c00,0x0,0x0,0xfc00,0xfc00,0xfc00,0xfc00,0xfc00,0xdc00,0xfc00,0xc000,0x3c00,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xdc00,0xdc00,0x0,0x0,0x0,0x0,0x0,0x0,0x800000,0xdc00,0x800000,0x800000,0x800000,0x800000,0x800000,0x800000,0x0,0x0,0x0,0x800000,0x800000
,0x800000,0x800000,0x800000,0x800000,0x0,0x0,0x10000,0x10000,0x0,0x0,0x0,0x0,0x0,0x0,0x1c00,0x1800,0x2000,};
}
private static void jj_la1_init_1() {
- jj_la1_1 = new int[] {0x0,0x0,0x0,0x0,0x20,0x0,0x0,0x0,0x20000,0xb7e18000,0xb7e18000,0xb7e18000,0x20,0x20,0x60,0x0,0x0,0x20,0x40,0x20,0x10,0x40,0x40000,0x80000,0x0,0x0,0xb7e18000,0x20000,0xb7e18000,0xb7e18000,0xb7e1800c,0xc,0xb7e18000,0xb7e1800c,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10,0x100,0x100,0x110,0x0,0x100,0x0,0x0,0x0,0x0,0x100,0x0,0x0,0x100,0x0,0x0,0x0,0x0,0x4001fb01,0x0,0x0,0x0,0x0,0x4001fb01,0x0,0x0,0x2,0x0,0x0,0x0,0x2,0x0,0x2,0x400,0xb7e18000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,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,0xb7e18000,0xb7e18000,0x0,0x0,0xb7e18000,0x0,0x0,0x0,0x0,0xb7e18000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x37e00000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
+ jj_la1_1 = new int[] {0x0,0x0,0x0,0x0,0x20,0x0,0x0,0x0,0x20000,0xffe18000,0xffe18000,0xffe18000,0x20,0x20,0x60,0x0,0x0,0x20,0x40,0x20,0x10,0x40,0x40000,0x80000,0x0,0x0,0xffe18000,0x20000,0xffe18000,0xffe18000,0xffe1800c,0xc,0xffe18000,0xffe1800c,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10,0x100,0x100,0x110,0x0,0x100,0x0,0x0,0x0,0x0,0x100,0x0,0x0,0x100,0x0,0x0,0x0,0x0,0x1fb01,0x0,0x0,0x0,0x0,0x1fb01,0x0,0x0,0x2,0x0,0x0,0x0,0x2,0x0,0x2,0x400,0xffe18000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,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,0xffe18000,0xffe18000,0x0,0x0,0xffe18000,0x0,0x0,0x0,0x0,0xffe18000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xffe00000,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,0x0,0x0,0x0,0xfffffcbd,0xfffffcbd,0xfffffcbd,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfffffcbd,0x0,0xfffffcbd,0xfffffcbd,0xfffffcbd,0x0,0xfffffcbd,0xfffffcbd,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfffffcbd,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x300,0x300,0x0,0x300,0x300,0x0,0x0,0x0,0x0,0x0,0x300,0x0,0x0,0x0,0x0,0x300,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,0xfffffcbd,0xfffffcbd,0x0,0x0,0xfffffcbd,0x0,0x0,0x0,0x0,0xfffffcbd,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,0x0,0x0,0x0,0xffff97b7,0xffff97b7,0xffff97b7,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xffff97b7,0x0,0xffff97b7,0xffff97b7,0xffff97b7,0x0,0xffff97b7,0xffff97b7,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8,0x0,0x0,0x0,0x0,0x8,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xffff97b7,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x6000,0x6000,0x0,0x6000,0x6000,0x0,0x0,0x0,0x0,0x0,0x6000,0x0,0x0,0x0,0x0,0x6000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40,0x40,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xffff97b7,0xffff97b7,0x0,0x0,0xffff97b7,0x0,0x0,0x0,0x0,0xffff97b7,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7,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,0x0,0xc000000,0x0,0xfbfffff,0xfbfffff,0xfbfffff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3bfffff,0x0,0x3bfffff,0x3bfffff,0x3bfffff,0x0,0x3bfffff,0x3bfffff,0x0,0x0,0x0,0x0,0x0,0xe0000000,0xe0000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20000000,0x60000000,0x0,0x0,0x0,0x0,0x0,0xc000000,0x0,0x0,0xc000000,0xc000000,0xc000000,0x0,0x0,0xc000000,0x0,0xc000000,0x0,0x0,0xc000000,0x0,0x0,0xc000000,0xc000000,0x0,0x0,0x0,0x0,0xc000000,0x0,0x0,0x0,0xc000000,0x0,0xc000000,0x0,0x3bfffff,0x0,0x0,0x0,0x0,0x0,0x0,0xc000000,0x0,0x0,0x0,0x0,0x0,0xc000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc000000,0xc000000,0xc000000,0xc000000,0xc000000,0x0,0x0,0x0,0xc000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfbfffff,0xfbfffff,0x0,0x0,0x3bfffff,0x0,0x0,0x0,0x0,0xfbfffff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc000000,0x0,0x0,0x0,0x0,};
+ jj_la1_3 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80000000,0x0,0xf7ffffff,0xf7ffffff,0xf7ffffff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x77ffffff,0x0,0x77ffffff,0x77ffffff,0x77ffffff,0x0,0x77ffffff,0x77ffffff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80000000,0x0,0x0,0x80000000,0x80000000,0x80000000,0x0,0x0,0x80000000,0x0,0x80000000,0x0,0x0,0x80000000,0x0,0x0,0x80000000,0x80000000,0x0,0x0,0x0,0x0,0x80000000,0x0,0x0,0x0,0x80000000,0x0,0x80000000,0x0,0x77ffffff,0x0,0x0,0x0,0x0,0x0,0x0,0x80000000,0x0,0x0,0x0,0x0,0x0,0x80000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80000000,0x80000000,0x80000000,0x80000000,0x80000000,0x0,0x0,0x0,0x80000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xf7ffffff,0xf7ffffff,0x0,0x0,0x77ffffff,0x0,0x0,0x0,0x0,0xf7ffffff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80000000,0x0,0
x0,0x0,0x0,};
}
private static void jj_la1_init_4() {
- jj_la1_4 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x87fc0000,0x0,0x87fc0000,0x87fc0000,0x87fc0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x84ff,0x84ff,0x200,0x800,0x200,0x200,0x200,0x200,0x200,0x200,0x8000,0x0,0x0,0x10000,0x0,0x0,0x2000,0x6000,0x87fc0000,0x0,0x0,0x87fc0000,0x87fc0000,0x87fc0000,0x0,0x0,0x87fc0000,0x0,0x87fc0000,0x0,0x0,0x87fc0000,0x0,0x0,0x87fc0000,0x87fc0000,0x0,0x0,0x200,0x0,0x87fc0000,0x0,0x0,0x0,0x87fc0000,0x0,0x87fc0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x87fc0000,0x0,0x0,0x0,0x0,0x0,0x87fc0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000,0x0,0x40000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x87fc0000,0x87fc0000,0x87fc0000,0x87fc0000,0x87fc0000,0x0,0x0,0x0,0x87fc0000,0x0,0x0,0x0,0x0,0x7e00000,0x7e00000,0x0,0x0,0x7e00000,0x0,0x0,0x87fc0000,0x87fc0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x87fc0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7fc0000,0x1c0000,0xe00000,0x7000000,0x0,0x80000
000,0x0,0x0,0x0,};
+ jj_la1_4 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xff800001,0x0,0xff800001,0xff800001,0xff800001,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x109ffc,0x109ffc,0x4000,0x10000,0x4000,0x4000,0x4000,0x4000,0x4000,0x4000,0x100000,0x4,0xc,0x200000,0x0,0x0,0x40000,0xc0000,0xff800001,0x0,0x0,0xff800001,0xff800001,0xff800001,0x0,0x0,0xff800001,0x0,0xff800001,0x0,0x0,0xff800001,0x0,0x0,0xff800001,0xff800001,0x0,0x0,0x4000,0x0,0xff800001,0x0,0x0,0x0,0xff800001,0x0,0xff800001,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xff800001,0x0,0x0,0x0,0x0,0x0,0xff800001,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800000,0x0,0x800000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xff800001,0xff800001,0xff800001,0xff800001,0xff800001,0x0,0x0,0x0,0xff800001,0x0,0x0,0x0,0x0,0xfc000000,0xfc000000,0x0,0x0,0xfc000000,0x0,0x0,0xff800001,0xff800001,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xff800001,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0
xff800000,0x3800000,0x1c000000,0xe0000000,0x1,0x0,0x0,0x0,0x0,};
}
private static void jj_la1_init_5() {
- jj_la1_5 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7,0x0,0xf,0xf,0x800000f,0x0,0x0,0x40,0x0,0x8000000,0x0,0x40,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8,0x0,0x8,0x8,0x8,0x0,0x8,0x8,0x0,0x0,0x0,0x0,0x800,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x52f,0x0,0x2000,0x52f,0x52f,0x52f,0x40,0x2000,0x52f,0x0,0x52f,0x2000,0x0,0x52f,0x40,0x2000,0x52f,0x52f,0x2000,0x40,0x0,0x28,0x407,0x0,0x28,0x28,0x407,0x28,0x407,0x0,0x8,0x0,0x1000,0x28,0x1000,0x28,0x2000,0x52f,0x0,0x800,0x0,0x0,0x1000,0x52f,0x100008,0x100008,0x800,0x100008,0x100008,0x1000,0x0,0x10000000,0x10000000,0xa000040,0x100008,0x80,0x1080,0xa001000,0xa000040,0x100008,0x0,0x0,0x8,0x0,0x0,0x108,0x108,0x52f,0x52f,0x52f,0x52f,0x427,0x0,0x400,0x0,0x427,0x800000,0x1000000,0xfc000,0xfc000,0x6000000,0x0,0x18000000,0x18000000,0x6000000,0x18000000,0x18000000,0x610000f,0xf,0x28,0x1000,0x0,0x1000,0x1000,0x1000,0x0,0xe10000f,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x800,0x800,0x0,0x28,0x20000000,0x20000000,0x0,0x0,0x0,0x0,0x0,0x7,0
x0,0x0,0x400,};
+ jj_la1_5 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xf0,0x0,0x1f0,0x1f0,0x1f0,0x0,0x0,0x800,0x0,0x0,0x0,0x800,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x100,0x0,0x100,0x100,0x100,0x0,0x100,0x100,0x0,0x0,0x0,0x0,0x10000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xa5f0,0x0,0x40000,0xa5f0,0xa5f0,0xa5f0,0x800,0x40000,0xa5f0,0x0,0xa5f0,0x40000,0x0,0xa5f0,0x800,0x40000,0xa5f0,0xa5f0,0x40000,0x800,0x0,0x500,0x80f0,0x0,0x500,0x500,0x80f0,0x500,0x80f0,0x0,0x100,0x0,0x20000,0x500,0x20000,0x500,0x40000,0xa5f0,0x0,0x10000,0x0,0x0,0x20000,0xa5f0,0x2000100,0x2000100,0x10000,0x2000100,0x2000100,0x20000,0x0,0x0,0x0,0x40000800,0x2000100,0x1000,0x21000,0x40020000,0x40000800,0x2000100,0x0,0x0,0x100,0x0,0x0,0x2100,0x2100,0xa5f0,0xa5f0,0xa5f0,0xa5f0,0x84f0,0x0,0x8000,0x0,0x84f0,0x10000000,0x20000000,0x1f80000,0x1f80000,0xc0000000,0x0,0x0,0x0,0xc0000000,0x0,0x0,0xc20001f0,0x1f0,0x500,0x20000,0x0,0x20000,0x20000,0x20000,0x0,0xc20001f0,0x0,0x0,0x0,0x0,0x0,0x0,0x10000,0x10000,0x10000,0
x0,0x0,0x0,0x0,0x0,0x0,0x0,0x500,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xf0,0x0,0x0,0x8000,};
}
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,0x2,0x2,0x0,0x2,0x2,0x0,0x1,0x2,0x2,0x10,0x2,0x0,0x0,0x0,0x10,0x0,0x1,0x2,0x2,0x0,0x2,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,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,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,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40,0x40,0x0,0x40,0x40,0x0,0x20,0x42,0x42,0x201,0x40,0x0,0x0,0x1,0x201,0x0,0x20,0x40,0x40,0x0,0x40,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3,0x3,0x0,0x3,0x3,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4,0x4,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
}
final private JJCalls[] jj_2_rtns = new JJCalls[5];
private boolean jj_rescan = false;
@@ -6725,7 +6960,7 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 176; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 182; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
@@ -6740,7 +6975,7 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 176; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 182; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
@@ -6751,7 +6986,7 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 176; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 182; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
@@ -6762,7 +6997,7 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 176; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 182; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
@@ -6772,7 +7007,7 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 176; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 182; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
@@ -6782,7 +7017,7 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 176; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 182; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
@@ -6894,12 +7129,12 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
/** Generate ParseException. */
public ParseException generateParseException() {
jj_expentries.clear();
- boolean[] la1tokens = new boolean[208];
+ boolean[] la1tokens = new boolean[213];
if (jj_kind >= 0) {
la1tokens[jj_kind] = true;
jj_kind = -1;
}
- for (int i = 0; i < 176; i++) {
+ for (int i = 0; i < 182; i++) {
if (jj_la1[i] == jj_gen) {
for (int j = 0; j < 32; j++) {
if ((jj_la1_0[i] & (1<<j)) != 0) {
@@ -6926,7 +7161,7 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
}
}
}
- for (int i = 0; i < 208; i++) {
+ for (int i = 0; i < 213; i++) {
if (la1tokens[i]) {
jj_expentry = new int[1];
jj_expentry[0] = i;
[14/16] jena git commit: Aggregates base URI
"http://jena.apache.org/ARQ/function/aggregate#"
Posted by an...@apache.org.
Aggregates base URI "http://jena.apache.org/ARQ/function/aggregate#"
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/9c2fa681
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/9c2fa681
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/9c2fa681
Branch: refs/heads/master
Commit: 9c2fa6817b76bb7345b73d69f68d300433ab47a0
Parents: 41f4054
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Mar 12 13:14:08 2016 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Mar 13 17:22:25 2016 +0000
----------------------------------------------------------------------
.../main/java/org/apache/jena/query/ARQ.java | 4 +-
.../org/apache/jena/sparql/ARQConstants.java | 3 +
.../expr/aggregate/AggregateRegistry.java | 5 ++
.../aggregate/lib/StandardCustomAggregates.java | 35 ++++-----
.../jena/sparql/function/StandardFunctions.java | 3 -
.../sparql/expr/TestStatisticsAggregates.java | 78 +++++++++++---------
6 files changed, 74 insertions(+), 54 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/9c2fa681/jena-arq/src/main/java/org/apache/jena/query/ARQ.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/query/ARQ.java b/jena-arq/src/main/java/org/apache/jena/query/ARQ.java
index 9391b6b..1842310 100644
--- a/jena-arq/src/main/java/org/apache/jena/query/ARQ.java
+++ b/jena-arq/src/main/java/org/apache/jena/query/ARQ.java
@@ -23,6 +23,7 @@ import org.apache.jena.sparql.SystemARQ ;
import org.apache.jena.sparql.algebra.optimize.TransformOrderByDistinctApplication ;
import org.apache.jena.sparql.core.assembler.AssemblerUtils ;
import org.apache.jena.sparql.engine.http.Service ;
+import org.apache.jena.sparql.expr.aggregate.AggregateRegistry ;
import org.apache.jena.sparql.function.FunctionRegistry ;
import org.apache.jena.sparql.lib.Metadata ;
import org.apache.jena.sparql.mgt.ARQMgt ;
@@ -578,8 +579,9 @@ public class ARQ
// initialization loops with RIOT.init() called directly.
RIOT.register() ;
- // Initialise
+ // Initialise the standard library.
FunctionRegistry.init() ;
+ AggregateRegistry.init() ;
PropertyFunctionRegistry.init() ;
JenaSystem.logLifecycle("ARQ.init - finish") ;
http://git-wip-us.apache.org/repos/asf/jena/blob/9c2fa681/jena-arq/src/main/java/org/apache/jena/sparql/ARQConstants.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/ARQConstants.java b/jena-arq/src/main/java/org/apache/jena/sparql/ARQConstants.java
index d5cf1cc..2fdebe1 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/ARQConstants.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/ARQConstants.java
@@ -69,6 +69,9 @@ public class ARQConstants
/** The ARQ function library URI space */
public static final String ARQFunctionLibraryURI = "http://jena.apache.org/ARQ/function#" ;
+ /** The ARQ aggregate function library URI space */
+ public static final String ARQAggregateLibraryURI = "http://jena.apache.org/ARQ/function/aggregate#" ;
+
/** The ARQ function library URI space - old Jena2 name
* @deprecated Use #ARQFunctionLibraryURI
*/
http://git-wip-us.apache.org/repos/asf/jena/blob/9c2fa681/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggregateRegistry.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggregateRegistry.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggregateRegistry.java
index 322a489..0955398 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggregateRegistry.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggregateRegistry.java
@@ -22,6 +22,7 @@ import java.util.HashMap ;
import java.util.Map ;
import org.apache.jena.graph.Node ;
+import org.apache.jena.sparql.expr.aggregate.lib.StandardCustomAggregates ;
/** Registry of custom aggregates
* There is only a single global registry of aggregates - it affects parsing
@@ -32,6 +33,10 @@ public class AggregateRegistry {
private static Map<String, AccumulatorFactory> registry = new HashMap<>() ;
private static Map<String, Node> noGroupValues = new HashMap<>() ;
+ public static void init() {
+ StandardCustomAggregates.register();
+ }
+
/**
* Register a custom aggregate, with its associated factory for accumulators.
*/
http://git-wip-us.apache.org/repos/asf/jena/blob/9c2fa681/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/lib/StandardCustomAggregates.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/lib/StandardCustomAggregates.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/lib/StandardCustomAggregates.java
index 0a396d4..a581348 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/lib/StandardCustomAggregates.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/lib/StandardCustomAggregates.java
@@ -29,36 +29,37 @@ import org.apache.jena.sparql.expr.aggregate.AggregateRegistry ;
*/
public class StandardCustomAggregates {
- public static String BASE = ARQConstants.ARQFunctionLibraryURI ;
+ public static String BASE = ARQConstants.ARQAggregateLibraryURI ;
+ public static String BASE2 = ARQConstants.ARQFunctionLibraryURI ;
public static void register() {
- // Non-DISTINCT
+ // The statistics aggregates
AccumulatorFactory f_VarP = (agg, distinct) -> new AccStatVarPopulation(agg.getExpr(), distinct) ;
AccumulatorFactory f_Var = (agg, distinct) -> new AccStatVarSample(agg.getExpr(), distinct) ;
AccumulatorFactory f_StdevP = (agg, distinct) -> new AccStatStdDevPopulation(agg.getExpr(), distinct) ;
AccumulatorFactory f_Stdev = (agg, distinct) -> new AccStatStdDevSample(agg.getExpr(), distinct) ;
-// AggregateRegistry.register(BASE+"stddevp", f_StdevP, null) ; // Common? typo
-// AggregateRegistry.register(BASE+"stddev", f_Stdev, null) ; // Common? typo
- AggregateRegistry.register(BASE+"stdevp", f_StdevP, null) ; // SQL spelling
- AggregateRegistry.register(BASE+"stdev", f_Stdev, null) ; // SQL spelling
+ AggregateRegistry.register(BASE+"stdevp", f_StdevP, null) ;
+ AggregateRegistry.register(BASE+"stdev", f_Stdev, null) ;
+ AggregateRegistry.register(BASE+"varp", f_VarP, null) ;
+ AggregateRegistry.register(BASE+"var", f_Var, null) ;
-// AggregateRegistry.register(BASE+"variancep", f_VarP, null) ; // Longer
-// AggregateRegistry.register(BASE+"variance", f_Var, null) ; // Longer
- AggregateRegistry.register(BASE+"varp", f_VarP, null) ; // SQL spelling
- AggregateRegistry.register(BASE+"var", f_Var, null) ; // SQL spelling
-
- // DISTINCT versions for
- //
+ // Again in the afn@ (not encouraged but easy to do)
+ AggregateRegistry.register(BASE2+"stdevp", f_StdevP, null) ;
+ AggregateRegistry.register(BASE2+"stdev", f_Stdev, null) ;
+ AggregateRegistry.register(BASE2+"varp", f_VarP, null) ;
+ AggregateRegistry.register(BASE2+"var", f_Var, null) ;
+
+ // DISTINCT versions as URIs.
AccumulatorFactory f_VarP_d = (agg, distinct) -> new AccStatVarPopulation(agg.getExpr(), true) ;
AccumulatorFactory f_Var_d = (agg, distinct) -> new AccStatVarSample(agg.getExpr(), true) ;
AccumulatorFactory f_StdevP_d = (agg, distinct) -> new AccStatStdDevPopulation(agg.getExpr(), true) ;
AccumulatorFactory f_Stdev_d = (agg, distinct) -> new AccStatStdDevSample(agg.getExpr(), true) ;
- AggregateRegistry.register(BASE+"varpd", f_VarP_d, null) ;
- AggregateRegistry.register(BASE+"vard", f_Var_d, null) ;
- AggregateRegistry.register(BASE+"stdevpd", f_StdevP_d, null) ;
- AggregateRegistry.register(BASE+"stdevd", f_Stdev_d, null) ;
+ AggregateRegistry.register(BASE+"varpd", f_VarP_d, null) ;
+ AggregateRegistry.register(BASE+"vard", f_Var_d, null) ;
+ AggregateRegistry.register(BASE+"stdevpd", f_StdevP_d, null) ;
+ AggregateRegistry.register(BASE+"stdevd", f_Stdev_d, null) ;
}
}
http://git-wip-us.apache.org/repos/asf/jena/blob/9c2fa681/jena-arq/src/main/java/org/apache/jena/sparql/function/StandardFunctions.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/function/StandardFunctions.java b/jena-arq/src/main/java/org/apache/jena/sparql/function/StandardFunctions.java
index 1d5d9f4..c860f47 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/function/StandardFunctions.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/function/StandardFunctions.java
@@ -20,7 +20,6 @@ package org.apache.jena.sparql.function;
import org.apache.jena.datatypes.xsd.XSDDatatype ;
import org.apache.jena.sparql.ARQConstants ;
-import org.apache.jena.sparql.expr.aggregate.lib.StandardCustomAggregates ;
import org.apache.jena.sparql.function.library.* ;
import org.apache.jena.sparql.function.library.sqrt ;
import org.apache.jena.sparql.function.library.leviathan.* ;
@@ -35,8 +34,6 @@ public class StandardFunctions
String math = ARQConstants.mathPrefix ;
String sparqlfn = ARQConstants.fnSparql ;
- StandardCustomAggregates.register();
-
// See http://www.w3.org/TR/xpath-datamodel/#types-hierarchy
// No durations here
http://git-wip-us.apache.org/repos/asf/jena/blob/9c2fa681/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestStatisticsAggregates.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestStatisticsAggregates.java b/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestStatisticsAggregates.java
index 99d3bc8..f094a82 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestStatisticsAggregates.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestStatisticsAggregates.java
@@ -25,9 +25,10 @@ import org.apache.jena.rdf.model.Literal ;
import org.apache.jena.sparql.core.DatasetGraph ;
import org.apache.jena.sparql.core.Var ;
import org.apache.jena.sparql.engine.binding.Binding ;
+import org.apache.jena.sparql.expr.aggregate.AggregateRegistry ;
import org.apache.jena.sparql.expr.aggregate.lib.StandardCustomAggregates ;
import org.apache.jena.sparql.sse.SSE ;
-import org.junit.Assert ;
+import static org.junit.Assert.* ;
import org.junit.BeforeClass ;
import org.junit.Test ;
@@ -35,7 +36,7 @@ public class TestStatisticsAggregates {
static String NL = "\n" ;
static String PRE = StrUtils.strjoinNL
- ("PREFIX afn: <http://jena.apache.org/ARQ/function#>") ;
+ ("PREFIX agg: <http://jena.apache.org/ARQ/function/aggregate#>") ;
static DatasetGraph ds = SSE.parseDatasetGraph("(dataset (graph (:x :p1 -1) (:x :p2 2) (:x :p3 3) (:x :p4 3) ))") ;
static DatasetGraph dsEmpty = SSE.parseDatasetGraph("(dataset)") ;
@@ -67,111 +68,125 @@ public class TestStatisticsAggregates {
// ---- stdev
@Test public void agg_stat_stdev_uri() {
- test("afn:stdev(?x)", VALUEstdev, syntaxSPARQL_11) ;
+ test("agg:stdev(?x)", VALUEstdev, syntaxSPARQL_11) ;
}
@Test public void agg_stat_stdev_uri_d() {
- test("afn:stdevd(?x)", VALUEstdevd, syntaxSPARQL_11) ;
+ test("agg:stdevd(?x)", VALUEstdevd, syntaxSPARQL_11) ;
}
@Test public void agg_stat_stdev_uri_distinct() {
- test("afn:stdev(DISTINCT ?x)", VALUEstdevd, syntaxSPARQL_11) ;
+ test("agg:stdev(DISTINCT ?x)", VALUEstdevd, syntaxSPARQL_11) ;
}
@Test public void agg_stat_stdev_agg() {
- test("AGG afn:stdev(?x)", VALUEstdev, syntaxARQ) ;
+ test("AGG agg:stdev(?x)", VALUEstdev, syntaxARQ) ;
}
@Test public void agg_stat_stdev_agg_distinct() {
- test("AGG afn:stdev(DISTINCT ?x)", VALUEstdevd, syntaxARQ) ;
+ test("AGG agg:stdev(DISTINCT ?x)", VALUEstdevd, syntaxARQ) ;
}
// ---- stdevp
@Test public void agg_stat_stdevp_uri() {
- test("afn:stdevp(?x)", VALUEstdevp, syntaxSPARQL_11) ;
+ test("agg:stdevp(?x)", VALUEstdevp, syntaxSPARQL_11) ;
}
@Test public void agg_stat_stdevp_uri_d() {
- test("afn:stdevpd(?x)", VALUEstdevpd, syntaxSPARQL_11) ;
+ test("agg:stdevpd(?x)", VALUEstdevpd, syntaxSPARQL_11) ;
}
@Test public void agg_stat_stdevp_uri_distinct() {
- test("afn:stdevp(DISTINCT ?x)", VALUEstdevpd, syntaxSPARQL_11) ;
+ test("agg:stdevp(DISTINCT ?x)", VALUEstdevpd, syntaxSPARQL_11) ;
}
@Test public void agg_stat_stdevp_agg() {
- test("AGG afn:stdevp(?x)", VALUEstdevp, syntaxARQ) ;
+ test("AGG agg:stdevp(?x)", VALUEstdevp, syntaxARQ) ;
}
@Test public void agg_stat_stdevp_agg_distinct() {
- test("AGG afn:stdevp(DISTINCT ?x)", VALUEstdevpd, syntaxARQ) ;
+ test("AGG agg:stdevp(DISTINCT ?x)", VALUEstdevpd, syntaxARQ) ;
}
// ---- var
@Test public void agg_stat_var_uri() {
- test("afn:var(?x)", VALUEvar, syntaxSPARQL_11) ;
+ test("agg:var(?x)", VALUEvar, syntaxSPARQL_11) ;
}
@Test public void agg_stat_var_uri_d() {
- test("afn:vard(?x)", VALUEvard, syntaxSPARQL_11) ;
+ test("agg:vard(?x)", VALUEvard, syntaxSPARQL_11) ;
}
@Test public void agg_stat_var_uri_distinct() {
- test("afn:var(DISTINCT ?x)", VALUEvard, syntaxSPARQL_11) ;
+ test("agg:var(DISTINCT ?x)", VALUEvard, syntaxSPARQL_11) ;
}
@Test public void agg_stat_var_agg() {
- test("AGG afn:var(?x)", VALUEvar, syntaxARQ) ;
+ test("AGG agg:var(?x)", VALUEvar, syntaxARQ) ;
}
@Test public void agg_stat_var_agg_distinct() {
- test("AGG afn:var(DISTINCT ?x)", VALUEvard, syntaxARQ) ;
+ test("AGG agg:var(DISTINCT ?x)", VALUEvard, syntaxARQ) ;
}
// ---- varp
@Test public void agg_stat_varp_uri() {
- test("afn:varp(?x)", VALUEvarp, syntaxSPARQL_11) ;
+ test("agg:varp(?x)", VALUEvarp, syntaxSPARQL_11) ;
}
@Test public void agg_stat_varp_uri_d() {
- test("afn:varpd(?x)", VALUEvarpd, syntaxSPARQL_11) ;
+ test("agg:varpd(?x)", VALUEvarpd, syntaxSPARQL_11) ;
}
@Test public void agg_stat_varp_uri_distinct() {
- test("afn:varp(DISTINCT ?x)", VALUEvarpd, syntaxSPARQL_11) ;
+ test("agg:varp(DISTINCT ?x)", VALUEvarpd, syntaxSPARQL_11) ;
}
@Test public void agg_stat_varp_agg() {
- test("AGG afn:varp(?x)", VALUEvarp, syntaxARQ) ;
+ test("AGG agg:varp(?x)", VALUEvarp, syntaxARQ) ;
}
@Test public void agg_stat_varp_agg_distinct() {
- test("AGG afn:varp(DISTINCT ?x)", VALUEvarpd, syntaxARQ) ;
+ test("AGG agg:varp(DISTINCT ?x)", VALUEvarpd, syntaxARQ) ;
+ }
+
+ //<http://jena.hpl.hp.com/ARQ/function/aggregate#>
+
+ @Test public void agg_stat_stdev_full_uri() {
+ test("<http://jena.apache.org/ARQ/function/aggregate#stdev>(?x)", VALUEstdev, syntaxSPARQL_11) ;
+ }
+
+ @Test public void agg_stat_registry() {
+ assertTrue(AggregateRegistry.isRegistered("http://jena.apache.org/ARQ/function/aggregate#stdev")) ;
+ assertTrue(AggregateRegistry.isRegistered("http://jena.apache.org/ARQ/function/aggregate#stdevp")) ;
+ assertTrue(AggregateRegistry.isRegistered("http://jena.apache.org/ARQ/function/aggregate#var")) ;
+ assertTrue(AggregateRegistry.isRegistered("http://jena.apache.org/ARQ/function/aggregate#varp")) ;
+ assertFalse(AggregateRegistry.isRegistered("http://jena.apache.org/ARQ/function#e")) ; // Not an aggregate
}
// ---- Corner cases. 0 and 1 matches.
@Test public void agg_stat_stdev_empty_1() {
// Empty -> error
- testErr("afn:stdev(?x)", dsEmpty, syntaxSPARQL_11) ;
+ testErr("agg:stdev(?x)", dsEmpty, syntaxSPARQL_11) ;
}
@Test public void agg_stat_stdev_empty_2() {
// Empty -> error
- testErr("afn:stdevp(?x)", dsEmpty, syntaxSPARQL_11) ;
+ testErr("agg:stdevp(?x)", dsEmpty, syntaxSPARQL_11) ;
}
// Sample of one -> error
@Test public void agg_stat_size_one_1() {
- testErr("afn:stdev(?x)", ds1, syntaxSPARQL_11) ;
+ testErr("agg:stdev(?x)", ds1, syntaxSPARQL_11) ;
}
// Population of one -> 0e0
@Test public void agg_stat_size_one_2() {
- Query query = build("afn:stdevp(?x)", syntaxSPARQL_11) ;
+ Query query = build("agg:stdevp(?x)", syntaxSPARQL_11) ;
test(query, 0e0, ds1) ;
}
@@ -188,15 +203,12 @@ public class TestStatisticsAggregates {
try ( QueryExecution qExec = QueryExecutionFactory.create(query, DatasetFactory.wrap(dsg)) ) {
Literal literal = qExec.execSelect().next().getLiteral("X") ;
double result = literal.getDouble() ;
- Assert.assertEquals(expected, result, 0.001);
+ assertEquals(expected, result, 0.001);
}
}
private static Query build(String qsAgg, Syntax syntax) {
String NL = "\n" ;
- String PRE = StrUtils.strjoinNL
- ("PREFIX math: <http://www.w3.org/2005/xpath-functions/math#>",
- "PREFIX afn: <http://jena.apache.org/ARQ/function#>") ;
String qs = PRE+NL+"SELECT ("+qsAgg+NL+"AS ?X) WHERE {?s ?p ?x} GROUP BY ?s" ;
Query query = QueryFactory.create(qs, syntax) ;
return query ;
@@ -206,10 +218,10 @@ public class TestStatisticsAggregates {
Query query = build(qsAgg, syntax) ;
try ( QueryExecution qExec = QueryExecutionFactory.create(query, DatasetFactory.wrap(ds)) ) {
ResultSet rs = qExec.execSelect() ;
- Assert.assertTrue(rs.hasNext()) ;
- Assert.assertTrue(rs.getResultVars().contains("X")) ;
+ assertTrue(rs.hasNext()) ;
+ assertTrue(rs.getResultVars().contains("X")) ;
Binding b = rs.nextBinding() ;
- Assert.assertFalse(b.contains(Var.alloc("X"))) ;
+ assertFalse(b.contains(Var.alloc("X"))) ;
}
}
}
[02/16] jena git commit: rdfcompare -> rdfdiff
Posted by an...@apache.org.
rdfcompare -> rdfdiff
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/a3b7eec7
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/a3b7eec7
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/a3b7eec7
Branch: refs/heads/master
Commit: a3b7eec7f40d044075f422dd95938bd9fadbacdd
Parents: 375b38e
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Mar 10 19:31:16 2016 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Mar 13 17:17:30 2016 +0000
----------------------------------------------------------------------
jena-cmds/src/main/java/arq/rdfdiff.java | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/a3b7eec7/jena-cmds/src/main/java/arq/rdfdiff.java
----------------------------------------------------------------------
diff --git a/jena-cmds/src/main/java/arq/rdfdiff.java b/jena-cmds/src/main/java/arq/rdfdiff.java
index 78a51bb..37e6e91 100644
--- a/jena-cmds/src/main/java/arq/rdfdiff.java
+++ b/jena-cmds/src/main/java/arq/rdfdiff.java
@@ -53,13 +53,7 @@ import org.apache.jena.sparql.util.Closure;
* </p>
*
* <pre>
- * java jena.rdfcompare model1 model2 [lang1 [lang2]]
- *
- * model1 and model2 can be file names or URL's
- * lang1 and lang2 specify the language of the input and can be:
- * RDF/XML
- * N-TRIPLE
- * N3
+ * java jena.rdfdiff model1 model2 lang1? lang2? base1? base2?
* </pre>
*/
public class rdfdiff extends java.lang.Object {
[07/16] jena git commit: JENA-1156: Use standard SQL naming. Add
keywords to extended SPARQL.
Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/jena/blob/6e588daa/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/SPARQLParser11TokenManager.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/SPARQLParser11TokenManager.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/SPARQLParser11TokenManager.java
index 2acd002..e26e88b 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/SPARQLParser11TokenManager.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/SPARQLParser11TokenManager.java
@@ -10,6 +10,7 @@ package org.apache.jena.sparql.lang.sparql_11 ;
+
/** Token Manager. */
public class SPARQLParser11TokenManager implements SPARQLParser11Constants
{
@@ -44,160 +45,160 @@ private int jjMoveStringLiteralDfa0_0()
jjmatchedKind = 1;
return jjMoveNfa_0(0, 0);
case 33:
- jjmatchedKind = 174;
- return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x20000000000L);
+ jjmatchedKind = 179;
+ return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x400000000000L, 0x0L);
case 38:
- return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x4000000000000L);
+ return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x80000000000000L, 0x0L);
case 40:
- jjmatchedKind = 157;
+ jjmatchedKind = 162;
return jjMoveNfa_0(0, 0);
case 41:
- jjmatchedKind = 158;
+ jjmatchedKind = 163;
return jjMoveNfa_0(0, 0);
case 42:
- jjmatchedKind = 181;
+ jjmatchedKind = 186;
return jjMoveNfa_0(0, 0);
case 43:
- jjmatchedKind = 179;
+ jjmatchedKind = 184;
return jjMoveNfa_0(0, 0);
case 44:
- jjmatchedKind = 166;
+ jjmatchedKind = 171;
return jjMoveNfa_0(0, 0);
case 45:
- jjmatchedKind = 180;
- return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x800000000000000L);
+ jjmatchedKind = 185;
+ return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x0L, 0x1L);
case 46:
- jjmatchedKind = 167;
+ jjmatchedKind = 172;
return jjMoveNfa_0(0, 0);
case 47:
- jjmatchedKind = 182;
+ jjmatchedKind = 187;
return jjMoveNfa_0(0, 0);
case 58:
- jjmatchedKind = 176;
+ jjmatchedKind = 181;
return jjMoveNfa_0(0, 0);
case 59:
- jjmatchedKind = 165;
+ jjmatchedKind = 170;
return jjMoveNfa_0(0, 0);
case 60:
- jjmatchedKind = 171;
- return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x1000100000000000L);
+ jjmatchedKind = 176;
+ return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x2000000000000L, 0x2L);
case 61:
- jjmatchedKind = 168;
+ jjmatchedKind = 173;
return jjMoveNfa_0(0, 0);
case 62:
- jjmatchedKind = 170;
- return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x200000000000L);
+ jjmatchedKind = 175;
+ return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x4000000000000L, 0x0L);
case 63:
- jjmatchedKind = 189;
+ jjmatchedKind = 194;
return jjMoveNfa_0(0, 0);
case 64:
- jjmatchedKind = 184;
+ jjmatchedKind = 189;
return jjMoveNfa_0(0, 0);
case 65:
- return jjMoveStringLiteralDfa1_0(0x211008408000000L, 0x8000000000080000L, 0x100L);
+ return jjMoveStringLiteralDfa1_0(0x211008408000000L, 0x1000000L, 0x2010L, 0x0L);
case 66:
- return jjMoveStringLiteralDfa1_0(0x4000100080100000L, 0x4L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x100080100000L, 0x88L, 0x0L, 0x0L);
case 67:
- return jjMoveStringLiteralDfa1_0(0x8020000004000000L, 0x6000000040900000L, 0x2L);
+ return jjMoveStringLiteralDfa1_0(0x20000004000000L, 0x812000010L, 0x4cL, 0x0L);
case 68:
- return jjMoveStringLiteralDfa1_0(0x802800000L, 0x140002000000100L, 0x90L);
+ return jjMoveStringLiteralDfa1_0(0x802800000L, 0x2800040000002000L, 0x1200L, 0x0L);
case 69:
- return jjMoveStringLiteralDfa1_0(0x400000000000L, 0x20000000L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x400000000000L, 0x400000000L, 0x0L, 0x0L);
case 70:
- return jjMoveStringLiteralDfa1_0(0x2000002000000000L, 0x20000000200000L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x2000000000L, 0x400000004000004L, 0x0L, 0x0L);
case 71:
- return jjMoveStringLiteralDfa1_0(0x1002010000000000L, 0x0L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x2010000000000L, 0x2L, 0x0L, 0x0L);
case 72:
- return jjMoveStringLiteralDfa1_0(0x4000000000000L, 0x4000000000L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x4000000000000L, 0x80000000000L, 0x0L, 0x0L);
case 73:
- return jjMoveStringLiteralDfa1_0(0x0L, 0x8000000000f80bL, 0x20L);
+ return jjMoveStringLiteralDfa1_0(0x0L, 0x10000000001f0160L, 0x400L, 0x0L);
case 76:
- return jjMoveStringLiteralDfa1_0(0x10000000L, 0x1000000010000600L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x10000000L, 0x20000c000L, 0x2L, 0x0L);
case 77:
- return jjMoveStringLiteralDfa1_0(0xc0080000000000L, 0x409000000000L, 0x5L);
+ return jjMoveStringLiteralDfa1_0(0xc0080000000000L, 0x8120000000000L, 0xa0L, 0x0L);
case 78:
- return jjMoveStringLiteralDfa1_0(0x801000000000L, 0x80000000000L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x801000000000L, 0x1000000000000L, 0x0L, 0x0L);
case 79:
- return jjMoveStringLiteralDfa1_0(0x20060000000L, 0x0L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x20060000000L, 0x0L, 0x0L, 0x0L);
case 80:
- return jjMoveStringLiteralDfa1_0(0x200000L, 0x0L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x200000L, 0x0L, 0x0L, 0x0L);
case 82:
- return jjMoveStringLiteralDfa1_0(0x1000000L, 0x4450000L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x1000000L, 0x88a00000L, 0x0L, 0x0L);
case 83:
- return jjMoveStringLiteralDfa1_0(0xd08200000400000L, 0xfa107830200e0L, 0x8L);
+ return jjMoveStringLiteralDfa1_0(0x1d08200000400000L, 0x1f420f060401c01L, 0x100L, 0x0L);
case 84:
- return jjMoveStringLiteralDfa1_0(0x0L, 0x10060000000000L, 0x40L);
+ return jjMoveStringLiteralDfa1_0(0x0L, 0x200c00000000000L, 0x800L, 0x0L);
case 85:
- return jjMoveStringLiteralDfa1_0(0x40200000000L, 0x100008000010L, 0x400L);
+ return jjMoveStringLiteralDfa1_0(0x40200000000L, 0x2000100000200L, 0x8000L, 0x0L);
case 86:
- return jjMoveStringLiteralDfa1_0(0x100000000L, 0x0L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0xe000000100000000L, 0x0L, 0x0L, 0x0L);
case 87:
- return jjMoveStringLiteralDfa1_0(0x4000000000L, 0x0L, 0x200L);
+ return jjMoveStringLiteralDfa1_0(0x4000000000L, 0x0L, 0x4000L, 0x0L);
case 89:
- return jjMoveStringLiteralDfa1_0(0x0L, 0x800000000L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x0L, 0x10000000000L, 0x0L, 0x0L);
case 91:
- jjmatchedKind = 162;
+ jjmatchedKind = 167;
return jjMoveNfa_0(0, 0);
case 93:
- jjmatchedKind = 163;
+ jjmatchedKind = 168;
return jjMoveNfa_0(0, 0);
case 94:
- jjmatchedKind = 186;
- return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x80000000000000L);
+ jjmatchedKind = 191;
+ return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x1000000000000000L, 0x0L);
case 97:
jjmatchedKind = 19;
- return jjMoveStringLiteralDfa1_0(0x211008408000000L, 0x8000000000080000L, 0x100L);
+ return jjMoveStringLiteralDfa1_0(0x211008408000000L, 0x1000000L, 0x2010L, 0x0L);
case 98:
- return jjMoveStringLiteralDfa1_0(0x4000100080100000L, 0x4L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x100080100000L, 0x88L, 0x0L, 0x0L);
case 99:
- return jjMoveStringLiteralDfa1_0(0x8020000004000000L, 0x6000000040900000L, 0x2L);
+ return jjMoveStringLiteralDfa1_0(0x20000004000000L, 0x812000010L, 0x4cL, 0x0L);
case 100:
- return jjMoveStringLiteralDfa1_0(0x802800000L, 0x140002000000100L, 0x90L);
+ return jjMoveStringLiteralDfa1_0(0x802800000L, 0x2800040000002000L, 0x1200L, 0x0L);
case 101:
- return jjMoveStringLiteralDfa1_0(0x400000000000L, 0x20000000L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x400000000000L, 0x400000000L, 0x0L, 0x0L);
case 102:
- return jjMoveStringLiteralDfa1_0(0x2000002000000000L, 0x20000000200000L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x2000000000L, 0x400000004000004L, 0x0L, 0x0L);
case 103:
- return jjMoveStringLiteralDfa1_0(0x1002010000000000L, 0x0L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x2010000000000L, 0x2L, 0x0L, 0x0L);
case 104:
- return jjMoveStringLiteralDfa1_0(0x4000000000000L, 0x4000000000L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x4000000000000L, 0x80000000000L, 0x0L, 0x0L);
case 105:
- return jjMoveStringLiteralDfa1_0(0x0L, 0x8000000000f80bL, 0x20L);
+ return jjMoveStringLiteralDfa1_0(0x0L, 0x10000000001f0160L, 0x400L, 0x0L);
case 108:
- return jjMoveStringLiteralDfa1_0(0x10000000L, 0x1000000010000600L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x10000000L, 0x20000c000L, 0x2L, 0x0L);
case 109:
- return jjMoveStringLiteralDfa1_0(0xc0080000000000L, 0x409000000000L, 0x5L);
+ return jjMoveStringLiteralDfa1_0(0xc0080000000000L, 0x8120000000000L, 0xa0L, 0x0L);
case 110:
- return jjMoveStringLiteralDfa1_0(0x801000000000L, 0x80000000000L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x801000000000L, 0x1000000000000L, 0x0L, 0x0L);
case 111:
- return jjMoveStringLiteralDfa1_0(0x20060000000L, 0x0L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x20060000000L, 0x0L, 0x0L, 0x0L);
case 112:
- return jjMoveStringLiteralDfa1_0(0x200000L, 0x0L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x200000L, 0x0L, 0x0L, 0x0L);
case 114:
- return jjMoveStringLiteralDfa1_0(0x1000000L, 0x4450000L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x1000000L, 0x88a00000L, 0x0L, 0x0L);
case 115:
- return jjMoveStringLiteralDfa1_0(0xd08200000400000L, 0xfa107830200e0L, 0x8L);
+ return jjMoveStringLiteralDfa1_0(0x1d08200000400000L, 0x1f420f060401c01L, 0x100L, 0x0L);
case 116:
- return jjMoveStringLiteralDfa1_0(0x0L, 0x10060000000000L, 0x40L);
+ return jjMoveStringLiteralDfa1_0(0x0L, 0x200c00000000000L, 0x800L, 0x0L);
case 117:
- return jjMoveStringLiteralDfa1_0(0x40200000000L, 0x100008000010L, 0x400L);
+ return jjMoveStringLiteralDfa1_0(0x40200000000L, 0x2000100000200L, 0x8000L, 0x0L);
case 118:
- return jjMoveStringLiteralDfa1_0(0x100000000L, 0x0L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0xe000000100000000L, 0x0L, 0x0L, 0x0L);
case 119:
- return jjMoveStringLiteralDfa1_0(0x4000000000L, 0x0L, 0x200L);
+ return jjMoveStringLiteralDfa1_0(0x4000000000L, 0x0L, 0x4000L, 0x0L);
case 121:
- return jjMoveStringLiteralDfa1_0(0x0L, 0x800000000L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x0L, 0x10000000000L, 0x0L, 0x0L);
case 123:
- jjmatchedKind = 160;
+ jjmatchedKind = 165;
return jjMoveNfa_0(0, 0);
case 124:
- jjmatchedKind = 185;
- return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x2000000000000L);
+ jjmatchedKind = 190;
+ return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x40000000000000L, 0x0L);
case 125:
- jjmatchedKind = 161;
+ jjmatchedKind = 166;
return jjMoveNfa_0(0, 0);
case 126:
- jjmatchedKind = 175;
+ jjmatchedKind = 180;
return jjMoveNfa_0(0, 0);
case 65279:
jjmatchedKind = 9;
@@ -206,7 +207,7 @@ private int jjMoveStringLiteralDfa0_0()
return jjMoveNfa_0(0, 0);
}
}
-private int jjMoveStringLiteralDfa1_0(long active0, long active1, long active2)
+private int jjMoveStringLiteralDfa1_0(long active0, long active1, long active2, long active3)
{
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
@@ -215,101 +216,101 @@ private int jjMoveStringLiteralDfa1_0(long active0, long active1, long active2)
switch(curChar)
{
case 38:
- if ((active2 & 0x4000000000000L) != 0L)
+ if ((active2 & 0x80000000000000L) != 0L)
{
- jjmatchedKind = 178;
+ jjmatchedKind = 183;
jjmatchedPos = 1;
}
break;
case 45:
- if ((active2 & 0x1000000000000000L) != 0L)
+ if ((active3 & 0x2L) != 0L)
{
- jjmatchedKind = 188;
+ jjmatchedKind = 193;
jjmatchedPos = 1;
}
break;
case 61:
- if ((active2 & 0x20000000000L) != 0L)
+ if ((active2 & 0x400000000000L) != 0L)
{
- jjmatchedKind = 169;
+ jjmatchedKind = 174;
jjmatchedPos = 1;
}
- else if ((active2 & 0x100000000000L) != 0L)
+ else if ((active2 & 0x2000000000000L) != 0L)
{
- jjmatchedKind = 172;
+ jjmatchedKind = 177;
jjmatchedPos = 1;
}
- else if ((active2 & 0x200000000000L) != 0L)
+ else if ((active2 & 0x4000000000000L) != 0L)
{
- jjmatchedKind = 173;
+ jjmatchedKind = 178;
jjmatchedPos = 1;
}
break;
case 62:
- if ((active2 & 0x800000000000000L) != 0L)
+ if ((active3 & 0x1L) != 0L)
{
- jjmatchedKind = 187;
+ jjmatchedKind = 192;
jjmatchedPos = 1;
}
break;
case 65:
- return jjMoveStringLiteralDfa2_0(active0, 0x884001100100000L, active1, 0x60002000060700L, active2, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0xe084001100100000L, active1, 0xc00040000c0e001L, active2, 0L, active3, 0L);
case 66:
- return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x80000L, active2, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x1000000L, active2, 0L, active3, 0L);
case 67:
- return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x18000000L, active2, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x300000000L, active2, 0L, active3, 0L);
case 68:
- return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x8000400000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x8000000000000L, active2, 0x10L, active3, 0L);
case 69:
- return jjMoveStringLiteralDfa2_0(active0, 0x8200803400000L, active1, 0x100010804110000L, active2, 0x84L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x8200803400000L, active1, 0x2000210082200000L, active2, 0x1080L, active3, 0L);
case 70:
- if ((active1 & 0x2L) != 0L)
+ if ((active1 & 0x40L) != 0L)
{
- jjmatchedKind = 65;
+ jjmatchedKind = 70;
jjmatchedPos = 1;
}
- return jjMoveStringLiteralDfa2_0(active0, 0x20000000L, active1, 0L, active2, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x20000000L, active1, 0L, active2, 0L, active3, 0L);
case 71:
- return jjMoveStringLiteralDfa2_0(active0, 0x10000000000000L, active1, 0L, active2, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x10000000000000L, active1, 0L, active2, 0L, active3, 0L);
case 72:
- return jjMoveStringLiteralDfa2_0(active0, 0x4000000000L, active1, 0xf800000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x4000000000L, active1, 0x1f0000000000000L, active2, 0L, active3, 0L);
case 73:
- return jjMoveStringLiteralDfa2_0(active0, 0x2040180010800000L, active1, 0x28000000000L, active2, 0x208L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x40180010800000L, active1, 0x500000000004L, active2, 0x4100L, active3, 0L);
case 76:
- return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x2000000000200000L, active2, 0x100L);
+ return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x4000000L, active2, 0x2004L, active3, 0L);
case 78:
- if ((active1 & 0x1L) != 0L)
+ if ((active1 & 0x20L) != 0L)
{
- jjmatchedKind = 64;
+ jjmatchedKind = 69;
jjmatchedPos = 1;
}
- return jjMoveStringLiteralDfa2_0(active0, 0x48200000000L, active1, 0x80000020000004L, active2, 0x20L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x48200000000L, active1, 0x1000000400000080L, active2, 0x400L, active3, 0L);
case 79:
- if ((active2 & 0x40L) != 0L)
+ if ((active2 & 0x800L) != 0L)
{
- jjmatchedKind = 134;
+ jjmatchedKind = 139;
jjmatchedPos = 1;
}
- return jjMoveStringLiteralDfa2_0(active0, 0xc020800004000000L, active1, 0x1000085040c00000L, active2, 0x3L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x20800004000000L, active1, 0x10a0818000018L, active2, 0x62L, active3, 0L);
case 80:
- return jjMoveStringLiteralDfa2_0(active0, 0x20000000000L, active1, 0L, active2, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x20000000000L, active1, 0L, active2, 0L, active3, 0L);
case 82:
- return jjMoveStringLiteralDfa2_0(active0, 0x1002012040200000L, active1, 0x4010000000000018L, active2, 0x10L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x2012040200000L, active1, 0x200000000000302L, active2, 0x208L, active3, 0L);
case 83:
if ((active0 & 0x1000000000000L) != 0L)
{
jjmatchedKind = 48;
jjmatchedPos = 1;
}
- return jjMoveStringLiteralDfa2_0(active0, 0x408000000L, active1, 0xf800L, active2, 0x400L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x408000000L, active1, 0x1f0000L, active2, 0x8000L, active3, 0L);
case 84:
- return jjMoveStringLiteralDfa2_0(active0, 0x400000000000000L, active1, 0x2007820000e0L, active2, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x1c00000000000000L, active1, 0x400f040001c00L, active2, 0L, active3, 0L);
case 85:
- return jjMoveStringLiteralDfa2_0(active0, 0x100000000000000L, active1, 0x100001000000L, active2, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x100000000000000L, active1, 0x2000020000000L, active2, 0L, active3, 0L);
case 86:
- return jjMoveStringLiteralDfa2_0(active0, 0x200000000000000L, active1, 0L, active2, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x200000000000000L, active1, 0L, active2, 0L, active3, 0L);
case 88:
- return jjMoveStringLiteralDfa2_0(active0, 0x400000000000L, active1, 0L, active2, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x400000000000L, active1, 0L, active2, 0L, active3, 0L);
case 89:
if ((active0 & 0x80000000L) != 0L)
{
@@ -318,77 +319,77 @@ private int jjMoveStringLiteralDfa1_0(long active0, long active1, long active2)
}
break;
case 90:
- if ((active1 & 0x40000000000L) != 0L)
+ if ((active1 & 0x800000000000L) != 0L)
{
- jjmatchedKind = 106;
+ jjmatchedKind = 111;
jjmatchedPos = 1;
}
break;
case 94:
- if ((active2 & 0x80000000000000L) != 0L)
+ if ((active2 & 0x1000000000000000L) != 0L)
{
- jjmatchedKind = 183;
+ jjmatchedKind = 188;
jjmatchedPos = 1;
}
break;
case 97:
- return jjMoveStringLiteralDfa2_0(active0, 0x884001100100000L, active1, 0x60002000060700L, active2, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0xe084001100100000L, active1, 0xc00040000c0e001L, active2, 0L, active3, 0L);
case 98:
- return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x80000L, active2, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x1000000L, active2, 0L, active3, 0L);
case 99:
- return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x18000000L, active2, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x300000000L, active2, 0L, active3, 0L);
case 100:
- return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x8000400000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x8000000000000L, active2, 0x10L, active3, 0L);
case 101:
- return jjMoveStringLiteralDfa2_0(active0, 0x8200803400000L, active1, 0x100010804110000L, active2, 0x84L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x8200803400000L, active1, 0x2000210082200000L, active2, 0x1080L, active3, 0L);
case 102:
- if ((active1 & 0x2L) != 0L)
+ if ((active1 & 0x40L) != 0L)
{
- jjmatchedKind = 65;
+ jjmatchedKind = 70;
jjmatchedPos = 1;
}
- return jjMoveStringLiteralDfa2_0(active0, 0x20000000L, active1, 0L, active2, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x20000000L, active1, 0L, active2, 0L, active3, 0L);
case 103:
- return jjMoveStringLiteralDfa2_0(active0, 0x10000000000000L, active1, 0L, active2, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x10000000000000L, active1, 0L, active2, 0L, active3, 0L);
case 104:
- return jjMoveStringLiteralDfa2_0(active0, 0x4000000000L, active1, 0xf800000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x4000000000L, active1, 0x1f0000000000000L, active2, 0L, active3, 0L);
case 105:
- return jjMoveStringLiteralDfa2_0(active0, 0x2040180010800000L, active1, 0x28000000000L, active2, 0x208L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x40180010800000L, active1, 0x500000000004L, active2, 0x4100L, active3, 0L);
case 108:
- return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x2000000000200000L, active2, 0x100L);
+ return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x4000000L, active2, 0x2004L, active3, 0L);
case 110:
- if ((active1 & 0x1L) != 0L)
+ if ((active1 & 0x20L) != 0L)
{
- jjmatchedKind = 64;
+ jjmatchedKind = 69;
jjmatchedPos = 1;
}
- return jjMoveStringLiteralDfa2_0(active0, 0x48200000000L, active1, 0x80000020000004L, active2, 0x20L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x48200000000L, active1, 0x1000000400000080L, active2, 0x400L, active3, 0L);
case 111:
- if ((active2 & 0x40L) != 0L)
+ if ((active2 & 0x800L) != 0L)
{
- jjmatchedKind = 134;
+ jjmatchedKind = 139;
jjmatchedPos = 1;
}
- return jjMoveStringLiteralDfa2_0(active0, 0xc020800004000000L, active1, 0x1000085040c00000L, active2, 0x3L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x20800004000000L, active1, 0x10a0818000018L, active2, 0x62L, active3, 0L);
case 112:
- return jjMoveStringLiteralDfa2_0(active0, 0x20000000000L, active1, 0L, active2, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x20000000000L, active1, 0L, active2, 0L, active3, 0L);
case 114:
- return jjMoveStringLiteralDfa2_0(active0, 0x1002012040200000L, active1, 0x4010000000000018L, active2, 0x10L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x2012040200000L, active1, 0x200000000000302L, active2, 0x208L, active3, 0L);
case 115:
if ((active0 & 0x1000000000000L) != 0L)
{
jjmatchedKind = 48;
jjmatchedPos = 1;
}
- return jjMoveStringLiteralDfa2_0(active0, 0x408000000L, active1, 0xf800L, active2, 0x400L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x408000000L, active1, 0x1f0000L, active2, 0x8000L, active3, 0L);
case 116:
- return jjMoveStringLiteralDfa2_0(active0, 0x400000000000000L, active1, 0x2007820000e0L, active2, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x1c00000000000000L, active1, 0x400f040001c00L, active2, 0L, active3, 0L);
case 117:
- return jjMoveStringLiteralDfa2_0(active0, 0x100000000000000L, active1, 0x100001000000L, active2, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x100000000000000L, active1, 0x2000020000000L, active2, 0L, active3, 0L);
case 118:
- return jjMoveStringLiteralDfa2_0(active0, 0x200000000000000L, active1, 0L, active2, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x200000000000000L, active1, 0L, active2, 0L, active3, 0L);
case 120:
- return jjMoveStringLiteralDfa2_0(active0, 0x400000000000L, active1, 0L, active2, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x400000000000L, active1, 0L, active2, 0L, active3, 0L);
case 121:
if ((active0 & 0x80000000L) != 0L)
{
@@ -397,16 +398,16 @@ private int jjMoveStringLiteralDfa1_0(long active0, long active1, long active2)
}
break;
case 122:
- if ((active1 & 0x40000000000L) != 0L)
+ if ((active1 & 0x800000000000L) != 0L)
{
- jjmatchedKind = 106;
+ jjmatchedKind = 111;
jjmatchedPos = 1;
}
break;
case 124:
- if ((active2 & 0x2000000000000L) != 0L)
+ if ((active2 & 0x40000000000000L) != 0L)
{
- jjmatchedKind = 177;
+ jjmatchedKind = 182;
jjmatchedPos = 1;
}
break;
@@ -415,9 +416,9 @@ private int jjMoveStringLiteralDfa1_0(long active0, long active1, long active2)
}
return jjMoveNfa_0(0, 1);
}
-private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long active1, long old2, long active2)
+private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long active1, long old2, long active2, long old3, long active3)
{
- if (((active0 &= old0) | (active1 &= old1) | (active2 &= old2)) == 0L)
+ if (((active0 &= old0) | (active1 &= old1) | (active2 &= old2) | (active3 &= old3)) == 0L)
return jjMoveNfa_0(0, 1);
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
@@ -426,39 +427,39 @@ private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long a
switch(curChar)
{
case 53:
- if ((active1 & 0x400000000000L) != 0L)
+ if ((active1 & 0x8000000000000L) != 0L)
{
- jjmatchedKind = 110;
+ jjmatchedKind = 115;
jjmatchedPos = 2;
}
break;
case 65:
- return jjMoveStringLiteralDfa3_0(active0, 0x8000010000000000L, active1, 0x100f800818000000L, active2, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x10000000000L, active1, 0x1f0010300000010L, active2, 0x2L);
case 66:
- return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x1002000L, active2, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x20040000L, active2, 0L);
case 67:
if ((active0 & 0x400000000L) != 0L)
{
jjmatchedKind = 34;
jjmatchedPos = 2;
}
- return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x10020000000L, active2, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x200400000000L, active2, 0L);
case 68:
if ((active0 & 0x8000000000L) != 0L)
{
jjmatchedKind = 39;
jjmatchedPos = 2;
}
- else if ((active1 & 0x8000000000000000L) != 0L)
+ else if ((active2 & 0x10L) != 0L)
{
- jjmatchedKind = 127;
+ jjmatchedKind = 132;
jjmatchedPos = 2;
}
- return jjMoveStringLiteralDfa3_0(active0, 0x400000241000000L, active1, 0L, active2, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x1c00000241000000L, active1, 0L, active2, 0L);
case 69:
- return jjMoveStringLiteralDfa3_0(active0, 0x4000200000L, active1, 0x6000000000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x4000200000L, active1, 0L, active2, 0xcL);
case 70:
- return jjMoveStringLiteralDfa3_0(active0, 0x20000000L, active1, 0L, active2, 0x80L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x20000000L, active1, 0L, active2, 0x1000L);
case 71:
if ((active0 & 0x10000000000000L) != 0L)
{
@@ -470,19 +471,19 @@ private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long a
jjmatchedKind = 57;
jjmatchedPos = 2;
}
- return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x10000L, active2, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x200000L, active2, 0L);
case 73:
- if ((active1 & 0x8L) != 0L)
+ if ((active1 & 0x100L) != 0L)
{
- jjmatchedKind = 67;
+ jjmatchedKind = 72;
jjmatchedPos = 2;
}
- else if ((active1 & 0x10L) != 0L)
+ else if ((active1 & 0x200L) != 0L)
{
- jjmatchedKind = 68;
+ jjmatchedKind = 73;
jjmatchedPos = 2;
}
- return jjMoveStringLiteralDfa3_0(active0, 0x440000000000L, active1, 0x100000101000L, active2, 0x400L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x440000000000L, active1, 0x2000002020000L, active2, 0x8000L);
case 75:
if ((active0 & 0x8000000L) != 0L)
{
@@ -491,59 +492,59 @@ private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long a
}
break;
case 76:
- if ((active2 & 0x100L) != 0L)
+ if ((active2 & 0x2000L) != 0L)
{
- jjmatchedKind = 136;
+ jjmatchedKind = 141;
jjmatchedPos = 2;
}
- return jjMoveStringLiteralDfa3_0(active0, 0x2000000100400000L, active1, 0x120000000004000L, active2, 0x8L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x100400000L, active1, 0x2400000000080004L, active2, 0x100L);
case 77:
if ((active0 & 0x100000000000000L) != 0L)
{
jjmatchedKind = 56;
jjmatchedPos = 2;
}
- return jjMoveStringLiteralDfa3_0(active0, 0x800001010000000L, active1, 0x20000020000L, active2, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x1010000000L, active1, 0x400000400001L, active2, 0L);
case 78:
if ((active0 & 0x40000000000000L) != 0L)
{
jjmatchedKind = 54;
jjmatchedPos = 2;
}
- return jjMoveStringLiteralDfa3_0(active0, 0x180004000000L, active1, 0x9040848600L, active2, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x180004000000L, active1, 0x12081090c000L, active2, 0L);
case 79:
- return jjMoveStringLiteralDfa3_0(active0, 0x1002002000000000L, active1, 0x200004L, active2, 0x10L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x2002000000000L, active1, 0x4000082L, active2, 0x200L);
case 80:
- return jjMoveStringLiteralDfa3_0(active0, 0x8000000000000L, active1, 0x4000000L, active2, 0x2L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x8000000000000L, active1, 0x80000000L, active2, 0x40L);
case 82:
- if ((active1 & 0x20L) != 0L)
+ if ((active1 & 0x400L) != 0L)
{
- jjmatchedKind = 69;
+ jjmatchedKind = 74;
jjmatchedPos = 2;
}
- return jjMoveStringLiteralDfa3_0(active0, 0x200000000000L, active1, 0x2007820000c0L, active2, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0xe000200000000000L, active1, 0x400f040001800L, active2, 0L);
case 83:
- if ((active1 & 0x80000L) != 0L)
+ if ((active1 & 0x1000000L) != 0L)
{
- jjmatchedKind = 83;
+ jjmatchedKind = 88;
jjmatchedPos = 2;
}
- return jjMoveStringLiteralDfa3_0(active0, 0x802900000L, active1, 0x80000000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x802900000L, active1, 0x1000000000000000L, active2, 0L);
case 84:
if ((active0 & 0x800000000000L) != 0L)
{
jjmatchedKind = 47;
jjmatchedPos = 2;
}
- return jjMoveStringLiteralDfa3_0(active0, 0x20000000000L, active1, 0x40000000000100L, active2, 0x224L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x20000000000L, active1, 0x800000000002000L, active2, 0x4480L);
case 85:
- return jjMoveStringLiteralDfa3_0(active0, 0x4020000000000000L, active1, 0x10004000400800L, active2, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x20000000000000L, active1, 0x200080008010008L, active2, 0L);
case 86:
- return jjMoveStringLiteralDfa3_0(active0, 0x4000000000000L, active1, 0L, active2, 0x1L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x4000000000000L, active1, 0L, active2, 0x20L);
case 87:
- if ((active1 & 0x80000000000L) != 0L)
+ if ((active1 & 0x1000000000000L) != 0L)
{
- jjmatchedKind = 107;
+ jjmatchedKind = 112;
jjmatchedPos = 2;
}
break;
@@ -555,39 +556,39 @@ private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long a
}
break;
case 89:
- if ((active1 & 0x2000000000L) != 0L)
+ if ((active1 & 0x40000000000L) != 0L)
{
- jjmatchedKind = 101;
+ jjmatchedKind = 106;
jjmatchedPos = 2;
}
break;
case 97:
- return jjMoveStringLiteralDfa3_0(active0, 0x8000010000000000L, active1, 0x100f800818000000L, active2, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x10000000000L, active1, 0x1f0010300000010L, active2, 0x2L);
case 98:
- return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x1002000L, active2, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x20040000L, active2, 0L);
case 99:
if ((active0 & 0x400000000L) != 0L)
{
jjmatchedKind = 34;
jjmatchedPos = 2;
}
- return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x10020000000L, active2, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x200400000000L, active2, 0L);
case 100:
if ((active0 & 0x8000000000L) != 0L)
{
jjmatchedKind = 39;
jjmatchedPos = 2;
}
- else if ((active1 & 0x8000000000000000L) != 0L)
+ else if ((active2 & 0x10L) != 0L)
{
- jjmatchedKind = 127;
+ jjmatchedKind = 132;
jjmatchedPos = 2;
}
- return jjMoveStringLiteralDfa3_0(active0, 0x400000241000000L, active1, 0L, active2, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x1c00000241000000L, active1, 0L, active2, 0L);
case 101:
- return jjMoveStringLiteralDfa3_0(active0, 0x4000200000L, active1, 0x6000000000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x4000200000L, active1, 0L, active2, 0xcL);
case 102:
- return jjMoveStringLiteralDfa3_0(active0, 0x20000000L, active1, 0L, active2, 0x80L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x20000000L, active1, 0L, active2, 0x1000L);
case 103:
if ((active0 & 0x10000000000000L) != 0L)
{
@@ -599,19 +600,19 @@ private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long a
jjmatchedKind = 57;
jjmatchedPos = 2;
}
- return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x10000L, active2, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x200000L, active2, 0L);
case 105:
- if ((active1 & 0x8L) != 0L)
+ if ((active1 & 0x100L) != 0L)
{
- jjmatchedKind = 67;
+ jjmatchedKind = 72;
jjmatchedPos = 2;
}
- else if ((active1 & 0x10L) != 0L)
+ else if ((active1 & 0x200L) != 0L)
{
- jjmatchedKind = 68;
+ jjmatchedKind = 73;
jjmatchedPos = 2;
}
- return jjMoveStringLiteralDfa3_0(active0, 0x440000000000L, active1, 0x100000101000L, active2, 0x400L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x440000000000L, active1, 0x2000002020000L, active2, 0x8000L);
case 107:
if ((active0 & 0x8000000L) != 0L)
{
@@ -620,59 +621,59 @@ private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long a
}
break;
case 108:
- if ((active2 & 0x100L) != 0L)
+ if ((active2 & 0x2000L) != 0L)
{
- jjmatchedKind = 136;
+ jjmatchedKind = 141;
jjmatchedPos = 2;
}
- return jjMoveStringLiteralDfa3_0(active0, 0x2000000100400000L, active1, 0x120000000004000L, active2, 0x8L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x100400000L, active1, 0x2400000000080004L, active2, 0x100L);
case 109:
if ((active0 & 0x100000000000000L) != 0L)
{
jjmatchedKind = 56;
jjmatchedPos = 2;
}
- return jjMoveStringLiteralDfa3_0(active0, 0x800001010000000L, active1, 0x20000020000L, active2, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x1010000000L, active1, 0x400000400001L, active2, 0L);
case 110:
if ((active0 & 0x40000000000000L) != 0L)
{
jjmatchedKind = 54;
jjmatchedPos = 2;
}
- return jjMoveStringLiteralDfa3_0(active0, 0x180004000000L, active1, 0x9040848600L, active2, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x180004000000L, active1, 0x12081090c000L, active2, 0L);
case 111:
- return jjMoveStringLiteralDfa3_0(active0, 0x1002002000000000L, active1, 0x200004L, active2, 0x10L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x2002000000000L, active1, 0x4000082L, active2, 0x200L);
case 112:
- return jjMoveStringLiteralDfa3_0(active0, 0x8000000000000L, active1, 0x4000000L, active2, 0x2L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x8000000000000L, active1, 0x80000000L, active2, 0x40L);
case 114:
- if ((active1 & 0x20L) != 0L)
+ if ((active1 & 0x400L) != 0L)
{
- jjmatchedKind = 69;
+ jjmatchedKind = 74;
jjmatchedPos = 2;
}
- return jjMoveStringLiteralDfa3_0(active0, 0x200000000000L, active1, 0x2007820000c0L, active2, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0xe000200000000000L, active1, 0x400f040001800L, active2, 0L);
case 115:
- if ((active1 & 0x80000L) != 0L)
+ if ((active1 & 0x1000000L) != 0L)
{
- jjmatchedKind = 83;
+ jjmatchedKind = 88;
jjmatchedPos = 2;
}
- return jjMoveStringLiteralDfa3_0(active0, 0x802900000L, active1, 0x80000000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x802900000L, active1, 0x1000000000000000L, active2, 0L);
case 116:
if ((active0 & 0x800000000000L) != 0L)
{
jjmatchedKind = 47;
jjmatchedPos = 2;
}
- return jjMoveStringLiteralDfa3_0(active0, 0x20000000000L, active1, 0x40000000000100L, active2, 0x224L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x20000000000L, active1, 0x800000000002000L, active2, 0x4480L);
case 117:
- return jjMoveStringLiteralDfa3_0(active0, 0x4020000000000000L, active1, 0x10004000400800L, active2, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x20000000000000L, active1, 0x200080008010008L, active2, 0L);
case 118:
- return jjMoveStringLiteralDfa3_0(active0, 0x4000000000000L, active1, 0L, active2, 0x1L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x4000000000000L, active1, 0L, active2, 0x20L);
case 119:
- if ((active1 & 0x80000000000L) != 0L)
+ if ((active1 & 0x1000000000000L) != 0L)
{
- jjmatchedKind = 107;
+ jjmatchedKind = 112;
jjmatchedPos = 2;
}
break;
@@ -684,9 +685,9 @@ private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long a
}
break;
case 121:
- if ((active1 & 0x2000000000L) != 0L)
+ if ((active1 & 0x40000000000L) != 0L)
{
- jjmatchedKind = 101;
+ jjmatchedKind = 106;
jjmatchedPos = 2;
}
break;
@@ -706,103 +707,103 @@ private int jjMoveStringLiteralDfa3_0(long old0, long active0, long old1, long a
switch(curChar)
{
case 49:
- if ((active1 & 0x800000000000L) != 0L)
+ if ((active1 & 0x10000000000000L) != 0L)
{
- jjmatchedKind = 111;
+ jjmatchedKind = 116;
jjmatchedPos = 3;
}
break;
case 50:
- return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x3000000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x60000000000000L, active2, 0L);
case 51:
- return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x4000000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x80000000000000L, active2, 0L);
case 53:
- return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x8000000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x100000000000000L, active2, 0L);
case 65:
- if ((active1 & 0x40000000000000L) != 0L)
+ if ((active1 & 0x800000000000000L) != 0L)
{
- jjmatchedKind = 118;
+ jjmatchedKind = 123;
jjmatchedPos = 3;
}
- else if ((active2 & 0x4L) != 0L)
+ else if ((active2 & 0x80L) != 0L)
{
- jjmatchedKind = 130;
+ jjmatchedKind = 135;
jjmatchedPos = 3;
}
- return jjMoveStringLiteralDfa4_0(active0, 0x8000000000000L, active1, 0x6000000400000100L, active2, 0x80L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x8000000000000L, active1, 0x8000002000L, active2, 0x100cL);
case 66:
- return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x200000000L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x4000000000L, active2, 0L);
case 67:
if ((active0 & 0x800000000L) != 0L)
{
jjmatchedKind = 35;
jjmatchedPos = 3;
}
- return jjMoveStringLiteralDfa4_0(active0, 0x2000000L, active1, 0x800000L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x2000000L, active1, 0x10000000L, active2, 0L);
case 68:
if ((active0 & 0x100000000000L) != 0L)
{
jjmatchedKind = 44;
jjmatchedPos = 3;
}
- else if ((active1 & 0x40000L) != 0L)
+ else if ((active1 & 0x800000L) != 0L)
{
- jjmatchedKind = 82;
+ jjmatchedKind = 87;
jjmatchedPos = 3;
}
- else if ((active1 & 0x100000000000L) != 0L)
+ else if ((active1 & 0x2000000000000L) != 0L)
{
- jjmatchedKind = 108;
+ jjmatchedKind = 113;
jjmatchedPos = 3;
}
- else if ((active1 & 0x1000000000000000L) != 0L)
+ else if ((active2 & 0x2L) != 0L)
{
- jjmatchedKind = 124;
+ jjmatchedKind = 129;
jjmatchedPos = 3;
}
- return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x84L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x1080L, active2, 0L);
case 69:
if ((active0 & 0x100000L) != 0L)
{
jjmatchedKind = 20;
jjmatchedPos = 3;
}
- else if ((active1 & 0x10000000000000L) != 0L)
+ else if ((active1 & 0x200000000000000L) != 0L)
{
- jjmatchedKind = 116;
+ jjmatchedKind = 121;
jjmatchedPos = 3;
}
- else if ((active2 & 0x1L) != 0L)
+ else if ((active2 & 0x20L) != 0L)
{
- jjmatchedKind = 128;
+ jjmatchedKind = 133;
jjmatchedPos = 3;
}
- return jjMoveStringLiteralDfa4_0(active0, 0x400001240400000L, active1, 0x180020100030000L, active2, 0x8L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x1c00001240400000L, active1, 0x3000402000600000L, active2, 0x100L);
case 70:
return jjMoveStringLiteralDfa4_0(active0, 0x200000L, active1, 0L, active2, 0L);
case 71:
- if ((active1 & 0x200L) != 0L)
+ if ((active1 & 0x4000L) != 0L)
{
- jjmatchedKind = 73;
+ jjmatchedKind = 78;
jjmatchedPos = 3;
}
- return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x400L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x8000L, active2, 0L);
case 72:
- if ((active2 & 0x200L) != 0L)
+ if ((active2 & 0x4000L) != 0L)
{
- jjmatchedKind = 137;
+ jjmatchedKind = 142;
jjmatchedPos = 3;
}
break;
case 73:
- return jjMoveStringLiteralDfa4_0(active0, 0x4020010000000L, active1, 0x4000L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x2004020010000000L, active1, 0x80000L, active2, 0L);
case 76:
- if ((active1 & 0x100000L) != 0L)
+ if ((active1 & 0x2000000L) != 0L)
{
- jjmatchedKind = 84;
+ jjmatchedKind = 89;
jjmatchedPos = 3;
}
- return jjMoveStringLiteralDfa4_0(active0, 0x8000000000000000L, active1, 0x6002040L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0xc0040810L, active2, 0L);
case 77:
if ((active0 & 0x2000000000L) != 0L)
{
@@ -811,128 +812,130 @@ private int jjMoveStringLiteralDfa3_0(long old0, long active0, long old1, long a
}
break;
case 78:
- return jjMoveStringLiteralDfa4_0(active0, 0x4020000000000000L, active1, 0x400000L, active2, 0x400L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x20000000000000L, active1, 0x8000008L, active2, 0x8000L);
case 79:
- if ((active2 & 0x20L) != 0L)
+ if ((active2 & 0x400L) != 0L)
{
- jjmatchedKind = 133;
+ jjmatchedKind = 138;
jjmatchedPos = 3;
}
- return jjMoveStringLiteralDfa4_0(active0, 0x40000000000L, active1, 0x10020200000L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x40000000000L, active1, 0x200404000000L, active2, 0L);
case 80:
- if ((active2 & 0x10L) != 0L)
+ if ((active2 & 0x200L) != 0L)
{
- jjmatchedKind = 132;
+ jjmatchedKind = 137;
jjmatchedPos = 3;
}
- return jjMoveStringLiteralDfa4_0(active0, 0x800010000000000L, active1, 0L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x10000000000L, active1, 0x1L, active2, 0L);
case 82:
- if ((active1 & 0x800000000L) != 0L)
+ if ((active1 & 0x10000000000L) != 0L)
{
- jjmatchedKind = 99;
+ jjmatchedKind = 104;
jjmatchedPos = 3;
}
- return jjMoveStringLiteralDfa4_0(active0, 0x4000000000L, active1, 0x4000001800L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x4000000000L, active1, 0x80000030000L, active2, 0L);
case 83:
- return jjMoveStringLiteralDfa4_0(active0, 0x400024000000L, active1, 0x20000099000000L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x400024000000L, active1, 0x400001320000000L, active2, 0L);
case 84:
- return jjMoveStringLiteralDfa4_0(active0, 0x2000000000800000L, active1, 0x1040000000L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x800000L, active1, 0x20800000004L, active2, 0L);
case 85:
- return jjMoveStringLiteralDfa4_0(active0, 0x1002080101000000L, active1, 0x208000008000L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x2080101000000L, active1, 0x4100000100002L, active2, 0L);
case 86:
return jjMoveStringLiteralDfa4_0(active0, 0x200000000000L, active1, 0L, active2, 0L);
case 89:
- if ((active2 & 0x2L) != 0L)
+ if ((active2 & 0x40L) != 0L)
{
- jjmatchedKind = 129;
+ jjmatchedKind = 134;
jjmatchedPos = 3;
}
break;
+ case 95:
+ return jjMoveStringLiteralDfa4_0(active0, 0xc000000000000000L, active1, 0L, active2, 0L);
case 97:
- if ((active1 & 0x40000000000000L) != 0L)
+ if ((active1 & 0x800000000000000L) != 0L)
{
- jjmatchedKind = 118;
+ jjmatchedKind = 123;
jjmatchedPos = 3;
}
- else if ((active2 & 0x4L) != 0L)
+ else if ((active2 & 0x80L) != 0L)
{
- jjmatchedKind = 130;
+ jjmatchedKind = 135;
jjmatchedPos = 3;
}
- return jjMoveStringLiteralDfa4_0(active0, 0x8000000000000L, active1, 0x6000000400000100L, active2, 0x80L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x8000000000000L, active1, 0x8000002000L, active2, 0x100cL);
case 98:
- return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x200000000L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x4000000000L, active2, 0L);
case 99:
if ((active0 & 0x800000000L) != 0L)
{
jjmatchedKind = 35;
jjmatchedPos = 3;
}
- return jjMoveStringLiteralDfa4_0(active0, 0x2000000L, active1, 0x800000L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x2000000L, active1, 0x10000000L, active2, 0L);
case 100:
if ((active0 & 0x100000000000L) != 0L)
{
jjmatchedKind = 44;
jjmatchedPos = 3;
}
- else if ((active1 & 0x40000L) != 0L)
+ else if ((active1 & 0x800000L) != 0L)
{
- jjmatchedKind = 82;
+ jjmatchedKind = 87;
jjmatchedPos = 3;
}
- else if ((active1 & 0x100000000000L) != 0L)
+ else if ((active1 & 0x2000000000000L) != 0L)
{
- jjmatchedKind = 108;
+ jjmatchedKind = 113;
jjmatchedPos = 3;
}
- else if ((active1 & 0x1000000000000000L) != 0L)
+ else if ((active2 & 0x2L) != 0L)
{
- jjmatchedKind = 124;
+ jjmatchedKind = 129;
jjmatchedPos = 3;
}
- return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x84L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x1080L, active2, 0L);
case 101:
if ((active0 & 0x100000L) != 0L)
{
jjmatchedKind = 20;
jjmatchedPos = 3;
}
- else if ((active1 & 0x10000000000000L) != 0L)
+ else if ((active1 & 0x200000000000000L) != 0L)
{
- jjmatchedKind = 116;
+ jjmatchedKind = 121;
jjmatchedPos = 3;
}
- else if ((active2 & 0x1L) != 0L)
+ else if ((active2 & 0x20L) != 0L)
{
- jjmatchedKind = 128;
+ jjmatchedKind = 133;
jjmatchedPos = 3;
}
- return jjMoveStringLiteralDfa4_0(active0, 0x400001240400000L, active1, 0x180020100030000L, active2, 0x8L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x1c00001240400000L, active1, 0x3000402000600000L, active2, 0x100L);
case 102:
return jjMoveStringLiteralDfa4_0(active0, 0x200000L, active1, 0L, active2, 0L);
case 103:
- if ((active1 & 0x200L) != 0L)
+ if ((active1 & 0x4000L) != 0L)
{
- jjmatchedKind = 73;
+ jjmatchedKind = 78;
jjmatchedPos = 3;
}
- return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x400L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x8000L, active2, 0L);
case 104:
- if ((active2 & 0x200L) != 0L)
+ if ((active2 & 0x4000L) != 0L)
{
- jjmatchedKind = 137;
+ jjmatchedKind = 142;
jjmatchedPos = 3;
}
break;
case 105:
- return jjMoveStringLiteralDfa4_0(active0, 0x4020010000000L, active1, 0x4000L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x2004020010000000L, active1, 0x80000L, active2, 0L);
case 108:
- if ((active1 & 0x100000L) != 0L)
+ if ((active1 & 0x2000000L) != 0L)
{
- jjmatchedKind = 84;
+ jjmatchedKind = 89;
jjmatchedPos = 3;
}
- return jjMoveStringLiteralDfa4_0(active0, 0x8000000000000000L, active1, 0x6002040L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0xc0040810L, active2, 0L);
case 109:
if ((active0 & 0x2000000000L) != 0L)
{
@@ -941,40 +944,40 @@ private int jjMoveStringLiteralDfa3_0(long old0, long active0, long old1, long a
}
break;
case 110:
- return jjMoveStringLiteralDfa4_0(active0, 0x4020000000000000L, active1, 0x400000L, active2, 0x400L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x20000000000000L, active1, 0x8000008L, active2, 0x8000L);
case 111:
- if ((active2 & 0x20L) != 0L)
+ if ((active2 & 0x400L) != 0L)
{
- jjmatchedKind = 133;
+ jjmatchedKind = 138;
jjmatchedPos = 3;
}
- return jjMoveStringLiteralDfa4_0(active0, 0x40000000000L, active1, 0x10020200000L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x40000000000L, active1, 0x200404000000L, active2, 0L);
case 112:
- if ((active2 & 0x10L) != 0L)
+ if ((active2 & 0x200L) != 0L)
{
- jjmatchedKind = 132;
+ jjmatchedKind = 137;
jjmatchedPos = 3;
}
- return jjMoveStringLiteralDfa4_0(active0, 0x800010000000000L, active1, 0L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x10000000000L, active1, 0x1L, active2, 0L);
case 114:
- if ((active1 & 0x800000000L) != 0L)
+ if ((active1 & 0x10000000000L) != 0L)
{
- jjmatchedKind = 99;
+ jjmatchedKind = 104;
jjmatchedPos = 3;
}
- return jjMoveStringLiteralDfa4_0(active0, 0x4000000000L, active1, 0x4000001800L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x4000000000L, active1, 0x80000030000L, active2, 0L);
case 115:
- return jjMoveStringLiteralDfa4_0(active0, 0x400024000000L, active1, 0x20000099000000L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x400024000000L, active1, 0x400001320000000L, active2, 0L);
case 116:
- return jjMoveStringLiteralDfa4_0(active0, 0x2000000000800000L, active1, 0x1040000000L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x800000L, active1, 0x20800000004L, active2, 0L);
case 117:
- return jjMoveStringLiteralDfa4_0(active0, 0x1002080101000000L, active1, 0x208000008000L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x2080101000000L, active1, 0x4100000100002L, active2, 0L);
case 118:
return jjMoveStringLiteralDfa4_0(active0, 0x200000000000L, active1, 0L, active2, 0L);
case 121:
- if ((active2 & 0x2L) != 0L)
+ if ((active2 & 0x40L) != 0L)
{
- jjmatchedKind = 129;
+ jjmatchedKind = 134;
jjmatchedPos = 3;
}
break;
@@ -994,15 +997,15 @@ private int jjMoveStringLiteralDfa4_0(long old0, long active0, long old1, long a
switch(curChar)
{
case 49:
- return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x8000000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x100000000000000L, active2, 0L);
case 50:
- return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x1000000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x20000000000000L, active2, 0L);
case 53:
- return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x2000000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x40000000000000L, active2, 0L);
case 56:
- return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x4000000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x80000000000000L, active2, 0L);
case 65:
- return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x44802040L, active2, 0L);
+ return jjMoveStringLiteralDfa5_0(active0, 0x2000000000000000L, active1, 0x890040800L, active2, 0L);
case 67:
return jjMoveStringLiteralDfa5_0(active0, 0x1400000L, active1, 0L, active2, 0L);
case 68:
@@ -1011,55 +1014,55 @@ private int jjMoveStringLiteralDfa4_0(long old0, long active0, long old1, long a
jjmatchedKind = 36;
jjmatchedPos = 4;
}
- else if ((active0 & 0x4000000000000000L) != 0L)
+ else if ((active1 & 0x8L) != 0L)
{
- jjmatchedKind = 62;
+ jjmatchedKind = 67;
jjmatchedPos = 4;
}
- else if ((active1 & 0x400000L) != 0L)
+ else if ((active1 & 0x8000000L) != 0L)
{
- jjmatchedKind = 86;
+ jjmatchedKind = 91;
jjmatchedPos = 4;
}
- return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x20000000L, active2, 0L);
+ return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x400000000L, active2, 0L);
case 69:
if ((active0 & 0x4000000000L) != 0L)
{
jjmatchedKind = 38;
jjmatchedPos = 4;
}
- else if ((active1 & 0x4L) != 0L)
+ else if ((active1 & 0x80L) != 0L)
{
- jjmatchedKind = 66;
+ jjmatchedKind = 71;
jjmatchedPos = 4;
}
- else if ((active1 & 0x8000000L) != 0L)
+ else if ((active1 & 0x100000000L) != 0L)
{
- jjmatchedKind = 91;
+ jjmatchedKind = 96;
jjmatchedPos = 4;
}
- else if ((active1 & 0x10000000L) != 0L)
+ else if ((active1 & 0x200000000L) != 0L)
{
- jjmatchedKind = 92;
+ jjmatchedKind = 97;
jjmatchedPos = 4;
}
- else if ((active1 & 0x20000000000000L) != 0L)
+ else if ((active1 & 0x400000000000000L) != 0L)
{
- jjmatchedKind = 117;
+ jjmatchedKind = 122;
jjmatchedPos = 4;
}
- return jjMoveStringLiteralDfa5_0(active0, 0xa000000120000000L, active1, 0x202000000L, active2, 0L);
+ return jjMoveStringLiteralDfa5_0(active0, 0x120000000L, active1, 0x4040000014L, active2, 0L);
case 70:
if ((active0 & 0x200000000L) != 0L)
{
jjmatchedKind = 33;
jjmatchedPos = 4;
}
- return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x400000000L, active2, 0L);
+ return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x8000000000L, active2, 0L);
case 71:
- if ((active2 & 0x400L) != 0L)
+ if ((active2 & 0x8000L) != 0L)
{
- jjmatchedKind = 138;
+ jjmatchedKind = 143;
jjmatchedPos = 4;
}
break;
@@ -1069,35 +1072,35 @@ private int jjMoveStringLiteralDfa4_0(long old0, long active0, long old1, long a
jjmatchedKind = 40;
jjmatchedPos = 4;
}
- else if ((active1 & 0x1000000000L) != 0L)
+ else if ((active1 & 0x20000000000L) != 0L)
{
- jjmatchedKind = 100;
+ jjmatchedKind = 105;
jjmatchedPos = 4;
}
break;
case 73:
- if ((active1 & 0x800L) != 0L)
+ if ((active1 & 0x10000L) != 0L)
{
- jjmatchedKind = 75;
+ jjmatchedKind = 80;
jjmatchedPos = 4;
}
- else if ((active1 & 0x1000L) != 0L)
+ else if ((active1 & 0x20000L) != 0L)
{
- jjmatchedKind = 76;
+ jjmatchedKind = 81;
jjmatchedPos = 4;
}
return jjMoveStringLiteralDfa5_0(active0, 0x200000a00000L, active1, 0L, active2, 0L);
case 76:
- return jjMoveStringLiteralDfa5_0(active0, 0x800000000000000L, active1, 0L, active2, 0L);
+ return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x1L, active2, 0L);
case 77:
- return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x8400L, active2, 0L);
+ return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x108000L, active2, 0L);
case 78:
if ((active0 & 0x40000000000L) != 0L)
{
jjmatchedKind = 42;
jjmatchedPos = 4;
}
- return jjMoveStringLiteralDfa5_0(active0, 0x4000000000000L, active1, 0x10100000000L, active2, 0x8L);
+ return jjMoveStringLiteralDfa5_0(active0, 0x4000000000000L, active1, 0x202000000000L, active2, 0x100L);
case 79:
return jjMoveStringLiteralDfa5_0(active0, 0x20000000000L, active1, 0L, active2, 0L);
case 80:
@@ -1106,36 +1109,36 @@ private int jjMoveStringLiteralDfa4_0(long old0, long active0, long old1, long a
jjmatchedKind = 49;
jjmatchedPos = 4;
}
- return jjMoveStringLiteralDfa5_0(active0, 0x1000000000000000L, active1, 0L, active2, 0L);
+ return jjMoveStringLiteralDfa5_0(active0, 0x8000000000000000L, active1, 0x2L, active2, 0L);
case 82:
if ((active0 & 0x40000000L) != 0L)
{
jjmatchedKind = 30;
jjmatchedPos = 4;
}
- else if ((active1 & 0x200000L) != 0L)
+ else if ((active1 & 0x4000000L) != 0L)
{
- jjmatchedKind = 85;
+ jjmatchedKind = 90;
jjmatchedPos = 4;
}
- else if ((active1 & 0x2000000000000000L) != 0L)
+ else if ((active2 & 0x4L) != 0L)
{
- jjmatchedKind = 125;
+ jjmatchedKind = 130;
jjmatchedPos = 4;
}
- return jjMoveStringLiteralDfa5_0(active0, 0x8000002000000L, active1, 0x80000000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa5_0(active0, 0x8000002000000L, active1, 0x1000000000000000L, active2, 0L);
case 83:
if ((active0 & 0x80000000000L) != 0L)
{
jjmatchedKind = 43;
jjmatchedPos = 4;
}
- else if ((active1 & 0x4000000000L) != 0L)
+ else if ((active1 & 0x80000000000L) != 0L)
{
- jjmatchedKind = 102;
+ jjmatchedKind = 107;
jjmatchedPos = 4;
}
- break;
+ return jjMoveStringLiteralDfa5_0(active0, 0x4000000000000000L, active1, 0L, active2, 0L);
case 84:
if ((active0 & 0x10000000L) != 0L)
{
@@ -1147,32 +1150,32 @@ private int jjMoveStringLiteralDfa4_0(long old0, long active0, long old1, long a
jjmatchedKind = 53;
jjmatchedPos = 4;
}
- else if ((active1 & 0x80L) != 0L)
+ else if ((active1 & 0x1000L) != 0L)
{
- jjmatchedKind = 71;
+ jjmatchedKind = 76;
jjmatchedPos = 4;
}
- return jjMoveStringLiteralDfa5_0(active0, 0x400004000000L, active1, 0x4100008081024100L, active2, 0L);
+ return jjMoveStringLiteralDfa5_0(active0, 0x400004000000L, active1, 0x2000101020482000L, active2, 0x8L);
case 85:
- return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x200000000000L, active2, 0x80L);
+ return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x4000000000000L, active2, 0x1000L);
case 86:
if ((active0 & 0x400000000000000L) != 0L)
{
jjmatchedKind = 58;
jjmatchedPos = 4;
}
- break;
+ return jjMoveStringLiteralDfa5_0(active0, 0x1800000000000000L, active1, 0L, active2, 0L);
case 88:
- if ((active1 & 0x10000L) != 0L)
+ if ((active1 & 0x200000L) != 0L)
{
- jjmatchedKind = 80;
+ jjmatchedKind = 85;
jjmatchedPos = 4;
}
break;
case 90:
- return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x20000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x400000000000L, active2, 0L);
case 97:
- return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x44802040L, active2, 0L);
+ return jjMoveStringLiteralDfa5_0(active0, 0x2000000000000000L, active1, 0x890040800L, active2, 0L);
case 99:
return jjMoveStringLiteralDfa5_0(active0, 0x1400000L, active1, 0L, active2, 0L);
case 100:
@@ -1181,55 +1184,55 @@ private int jjMoveStringLiteralDfa4_0(long old0, long active0, long old1, long a
jjmatchedKind = 36;
jjmatchedPos = 4;
}
- else if ((active0 & 0x4000000000000000L) != 0L)
+ else if ((active1 & 0x8L) != 0L)
{
- jjmatchedKind = 62;
+ jjmatchedKind = 67;
jjmatchedPos = 4;
}
- else if ((active1 & 0x400000L) != 0L)
+ else if ((active1 & 0x8000000L) != 0L)
{
- jjmatchedKind = 86;
+ jjmatchedKind = 91;
jjmatchedPos = 4;
}
- return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x20000000L, active2, 0L);
+ return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x400000000L, active2, 0L);
case 101:
if ((active0 & 0x4000000000L) != 0L)
{
jjmatchedKind = 38;
jjmatchedPos = 4;
}
- else if ((active1 & 0x4L) != 0L)
+ else if ((active1 & 0x80L) != 0L)
{
- jjmatchedKind = 66;
+ jjmatchedKind = 71;
jjmatchedPos = 4;
}
- else if ((active1 & 0x8000000L) != 0L)
+ else if ((active1 & 0x100000000L) != 0L)
{
- jjmatchedKind = 91;
+ jjmatchedKind = 96;
jjmatchedPos = 4;
}
- else if ((active1 & 0x10000000L) != 0L)
+ else if ((active1 & 0x200000000L) != 0L)
{
- jjmatchedKind = 92;
+ jjmatchedKind = 97;
jjmatchedPos = 4;
}
- else if ((active1 & 0x20000000000000L) != 0L)
+ else if ((active1 & 0x400000000000000L) != 0L)
{
- jjmatchedKind = 117;
+ jjmatchedKind = 122;
jjmatchedPos = 4;
}
- return jjMoveStringLiteralDfa5_0(active0, 0xa000000120000000L, active1, 0x202000000L, active2, 0L);
+ return jjMoveStringLiteralDfa5_0(active0, 0x120000000L, active1, 0x4040000014L, active2, 0L);
case 102:
if ((active0 & 0x200000000L) != 0L)
{
jjmatchedKind = 33;
jjmatchedPos = 4;
}
- return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x400000000L, active2, 0L);
+ return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x8000000000L, active2, 0L);
case 103:
- if ((active2 & 0x400L) != 0L)
+ if ((active2 & 0x8000L) != 0L)
{
- jjmatchedKind = 138;
+ jjmatchedKind = 143;
jjmatchedPos = 4;
}
break;
@@ -1239,35 +1242,35 @@ private int jjMoveStringLiteralDfa4_0(long old0, long active0, long old1, long a
jjmatchedKind = 40;
jjmatchedPos = 4;
}
- else if ((active1 & 0x1000000000L) != 0L)
+ else if ((active1 & 0x20000000000L) != 0L)
{
- jjmatchedKind = 100;
+ jjmatchedKind = 105;
jjmatchedPos = 4;
}
break;
case 105:
- if ((active1 & 0x800L) != 0L)
+ if ((active1 & 0x10000L) != 0L)
{
- jjmatchedKind = 75;
+ jjmatchedKind = 80;
jjmatchedPos = 4;
}
- else if ((active1 & 0x1000L) != 0L)
+ else if ((active1 & 0x20000L) != 0L)
{
- jjmatchedKind = 76;
+ jjmatchedKind = 81;
jjmatchedPos = 4;
}
return jjMoveStringLiteralDfa5_0(active0, 0x200000a00000L, active1, 0L, active2, 0L);
case 108:
- return jjMoveStringLiteralDfa5_0(active0, 0x800000000000000L, active1, 0L, active2, 0L);
+ return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x1L, active2, 0L);
case 109:
- return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x8400L, active2, 0L);
+ return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x108000L, active2, 0L);
case 110:
if ((active0 & 0x40000000000L) != 0L)
{
jjmatchedKind = 42;
jjmatchedPos = 4;
}
- return jjMoveStringLiteralDfa5_0(active0, 0x4000000000000L, active1, 0x10100000000L, active2, 0x8L);
+ return jjMoveStringLiteralDfa5_0(active0, 0x4000000000000L, active1, 0x202000000000L, active2, 0x100L);
case 111:
return jjMoveStringLiteralDfa5_0(active0, 0x20000000000L, active1, 0L, active2, 0L);
case 112:
@@ -1276,36 +1279,36 @@ private int jjMoveStringLiteralDfa4_0(long old0, long active0, long old1, long a
jjmatchedKind = 49;
jjmatchedPos = 4;
}
- return jjMoveStringLiteralDfa5_0(active0, 0x1000000000000000L, active1, 0L, active2, 0L);
+ return jjMoveStringLiteralDfa5_0(active0, 0x8000000000000000L, active1, 0x2L, active2, 0L);
case 114:
if ((active0 & 0x40000000L) != 0L)
{
jjmatchedKind = 30;
jjmatchedPos = 4;
}
- else if ((active1 & 0x200000L) != 0L)
+ else if ((active1 & 0x4000000L) != 0L)
{
- jjmatchedKind = 85;
+ jjmatchedKind = 90;
jjmatchedPos = 4;
}
- else if ((active1 & 0x2000000000000000L) != 0L)
+ else if ((active2 & 0x4L) != 0L)
{
- jjmatchedKind = 125;
+ jjmatchedKind = 130;
jjmatchedPos = 4;
}
- return jjMoveStringLiteralDfa5_0(active0, 0x8000002000000L, active1, 0x80000000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa5_0(active0, 0x8000002000000L, active1, 0x1000000000000000L, active2, 0L);
case 115:
if ((active0 & 0x80000000000L) != 0L)
{
jjmatchedKind = 43;
jjmatchedPos = 4;
}
- else if ((active1 & 0x4000000000L) != 0L)
+ else if ((active1 & 0x80000000000L) != 0L)
{
- jjmatchedKind = 102;
+ jjmatchedKind = 107;
jjmatchedPos = 4;
}
- break;
+ return jjMoveStringLiteralDfa5_0(active0, 0x4000000000000000L, active1, 0L, active2, 0L);
case 116:
if ((active0 & 0x10000000L) != 0L)
{
@@ -1317,30 +1320,30 @@ private int jjMoveStringLiteralDfa4_0(long old0, long active0, long old1, long a
jjmatchedKind = 53;
jjmatchedPos = 4;
}
- else if ((active1 & 0x80L) != 0L)
+ else if ((active1 & 0x1000L) != 0L)
{
- jjmatchedKind = 71;
+ jjmatchedKind = 76;
jjmatchedPos = 4;
}
- return jjMoveStringLiteralDfa5_0(active0, 0x400004000000L, active1, 0x4100008081024100L, active2, 0L);
+ return jjMoveStringLiteralDfa5_0(active0, 0x400004000000L, active1, 0x2000101020482000L, active2, 0x8L);
case 117:
- return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x200000000000L, active2, 0x80L);
+ return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x4000000000000L, active2, 0x1000L);
case 118:
if ((active0 & 0x400000000000000L) != 0L)
{
jjmatchedKind = 58;
jjmatchedPos = 4;
}
- break;
+ return jjMoveStringLiteralDfa5_0(active0, 0x1800000000000000L, active1, 0L, active2, 0L);
case 120:
- if ((active1 & 0x10000L) != 0L)
+ if ((active1 & 0x200000L) != 0L)
{
- jjmatchedKind = 80;
+ jjmatchedKind = 85;
jjmatchedPos = 4;
}
break;
case 122:
- return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x20000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x400000000000L, active2, 0L);
default :
break;
}
@@ -1357,56 +1360,56 @@ private int jjMoveStringLiteralDfa5_0(long old0, long active0, long old1, long a
switch(curChar)
{
case 50:
- if ((active1 & 0x8000000000000L) != 0L)
+ if ((active1 & 0x100000000000000L) != 0L)
{
- jjmatchedKind = 115;
+ jjmatchedKind = 120;
jjmatchedPos = 5;
}
break;
case 52:
- if ((active1 & 0x1000000000000L) != 0L)
+ if ((active1 & 0x20000000000000L) != 0L)
{
- jjmatchedKind = 112;
+ jjmatchedKind = 117;
jjmatchedPos = 5;
}
- else if ((active1 & 0x4000000000000L) != 0L)
+ else if ((active1 & 0x80000000000000L) != 0L)
{
- jjmatchedKind = 114;
+ jjmatchedKind = 119;
jjmatchedPos = 5;
}
break;
case 54:
- if ((active1 & 0x2000000000000L) != 0L)
+ if ((active1 & 0x40000000000000L) != 0L)
{
- jjmatchedKind = 113;
+ jjmatchedKind = 118;
jjmatchedPos = 5;
}
break;
case 65:
- return jjMoveStringLiteralDfa6_0(active0, 0x8000000000000L, active1, 0x80000400L, active2, 0L);
+ return jjMoveStringLiteralDfa6_0(active0, 0x4008000000000000L, active1, 0x1000008000L, active2, 0L);
case 67:
- return jjMoveStringLiteralDfa6_0(active0, 0x200000000000L, active1, 0x4000000L, active2, 0L);
+ return jjMoveStringLiteralDfa6_0(active0, 0x200000000000L, active1, 0x80000000L, active2, 0L);
case 68:
- return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x10100000000L, active2, 0L);
+ return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x202000000000L, active2, 0L);
case 69:
- if ((active0 & 0x800000000000000L) != 0L)
+ if ((active1 & 0x1L) != 0L)
{
- jjmatchedKind = 59;
+ jjmatchedKind = 64;
jjmatchedPos = 5;
}
- else if ((active1 & 0x100000000000000L) != 0L)
+ else if ((active1 & 0x2000000000000000L) != 0L)
{
- jjmatchedKind = 120;
+ jjmatchedKind = 125;
jjmatchedPos = 5;
}
- else if ((active1 & 0x4000000000000000L) != 0L)
+ else if ((active2 & 0x8L) != 0L)
{
- jjmatchedKind = 126;
+ jjmatchedKind = 131;
jjmatchedPos = 5;
}
- return jjMoveStringLiteralDfa6_0(active0, 0x1000000L, active1, 0x802002c000L, active2, 0L);
+ return jjMoveStringLiteralDfa6_0(active0, 0x1000000L, active1, 0x100400580000L, active2, 0L);
case 70:
- return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x200000000L, active2, 0L);
+ return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x4000000000L, active2, 0L);
case 71:
if ((active0 & 0x4000000000000L) != 0L)
{
@@ -1415,27 +1418,27 @@ private int jjMoveStringLiteralDfa5_0(long old0, long active0, long old1, long a
}
break;
case 73:
- return jjMoveStringLiteralDfa6_0(active0, 0x2000000L, active1, 0x200040000000L, active2, 0L);
+ return jjMoveStringLiteralDfa6_0(active0, 0x2000000L, active1, 0x4000800000000L, active2, 0L);
case 76:
- return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0L, active2, 0x80L);
+ return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0L, active2, 0x1000L);
case 78:
- if ((active1 & 0x2000000L) != 0L)
+ if ((active1 & 0x40000000L) != 0L)
{
- jjmatchedKind = 89;
+ jjmatchedKind = 94;
jjmatchedPos = 5;
}
- return jjMoveStringLiteralDfa6_0(active0, 0x20000800000L, active1, 0x2040L, active2, 0L);
+ return jjMoveStringLiteralDfa6_0(active0, 0x2000020000800000L, active1, 0x40800L, active2, 0L);
case 79:
- return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x20000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa6_0(active0, 0x8000000000000000L, active1, 0x400000000000L, active2, 0L);
case 82:
- if ((active0 & 0x2000000000000000L) != 0L)
+ if ((active1 & 0x4L) != 0L)
{
- jjmatchedKind = 61;
+ jjmatchedKind = 66;
jjmatchedPos = 5;
}
- else if ((active1 & 0x1000000L) != 0L)
+ else if ((active1 & 0x20000000L) != 0L)
{
- jjmatchedKind = 88;
+ jjmatchedKind = 93;
jjmatchedPos = 5;
}
return jjMoveStringLiteralDfa6_0(active0, 0x4000000L, active1, 0L, active2, 0L);
@@ -1450,7 +1453,7 @@ private int jjMoveStringLiteralDfa5_0(long old0, long active0, long old1, long a
jjmatchedKind = 46;
jjmatchedPos = 5;
}
- return jjMoveStringLiteralDfa6_0(active0, 0x8000000000000000L, active1, 0L, active2, 0L);
+ return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x10L, active2, 0L);
case 84:
if ((active0 & 0x400000L) != 0L)
{
@@ -1462,22 +1465,22 @@ private int jjMoveStringLiteralDfa5_0(long old0, long active0, long old1, long a
jjmatchedKind = 29;
jjmatchedPos = 5;
}
- else if ((active1 & 0x800000L) != 0L)
+ else if ((active1 & 0x10000000L) != 0L)
{
- jjmatchedKind = 87;
+ jjmatchedKind = 92;
jjmatchedPos = 5;
}
- else if ((active1 & 0x80000000000000L) != 0L)
+ else if ((active1 & 0x1000000000000000L) != 0L)
{
- jjmatchedKind = 119;
+ jjmatchedKind = 124;
jjmatchedPos = 5;
}
- else if ((active2 & 0x8L) != 0L)
+ else if ((active2 & 0x100L) != 0L)
{
- jjmatchedKind = 131;
+ jjmatchedKind = 136;
jjmatchedPos = 5;
}
- return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x400000000L, active2, 0L);
+ return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x8000000000L, active2, 0L);
case 88:
if ((active0 & 0x200000L) != 0L)
{
@@ -1486,34 +1489,34 @@ private int jjMoveStringLiteralDfa5_0(long old0, long active0, long old1, long a
}
break;
case 89:
- return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x100L, active2, 0L);
+ return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x2000L, active2, 0L);
case 95:
- return jjMoveStringLiteralDfa6_0(active0, 0x1000000000000000L, active1, 0L, active2, 0L);
+ return jjMoveStringLiteralDfa6_0(active0, 0x1800000000000000L, active1, 0x2L, active2, 0L);
case 97:
- return jjMoveStringLiteralDfa6_0(active0, 0x8000000000000L, active1, 0x80000400L, active2, 0L);
+ return jjMoveStringLiteralDfa6_0(active0, 0x4008000000000000L, active1, 0x1000008000L, active2, 0L);
case 99:
- return jjMoveStringLiteralDfa6_0(active0, 0x200000000000L, active1, 0x4000000L, active2, 0L);
+ return jjMoveStringLiteralDfa6_0(active0, 0x200000000000L, active1, 0x80000000L, active2, 0L);
case 100:
- return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x10100000000L, active2, 0L);
+ return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x202000000000L, active2, 0L);
case 101:
- if ((active0 & 0x800000000000000L) != 0L)
+ if ((active1 & 0x1L) != 0L)
{
- jjmatchedKind = 59;
+ jjmatchedKind = 64;
jjmatchedPos = 5;
}
- else if ((active1 & 0x100000000000000L) != 0L)
+ else if ((active1 & 0x2000000000000000L) != 0L)
{
- jjmatchedKind = 120;
+ jjmatchedKind = 125;
jjmatchedPos = 5;
}
- else if ((active1 & 0x4000000000000000L) != 0L)
+ else if ((active2 & 0x8L) != 0L)
{
- jjmatchedKind = 126;
+ jjmatchedKind = 131;
jjmatchedPos = 5;
}
- return jjMoveStringLiteralDfa6_0(active0, 0x1000000L, active1, 0x802002c000L, active2, 0L);
+ return jjMoveStringLiteralDfa6_0(active0, 0x1000000L, active1, 0x100400580000L, active2, 0L);
case 102:
- return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x200000000L, active2, 0L);
+ return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x4000000000L, active2, 0L);
case 103:
if ((active0 & 0x4000000000000L) != 0L)
{
@@ -1522,27 +1525,27 @@ private int jjMoveStringLiteralDfa5_0(long old0, long active0, long old1, long a
}
break;
case 105:
- return jjMoveStringLiteralDfa6_0(active0, 0x2000000L, active1, 0x200040000000L, active2, 0L);
+ return jjMoveStringLiteralDfa6_0(active0, 0x2000000L, active1, 0x4000800000000L, active2, 0L);
case 108:
- return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0L, active2, 0x80L);
+ return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0L, active2, 0x1000L);
case 110:
- if ((active1 & 0x2000000L) != 0L)
+ if ((active1 & 0x40000000L) != 0L)
{
- jjmatchedKind = 89;
+ jjmatchedKind = 94;
jjmatchedPos = 5;
}
- return jjMoveStringLiteralDfa6_0(active0, 0x20000800000L, active1, 0x2040L, active2, 0L);
+ return jjMoveStringLiteralDfa6_0(active0, 0x2000020000800000L, active1, 0x40800L, active2, 0L);
case 111:
- return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x20000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa6_0(active0, 0x8000000000000000L, active1, 0x400000000000L, active2, 0L);
case 114:
- if ((active0 & 0x2000000000000000L) != 0L)
+ if ((active1 & 0x4L) != 0L)
{
- jjmatchedKind = 61;
+ jjmatchedKind = 66;
jjmatchedPos = 5;
}
- else if ((active1 & 0x1000000L) != 0L)
+ else if ((active1 & 0x20000000L) != 0L)
{
- jjmatchedKind = 88;
+ jjmatchedKind = 93;
jjmatchedPos = 5;
}
return jjMoveStringLiteralDfa6_0(active0, 0x4000000L, active1, 0L, active2, 0L);
@@ -1557,7 +1560,7 @@ private int jjMoveStringLiteralDfa5_0(long old0, long active0, long old1, long a
jjmatchedKind = 46;
jjmatchedPos = 5;
}
- return jjMoveStringLiteralDfa6_0(active0, 0x8000000000000000L, active1, 0L, active2, 0L);
+ return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x10L, active2, 0L);
case 116:
if ((active0 & 0x400000L) != 0L)
{
@@ -1569,22 +1572,22 @@ private int jjMoveStringLiteralDfa5_0(long old0, long active0, long old1, long a
jjmatchedKind = 29;
jjmatchedPos = 5;
}
- else if ((active1 & 0x800000L) != 0L)
+ else if ((active1 & 0x10000000L) != 0L)
{
- jjmatchedKind = 87;
+ jjmatchedKind = 92;
jjmatchedPos = 5;
}
- else if ((active1 & 0x80000000000000L) != 0L)
+ else if ((active1 & 0x1000000000000000L) != 0L)
{
- jjmatchedKind = 119;
+ jjmatchedKind = 124;
jjmatchedPos = 5;
}
- else if ((active2 & 0x8L) != 0L)
+ else if ((active2 & 0x100L) != 0L)
{
- jjmatchedKind = 131;
+ jjmatchedKind = 136;
jjmatchedPos = 5;
}
- return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x400000000L, active2, 0L);
+ return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x8000000000L, active2, 0L);
case 120:
if ((active0 & 0x200000L) != 0L)
{
@@ -1593,7 +1596,7 @@ private int jjMoveStringLiteralDfa5_0(long old0, long active0, long old1, long a
}
break;
case 121:
- return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x100L, active2, 0L);
+ return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x2000L, active2, 0L);
default :
break;
}
@@ -1614,16 +1617,16 @@ private int jjMoveStringLiteralDfa6_0(long old0, long active0, long old1, long a
case 66:
return jjMoveStringLiteralDfa7_0(active0, 0x2000000L, active1, 0L, active2, 0L);
case 67:
- return jjMoveStringLiteralDfa7_0(active0, 0x9000000000800000L, active1, 0L, active2, 0L);
+ return jjMoveStringLiteralDfa7_0(active0, 0x2000000000800000L, active1, 0x12L, active2, 0L);
case 68:
if ((active0 & 0x1000000L) != 0L)
{
jjmatchedKind = 24;
jjmatchedPos = 6;
}
- else if ((active1 & 0x200000000000L) != 0L)
+ else if ((active1 & 0x4000000000000L) != 0L)
{
- jjmatchedKind = 109;
+ jjmatchedKind = 114;
jjmatchedPos = 6;
}
break;
@@ -1633,77 +1636,84 @@ private int jjMoveStringLiteralDfa6_0(long old0, long active0, long old1, long a
jjmatchedKind = 45;
jjmatchedPos = 6;
}
- else if ((active1 & 0x4000000L) != 0L)
+ else if ((active1 & 0x80000000L) != 0L)
{
- jjmatchedKind = 90;
+ jjmatchedKind = 95;
jjmatchedPos = 6;
}
- return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x400000000L, active2, 0L);
+ return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x8000000000L, active2, 0L);
case 71:
- if ((active1 & 0x40L) != 0L)
+ if ((active1 & 0x800L) != 0L)
{
- jjmatchedKind = 70;
+ jjmatchedKind = 75;
jjmatchedPos = 6;
}
break;
case 75:
- if ((active1 & 0x2000L) != 0L)
+ if ((active1 & 0x40000L) != 0L)
{
- jjmatchedKind = 77;
+ jjmatchedKind = 82;
jjmatchedPos = 6;
}
break;
+ case 77:
+ return jjMoveStringLiteralDfa7_0(active0, 0x4000000000000000L, active1, 0L, active2, 0L);
case 78:
- return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x20040000000L, active2, 0L);
+ return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x400800000000L, active2, 0L);
case 79:
- return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x200000000L, active2, 0L);
+ return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x4000000000L, active2, 0L);
case 80:
- return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x100L, active2, 0L);
+ if ((active0 & 0x8000000000000000L) != 0L)
+ {
+ jjmatchedKind = 63;
+ jjmatchedPos = 6;
+ }
+ return jjMoveStringLiteralDfa7_0(active0, 0x1000000000000000L, active1, 0x20
<TRUNCATED>
[03/16] jena git commit: Remove separate AccumulatorDistinctExpr.
Posted by an...@apache.org.
Remove separate AccumulatorDistinctExpr.
Move functionality into AccumulatorExpr.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/375b38ef
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/375b38ef
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/375b38ef
Branch: refs/heads/master
Commit: 375b38efee3e78ca0508e500a051b8d57a465dd9
Parents: 085f2ef
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Mar 10 10:54:30 2016 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Mar 13 17:17:30 2016 +0000
----------------------------------------------------------------------
.../expr/aggregate/AccumulatorDistinctExpr.java | 75 --------------------
.../sparql/expr/aggregate/AccumulatorExpr.java | 22 +++++-
.../jena/sparql/expr/aggregate/AggAvg.java | 2 +-
.../sparql/expr/aggregate/AggAvgDistinct.java | 6 +-
.../jena/sparql/expr/aggregate/AggCountVar.java | 2 +-
.../expr/aggregate/AggCountVarDistinct.java | 10 +--
.../sparql/expr/aggregate/AggGroupConcat.java | 2 +-
.../expr/aggregate/AggGroupConcatDistinct.java | 10 +--
.../jena/sparql/expr/aggregate/AggMaxBase.java | 2 +-
.../jena/sparql/expr/aggregate/AggMinBase.java | 2 +-
.../jena/sparql/expr/aggregate/AggSample.java | 3 +-
.../expr/aggregate/AggSampleDistinct.java | 6 +-
.../jena/sparql/expr/aggregate/AggSum.java | 2 +-
.../sparql/expr/aggregate/AggSumDistinct.java | 6 +-
.../org/apache/jena/sparql/api/TestAPI.java | 4 +-
15 files changed, 48 insertions(+), 106 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/375b38ef/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AccumulatorDistinctExpr.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AccumulatorDistinctExpr.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AccumulatorDistinctExpr.java
deleted file mode 100644
index e5e10ba..0000000
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AccumulatorDistinctExpr.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * 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 org.apache.jena.sparql.expr.aggregate;
-
-import java.util.HashSet ;
-import java.util.Set ;
-
-import org.apache.jena.sparql.engine.binding.Binding ;
-import org.apache.jena.sparql.expr.Expr ;
-import org.apache.jena.sparql.expr.ExprEvalException ;
-import org.apache.jena.sparql.expr.NodeValue ;
-import org.apache.jena.sparql.function.FunctionEnv ;
-
-/** Accumulator that only passes down unique values of an expression (the first encountered) */
-abstract class AccumulatorDistinctExpr implements Accumulator
-{
- // Better?? record a large hash.
- private final Set<NodeValue> values = new HashSet<>() ;
- private long errorCount = 0 ;
- private long count = 0 ;
- private final Expr expr ;
-
- protected AccumulatorDistinctExpr(Expr expr)
- {
- this.expr = expr ;
- }
-
- @Override
- final public void accumulate(Binding binding, FunctionEnv functionEnv)
- {
- try {
- NodeValue nv = expr.eval(binding, functionEnv) ;
- if ( values.contains(nv) )
- return ;
- values.add(nv) ;
- accumulateDistinct(nv, binding, functionEnv) ;
- count++ ;
- } catch (ExprEvalException ex)
- {
- errorCount++ ;
- accumulateError(binding, functionEnv) ;
- }
- }
-
- // Count(DISTINCT ?v) is different
- @Override
- public NodeValue getValue()
- {
- if ( errorCount == 0 )
- return getAccValue() ;
- return null ;
- }
-
- protected long getErrorCount() { return errorCount ; }
-
- protected abstract NodeValue getAccValue() ;
- protected abstract void accumulateDistinct(NodeValue nv, Binding binding, FunctionEnv functionEnv) ;
- protected abstract void accumulateError(Binding binding, FunctionEnv functionEnv) ;
-}
http://git-wip-us.apache.org/repos/asf/jena/blob/375b38ef/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AccumulatorExpr.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AccumulatorExpr.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AccumulatorExpr.java
index 3c9d87a..43a6844 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AccumulatorExpr.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AccumulatorExpr.java
@@ -18,6 +18,9 @@
package org.apache.jena.sparql.expr.aggregate;
+import java.util.HashSet ;
+import java.util.Set ;
+
import org.apache.jena.sparql.engine.binding.Binding ;
import org.apache.jena.sparql.expr.Expr ;
import org.apache.jena.sparql.expr.ExprEvalException ;
@@ -28,18 +31,29 @@ import org.apache.jena.sparql.function.FunctionEnv ;
/** Accumulator that passes down every value of an expression */
public abstract class AccumulatorExpr implements Accumulator
{
+ private final Set<NodeValue> values ;
private long accCount = 0 ;
protected long errorCount = 0 ;
private final Expr expr ;
+ private final boolean makeDistinct;
- protected AccumulatorExpr(Expr expr) {
+ protected AccumulatorExpr(Expr expr, boolean makeDistinct) {
this.expr = expr;
+ // Not all subclsses use th wmachinary here to handled DISTINCT.
+ // SAMPLE(DISTINCT) and COUNT(DISTINCT *) are different.
+ this.makeDistinct = makeDistinct ;
+ this.values = makeDistinct ? new HashSet<>() : null ;
}
@Override
final public void accumulate(Binding binding, FunctionEnv functionEnv) {
NodeValue nv = ExprLib.evalOrNull(expr, binding, functionEnv);
if ( nv != null ) {
+ if ( makeDistinct ) {
+ if ( values.contains(nv) )
+ return ;
+ values.add(nv) ;
+ }
try {
accumulate(nv, binding, functionEnv);
accCount++;
@@ -52,8 +66,10 @@ public abstract class AccumulatorExpr implements Accumulator
errorCount++;
}
- // COUNT(?v) is different : errors of the expression/variable do not cause an aggregate eval error.
- // SAMPLE is different : it treats errors as "just another value" and tries to return a defined value if any have been seen.
+ // COUNT(?v) and COUNT(DISTINCT ?v) are different
+ // errors of the expression/variable do not cause an aggregate eval error.
+ // SAMPLE, SAMPLE(DISTINCT) are different
+ // treat errors as "just another value" and tries to return a defined value if any have been seen.
@Override
public NodeValue getValue() {
http://git-wip-us.apache.org/repos/asf/jena/blob/375b38ef/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggAvg.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggAvg.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggAvg.java
index 57c32c7..8c5ff59 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggAvg.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggAvg.java
@@ -68,7 +68,7 @@ public class AggAvg extends AggregatorBase
static final boolean DEBUG = false ;
- public AccAvg(Expr expr) { super(expr) ; }
+ public AccAvg(Expr expr) { super(expr, false) ; }
@Override
protected void accumulate(NodeValue nv, Binding binding, FunctionEnv functionEnv)
http://git-wip-us.apache.org/repos/asf/jena/blob/375b38ef/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggAvgDistinct.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggAvgDistinct.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggAvgDistinct.java
index 126f516..5e3c538 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggAvgDistinct.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggAvgDistinct.java
@@ -61,7 +61,7 @@ public class AggAvgDistinct extends AggregatorBase
// ---- Accumulator
- class AccAvgDistinct extends AccumulatorDistinctExpr
+ class AccAvgDistinct extends AccumulatorExpr
{
// Non-empty case but still can be nothing because the expression may be undefined.
private NodeValue total = noValuesToAvg ;
@@ -69,10 +69,10 @@ public class AggAvgDistinct extends AggregatorBase
static final boolean DEBUG = false ;
- public AccAvgDistinct(Expr expr) { super(expr) ; }
+ public AccAvgDistinct(Expr expr) { super(expr, true) ; }
@Override
- protected void accumulateDistinct(NodeValue nv, Binding binding, FunctionEnv functionEnv)
+ protected void accumulate(NodeValue nv, Binding binding, FunctionEnv functionEnv)
{
if ( nv.isNumber() )
{
http://git-wip-us.apache.org/repos/asf/jena/blob/375b38ef/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggCountVar.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggCountVar.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggCountVar.java
index 50b2eff..5652c71 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggCountVar.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggCountVar.java
@@ -59,7 +59,7 @@ public class AggCountVar extends AggregatorBase
private static class AccCountVar extends AccumulatorExpr
{
private long count = 0 ;
- public AccCountVar(Expr expr) { super(expr) ; }
+ public AccCountVar(Expr expr) { super(expr, false) ; }
@Override
public void accumulate(NodeValue nv, Binding binding, FunctionEnv functionEnv)
http://git-wip-us.apache.org/repos/asf/jena/blob/375b38ef/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggCountVarDistinct.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggCountVarDistinct.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggCountVarDistinct.java
index 57df9be..9035ae8 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggCountVarDistinct.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggCountVarDistinct.java
@@ -56,21 +56,21 @@ public class AggCountVarDistinct extends AggregatorBase
}
// ---- Accumulator
- class AccCountVarDistinct extends AccumulatorDistinctExpr
+ class AccCountVarDistinct extends AccumulatorExpr
{
private long count = 0 ;
- public AccCountVarDistinct() { super(getExpr()) ; }
- // The group key part of binding will be the same for all elements of the group.
+ public AccCountVarDistinct() { super(getExpr(), true) ; }
+
@Override
- public void accumulateDistinct(NodeValue nv, Binding binding, FunctionEnv functionEnv)
+ public void accumulate(NodeValue nv, Binding binding, FunctionEnv functionEnv)
{ count++ ; }
+ // Ignore errors.
@Override
protected void accumulateError(Binding binding, FunctionEnv functionEnv)
{}
- // Ignore errors.
@Override
public NodeValue getValue()
{ return getAccValue() ; }
http://git-wip-us.apache.org/repos/asf/jena/blob/375b38ef/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggGroupConcat.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggGroupConcat.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggGroupConcat.java
index c8fc4a2..b4391d5 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggGroupConcat.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggGroupConcat.java
@@ -141,7 +141,7 @@ public class AggGroupConcat extends AggregatorBase
private final String separator ;
public AccGroupConcat(Expr expr, String sep)
- { super(expr) ; this.separator = sep ; }
+ { super(expr, false) ; this.separator = sep ; }
@Override
protected void accumulate(NodeValue nv, Binding binding, FunctionEnv functionEnv)
http://git-wip-us.apache.org/repos/asf/jena/blob/375b38ef/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggGroupConcatDistinct.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggGroupConcatDistinct.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggGroupConcatDistinct.java
index 3e20fcd..249a0c0 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggGroupConcatDistinct.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggGroupConcatDistinct.java
@@ -86,17 +86,19 @@ public class AggGroupConcatDistinct extends AggregatorBase
}
// ---- Accumulator
- static class AccGroupConcatDistinct extends AccumulatorDistinctExpr
+ static class AccGroupConcatDistinct extends AccumulatorExpr
{
private StringBuilder stringSoFar = new StringBuilder() ;
private boolean first = true ;
private final String separator ;
- public AccGroupConcatDistinct(Expr expr, String sep)
- { super(expr) ; this.separator = sep ; }
+ public AccGroupConcatDistinct(Expr expr, String sep) {
+ super(expr, true);
+ this.separator = sep;
+ }
@Override
- public void accumulateDistinct(NodeValue nv, Binding binding, FunctionEnv functionEnv)
+ public void accumulate(NodeValue nv, Binding binding, FunctionEnv functionEnv)
{
String str = nv.asString() ;
if ( ! first )
http://git-wip-us.apache.org/repos/asf/jena/blob/375b38ef/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggMaxBase.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggMaxBase.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggMaxBase.java
index 7430590..c3d6ce6 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggMaxBase.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggMaxBase.java
@@ -45,7 +45,7 @@ abstract class AggMaxBase extends AggregatorBase
// Non-empty case but still can be nothing because the expression may be undefined.
private NodeValue maxSoFar = null ;
- public AccMax(Expr expr) { super(expr) ; }
+ public AccMax(Expr expr) { super(expr, false) ; }
static final boolean DEBUG = false ;
http://git-wip-us.apache.org/repos/asf/jena/blob/375b38ef/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggMinBase.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggMinBase.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggMinBase.java
index 71b6e4b..a7aefbe 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggMinBase.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggMinBase.java
@@ -45,7 +45,7 @@ abstract class AggMinBase extends AggregatorBase
// Non-empty case but still can be nothing because the expression may be undefined.
private NodeValue minSoFar = null ;
- public AccMin(Expr expr) { super(expr) ; }
+ public AccMin(Expr expr) { super(expr, false) ; }
static final boolean DEBUG = false ;
http://git-wip-us.apache.org/repos/asf/jena/blob/375b38ef/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggSample.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggSample.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggSample.java
index e889cab..5110836 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggSample.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggSample.java
@@ -61,7 +61,8 @@ public class AggSample extends AggregatorBase
// Sample: first evaluation of the expression that is not an error.
private NodeValue sampleSoFar = null ;
- public AccSample(Expr expr) { super(expr) ; }
+ // SAMPLE is different : it treats errors as "just another value" and tries to return a defined value if any have been seen.
+ public AccSample(Expr expr) { super(expr, false) ; }
@Override
public void accumulate(NodeValue nv, Binding binding, FunctionEnv functionEnv) {
http://git-wip-us.apache.org/repos/asf/jena/blob/375b38ef/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggSampleDistinct.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggSampleDistinct.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggSampleDistinct.java
index e2623ef..b5797b6 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggSampleDistinct.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggSampleDistinct.java
@@ -55,11 +55,11 @@ public class AggSampleDistinct extends AggregatorBase
// ---- Accumulator
private static class AccSampleDistict extends AccumulatorExpr
{
- // NOT AccumulatorDistinctExpr - avoid "distinct" overheads.
- // For sample, DISTINCT is a no-op - this code is picks the last element.
+ // For sample, DISTINCT is a no-op - this code is picks the last element.
+ // it does not need the group to made made distinct.
private NodeValue sampleSoFar = null ;
- public AccSampleDistict(Expr expr) { super(expr) ; }
+ public AccSampleDistict(Expr expr) { super(expr, false) ; }
@Override
public void accumulate(NodeValue nv, Binding binding, FunctionEnv functionEnv) {
http://git-wip-us.apache.org/repos/asf/jena/blob/375b38ef/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggSum.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggSum.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggSum.java
index deb3e61..8f71af8 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggSum.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggSum.java
@@ -64,7 +64,7 @@ public class AggSum extends AggregatorBase
// Non-empty case but still can be nothing because the expression may be undefined.
private NodeValue total = null ;
- public AccSum(Expr expr) { super(expr) ; }
+ public AccSum(Expr expr) { super(expr, false) ; }
@Override
protected void accumulate(NodeValue nv, Binding binding, FunctionEnv functionEnv)
http://git-wip-us.apache.org/repos/asf/jena/blob/375b38ef/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggSumDistinct.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggSumDistinct.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggSumDistinct.java
index ca28de3..dc5ba24 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggSumDistinct.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggSumDistinct.java
@@ -59,15 +59,15 @@ public class AggSumDistinct extends AggregatorBase
public Node getValueEmpty() { return NodeValue.toNode(noValuesToSum) ; }
// ---- Accumulator
- class AccSumDistinct extends AccumulatorDistinctExpr
+ class AccSumDistinct extends AccumulatorExpr
{
// Non-empty case but still can be nothing because the expression may be undefined.
private NodeValue total = null ;
- public AccSumDistinct(Expr expr) { super(expr) ; }
+ public AccSumDistinct(Expr expr) { super(expr, true) ; }
@Override
- public void accumulateDistinct(NodeValue nv, Binding binding, FunctionEnv functionEnv)
+ public void accumulate(NodeValue nv, Binding binding, FunctionEnv functionEnv)
{
if ( nv.isNumber() )
{
http://git-wip-us.apache.org/repos/asf/jena/blob/375b38ef/jena-arq/src/test/java/org/apache/jena/sparql/api/TestAPI.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/api/TestAPI.java b/jena-arq/src/test/java/org/apache/jena/sparql/api/TestAPI.java
index d8b51ca..9d387fc 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/api/TestAPI.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/api/TestAPI.java
@@ -252,14 +252,12 @@ public class TestAPI extends BaseTest
assertEquals(3, count) ;
}
-
@Test public void testReuseQueryObject2()
{
- String queryString = "SELECT (count(?s) AS ?c) {?s ?p ?o} GROUP BY ?s";
+ String queryString = "SELECT (count(?o) AS ?c) {?s ?p ?o} GROUP BY ?s";
Query q = QueryFactory.create(queryString) ;
try(QueryExecution qExec = QueryExecutionFactory.create(q, m)) {
-
ResultSet rs = qExec.execSelect() ;
QuerySolution qs = rs.nextSolution() ;
assertEquals(3, qs.getLiteral("c").getInt()) ;
[04/16] jena git commit: JENA-1156: add agg:stdev, agg:stdev_samp,
agg:stdev_pop and variance.
Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/jena/blob/9538e473/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParser.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParser.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParser.java
index f152930..b5445d1 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParser.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParser.java
@@ -2714,13 +2714,13 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
}
final public Expr FunctionCall() throws ParseException {
- String fname ; ExprList a ;
+ String fname ; Args a ;
fname = iri();
a = ArgList();
if ( AggregateRegistry.isRegistered(fname) ) {
if ( ! getAllowAggregatesInExpressions() )
throwParseException("Aggregate expression not legal at this point : "+fname, -1, -1) ;
- Aggregator agg = AggregatorFactory.createCustom(true, false, fname, a) ;
+ Aggregator agg = AggregatorFactory.createCustom(fname, a) ;
Expr exprAgg = getQuery().allocAggregate(agg) ;
{if (true) return exprAgg ;}
}
@@ -2728,9 +2728,8 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
throw new Error("Missing return statement in function");
}
- final public ExprList ArgList() throws ParseException {
- Expr expr ; boolean distinct = false ;
- ExprList args = new ExprList() ; Token t ;
+ final public Args ArgList() throws ParseException {
+ Expr expr ; Args args = new Args() ; Token t ;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case NIL:
jj_consume_token(NIL);
@@ -2740,7 +2739,7 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case DISTINCT:
t = jj_consume_token(DISTINCT);
- distinct = true ;
+ args.distinct = true ;
int beginLine = t.beginLine; int beginColumn = t.beginColumn; t = null;
if ( ! getAllowAggregatesInExpressions() )
throwParseException("Aggregate expression not legal at this point",
@@ -2778,7 +2777,7 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
}
final public ExprList ExpressionList() throws ParseException {
- Expr expr = null ; ExprList args = new ExprList() ;
+ Expr expr = null ; ExprList exprList = new ExprList() ;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case NIL:
jj_consume_token(NIL);
@@ -2786,7 +2785,7 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
case LPAREN:
jj_consume_token(LPAREN);
expr = Expression();
- args.add(expr) ;
+ exprList.add(expr) ;
label_24:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -2799,7 +2798,7 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
}
jj_consume_token(COMMA);
expr = Expression();
- args.add(expr) ;
+ exprList.add(expr) ;
}
jj_consume_token(RPAREN);
break;
@@ -2808,7 +2807,7 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
jj_consume_token(-1);
throw new ParseException();
}
- {if (true) return args ;}
+ {if (true) return exprList ;}
throw new Error("Missing return statement in function");
}
@@ -4953,9 +4952,8 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
final public Expr Aggregate() throws ParseException {
Aggregator agg = null ; String sep = null ;
- boolean distinct = false ;
Expr expr = null ; Expr expr2 = null ;
- ExprList a = new ExprList() ;
+ boolean distinct = false ;
ExprList ordered = new ExprList() ;
Token t ;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -5167,7 +5165,6 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
;
}
expr = Expression();
- a.add(expr) ;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case SEMICOLON:
if (jj_2_5(2)) {
@@ -5212,148 +5209,27 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
break;
case AGG:
t = jj_consume_token(AGG);
- String iri ;
+ String iri ;
iri = iri();
- jj_consume_token(LPAREN);
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case DISTINCT:
- jj_consume_token(DISTINCT);
- distinct = true ;
- break;
- default:
- jj_la1[163] = jj_gen;
- ;
- }
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case IRIref:
- case PNAME_NS:
- case PNAME_LN:
- case VAR1:
- case VAR2:
- case EXISTS:
- case NOT:
- case AGG:
- case COUNT:
- case MIN:
- case MAX:
- case SUM:
- case AVG:
- case SAMPLE:
- case GROUP_CONCAT:
- case BOUND:
- case COALESCE:
- case IF:
- case BNODE:
- case IRI:
- case URI:
- case CALL:
- case STR:
- case STRLANG:
- case STRDT:
- case DTYPE:
- case LANG:
- case LANGMATCHES:
- case IS_URI:
- case IS_IRI:
- case IS_BLANK:
- case IS_LITERAL:
- case IS_NUMERIC:
- case REGEX:
- case SAME_TERM:
- case RAND:
- case ABS:
- case CEIL:
- case FLOOR:
- case ROUND:
- case CONCAT:
- case SUBSTR:
- case STRLEN:
- case REPLACE:
- case UCASE:
- case LCASE:
- case ENCODE_FOR_URI:
- case CONTAINS:
- case STRSTARTS:
- case STRENDS:
- case STRBEFORE:
- case STRAFTER:
- case YEAR:
- case MONTH:
- case DAY:
- case HOURS:
- case MINUTES:
- case SECONDS:
- case TIMEZONE:
- case TZ:
- case NOW:
- case UUID:
- case STRUUID:
- case VERSION:
- case MD5:
- case SHA1:
- case SHA256:
- case SHA384:
- case SHA512:
- case TRUE:
- case FALSE:
- case INTEGER:
- case DECIMAL:
- case DOUBLE:
- case INTEGER_POSITIVE:
- case DECIMAL_POSITIVE:
- case DOUBLE_POSITIVE:
- case INTEGER_NEGATIVE:
- case DECIMAL_NEGATIVE:
- case DOUBLE_NEGATIVE:
- case STRING_LITERAL1:
- case STRING_LITERAL2:
- case STRING_LITERAL_LONG1:
- case STRING_LITERAL_LONG2:
- case LPAREN:
- case BANG:
- case PLUS:
- case MINUS:
- expr = Expression();
- a.add(expr) ;
- label_41:
- while (true) {
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case COMMA:
- ;
- break;
- default:
- jj_la1[164] = jj_gen;
- break label_41;
- }
- jj_consume_token(COMMA);
- expr = Expression();
- a.add(expr) ;
- }
- break;
- default:
- jj_la1[165] = jj_gen;
- ;
- }
- jj_consume_token(RPAREN);
- agg = AggregatorFactory.createCustom(false, distinct, iri, a) ;
+ Args a = new Args() ;
+ a = ArgList();
+ agg = AggregatorFactory.createCustom(iri, a) ;
break;
default:
- jj_la1[166] = jj_gen;
+ jj_la1[163] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
- if ( ! getAllowAggregatesInExpressions() )
- throwParseException("Aggregate expression not legal at this point",
- t.beginLine, t.beginColumn) ;
- Expr exprAgg = getQuery().allocAggregate(agg) ;
- {if (true) return exprAgg ;}
+ if ( ! getAllowAggregatesInExpressions() )
+ throwParseException("Aggregate expression not legal at this point",
+ t.beginLine, t.beginColumn) ;
+ Expr exprAgg = getQuery().allocAggregate(agg) ;
+ {if (true) return exprAgg ;}
throw new Error("Missing return statement in function");
}
final public Expr iriOrFunction() throws ParseException {
- String iri ; ExprList a = null ;
- ExprList params = null ;
- boolean distinct = false ;
+ String iri ; Args a = null ;
iri = iri();
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case LPAREN:
@@ -5361,7 +5237,7 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
a = ArgList();
break;
default:
- jj_la1[167] = jj_gen;
+ jj_la1[164] = jj_gen;
;
}
if ( a == null )
@@ -5369,7 +5245,7 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
if ( AggregateRegistry.isRegistered(iri) ) {
if ( ! getAllowAggregatesInExpressions() )
throwParseException("Aggregate expression not legal at this point : "+iri, -1, -1) ;
- Aggregator agg = AggregatorFactory.createCustom(true, false, iri, a) ;
+ Aggregator agg = AggregatorFactory.createCustom(iri, a) ;
Expr exprAgg = getQuery().allocAggregate(agg) ;
{if (true) return exprAgg ;}
}
@@ -5394,13 +5270,13 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
uri = iri();
break;
default:
- jj_la1[168] = jj_gen;
+ jj_la1[165] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
break;
default:
- jj_la1[169] = jj_gen;
+ jj_la1[166] = jj_gen;
;
}
{if (true) return createLiteral(lex, lang, uri) ;}
@@ -5426,7 +5302,7 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
n = NumericLiteralNegative();
break;
default:
- jj_la1[170] = jj_gen;
+ jj_la1[167] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -5450,7 +5326,7 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
{if (true) return createLiteralDouble(t.image) ;}
break;
default:
- jj_la1[171] = jj_gen;
+ jj_la1[168] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -5473,7 +5349,7 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
{if (true) return createLiteralDouble(t.image) ;}
break;
default:
- jj_la1[172] = jj_gen;
+ jj_la1[169] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -5496,7 +5372,7 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
{if (true) return createLiteralDouble(t.image) ;}
break;
default:
- jj_la1[173] = jj_gen;
+ jj_la1[170] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -5514,7 +5390,7 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
{if (true) return XSD_FALSE ;}
break;
default:
- jj_la1[174] = jj_gen;
+ jj_la1[171] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -5541,7 +5417,7 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
lex = stripQuotes3(t.image) ;
break;
default:
- jj_la1[175] = jj_gen;
+ jj_la1[172] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -5563,7 +5439,7 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
{if (true) return iri ;}
break;
default:
- jj_la1[176] = jj_gen;
+ jj_la1[173] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -5582,7 +5458,7 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
{if (true) return resolvePName(t.image, t.beginLine, t.beginColumn) ;}
break;
default:
- jj_la1[177] = jj_gen;
+ jj_la1[174] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -5601,7 +5477,7 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
{if (true) return createBNode(t.beginLine, t.beginColumn) ;}
break;
default:
- jj_la1[178] = jj_gen;
+ jj_la1[175] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -5650,231 +5526,267 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
finally { jj_save(4, xla); }
}
- private boolean jj_3R_158() {
- if (jj_3R_169()) return true;
+ private boolean jj_3R_70() {
+ if (jj_scan_token(YEAR)) return true;
+ if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_157() {
- if (jj_3R_168()) return true;
+ private boolean jj_3R_69() {
+ if (jj_scan_token(STRAFTER)) return true;
+ if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_70() {
- if (jj_scan_token(STRAFTER)) return true;
- if (jj_scan_token(LPAREN)) return true;
+ private boolean jj_3R_171() {
+ if (jj_scan_token(DOUBLE)) return true;
return false;
}
- private boolean jj_3R_156() {
- if (jj_3R_167()) return true;
+ private boolean jj_3R_170() {
+ if (jj_scan_token(DECIMAL)) return true;
return false;
}
- private boolean jj_3R_69() {
+ private boolean jj_3R_68() {
if (jj_scan_token(STRBEFORE)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_150() {
+ private boolean jj_3R_169() {
+ if (jj_scan_token(INTEGER)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_166() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_156()) {
+ if (jj_3R_169()) {
jj_scanpos = xsp;
- if (jj_3R_157()) {
+ if (jj_3R_170()) {
jj_scanpos = xsp;
- if (jj_3R_158()) return true;
+ if (jj_3R_171()) return true;
}
}
return false;
}
- private boolean jj_3R_68() {
+ private boolean jj_3R_67() {
if (jj_scan_token(STRENDS)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_130() {
- if (jj_3R_136()) return true;
+ private boolean jj_3R_129() {
+ if (jj_3R_135()) return true;
return false;
}
- private boolean jj_3R_67() {
+ private boolean jj_3R_66() {
if (jj_scan_token(STRSTARTS)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_116() {
+ private boolean jj_3R_157() {
+ if (jj_3R_168()) return true;
+ return false;
+ }
+
+ private boolean jj_3R_115() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_130()) {
+ if (jj_3R_129()) {
jj_scanpos = xsp;
- if (jj_3R_131()) return true;
+ if (jj_3R_130()) return true;
}
return false;
}
- private boolean jj_3R_66() {
- if (jj_scan_token(CONTAINS)) return true;
- if (jj_scan_token(LPAREN)) return true;
+ private boolean jj_3R_156() {
+ if (jj_3R_167()) return true;
return false;
}
private boolean jj_3R_65() {
- if (jj_scan_token(ENCODE_FOR_URI)) return true;
+ if (jj_scan_token(CONTAINS)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
+ private boolean jj_3R_155() {
+ if (jj_3R_166()) return true;
+ return false;
+ }
+
private boolean jj_3R_64() {
- if (jj_scan_token(LCASE)) return true;
+ if (jj_scan_token(ENCODE_FOR_URI)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
private boolean jj_3R_63() {
- if (jj_scan_token(UCASE)) return true;
+ if (jj_scan_token(LCASE)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
private boolean jj_3R_62() {
- if (jj_3R_110()) return true;
+ if (jj_scan_token(UCASE)) return true;
+ if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_61() {
- if (jj_scan_token(STRLEN)) return true;
- if (jj_scan_token(LPAREN)) return true;
+ private boolean jj_3R_149() {
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_155()) {
+ jj_scanpos = xsp;
+ if (jj_3R_156()) {
+ jj_scanpos = xsp;
+ if (jj_3R_157()) return true;
+ }
+ }
return false;
}
- private boolean jj_3R_60() {
+ private boolean jj_3R_61() {
if (jj_3R_109()) return true;
return false;
}
- private boolean jj_3R_149() {
- if (jj_3R_155()) return true;
+ private boolean jj_3R_60() {
+ if (jj_scan_token(STRLEN)) return true;
+ if (jj_scan_token(LPAREN)) return true;
return false;
}
private boolean jj_3R_59() {
- if (jj_scan_token(CONCAT)) return true;
if (jj_3R_108()) return true;
return false;
}
private boolean jj_3R_58() {
+ if (jj_scan_token(CONCAT)) return true;
+ if (jj_3R_107()) return true;
+ return false;
+ }
+
+ private boolean jj_3R_57() {
if (jj_scan_token(ROUND)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_57() {
+ private boolean jj_3R_56() {
if (jj_scan_token(FLOOR)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_56() {
+ private boolean jj_3R_55() {
if (jj_scan_token(CEIL)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_55() {
+ private boolean jj_3R_54() {
if (jj_scan_token(ABS)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_54() {
+ private boolean jj_3R_53() {
if (jj_scan_token(RAND)) return true;
if (jj_scan_token(NIL)) return true;
return false;
}
- private boolean jj_3R_107() {
+ private boolean jj_3R_106() {
if (jj_scan_token(NIL)) return true;
return false;
}
- private boolean jj_3R_106() {
+ private boolean jj_3R_148() {
+ if (jj_3R_154()) return true;
+ return false;
+ }
+
+ private boolean jj_3R_105() {
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_53() {
+ private boolean jj_3R_52() {
if (jj_scan_token(BNODE)) return true;
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_106()) {
+ if (jj_3R_105()) {
jj_scanpos = xsp;
- if (jj_3R_107()) return true;
+ if (jj_3R_106()) return true;
}
return false;
}
- private boolean jj_3R_52() {
+ private boolean jj_3R_51() {
if (jj_scan_token(URI)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_51() {
+ private boolean jj_3R_50() {
if (jj_scan_token(IRI)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_50() {
+ private boolean jj_3R_49() {
if (jj_scan_token(BOUND)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_49() {
+ private boolean jj_3R_48() {
if (jj_scan_token(DTYPE)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_127() {
+ private boolean jj_3R_126() {
if (jj_scan_token(LBRACE)) return true;
return false;
}
- private boolean jj_3R_48() {
- if (jj_scan_token(LANGMATCHES)) 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_44()) return true;
+ if (jj_3R_43()) return true;
return false;
}
private boolean jj_3R_47() {
- if (jj_scan_token(LANG)) return true;
+ if (jj_scan_token(LANGMATCHES)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
private boolean jj_3R_46() {
+ if (jj_scan_token(LANG)) return true;
+ if (jj_scan_token(LPAREN)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_45() {
if (jj_scan_token(STR)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_42() {
+ private boolean jj_3R_41() {
Token xsp;
xsp = jj_scanpos;
+ if (jj_3R_44()) {
+ jj_scanpos = xsp;
if (jj_3R_45()) {
jj_scanpos = xsp;
if (jj_3R_46()) {
@@ -5985,9 +5897,7 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
jj_scanpos = xsp;
if (jj_3R_99()) {
jj_scanpos = xsp;
- if (jj_3R_100()) {
- jj_scanpos = xsp;
- if (jj_3R_101()) return true;
+ if (jj_3R_100()) return true;
}
}
}
@@ -6047,20 +5957,20 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
return false;
}
- private boolean jj_3R_45() {
- if (jj_3R_105()) return true;
+ private boolean jj_3R_44() {
+ if (jj_3R_104()) return true;
return false;
}
- private boolean jj_3R_125() {
+ private boolean jj_3R_124() {
if (jj_scan_token(AGG)) return true;
- if (jj_3R_134()) return true;
+ if (jj_3R_133()) return true;
return false;
}
private boolean jj_3_2() {
if (jj_scan_token(SEMICOLON)) return true;
- if (jj_3R_43()) return true;
+ if (jj_3R_42()) return true;
Token xsp;
xsp = jj_scanpos;
if (jj_scan_token(130)) {
@@ -6112,61 +6022,63 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
return false;
}
- private boolean jj_3R_138() {
+ private boolean jj_3R_137() {
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_124() {
+ private boolean jj_3R_123() {
if (jj_scan_token(GROUP_CONCAT)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_123() {
+ private boolean jj_3R_122() {
if (jj_scan_token(SAMPLE)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_122() {
+ private boolean jj_3R_121() {
if (jj_scan_token(AVG)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_121() {
- if (jj_scan_token(MAX)) return true;
- if (jj_scan_token(LPAREN)) return true;
+ private boolean jj_3_1() {
+ if (jj_3R_41()) return true;
return false;
}
- private boolean jj_3_1() {
- if (jj_3R_42()) return true;
+ private boolean jj_3R_120() {
+ if (jj_scan_token(MAX)) return true;
+ if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_120() {
+ private boolean jj_3R_119() {
if (jj_scan_token(MIN)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_119() {
+ private boolean jj_3R_118() {
if (jj_scan_token(SUM)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_118() {
+ private boolean jj_3R_117() {
if (jj_scan_token(COUNT)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_105() {
+ private boolean jj_3R_104() {
Token xsp;
xsp = jj_scanpos;
+ if (jj_3R_117()) {
+ jj_scanpos = xsp;
if (jj_3R_118()) {
jj_scanpos = xsp;
if (jj_3R_119()) {
@@ -6179,9 +6091,7 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
jj_scanpos = xsp;
if (jj_3R_123()) {
jj_scanpos = xsp;
- if (jj_3R_124()) {
- jj_scanpos = xsp;
- if (jj_3R_125()) return true;
+ if (jj_3R_124()) return true;
}
}
}
@@ -6192,161 +6102,136 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
return false;
}
- private boolean jj_3R_139() {
+ private boolean jj_3R_138() {
if (jj_scan_token(LBRACKET)) return true;
return false;
}
- private boolean jj_3R_133() {
- if (jj_3R_139()) return true;
+ private boolean jj_3R_132() {
+ if (jj_3R_138()) return true;
return false;
}
- private boolean jj_3R_132() {
- if (jj_3R_138()) return true;
+ private boolean jj_3R_131() {
+ if (jj_3R_137()) return true;
return false;
}
- private boolean jj_3R_117() {
+ private boolean jj_3R_116() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_132()) {
+ if (jj_3R_131()) {
jj_scanpos = xsp;
- if (jj_3R_133()) return true;
+ if (jj_3R_132()) return true;
}
return false;
}
- private boolean jj_3R_113() {
+ private boolean jj_3R_112() {
if (jj_scan_token(NOT)) return true;
if (jj_scan_token(EXISTS)) return true;
return false;
}
- private boolean jj_3R_112() {
+ private boolean jj_3R_111() {
if (jj_scan_token(EXISTS)) return true;
- if (jj_3R_127()) return true;
+ if (jj_3R_126()) return true;
return false;
}
- private boolean jj_3R_115() {
- if (jj_3R_129()) return true;
+ private boolean jj_3R_114() {
+ if (jj_3R_128()) return true;
return false;
}
- private boolean jj_3R_129() {
+ private boolean jj_3R_128() {
if (jj_scan_token(PREFIX)) return true;
if (jj_scan_token(PNAME_NS)) return true;
- if (jj_3R_135()) return true;
+ if (jj_3R_134()) return true;
return false;
}
- private boolean jj_3R_110() {
- if (jj_scan_token(REPLACE)) return true;
- if (jj_scan_token(LPAREN)) return true;
+ private boolean jj_3R_127() {
+ if (jj_scan_token(BASE)) return true;
+ if (jj_3R_134()) return true;
return false;
}
- private boolean jj_3R_128() {
- if (jj_scan_token(BASE)) return true;
- if (jj_3R_135()) return true;
+ private boolean jj_3R_109() {
+ if (jj_scan_token(REPLACE)) return true;
+ if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_114() {
- if (jj_3R_128()) return true;
+ private boolean jj_3R_113() {
+ if (jj_3R_127()) return true;
return false;
}
- private boolean jj_3R_102() {
+ private boolean jj_3R_101() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_114()) {
+ if (jj_3R_113()) {
jj_scanpos = xsp;
- if (jj_3R_115()) return true;
+ if (jj_3R_114()) return true;
}
return false;
}
- private boolean jj_3R_43() {
+ private boolean jj_3R_42() {
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_102()) { jj_scanpos = xsp; break; }
+ if (jj_3R_101()) { jj_scanpos = xsp; break; }
}
return false;
}
- private boolean jj_3R_109() {
+ private boolean jj_3R_108() {
if (jj_scan_token(SUBSTR)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_104() {
- if (jj_3R_117()) return true;
+ private boolean jj_3R_103() {
+ if (jj_3R_116()) return true;
return false;
}
- private boolean jj_3R_44() {
+ private boolean jj_3R_43() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_103()) {
+ if (jj_3R_102()) {
jj_scanpos = xsp;
- if (jj_3R_104()) return true;
+ if (jj_3R_103()) return true;
}
return false;
}
- private boolean jj_3R_103() {
- if (jj_3R_116()) return true;
- return false;
- }
-
- private boolean jj_3R_135() {
- if (jj_scan_token(IRIref)) return true;
+ private boolean jj_3R_102() {
+ if (jj_3R_115()) return true;
return false;
}
private boolean jj_3_4() {
if (jj_scan_token(DOT)) return true;
- if (jj_3R_44()) return true;
- return false;
- }
-
- private boolean jj_3R_162() {
- if (jj_scan_token(ANON)) return true;
- return false;
- }
-
- private boolean jj_3R_161() {
- if (jj_scan_token(BLANK_NODE_LABEL)) return true;
- return false;
- }
-
- private boolean jj_3R_152() {
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_161()) {
- jj_scanpos = xsp;
- if (jj_3R_162()) return true;
- }
+ if (jj_3R_43()) return true;
return false;
}
- private boolean jj_3R_111() {
+ private boolean jj_3R_110() {
if (jj_scan_token(REGEX)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_154() {
- if (jj_scan_token(PNAME_NS)) return true;
+ private boolean jj_3R_134() {
+ if (jj_scan_token(IRIref)) return true;
return false;
}
- private boolean jj_3R_101() {
- if (jj_3R_113()) return true;
+ private boolean jj_3R_161() {
+ if (jj_scan_token(ANON)) return true;
return false;
}
@@ -6355,252 +6240,238 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
return false;
}
- private boolean jj_3R_153() {
- if (jj_scan_token(PNAME_LN)) return true;
+ private boolean jj_3R_99() {
+ if (jj_3R_111()) return true;
return false;
}
- private boolean jj_3R_99() {
- if (jj_3R_111()) return true;
+ private boolean jj_3R_98() {
+ if (jj_3R_110()) return true;
return false;
}
- private boolean jj_3R_148() {
+ private boolean jj_3R_160() {
+ if (jj_scan_token(BLANK_NODE_LABEL)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_151() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_153()) {
+ if (jj_3R_160()) {
jj_scanpos = xsp;
- if (jj_3R_154()) return true;
+ if (jj_3R_161()) return true;
}
return false;
}
- private boolean jj_3R_98() {
+ private boolean jj_3R_97() {
if (jj_scan_token(IS_NUMERIC)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_97() {
- if (jj_scan_token(IS_LITERAL)) return true;
- if (jj_scan_token(LPAREN)) return true;
+ private boolean jj_3R_153() {
+ if (jj_scan_token(PNAME_NS)) return true;
return false;
}
- private boolean jj_3R_141() {
- if (jj_3R_148()) return true;
+ private boolean jj_3R_96() {
+ if (jj_scan_token(IS_LITERAL)) return true;
+ if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_96() {
+ private boolean jj_3R_95() {
if (jj_scan_token(IS_BLANK)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_140() {
- if (jj_3R_135()) return true;
+ private boolean jj_3R_152() {
+ if (jj_scan_token(PNAME_LN)) return true;
return false;
}
- private boolean jj_3R_134() {
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_140()) {
- jj_scanpos = xsp;
- if (jj_3R_141()) return true;
- }
+ private boolean jj_3R_125() {
+ if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_126() {
+ private boolean jj_3R_94() {
+ if (jj_scan_token(IS_URI)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_95() {
- if (jj_scan_token(IS_URI)) return true;
- if (jj_scan_token(LPAREN)) return true;
+ private boolean jj_3R_147() {
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_152()) {
+ jj_scanpos = xsp;
+ if (jj_3R_153()) return true;
+ }
return false;
}
- private boolean jj_3R_94() {
+ private boolean jj_3R_93() {
if (jj_scan_token(IS_IRI)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_108() {
+ private boolean jj_3R_107() {
Token xsp;
xsp = jj_scanpos;
if (jj_scan_token(165)) {
jj_scanpos = xsp;
- if (jj_3R_126()) return true;
+ if (jj_3R_125()) return true;
}
return false;
}
- private boolean jj_3R_93() {
+ private boolean jj_3R_92() {
if (jj_scan_token(SAME_TERM)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_166() {
- if (jj_scan_token(STRING_LITERAL_LONG2)) return true;
+ private boolean jj_3R_140() {
+ if (jj_3R_147()) return true;
return false;
}
- private boolean jj_3R_92() {
+ private boolean jj_3R_91() {
if (jj_scan_token(STRDT)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_165() {
- if (jj_scan_token(STRING_LITERAL_LONG1)) return true;
+ private boolean jj_3R_139() {
+ if (jj_3R_134()) return true;
return false;
}
- private boolean jj_3R_164() {
- if (jj_scan_token(STRING_LITERAL2)) return true;
+ private boolean jj_3R_133() {
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_139()) {
+ jj_scanpos = xsp;
+ if (jj_3R_140()) return true;
+ }
return false;
}
- private boolean jj_3R_91() {
+ private boolean jj_3R_90() {
if (jj_scan_token(STRLANG)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_163() {
- if (jj_scan_token(STRING_LITERAL1)) return true;
+ private boolean jj_3R_89() {
+ if (jj_scan_token(IF)) return true;
+ if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_155() {
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_163()) {
- jj_scanpos = xsp;
- if (jj_3R_164()) {
- jj_scanpos = xsp;
- if (jj_3R_165()) {
- jj_scanpos = xsp;
- if (jj_3R_166()) return true;
- }
- }
- }
+ private boolean jj_3R_165() {
+ if (jj_scan_token(STRING_LITERAL_LONG2)) return true;
return false;
}
- private boolean jj_3R_90() {
- if (jj_scan_token(IF)) return true;
- if (jj_scan_token(LPAREN)) return true;
+ private boolean jj_3R_164() {
+ if (jj_scan_token(STRING_LITERAL_LONG1)) return true;
return false;
}
- private boolean jj_3R_160() {
- if (jj_scan_token(FALSE)) return true;
+ private boolean jj_3R_163() {
+ if (jj_scan_token(STRING_LITERAL2)) return true;
return false;
}
- private boolean jj_3R_159() {
- if (jj_scan_token(TRUE)) return true;
+ private boolean jj_3R_162() {
+ if (jj_scan_token(STRING_LITERAL1)) return true;
return false;
}
- private boolean jj_3R_151() {
+ private boolean jj_3R_154() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_159()) {
+ if (jj_3R_162()) {
+ jj_scanpos = xsp;
+ if (jj_3R_163()) {
+ jj_scanpos = xsp;
+ if (jj_3R_164()) {
jj_scanpos = xsp;
- if (jj_3R_160()) return true;
+ if (jj_3R_165()) return true;
+ }
+ }
}
return false;
}
- private boolean jj_3R_89() {
+ private boolean jj_3R_88() {
if (jj_scan_token(CALL)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_178() {
- if (jj_scan_token(DOUBLE_NEGATIVE)) return true;
- return false;
- }
-
- private boolean jj_3R_88() {
+ private boolean jj_3R_87() {
if (jj_scan_token(COALESCE)) return true;
- if (jj_3R_108()) return true;
- return false;
- }
-
- private boolean jj_3R_177() {
- if (jj_scan_token(DECIMAL_NEGATIVE)) return true;
+ if (jj_3R_107()) return true;
return false;
}
- private boolean jj_3R_147() {
+ private boolean jj_3R_146() {
if (jj_scan_token(NIL)) return true;
return false;
}
- private boolean jj_3R_87() {
+ private boolean jj_3R_86() {
if (jj_scan_token(VERSION)) return true;
if (jj_scan_token(NIL)) return true;
return false;
}
- private boolean jj_3R_176() {
- if (jj_scan_token(INTEGER_NEGATIVE)) return true;
- return false;
- }
-
- private boolean jj_3R_169() {
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_176()) {
- jj_scanpos = xsp;
- if (jj_3R_177()) {
- jj_scanpos = xsp;
- if (jj_3R_178()) return true;
- }
- }
+ private boolean jj_3R_159() {
+ if (jj_scan_token(FALSE)) return true;
return false;
}
- private boolean jj_3R_146() {
- if (jj_3R_152()) return true;
+ private boolean jj_3R_145() {
+ if (jj_3R_151()) return true;
return false;
}
- private boolean jj_3R_86() {
+ private boolean jj_3R_85() {
if (jj_scan_token(SHA512)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_145() {
- if (jj_3R_151()) return true;
+ private boolean jj_3R_144() {
+ if (jj_3R_150()) return true;
return false;
}
- private boolean jj_3R_85() {
+ private boolean jj_3R_84() {
if (jj_scan_token(SHA384)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_144() {
- if (jj_3R_150()) return true;
+ private boolean jj_3R_158() {
+ if (jj_scan_token(TRUE)) return true;
return false;
}
- private boolean jj_3R_84() {
- if (jj_scan_token(SHA256)) return true;
- if (jj_scan_token(LPAREN)) return true;
+ private boolean jj_3R_150() {
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_158()) {
+ jj_scanpos = xsp;
+ if (jj_3R_159()) return true;
+ }
return false;
}
@@ -6610,24 +6481,32 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
}
private boolean jj_3R_83() {
- if (jj_scan_token(SHA1)) return true;
+ if (jj_scan_token(SHA256)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_175() {
- if (jj_scan_token(DOUBLE_POSITIVE)) return true;
+ private boolean jj_3R_142() {
+ if (jj_3R_148()) return true;
return false;
}
- private boolean jj_3R_142() {
- if (jj_3R_134()) return true;
+ private boolean jj_3R_82() {
+ if (jj_scan_token(SHA1)) return true;
+ if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_137() {
+ private boolean jj_3R_141() {
+ if (jj_3R_133()) return true;
+ return false;
+ }
+
+ private boolean jj_3R_136() {
Token xsp;
xsp = jj_scanpos;
+ if (jj_3R_141()) {
+ jj_scanpos = xsp;
if (jj_3R_142()) {
jj_scanpos = xsp;
if (jj_3R_143()) {
@@ -6636,9 +6515,7 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
jj_scanpos = xsp;
if (jj_3R_145()) {
jj_scanpos = xsp;
- if (jj_3R_146()) {
- jj_scanpos = xsp;
- if (jj_3R_147()) return true;
+ if (jj_3R_146()) return true;
}
}
}
@@ -6647,48 +6524,35 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
return false;
}
- private boolean jj_3R_82() {
+ private boolean jj_3R_81() {
if (jj_scan_token(MD5)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_174() {
- if (jj_scan_token(DECIMAL_POSITIVE)) return true;
- return false;
- }
-
- private boolean jj_3R_81() {
+ private boolean jj_3R_80() {
if (jj_scan_token(STRUUID)) return true;
if (jj_scan_token(NIL)) return true;
return false;
}
- private boolean jj_3R_173() {
- if (jj_scan_token(INTEGER_POSITIVE)) return true;
+ private boolean jj_3R_177() {
+ if (jj_scan_token(DOUBLE_NEGATIVE)) return true;
return false;
}
- private boolean jj_3R_168() {
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_173()) {
- jj_scanpos = xsp;
- if (jj_3R_174()) {
- jj_scanpos = xsp;
- if (jj_3R_175()) return true;
- }
- }
+ private boolean jj_3R_79() {
+ if (jj_scan_token(UUID)) return true;
+ if (jj_scan_token(NIL)) return true;
return false;
}
- private boolean jj_3R_80() {
- if (jj_scan_token(UUID)) return true;
- if (jj_scan_token(NIL)) return true;
+ private boolean jj_3R_176() {
+ if (jj_scan_token(DECIMAL_NEGATIVE)) return true;
return false;
}
- private boolean jj_3R_136() {
+ private boolean jj_3R_135() {
Token xsp;
xsp = jj_scanpos;
if (jj_scan_token(14)) {
@@ -6698,89 +6562,101 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
return false;
}
- private boolean jj_3R_79() {
+ private boolean jj_3R_78() {
if (jj_scan_token(NOW)) return true;
if (jj_scan_token(NIL)) return true;
return false;
}
- private boolean jj_3R_78() {
- if (jj_scan_token(TZ)) return true;
- if (jj_scan_token(LPAREN)) return true;
- return false;
- }
-
- private boolean jj_3R_77() {
- if (jj_scan_token(TIMEZONE)) return true;
- if (jj_scan_token(LPAREN)) return true;
+ private boolean jj_3R_175() {
+ if (jj_scan_token(INTEGER_NEGATIVE)) return true;
return false;
}
- private boolean jj_3R_172() {
- if (jj_scan_token(DOUBLE)) return true;
+ private boolean jj_3R_168() {
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_175()) {
+ jj_scanpos = xsp;
+ if (jj_3R_176()) {
+ jj_scanpos = xsp;
+ if (jj_3R_177()) return true;
+ }
+ }
return false;
}
- private boolean jj_3R_131() {
- if (jj_3R_137()) return true;
+ private boolean jj_3R_77() {
+ if (jj_scan_token(TZ)) return true;
+ if (jj_scan_token(LPAREN)) return true;
return false;
}
private boolean jj_3R_76() {
- if (jj_scan_token(SECONDS)) return true;
+ if (jj_scan_token(TIMEZONE)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_171() {
- if (jj_scan_token(DECIMAL)) return true;
+ private boolean jj_3R_130() {
+ if (jj_3R_136()) return true;
return false;
}
private boolean jj_3R_75() {
- if (jj_scan_token(MINUTES)) return true;
+ if (jj_scan_token(SECONDS)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_170() {
- if (jj_scan_token(INTEGER)) return true;
+ private boolean jj_3R_74() {
+ if (jj_scan_token(MINUTES)) return true;
+ if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_167() {
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_170()) {
- jj_scanpos = xsp;
- if (jj_3R_171()) {
- jj_scanpos = xsp;
- if (jj_3R_172()) return true;
- }
- }
+ private boolean jj_3R_174() {
+ if (jj_scan_token(DOUBLE_POSITIVE)) return true;
return false;
}
- private boolean jj_3R_74() {
+ private boolean jj_3R_73() {
if (jj_scan_token(HOURS)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_73() {
- if (jj_scan_token(DAY)) return true;
- if (jj_scan_token(LPAREN)) return true;
+ private boolean jj_3R_173() {
+ if (jj_scan_token(DECIMAL_POSITIVE)) return true;
return false;
}
private boolean jj_3R_72() {
- if (jj_scan_token(MONTH)) return true;
+ if (jj_scan_token(DAY)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
+ private boolean jj_3R_172() {
+ if (jj_scan_token(INTEGER_POSITIVE)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_167() {
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_172()) {
+ jj_scanpos = xsp;
+ if (jj_3R_173()) {
+ jj_scanpos = xsp;
+ if (jj_3R_174()) return true;
+ }
+ }
+ return false;
+ }
+
private boolean jj_3R_71() {
- if (jj_scan_token(YEAR)) return true;
+ if (jj_scan_token(MONTH)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
@@ -6796,7 +6672,7 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
private Token jj_scanpos, jj_lastpos;
private int jj_la;
private int jj_gen;
- final private int[] jj_la1 = new int[179];
+ final private int[] jj_la1 = new int[176];
static private int[] jj_la1_0;
static private int[] jj_la1_1;
static private int[] jj_la1_2;
@@ -6814,25 +6690,25 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
jj_la1_init_6();
}
private static void jj_la1_init_0() {
- jj_la1_0 = new int[] {0xe400000,0x200,0x300000,0x300000,0x0,0x1800000,0x1800000,0x1c00,0x0,0xdc00,0xdc00,0xdc00,0x0,0x0,0x0,0xdc00,0xdc00,0x0,0x0,0x0,0x1c00,0x0,0x0,0x0,0x40000000,0x30000000,0xdc00,0x0,0xdc00,0x1c00,0xdc00,0x0,0xdc00,0xdc00,0x20000000,0x10000000,0x30000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1c00,0x0,0x1c00,0x0,0xfc00,0x0,0x0,0xfc00,0xfc00,0xfc00,0x0,0x0,0xfc00,0x0,0xfc00,0x0,0x400000,0xfc00,0x0,0x0,0xfc00,0xfc00,0x0,0x0,0x0,0xc000,0x3c00,0xc000,0x0,0x0,0x3c00,0x0,0x3c00,0x0,0x1c00,0x800000,0x0,0x0,0x0,0x0,0x0,0xfc00,0x8dc00,0x0,0x8dc00,0x8dc00,0x0,0xfc00,0x88dc00,0x88dc00,0x0,0x88dc00,0x88dc00,0x0,0x0,0x0,0x0,0x0,0x881c00,0x0,0x0,0x0,0x0,0x881c00,0x0,0x81c00,0x81c00,0x81c00,0x81c00,0x0,0x0,0xfc00,0xfc00,0xfc00,0xfc00,0xfc00,0xdc00,0xfc00,0xc000,0x3c00,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xdc00,0xdc00,0x0,0x0,0x0,0x0,0x0,0x0,0x800000,0xdc00,0x800000,0x800000,0x800000,0x800000,0x800000,0x800000,0x0,0x0,0x0,0x800000,0x0,0xdc
00,0x0,0x0,0x10000,0x10000,0x0,0x0,0x0,0x0,0x0,0x0,0x1c00,0x1800,0x2000,};
+ jj_la1_0 = new int[] {0xe400000,0x200,0x300000,0x300000,0x0,0x1800000,0x1800000,0x1c00,0x0,0xdc00,0xdc00,0xdc00,0x0,0x0,0x0,0xdc00,0xdc00,0x0,0x0,0x0,0x1c00,0x0,0x0,0x0,0x40000000,0x30000000,0xdc00,0x0,0xdc00,0x1c00,0xdc00,0x0,0xdc00,0xdc00,0x20000000,0x10000000,0x30000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1c00,0x0,0x1c00,0x0,0xfc00,0x0,0x0,0xfc00,0xfc00,0xfc00,0x0,0x0,0xfc00,0x0,0xfc00,0x0,0x400000,0xfc00,0x0,0x0,0xfc00,0xfc00,0x0,0x0,0x0,0xc000,0x3c00,0xc000,0x0,0x0,0x3c00,0x0,0x3c00,0x0,0x1c00,0x800000,0x0,0x0,0x0,0x0,0x0,0xfc00,0x8dc00,0x0,0x8dc00,0x8dc00,0x0,0xfc00,0x88dc00,0x88dc00,0x0,0x88dc00,0x88dc00,0x0,0x0,0x0,0x0,0x0,0x881c00,0x0,0x0,0x0,0x0,0x881c00,0x0,0x81c00,0x81c00,0x81c00,0x81c00,0x0,0x0,0xfc00,0xfc00,0xfc00,0xfc00,0xfc00,0xdc00,0xfc00,0xc000,0x3c00,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xdc00,0xdc00,0x0,0x0,0x0,0x0,0x0,0x0,0x800000,0xdc00,0x800000,0x800000,0x800000,0x800000,0x800000,0x800000,0x0,0x0,0x0,0x0,0x0,0x10000,0
x10000,0x0,0x0,0x0,0x0,0x0,0x0,0x1c00,0x1800,0x2000,};
}
private static void jj_la1_init_1() {
- jj_la1_1 = new int[] {0x0,0x0,0x0,0x0,0x20,0x0,0x0,0x0,0x20000,0xb7e18000,0xb7e18000,0xb7e18000,0x20,0x20,0x60,0x0,0x0,0x20,0x40,0x20,0x10,0x40,0x40000,0x80000,0x0,0x0,0xb7e18000,0x20000,0xb7e18000,0xb7e18000,0xb7e1800c,0xc,0xb7e18000,0xb7e1800c,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10,0x100,0x100,0x110,0x0,0x100,0x0,0x0,0x0,0x0,0x100,0x0,0x0,0x100,0x0,0x0,0x0,0x0,0x4001fb01,0x0,0x0,0x0,0x0,0x4001fb01,0x0,0x0,0x2,0x0,0x0,0x0,0x2,0x0,0x2,0x400,0xb7e18000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,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,0xb7e18000,0xb7e18000,0x0,0x0,0xb7e18000,0x0,0x0,0x0,0x0,0xb7e18000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xb7e18000,0x37e00000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
+ jj_la1_1 = new int[] {0x0,0x0,0x0,0x0,0x20,0x0,0x0,0x0,0x20000,0xb7e18000,0xb7e18000,0xb7e18000,0x20,0x20,0x60,0x0,0x0,0x20,0x40,0x20,0x10,0x40,0x40000,0x80000,0x0,0x0,0xb7e18000,0x20000,0xb7e18000,0xb7e18000,0xb7e1800c,0xc,0xb7e18000,0xb7e1800c,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10,0x100,0x100,0x110,0x0,0x100,0x0,0x0,0x0,0x0,0x100,0x0,0x0,0x100,0x0,0x0,0x0,0x0,0x4001fb01,0x0,0x0,0x0,0x0,0x4001fb01,0x0,0x0,0x2,0x0,0x0,0x0,0x2,0x0,0x2,0x400,0xb7e18000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,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,0xb7e18000,0xb7e18000,0x0,0x0,0xb7e18000,0x0,0x0,0x0,0x0,0xb7e18000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x37e00000,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,0x0,0x0,0x0,0xfffffcbd,0xfffffcbd,0xfffffcbd,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfffffcbd,0x0,0xfffffcbd,0xfffffcbd,0xfffffcbd,0x0,0xfffffcbd,0xfffffcbd,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfffffcbd,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x300,0x300,0x0,0x300,0x300,0x0,0x0,0x0,0x0,0x0,0x300,0x0,0x0,0x0,0x0,0x300,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,0xfffffcbd,0xfffffcbd,0x0,0x0,0xfffffcbd,0x0,0x0,0x0,0x0,0xfffffcbd,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfffffcbd,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
+ jj_la1_2 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfffffcbd,0xfffffcbd,0xfffffcbd,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfffffcbd,0x0,0xfffffcbd,0xfffffcbd,0xfffffcbd,0x0,0xfffffcbd,0xfffffcbd,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfffffcbd,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x300,0x300,0x0,0x300,0x300,0x0,0x0,0x0,0x0,0x0,0x300,0x0,0x0,0x0,0x0,0x300,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,0xfffffcbd,0xfffffcbd,0x0,0x0,0xfffffcbd,0x0,0x0,0x0,0x0,0xfffffcbd,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,0x0,0xc000000,0x0,0xfbfffff,0xfbfffff,0xfbfffff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3bfffff,0x0,0x3bfffff,0x3bfffff,0x3bfffff,0x0,0x3bfffff,0x3bfffff,0x0,0x0,0x0,0x0,0x0,0xe0000000,0xe0000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20000000,0x60000000,0x0,0x0,0x0,0x0,0x0,0xc000000,0x0,0x0,0xc000000,0xc000000,0xc000000,0x0,0x0,0xc000000,0x0,0xc000000,0x0,0x0,0xc000000,0x0,0x0,0xc000000,0xc000000,0x0,0x0,0x0,0x0,0xc000000,0x0,0x0,0x0,0xc000000,0x0,0xc000000,0x0,0x3bfffff,0x0,0x0,0x0,0x0,0x0,0x0,0xc000000,0x0,0x0,0x0,0x0,0x0,0xc000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc000000,0xc000000,0xc000000,0xc000000,0xc000000,0x0,0x0,0x0,0xc000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfbfffff,0xfbfffff,0x0,0x0,0x3bfffff,0x0,0x0,0x0,0x0,0xfbfffff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfbfffff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc000000,0x0,0x0,0x0,0x0,};
+ jj_la1_3 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc000000,0x0,0xfbfffff,0xfbfffff,0xfbfffff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3bfffff,0x0,0x3bfffff,0x3bfffff,0x3bfffff,0x0,0x3bfffff,0x3bfffff,0x0,0x0,0x0,0x0,0x0,0xe0000000,0xe0000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20000000,0x60000000,0x0,0x0,0x0,0x0,0x0,0xc000000,0x0,0x0,0xc000000,0xc000000,0xc000000,0x0,0x0,0xc000000,0x0,0xc000000,0x0,0x0,0xc000000,0x0,0x0,0xc000000,0xc000000,0x0,0x0,0x0,0x0,0xc000000,0x0,0x0,0x0,0xc000000,0x0,0xc000000,0x0,0x3bfffff,0x0,0x0,0x0,0x0,0x0,0x0,0xc000000,0x0,0x0,0x0,0x0,0x0,0xc000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc000000,0xc000000,0xc000000,0xc000000,0xc000000,0x0,0x0,0x0,0xc000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfbfffff,0xfbfffff,0x0,0x0,0x3bfffff,0x0,0x0,0x0,0x0,0xfbfffff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc000000,0x0,0x0,0x0,0x0,};
}
private static void jj_la1_init_4() {
- jj_la1_4 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x87fc0000,0x0,0x87fc0000,0x87fc0000,0x87fc0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x84ff,0x84ff,0x200,0x800,0x200,0x200,0x200,0x200,0x200,0x200,0x8000,0x0,0x0,0x10000,0x0,0x0,0x2000,0x6000,0x87fc0000,0x0,0x0,0x87fc0000,0x87fc0000,0x87fc0000,0x0,0x0,0x87fc0000,0x0,0x87fc0000,0x0,0x0,0x87fc0000,0x0,0x0,0x87fc0000,0x87fc0000,0x0,0x0,0x200,0x0,0x87fc0000,0x0,0x0,0x0,0x87fc0000,0x0,0x87fc0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x87fc0000,0x0,0x0,0x0,0x0,0x0,0x87fc0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000,0x0,0x40000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x87fc0000,0x87fc0000,0x87fc0000,0x87fc0000,0x87fc0000,0x0,0x0,0x0,0x87fc0000,0x0,0x0,0x0,0x0,0x7e00000,0x7e00000,0x0,0x0,0x7e00000,0x0,0x0,0x87fc0000,0x87fc0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x87fc0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x87fc0000,0x0,0x0,0x0,0x0,0x7fc0000,0x1c0000,0xe00000,0x
7000000,0x0,0x80000000,0x0,0x0,0x0,};
+ jj_la1_4 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x87fc0000,0x0,0x87fc0000,0x87fc0000,0x87fc0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x84ff,0x84ff,0x200,0x800,0x200,0x200,0x200,0x200,0x200,0x200,0x8000,0x0,0x0,0x10000,0x0,0x0,0x2000,0x6000,0x87fc0000,0x0,0x0,0x87fc0000,0x87fc0000,0x87fc0000,0x0,0x0,0x87fc0000,0x0,0x87fc0000,0x0,0x0,0x87fc0000,0x0,0x0,0x87fc0000,0x87fc0000,0x0,0x0,0x200,0x0,0x87fc0000,0x0,0x0,0x0,0x87fc0000,0x0,0x87fc0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x87fc0000,0x0,0x0,0x0,0x0,0x0,0x87fc0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000,0x0,0x40000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x87fc0000,0x87fc0000,0x87fc0000,0x87fc0000,0x87fc0000,0x0,0x0,0x0,0x87fc0000,0x0,0x0,0x0,0x0,0x7e00000,0x7e00000,0x0,0x0,0x7e00000,0x0,0x0,0x87fc0000,0x87fc0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x87fc0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7fc0000,0x1c0000,0xe00000,0x7000000,0x0,0x80000
000,0x0,0x0,0x0,};
}
private static void jj_la1_init_5() {
- jj_la1_5 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7,0x0,0xf,0xf,0x800000f,0x0,0x0,0x40,0x0,0x8000000,0x0,0x40,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8,0x0,0x8,0x8,0x8,0x0,0x8,0x8,0x0,0x0,0x0,0x0,0x800,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x52f,0x0,0x2000,0x52f,0x52f,0x52f,0x40,0x2000,0x52f,0x0,0x52f,0x2000,0x0,0x52f,0x40,0x2000,0x52f,0x52f,0x2000,0x40,0x0,0x28,0x407,0x0,0x28,0x28,0x407,0x28,0x407,0x0,0x8,0x0,0x1000,0x28,0x1000,0x28,0x2000,0x52f,0x0,0x800,0x0,0x0,0x1000,0x52f,0x100008,0x100008,0x800,0x100008,0x100008,0x1000,0x0,0x10000000,0x10000000,0xa000040,0x100008,0x80,0x1080,0xa001000,0xa000040,0x100008,0x0,0x0,0x8,0x0,0x0,0x108,0x108,0x52f,0x52f,0x52f,0x52f,0x427,0x0,0x400,0x0,0x427,0x800000,0x1000000,0xfc000,0xfc000,0x6000000,0x0,0x18000000,0x18000000,0x6000000,0x18000000,0x18000000,0x610000f,0xf,0x28,0x1000,0x0,0x1000,0x1000,0x1000,0x0,0xe10000f,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x800,0x800,0x0,0x1000,0x610000f,0x0,0x28,0x20000000,0x20000000,0x0,
0x0,0x0,0x0,0x0,0x7,0x0,0x0,0x400,};
+ jj_la1_5 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7,0x0,0xf,0xf,0x800000f,0x0,0x0,0x40,0x0,0x8000000,0x0,0x40,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8,0x0,0x8,0x8,0x8,0x0,0x8,0x8,0x0,0x0,0x0,0x0,0x800,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x52f,0x0,0x2000,0x52f,0x52f,0x52f,0x40,0x2000,0x52f,0x0,0x52f,0x2000,0x0,0x52f,0x40,0x2000,0x52f,0x52f,0x2000,0x40,0x0,0x28,0x407,0x0,0x28,0x28,0x407,0x28,0x407,0x0,0x8,0x0,0x1000,0x28,0x1000,0x28,0x2000,0x52f,0x0,0x800,0x0,0x0,0x1000,0x52f,0x100008,0x100008,0x800,0x100008,0x100008,0x1000,0x0,0x10000000,0x10000000,0xa000040,0x100008,0x80,0x1080,0xa001000,0xa000040,0x100008,0x0,0x0,0x8,0x0,0x0,0x108,0x108,0x52f,0x52f,0x52f,0x52f,0x427,0x0,0x400,0x0,0x427,0x800000,0x1000000,0xfc000,0xfc000,0x6000000,0x0,0x18000000,0x18000000,0x6000000,0x18000000,0x18000000,0x610000f,0xf,0x28,0x1000,0x0,0x1000,0x1000,0x1000,0x0,0xe10000f,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x800,0x800,0x0,0x28,0x20000000,0x20000000,0x0,0x0,0x0,0x0,0x0,0x7,0
x0,0x0,0x400,};
}
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,0x2,0x2,0x0,0x2,0x2,0x0,0x1,0x2,0x2,0x10,0x2,0x0,0x0,0x0,0x10,0x0,0x1,0x2,0x2,0x0,0x2,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,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,0x2,0x2,0x0,0x2,0x2,0x0,0x1,0x2,0x2,0x10,0x2,0x0,0x0,0x0,0x10,0x0,0x1,0x2,0x2,0x0,0x2,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,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[5];
private boolean jj_rescan = false;
@@ -6849,7 +6725,7 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 179; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 176; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
@@ -6864,7 +6740,7 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 179; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 176; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
@@ -6875,7 +6751,7 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 179; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 176; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
@@ -6886,7 +6762,7 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 179; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 176; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
@@ -6896,7 +6772,7 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 179; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 176; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
@@ -6906,7 +6782,7 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 179; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 176; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
@@ -7023,7 +6899,7 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
la1tokens[jj_kind] = true;
jj_kind = -1;
}
- for (int i = 0; i < 179; i++) {
+ for (int i = 0; i < 176; i++) {
if (jj_la1[i] == jj_gen) {
for (int j = 0; j < 32; j++) {
if ((jj_la1_0[i] & (1<<j)) != 0) {
http://git-wip-us.apache.org/repos/asf/jena/blob/9538e473/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/SPARQLParser11.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/SPARQLParser11.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/SPARQLParser11.java
index f8388b1..31691e9 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/SPARQLParser11.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/SPARQLParser11.java
@@ -2253,13 +2253,13 @@ public class SPARQLParser11 extends SPARQLParser11Base implements SPARQLParser11
}
final public Expr FunctionCall() throws ParseException {
- String fname ; ExprList a ;
+ String fname ; Args a ;
fname = iri();
a = ArgList();
if ( AggregateRegistry.isRegistered(fname) ) {
if ( ! getAllowAggregatesInExpressions() )
throwParseException("Aggregate expression not legal at this point : "+fname, -1, -1) ;
- Aggregator agg = AggregatorFactory.createCustom(true, false, fname, a) ;
+ Aggregator agg = AggregatorFactory.createCustom(fname, a) ;
Expr exprAgg = getQuery().allocAggregate(agg) ;
{if (true) return exprAgg ;}
}
@@ -2267,9 +2267,8 @@ public class SPARQLParser11 extends SPARQLParser11Base implements SPARQLParser11
throw new Error("Missing return statement in function");
}
- final public ExprList ArgList() throws ParseException {
- Expr expr ; boolean distinct = false ;
- ExprList args = new ExprList() ; Token t ;
+ final public Args ArgList() throws ParseException {
+ Expr expr ; Args args = new Args() ; Token t ;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case NIL:
jj_consume_token(NIL);
@@ -2279,7 +2278,7 @@ public class SPARQLParser11 extends SPARQLParser11Base implements SPARQLParser11
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case DISTINCT:
t = jj_consume_token(DISTINCT);
- distinct = true ;
+ args.distinct = true ;
int beginLine = t.beginLine; int beginColumn = t.beginColumn; t = null;
if ( ! getAllowAggregatesInExpressions() )
throwParseException("Aggregate expression not legal at this point",
@@ -2317,7 +2316,7 @@ public class SPARQLParser11 extends SPARQLParser11Base implements SPARQLParser11
}
final public ExprList ExpressionList() throws ParseException {
- Expr expr = null ; ExprList args = new ExprList() ;
+ Expr expr = null ; ExprList exprList = new ExprList() ;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case NIL:
jj_consume_token(NIL);
@@ -2325,7 +2324,7 @@ public class SPARQLParser11 extends SPARQLParser11Base implements SPARQLParser11
case LPAREN:
jj_consume_token(LPAREN);
expr = Expression();
- args.add(expr) ;
+ exprList.add(expr) ;
label_21:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -2338,7 +2337,7 @@ public class SPARQLParser11 extends SPARQLParser11Base implements SPARQLParser11
}
jj_consume_token(COMMA);
expr = Expression();
- args.add(expr) ;
+ exprList.add(expr) ;
}
jj_consume_token(RPAREN);
break;
@@ -2347,7 +2346,7 @@ public class SPARQLParser11 extends SPARQLParser11Base implements SPARQLParser11
jj_consume_token(-1);
throw new ParseException();
}
- {if (true) return args ;}
+ {if (true) return exprList ;}
throw new Error("Missing return statement in function");
}
@@ -4394,9 +4393,8 @@ public class SPARQLParser11 extends SPARQLParser11Base implements SPARQLParser11
final public Expr Aggregate() throws ParseException {
Aggregator agg = null ; String sep = null ;
- boolean distinct = false ;
Expr expr = null ; Expr expr2 = null ;
- ExprList a = new ExprList() ;
+ boolean distinct = false ;
ExprList ordered = new ExprList() ;
Token t ;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -4605,7 +4603,6 @@ public class SPARQLParser11 extends SPARQLParser11Base implements SPARQLParser11
;
}
expr = Expression();
- a.add(expr) ;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case SEMICOLON:
jj_consume_token(SEMICOLON);
@@ -4625,18 +4622,16 @@ public class SPARQLParser11 extends SPARQLParser11Base implements SPARQLParser11
jj_consume_token(-1);
throw new ParseException();
}
- if ( ! getAllowAggregatesInExpressions() )
- throwParseException("Aggregate expression not legal at this point",
- t.beginLine, t.beginColumn) ;
- Expr exprAgg = getQuery().allocAggregate(agg) ;
- {if (true) return exprAgg ;}
+ if ( ! getAllowAggregatesInExpressions() )
+ throwParseException("Aggregate expression not legal at this point",
+ t.beginLine, t.beginColumn) ;
+ Expr exprAgg = getQuery().allocAggregate(agg) ;
+ {if (true) return exprAgg ;}
throw new Error("Missing return statement in function");
}
final public Expr iriOrFunction() throws ParseException {
- String iri ; ExprList a = null ;
- ExprList params = null ;
- boolean distinct = false ;
+ String iri ; Args a = null ;
iri = iri();
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case LPAREN:
@@ -4652,7 +4647,7 @@ public class SPARQLParser11 extends SPARQLParser11Base implements SPARQLParser11
if ( AggregateRegistry.isRegistered(iri) ) {
if ( ! getAllowAggregatesInExpressions() )
throwParseException("Aggregate expression not legal at this point : "+iri, -1, -1) ;
- Aggregator agg = AggregatorFactory.createCustom(true, false, iri, a) ;
+ Aggregator agg = AggregatorFactory.createCustom(iri, a) ;
Expr exprAgg = getQuery().allocAggregate(agg) ;
{if (true) return exprAgg ;}
}
http://git-wip-us.apache.org/repos/asf/jena/blob/9538e473/jena-arq/src/main/java/org/apache/jena/sparql/sse/builders/BuilderExpr.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/sse/builders/BuilderExpr.java b/jena-arq/src/main/java/org/apache/jena/sparql/sse/builders/BuilderExpr.java
index 777df8b..5b21cca 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/sse/builders/BuilderExpr.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/sse/builders/BuilderExpr.java
@@ -1402,7 +1402,7 @@ public class BuilderExpr
if ( distinct )
x = x.cdr();
ExprList e = buildExprListUntagged(x, 0) ;
- Aggregator agg = AggregatorFactory.createCustom(false, distinct, z.getNode().getURI(), e) ;
+ Aggregator agg = AggregatorFactory.createCustom(z.getNode().getURI(), distinct, e) ;
return new ExprAggregator(null, agg) ;
}
} ;
http://git-wip-us.apache.org/repos/asf/jena/blob/9538e473/jena-arq/src/test/java/org/apache/jena/sparql/expr/TS_Expr.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/expr/TS_Expr.java b/jena-arq/src/test/java/org/apache/jena/sparql/expr/TS_Expr.java
index 4958771..9d7567b 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/expr/TS_Expr.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/expr/TS_Expr.java
@@ -45,6 +45,7 @@ import org.junit.runners.Suite.SuiteClasses ;
, TestExprLib.class
, TestExprTransform.class
, TestCustomAggregates.class
+ , TestStatisticsAggregates.class
})
public class TS_Expr
http://git-wip-us.apache.org/repos/asf/jena/blob/9538e473/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestCustomAggregates.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestCustomAggregates.java b/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestCustomAggregates.java
index b32747d..47b0216 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestCustomAggregates.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestCustomAggregates.java
@@ -47,13 +47,13 @@ public class TestCustomAggregates extends BaseTest {
static AccumulatorFactory myAccumulatorFactory = new AccumulatorFactory() {
@Override
- public Accumulator createAccumulator(AggCustom agg) { return new MyAccumulator(agg) ; }
+ public Accumulator createAccumulator(AggCustom agg, boolean distinct) { return new MyAccumulator(agg, distinct) ; }
} ;
static class MyAccumulator implements Accumulator {
int count = 0 ;
private AggCustom agg ;
- MyAccumulator(AggCustom agg) { this.agg = agg ; }
+ MyAccumulator(AggCustom agg, boolean ignored) { this.agg = agg ; }
@Override
public void accumulate(Binding binding, FunctionEnv functionEnv) {
http://git-wip-us.apache.org/repos/asf/jena/blob/9538e473/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestStatisticsAggregates.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestStatisticsAggregates.java b/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestStatisticsAggregates.java
new file mode 100644
index 0000000..99d3bc8
--- /dev/null
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestStatisticsAggregates.java
@@ -0,0 +1,215 @@
+/*
+ * 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 org.apache.jena.sparql.expr;
+
+import org.apache.jena.atlas.lib.StrUtils ;
+import org.apache.jena.query.* ;
+import static org.apache.jena.query.Syntax.* ;
+import org.apache.jena.rdf.model.Literal ;
+import org.apache.jena.sparql.core.DatasetGraph ;
+import org.apache.jena.sparql.core.Var ;
+import org.apache.jena.sparql.engine.binding.Binding ;
+import org.apache.jena.sparql.expr.aggregate.lib.StandardCustomAggregates ;
+import org.apache.jena.sparql.sse.SSE ;
+import org.junit.Assert ;
+import org.junit.BeforeClass ;
+import org.junit.Test ;
+
+public class TestStatisticsAggregates {
+
+ static String NL = "\n" ;
+ static String PRE = StrUtils.strjoinNL
+ ("PREFIX afn: <http://jena.apache.org/ARQ/function#>") ;
+
+ static DatasetGraph ds = SSE.parseDatasetGraph("(dataset (graph (:x :p1 -1) (:x :p2 2) (:x :p3 3) (:x :p4 3) ))") ;
+ static DatasetGraph dsEmpty = SSE.parseDatasetGraph("(dataset)") ;
+ static DatasetGraph ds1 = SSE.parseDatasetGraph("(dataset (graph (:x :p -1)) )") ;
+
+ @BeforeClass public static void setupClass() {
+ StandardCustomAggregates.register();
+ }
+
+ static double VALUEstdev = 1.8929694486000912 ;
+ static double VALUEstdevd = 2.0816659994661326 ;
+
+ static double VALUEstdevp = 1.6393596310755 ;
+ static double VALUEstdevpd = 1.699673171197595 ;
+
+ static double VALUEvar = 3.5833333333333333 ;
+ static double VALUEvard = 4.333333333333333 ;
+
+ static double VALUEvarp = 2.6875 ;
+ static double VALUEvarpd = 2.888888888888889 ;
+
+ // For each aggregate function, there are the following tests.
+ // _uri The aggregate <uri>() / SPARQL 1.1
+ // _uri_d The distinct aggregate <uri_distinct>() by URI / SPARQL 1.1
+ // _uri_distinct The DISTINCT aggregate / SPARQL 1.1
+ // _agg AGG <uri>() / ARQ
+ // _agg_distinct AGG DISTINCT <uri>() / ARQ
+
+ // ---- stdev
+
+ @Test public void agg_stat_stdev_uri() {
+ test("afn:stdev(?x)", VALUEstdev, syntaxSPARQL_11) ;
+ }
+
+ @Test public void agg_stat_stdev_uri_d() {
+ test("afn:stdevd(?x)", VALUEstdevd, syntaxSPARQL_11) ;
+ }
+
+ @Test public void agg_stat_stdev_uri_distinct() {
+ test("afn:stdev(DISTINCT ?x)", VALUEstdevd, syntaxSPARQL_11) ;
+ }
+
+ @Test public void agg_stat_stdev_agg() {
+ test("AGG afn:stdev(?x)", VALUEstdev, syntaxARQ) ;
+ }
+
+ @Test public void agg_stat_stdev_agg_distinct() {
+ test("AGG afn:stdev(DISTINCT ?x)", VALUEstdevd, syntaxARQ) ;
+ }
+
+ // ---- stdevp
+
+ @Test public void agg_stat_stdevp_uri() {
+ test("afn:stdevp(?x)", VALUEstdevp, syntaxSPARQL_11) ;
+ }
+
+ @Test public void agg_stat_stdevp_uri_d() {
+ test("afn:stdevpd(?x)", VALUEstdevpd, syntaxSPARQL_11) ;
+ }
+
+ @Test public void agg_stat_stdevp_uri_distinct() {
+ test("afn:stdevp(DISTINCT ?x)", VALUEstdevpd, syntaxSPARQL_11) ;
+ }
+
+ @Test public void agg_stat_stdevp_agg() {
+ test("AGG afn:stdevp(?x)", VALUEstdevp, syntaxARQ) ;
+ }
+
+ @Test public void agg_stat_stdevp_agg_distinct() {
+ test("AGG afn:stdevp(DISTINCT ?x)", VALUEstdevpd, syntaxARQ) ;
+ }
+
+ // ---- var
+
+ @Test public void agg_stat_var_uri() {
+ test("afn:var(?x)", VALUEvar, syntaxSPARQL_11) ;
+ }
+
+ @Test public void agg_stat_var_uri_d() {
+ test("afn:vard(?x)", VALUEvard, syntaxSPARQL_11) ;
+ }
+
+ @Test public void agg_stat_var_uri_distinct() {
+ test("afn:var(DISTINCT ?x)", VALUEvard, syntaxSPARQL_11) ;
+ }
+
+ @Test public void agg_stat_var_agg() {
+ test("AGG afn:var(?x)", VALUEvar, syntaxARQ) ;
+ }
+
+ @Test public void agg_stat_var_agg_distinct() {
+ test("AGG afn:var(DISTINCT ?x)", VALUEvard, syntaxARQ) ;
+ }
+
+ // ---- varp
+
+ @Test public void agg_stat_varp_uri() {
+ test("afn:varp(?x)", VALUEvarp, syntaxSPARQL_11) ;
+ }
+
+ @Test public void agg_stat_varp_uri_d() {
+ test("afn:varpd(?x)", VALUEvarpd, syntaxSPARQL_11) ;
+ }
+
+ @Test public void agg_stat_varp_uri_distinct() {
+ test("afn:varp(DISTINCT ?x)", VALUEvarpd, syntaxSPARQL_11) ;
+ }
+
+ @Test public void agg_stat_varp_agg() {
+ test("AGG afn:varp(?x)", VALUEvarp, syntaxARQ) ;
+ }
+
+ @Test public void agg_stat_varp_agg_distinct() {
+ test("AGG afn:varp(DISTINCT ?x)", VALUEvarpd, syntaxARQ) ;
+ }
+
+ // ---- Corner cases. 0 and 1 matches.
+
+ @Test public void agg_stat_stdev_empty_1() {
+ // Empty -> error
+ testErr("afn:stdev(?x)", dsEmpty, syntaxSPARQL_11) ;
+ }
+
+ @Test public void agg_stat_stdev_empty_2() {
+ // Empty -> error
+ testErr("afn:stdevp(?x)", dsEmpty, syntaxSPARQL_11) ;
+ }
+
+ // Sample of one -> error
+ @Test public void agg_stat_size_one_1() {
+ testErr("afn:stdev(?x)", ds1, syntaxSPARQL_11) ;
+ }
+
+ // Population of one -> 0e0
+ @Test public void agg_stat_size_one_2() {
+ Query query = build("afn:stdevp(?x)", syntaxSPARQL_11) ;
+ test(query, 0e0, ds1) ;
+ }
+
+ private static void test(String qsAgg, double expected, Syntax syntax) {
+ test(qsAgg, expected, syntax, ds) ;
+ }
+
+ private static void test(String qsAgg, double expected, Syntax syntax, DatasetGraph dsg) {
+ Query query = build(qsAgg, syntax) ;
+ test(query, expected, dsg) ;
+ }
+
+ private static void test(Query query, double expected, DatasetGraph dsg) {
+ try ( QueryExecution qExec = QueryExecutionFactory.create(query, DatasetFactory.wrap(dsg)) ) {
+ Literal literal = qExec.execSelect().next().getLiteral("X") ;
+ double result = literal.getDouble() ;
+ Assert.assertEquals(expected, result, 0.001);
+ }
+ }
+
+ private static Query build(String qsAgg, Syntax syntax) {
+ String NL = "\n" ;
+ String PRE = StrUtils.strjoinNL
+ ("PREFIX math: <http://www.w3.org/2005/xpath-functions/math#>",
+ "PREFIX afn: <http://jena.apache.org/ARQ/function#>") ;
+ String qs = PRE+NL+"SELECT ("+qsAgg+NL+"AS ?X) WHERE {?s ?p ?x} GROUP BY ?s" ;
+ Query query = QueryFactory.create(qs, syntax) ;
+ return query ;
+ }
+
+ private void testErr(String qsAgg, DatasetGraph ds, Syntax syntax) {
+ Query query = build(qsAgg, syntax) ;
+ try ( QueryExecution qExec = QueryExecutionFactory.create(query, DatasetFactory.wrap(ds)) ) {
+ ResultSet rs = qExec.execSelect() ;
+ Assert.assertTrue(rs.hasNext()) ;
+ Assert.assertTrue(rs.getResultVars().contains("X")) ;
+ Binding b = rs.nextBinding() ;
+ Assert.assertFalse(b.contains(Var.alloc("X"))) ;
+ }
+ }
+}
[16/16] jena git commit: This closes #130.
Posted by an...@apache.org.
This closes #130.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/0653392c
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/0653392c
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/0653392c
Branch: refs/heads/master
Commit: 0653392c24d6ec0d83c97c77f789a85b3c3b79de
Parents: 6e588da
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Mar 13 17:27:40 2016 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Mar 13 17:27:40 2016 +0000
----------------------------------------------------------------------
----------------------------------------------------------------------
[06/16] jena git commit: JENA-1156: Use standard SQL naming. Add
keywords to extended SPARQL.
Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/jena/blob/6e588daa/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestStatisticsAggregates.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestStatisticsAggregates.java b/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestStatisticsAggregates.java
index f094a82..829fccf 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestStatisticsAggregates.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestStatisticsAggregates.java
@@ -26,7 +26,7 @@ import org.apache.jena.sparql.core.DatasetGraph ;
import org.apache.jena.sparql.core.Var ;
import org.apache.jena.sparql.engine.binding.Binding ;
import org.apache.jena.sparql.expr.aggregate.AggregateRegistry ;
-import org.apache.jena.sparql.expr.aggregate.lib.StandardCustomAggregates ;
+import org.apache.jena.sparql.expr.aggregate.lib.StandardAggregates ;
import org.apache.jena.sparql.sse.SSE ;
import static org.junit.Assert.* ;
import org.junit.BeforeClass ;
@@ -43,153 +43,250 @@ public class TestStatisticsAggregates {
static DatasetGraph ds1 = SSE.parseDatasetGraph("(dataset (graph (:x :p -1)) )") ;
@BeforeClass public static void setupClass() {
- StandardCustomAggregates.register();
+ StandardAggregates.register();
}
- static double VALUEstdev = 1.8929694486000912 ;
- static double VALUEstdevd = 2.0816659994661326 ;
+ static double VALUEstdev_samp = 1.8929694486000912 ;
+ static double VALUEstdev_sampd = 2.0816659994661326 ;
- static double VALUEstdevp = 1.6393596310755 ;
- static double VALUEstdevpd = 1.699673171197595 ;
+ static double VALUEstdev_pop = 1.6393596310755 ;
+ static double VALUEstdev_popd = 1.699673171197595 ;
- static double VALUEvar = 3.5833333333333333 ;
- static double VALUEvard = 4.333333333333333 ;
+ static double VALUEvar_samp = 3.5833333333333333 ;
+ static double VALUEvar_sampd = 4.333333333333333 ;
- static double VALUEvarp = 2.6875 ;
- static double VALUEvarpd = 2.888888888888889 ;
+ static double VALUEvar_pop = 2.6875 ;
+ static double VALUEvar_popd = 2.888888888888889 ;
// For each aggregate function, there are the following tests.
- // _uri The aggregate <uri>() / SPARQL 1.1
- // _uri_d The distinct aggregate <uri_distinct>() by URI / SPARQL 1.1
- // _uri_distinct The DISTINCT aggregate / SPARQL 1.1
- // _agg AGG <uri>() / ARQ
- // _agg_distinct AGG DISTINCT <uri>() / ARQ
+ // The aggregate <uri>() / SPARQL 1.1
+ // The DISTINCT aggregate / SPARQL 1.1
+ // ARQ keyword
+ // ARQ DISTINCT keyword
+ // AGG <uri>() / ARQ
+ // AGG DISTINCT <uri>() / ARQ
// ---- stdev
@Test public void agg_stat_stdev_uri() {
- test("agg:stdev(?x)", VALUEstdev, syntaxSPARQL_11) ;
- }
-
- @Test public void agg_stat_stdev_uri_d() {
- test("agg:stdevd(?x)", VALUEstdevd, syntaxSPARQL_11) ;
+ test("agg:stdev(?x)", VALUEstdev_samp, syntaxSPARQL_11) ;
}
@Test public void agg_stat_stdev_uri_distinct() {
- test("agg:stdev(DISTINCT ?x)", VALUEstdevd, syntaxSPARQL_11) ;
+ test("agg:stdev(DISTINCT ?x)", VALUEstdev_sampd, syntaxSPARQL_11) ;
+ }
+
+ @Test public void agg_stat_stdev_kw() {
+ test("STDEV(?x)", VALUEstdev_samp, syntaxARQ) ;
+ }
+
+ @Test public void agg_stat_stdev_kw_distinct() {
+ test("STDEV(DISTINCT ?x)", VALUEstdev_sampd, syntaxARQ) ;
}
@Test public void agg_stat_stdev_agg() {
- test("AGG agg:stdev(?x)", VALUEstdev, syntaxARQ) ;
+ test("AGG agg:stdev(?x)", VALUEstdev_samp, syntaxARQ) ;
}
@Test public void agg_stat_stdev_agg_distinct() {
- test("AGG agg:stdev(DISTINCT ?x)", VALUEstdevd, syntaxARQ) ;
+ test("AGG agg:stdev(DISTINCT ?x)", VALUEstdev_sampd, syntaxARQ) ;
}
- // ---- stdevp
+ // ---- stdev_samp
- @Test public void agg_stat_stdevp_uri() {
- test("agg:stdevp(?x)", VALUEstdevp, syntaxSPARQL_11) ;
+ @Test public void agg_stat_stdev_samp_uri() {
+ test("agg:stdev_samp(?x)", VALUEstdev_samp, syntaxSPARQL_11) ;
+ }
+
+ @Test public void agg_stat_stdev_samp_uri_distinct() {
+ test("agg:stdev_samp(DISTINCT ?x)", VALUEstdev_sampd, syntaxSPARQL_11) ;
+ }
+
+ @Test public void agg_stat_stdev_samp_kw() {
+ test("STDEV_SAMP(?x)", VALUEstdev_samp, syntaxARQ) ;
+ }
+
+ @Test public void agg_stat_stdev_samp_kw_distinct() {
+ test("STDEV_SAMP(DISTINCT ?x)", VALUEstdev_sampd, syntaxARQ) ;
+ }
+
+ @Test public void agg_stat_stdev_samp_agg() {
+ test("AGG agg:stdev_samp(?x)", VALUEstdev_samp, syntaxARQ) ;
+ }
+
+ @Test public void agg_stat_stdev_samp_agg_distinct() {
+ test("AGG agg:stdev_samp(DISTINCT ?x)", VALUEstdev_sampd, syntaxARQ) ;
}
- @Test public void agg_stat_stdevp_uri_d() {
- test("agg:stdevpd(?x)", VALUEstdevpd, syntaxSPARQL_11) ;
+ // ---- stdev_pop
+
+ @Test public void agg_stat_stdevp_uri() {
+ test("agg:stdev_pop(?x)", VALUEstdev_pop, syntaxSPARQL_11) ;
}
- @Test public void agg_stat_stdevp_uri_distinct() {
- test("agg:stdevp(DISTINCT ?x)", VALUEstdevpd, syntaxSPARQL_11) ;
+ @Test public void agg_stat_stdev_pop_uri_distinct() {
+ test("agg:stdev_pop(DISTINCT ?x)", VALUEstdev_popd, syntaxSPARQL_11) ;
}
- @Test public void agg_stat_stdevp_agg() {
- test("AGG agg:stdevp(?x)", VALUEstdevp, syntaxARQ) ;
+ @Test public void agg_stat_stdev_pop_kw() {
+ test("STDEV_POP(?x)", VALUEstdev_pop, syntaxARQ) ;
}
- @Test public void agg_stat_stdevp_agg_distinct() {
- test("AGG agg:stdevp(DISTINCT ?x)", VALUEstdevpd, syntaxARQ) ;
+ @Test public void agg_stat_stdev_pop_kw_distinct() {
+ test("STDEV_POP(DISTINCT ?x)", VALUEstdev_popd, syntaxARQ) ;
}
- // ---- var
+ @Test public void agg_stat_stdev_pop_agg() {
+ test("AGG agg:stdev_pop(?x)", VALUEstdev_pop, syntaxARQ) ;
+ }
- @Test public void agg_stat_var_uri() {
- test("agg:var(?x)", VALUEvar, syntaxSPARQL_11) ;
+ @Test public void agg_stat_stdev_pop_agg_distinct() {
+ test("AGG agg:stdev_pop(DISTINCT ?x)", VALUEstdev_popd, syntaxARQ) ;
}
-
- @Test public void agg_stat_var_uri_d() {
- test("agg:vard(?x)", VALUEvard, syntaxSPARQL_11) ;
+
+ // ---- variance
+
+ @Test public void agg_stat_var_uri() {
+ test("agg:variance(?x)", VALUEvar_samp, syntaxSPARQL_11) ;
}
@Test public void agg_stat_var_uri_distinct() {
- test("agg:var(DISTINCT ?x)", VALUEvard, syntaxSPARQL_11) ;
+ test("agg:variance(DISTINCT ?x)", VALUEvar_sampd, syntaxSPARQL_11) ;
+ }
+
+ @Test public void agg_stat_var_kw() {
+ test("VARIANCE(?x)", VALUEvar_samp, syntaxARQ) ;
+ }
+
+ @Test public void agg_stat_var_kw_distinct() {
+ test("VARIANCE(DISTINCT ?x)", VALUEvar_sampd, syntaxARQ) ;
}
@Test public void agg_stat_var_agg() {
- test("AGG agg:var(?x)", VALUEvar, syntaxARQ) ;
+ test("AGG agg:variance(?x)", VALUEvar_samp, syntaxARQ) ;
}
@Test public void agg_stat_var_agg_distinct() {
- test("AGG agg:var(DISTINCT ?x)", VALUEvard, syntaxARQ) ;
+ test("AGG agg:variance(DISTINCT ?x)", VALUEvar_sampd, syntaxARQ) ;
}
- // ---- varp
+ // ---- var_samp
- @Test public void agg_stat_varp_uri() {
- test("agg:varp(?x)", VALUEvarp, syntaxSPARQL_11) ;
+ @Test public void agg_stat_var_samp_uri() {
+ test("agg:var_samp(?x)", VALUEvar_samp, syntaxSPARQL_11) ;
}
- @Test public void agg_stat_varp_uri_d() {
- test("agg:varpd(?x)", VALUEvarpd, syntaxSPARQL_11) ;
+ @Test public void agg_stat_var_samp_uri_distinct() {
+ test("agg:var_samp(DISTINCT ?x)", VALUEvar_sampd, syntaxSPARQL_11) ;
+ }
+
+ @Test public void agg_stat_var_samp_kw() {
+ test("VAR_SAMP(?x)", VALUEvar_samp, syntaxARQ) ;
+ }
+
+ @Test public void agg_stat_var_samp_kw_distinct() {
+ test("VAR_SAMP(DISTINCT ?x)", VALUEvar_sampd, syntaxARQ) ;
+ }
+
+ @Test public void agg_stat_var_samp_agg() {
+ test("AGG agg:var_samp(?x)", VALUEvar_samp, syntaxARQ) ;
+ }
+
+ @Test public void agg_stat_var_samp_agg_distinct() {
+ test("AGG agg:var_samp(DISTINCT ?x)", VALUEvar_sampd, syntaxARQ) ;
+ }
+
+ // ---- var_pop
+
+ @Test public void agg_stat_var_pop_uri() {
+ test("agg:var_pop(?x)", VALUEvar_pop, syntaxSPARQL_11) ;
}
- @Test public void agg_stat_varp_uri_distinct() {
- test("agg:varp(DISTINCT ?x)", VALUEvarpd, syntaxSPARQL_11) ;
+ @Test public void agg_stat_var_pop_uri_distinct() {
+ test("agg:var_pop(DISTINCT ?x)", VALUEvar_popd, syntaxSPARQL_11) ;
}
- @Test public void agg_stat_varp_agg() {
- test("AGG agg:varp(?x)", VALUEvarp, syntaxARQ) ;
+ @Test public void agg_stat_var_pop_kw() {
+ test("VAR_POP(?x)", VALUEvar_pop, syntaxARQ) ;
}
- @Test public void agg_stat_varp_agg_distinct() {
- test("AGG agg:varp(DISTINCT ?x)", VALUEvarpd, syntaxARQ) ;
+ @Test public void agg_stat_var_pop_kw_distinct() {
+ test("VAR_POP(DISTINCT ?x)", VALUEvar_popd, syntaxARQ) ;
}
- //<http://jena.hpl.hp.com/ARQ/function/aggregate#>
+ @Test public void agg_stat_var_pop_agg() {
+ test("AGG agg:var_pop(?x)", VALUEvar_pop, syntaxARQ) ;
+ }
+
+ @Test public void agg_stat_var_pop_agg_distinct() {
+ test("AGG agg:var_pop(DISTINCT ?x)", VALUEvar_popd, syntaxARQ) ;
+ }
+
+ //<http://jena.apache.org/ARQ/function/aggregate#>
@Test public void agg_stat_stdev_full_uri() {
- test("<http://jena.apache.org/ARQ/function/aggregate#stdev>(?x)", VALUEstdev, syntaxSPARQL_11) ;
+ test("<http://jena.apache.org/ARQ/function/aggregate#stdev>(?x)", VALUEstdev_samp, syntaxSPARQL_11) ;
}
@Test public void agg_stat_registry() {
assertTrue(AggregateRegistry.isRegistered("http://jena.apache.org/ARQ/function/aggregate#stdev")) ;
- assertTrue(AggregateRegistry.isRegistered("http://jena.apache.org/ARQ/function/aggregate#stdevp")) ;
- assertTrue(AggregateRegistry.isRegistered("http://jena.apache.org/ARQ/function/aggregate#var")) ;
- assertTrue(AggregateRegistry.isRegistered("http://jena.apache.org/ARQ/function/aggregate#varp")) ;
+ assertTrue(AggregateRegistry.isRegistered("http://jena.apache.org/ARQ/function/aggregate#stdev_samp")) ;
+ assertTrue(AggregateRegistry.isRegistered("http://jena.apache.org/ARQ/function/aggregate#stdev_pop")) ;
+ assertTrue(AggregateRegistry.isRegistered("http://jena.apache.org/ARQ/function/aggregate#variance")) ;
+ assertTrue(AggregateRegistry.isRegistered("http://jena.apache.org/ARQ/function/aggregate#var_samp")) ;
+ assertTrue(AggregateRegistry.isRegistered("http://jena.apache.org/ARQ/function/aggregate#var_pop")) ;
+
assertFalse(AggregateRegistry.isRegistered("http://jena.apache.org/ARQ/function#e")) ; // Not an aggregate
}
// ---- Corner cases. 0 and 1 matches.
- @Test public void agg_stat_stdev_empty_1() {
- // Empty -> error
+ // Empty -> error
+ @Test public void agg_stat_stdev_empty() {
testErr("agg:stdev(?x)", dsEmpty, syntaxSPARQL_11) ;
}
- @Test public void agg_stat_stdev_empty_2() {
- // Empty -> error
- testErr("agg:stdevp(?x)", dsEmpty, syntaxSPARQL_11) ;
+ // Empty -> error
+ @Test public void agg_stat_stdev_samp_empty() {
+ testErr("agg:stdev_samp(?x)", dsEmpty, syntaxSPARQL_11) ;
+ }
+
+ // Empty -> error
+ @Test public void agg_stat_stdev_pop_empty() {
+ testErr("agg:stdev_pop(?x)", dsEmpty, syntaxSPARQL_11) ;
}
// Sample of one -> error
- @Test public void agg_stat_size_one_1() {
+ @Test public void agg_stat_stdev_size_one() {
testErr("agg:stdev(?x)", ds1, syntaxSPARQL_11) ;
}
+ // Sample of one -> error
+ @Test public void agg_stat_stdev_samp_size_one() {
+ testErr("agg:stdev_samp(?x)", ds1, syntaxSPARQL_11) ;
+ }
+
+ // Sample of one -> error
+ @Test public void agg_stat_var_size_one_1() {
+ testErr("agg:var_samp(?x)", ds1, syntaxSPARQL_11) ;
+ }
+
+ // Population of one -> 0e0
+ @Test public void agg_stat_stdev_pop_size_one() {
+ Query query = build("agg:stdev_pop(?x)", syntaxSPARQL_11) ;
+ test(query, 0e0, ds1) ;
+ }
+
// Population of one -> 0e0
- @Test public void agg_stat_size_one_2() {
- Query query = build("agg:stdevp(?x)", syntaxSPARQL_11) ;
+ @Test public void agg_stat_var_pop_size_one() {
+ Query query = build("agg:var_pop(?x)", syntaxSPARQL_11) ;
test(query, 0e0, ds1) ;
}
+ // By keyword
+
+
+
private static void test(String qsAgg, double expected, Syntax syntax) {
test(qsAgg, expected, syntax, ds) ;
}
[15/16] jena git commit: Abbreviate URIs of custom aggregate
functions.
Posted by an...@apache.org.
Abbreviate URIs of custom aggregate functions.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/7cc7e0e6
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/7cc7e0e6
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/7cc7e0e6
Branch: refs/heads/master
Commit: 7cc7e0e6248b34f723de9acec4eac620322ec583
Parents: 9c2fa68
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Mar 12 13:27:01 2016 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Mar 13 17:22:25 2016 +0000
----------------------------------------------------------------------
.../jena/sparql/expr/aggregate/AggCustom.java | 215 ++++++++++---------
1 file changed, 112 insertions(+), 103 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/7cc7e0e6/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggCustom.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggCustom.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggCustom.java
index 40e8ed3..d3a4aa8 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggCustom.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggCustom.java
@@ -18,97 +18,102 @@
package org.apache.jena.sparql.expr.aggregate;
-import java.util.Locale ;
+import java.util.Locale;
import java.util.Objects;
-import org.apache.jena.atlas.io.IndentedLineBuffer ;
-import org.apache.jena.graph.Node ;
-import org.apache.jena.query.QueryExecException ;
-import org.apache.jena.sparql.engine.binding.Binding ;
-import org.apache.jena.sparql.expr.E_Function ;
-import org.apache.jena.sparql.expr.Expr ;
-import org.apache.jena.sparql.expr.ExprList ;
-import org.apache.jena.sparql.expr.NodeValue ;
-import org.apache.jena.sparql.function.FunctionEnv ;
-import org.apache.jena.sparql.serializer.SerializationContext ;
-import org.apache.jena.sparql.sse.writers.WriterExpr ;
-import org.apache.jena.sparql.util.ExprUtils ;
-
-/** Syntax element and framework execution for custom aggregates.
+import org.apache.jena.atlas.io.IndentedLineBuffer;
+import org.apache.jena.graph.Node;
+import org.apache.jena.query.QueryExecException;
+import org.apache.jena.sparql.engine.binding.Binding;
+import org.apache.jena.sparql.expr.E_Function;
+import org.apache.jena.sparql.expr.Expr;
+import org.apache.jena.sparql.expr.ExprList;
+import org.apache.jena.sparql.expr.NodeValue;
+import org.apache.jena.sparql.function.FunctionEnv;
+import org.apache.jena.sparql.serializer.SerializationContext;
+import org.apache.jena.sparql.sse.writers.WriterExpr;
+import org.apache.jena.sparql.util.ExprUtils;
+import org.apache.jena.sparql.util.FmtUtils ;
+
+/**
+ * Syntax element and framework execution for custom aggregates.
*/
-public class AggCustom extends AggregatorBase
-{
+public class AggCustom extends AggregatorBase {
// See also ExprAggregator
-
- private final String iri ;
-
- public AggCustom(String iri, boolean distinct, ExprList exprs) {
- super("AGG", distinct, exprs) ;
- this.iri = iri ;
- }
-
+
+ private final String iri;
+
+ public AggCustom(String iri, boolean distinct, ExprList exprs) {
+ super("AGG", distinct, exprs);
+ this.iri = iri;
+ }
+
@Override
- public Aggregator copy(ExprList exprs) { return new AggCustom(iri, isDistinct, exprs) ; }
-
+ public Aggregator copy(ExprList exprs) {
+ return new AggCustom(iri, isDistinct, exprs);
+ }
+
@Override
public String asSparqlExpr(SerializationContext sCxt) {
- IndentedLineBuffer x = new IndentedLineBuffer() ;
- if ( ! AggregateRegistry.isRegistered(iri) ) {
- // If not registered and if parsed in again not registered, it becomes a function.
- // AGG <iri>(...) syntax. It can't have been legal SPARQL 1.1 unless it got
+ IndentedLineBuffer x = new IndentedLineBuffer();
+ if ( !AggregateRegistry.isRegistered(iri) ) {
+ // If not registered and if parsed in again not registered, it becomes a
+ // function.
+ // AGG <iri>(...) syntax. It can't have been legal SPARQL 1.1 unless it got
// unregistered in which case all bets are off anyway.
- x.append(getName()) ;
- x.append(" ") ;
+ x.append(getName());
+ x.append(" ");
}
- x.append("<") ;
- x.append(iri);
- x.append(">") ;
- x.append("(") ;
+
+ String uriStr = FmtUtils.stringForURI(iri, sCxt) ;
+ x.append(uriStr) ;
+ x.append("(");
if ( isDistinct )
- x.append("DISTINCT ") ;
- x.incIndent();
- ExprUtils.fmtSPARQL(x, getExprList(), sCxt) ;
- x.decIndent();
- x.append(")") ;
- return x.asString() ;
+ x.append("DISTINCT ");
+ x.incIndent();
+ ExprUtils.fmtSPARQL(x, getExprList(), sCxt);
+ x.decIndent();
+ x.append(")");
+ return x.asString();
}
@Override
- public String toPrefixString() {
- IndentedLineBuffer x = new IndentedLineBuffer() ;
- x.append("(") ;
- x.append(getName().toLowerCase(Locale.ROOT)) ;
- x.append(" <") ;
+ public String toPrefixString() {
+ IndentedLineBuffer x = new IndentedLineBuffer();
+ x.append("(");
+ x.append(getName().toLowerCase(Locale.ROOT));
+ x.append(" <");
x.append(iri);
- x.append("> ") ;
- x.incIndent();
-
+ x.append("> ");
+ x.incIndent();
+
if ( isDistinct )
- x.append("distinct ") ;
- boolean first = true ;
+ x.append("distinct ");
+ boolean first = true;
for ( Expr e : getExprList() ) {
- if ( ! first )
+ if ( !first )
x.append(" ");
- first = false ;
- WriterExpr.output(x, e, null) ;
- first = false ;
+ first = false;
+ WriterExpr.output(x, e, null);
+ first = false;
}
x.decIndent();
- x.append(")") ;
- return x.asString() ;
+ x.append(")");
+ return x.asString();
}
@Override
- public Accumulator createAccumulator()
- {
- AccumulatorFactory f = AggregateRegistry.getAccumulatorFactory(iri) ;
+ public Accumulator createAccumulator() {
+ AccumulatorFactory f = AggregateRegistry.getAccumulatorFactory(iri);
if ( f == null )
- throw new QueryExecException("Unregistered aggregate: "+iri) ;
- return f.createAccumulator(this, isDistinct) ;
+ throw new QueryExecException("Unregistered aggregate: " + iri);
+ return f.createAccumulator(this, isDistinct);
}
@Override
- public Node getValueEmpty() { return AggregateRegistry.getNoGroupValue(iri) ; }
+ public Node getValueEmpty() {
+ return AggregateRegistry.getNoGroupValue(iri);
+ }
@Override
public Expr getExpr() {
@@ -117,59 +122,63 @@ public class AggCustom extends AggregatorBase
else
return exprList.get(0);
}
-
- public String getIRI() { return iri ; }
+
+ public String getIRI() {
+ return iri;
+ }
@Override
- public int hashCode() {
- if ( ! AggregateRegistry.isRegistered(iri) ) {
- return asFunction().hashCode() ;
+ public int hashCode() {
+ if ( !AggregateRegistry.isRegistered(iri) ) {
+ return asFunction().hashCode();
}
- return HC_AggCustom ^ getExprList().hashCode() ^ iri.hashCode() ;
+ return HC_AggCustom ^ getExprList().hashCode() ^ iri.hashCode();
}
-
+
private E_Function asFunction() {
- return new E_Function(iri, exprList) ;
+ return new E_Function(iri, exprList);
}
-
+
@Override
public boolean equals(Aggregator other, boolean bySyntax) {
- if ( other == null ) return false ;
- if ( this == other ) return true ;
-
- if ( ! AggregateRegistry.isRegistered(iri) ) {
- E_Function f1 = asFunction() ;
- if ( ! ( other instanceof AggCustom ) )
- return false ;
- E_Function f2 = ((AggCustom)other).asFunction() ;
- return f1.equals(f2, bySyntax) ;
+ if ( other == null )
+ return false;
+ if ( this == other )
+ return true;
+
+ if ( !AggregateRegistry.isRegistered(iri) ) {
+ E_Function f1 = asFunction();
+ if ( !(other instanceof AggCustom) )
+ return false;
+ E_Function f2 = ((AggCustom)other).asFunction();
+ return f1.equals(f2, bySyntax);
}
-
- if ( ! ( other instanceof AggCustom ) )
- return false ;
- AggCustom agg = (AggCustom)other ;
- return Objects.equals(this.iri, agg.iri) &&
- this.isDistinct == agg.isDistinct &&
- this.getExprList().equals(agg.getExprList(), bySyntax) ;
- }
-
- public static Accumulator createAccNull() { return new AccCustom() ; }
-
+
+ if ( !(other instanceof AggCustom) )
+ return false;
+ AggCustom agg = (AggCustom)other;
+ return Objects.equals(this.iri, agg.iri) && this.isDistinct == agg.isDistinct
+ && this.getExprList().equals(agg.getExprList(), bySyntax);
+ }
+
+ public static Accumulator createAccNull() {
+ return new AccCustom();
+ }
+
// ---- Accumulator
- private static class AccCustom implements Accumulator
- {
- private int nBindings = 0 ;
+ private static class AccCustom implements Accumulator {
+ private int nBindings = 0;
- public AccCustom() { }
+ public AccCustom() {}
@Override
- public void accumulate(Binding binding, FunctionEnv functionEnv)
- { nBindings++ ; }
+ public void accumulate(Binding binding, FunctionEnv functionEnv) {
+ nBindings++;
+ }
@Override
- public NodeValue getValue()
- {
- return null ;
+ public NodeValue getValue() {
+ return null;
}
}
[10/16] jena git commit: JENA-1156: Use standard SQL naming. Add
keywords to extended SPARQL.
Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/jena/blob/6e588daa/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParserConstants.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParserConstants.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParserConstants.java
index 3d41145..fd397c7 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParserConstants.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParserConstants.java
@@ -117,303 +117,313 @@ public interface ARQParserConstants {
/** RegularExpression Id. */
int AVG = 58;
/** RegularExpression Id. */
- int STDDEV = 59;
+ int STDEV = 59;
/** RegularExpression Id. */
- int SAMPLE = 60;
+ int STDEV_SAMP = 60;
/** RegularExpression Id. */
- int GROUP_CONCAT = 61;
+ int STDEV_POP = 61;
/** RegularExpression Id. */
- int FILTER = 62;
+ int VARIANCE = 62;
/** RegularExpression Id. */
- int BOUND = 63;
+ int VAR_SAMP = 63;
/** RegularExpression Id. */
- int COALESCE = 64;
+ int VAR_POP = 64;
/** RegularExpression Id. */
- int IN = 65;
+ int SAMPLE = 65;
/** RegularExpression Id. */
- int IF = 66;
+ int GROUP_CONCAT = 66;
/** RegularExpression Id. */
- int BNODE = 67;
+ int FILTER = 67;
/** RegularExpression Id. */
- int IRI = 68;
+ int BOUND = 68;
/** RegularExpression Id. */
- int URI = 69;
+ int COALESCE = 69;
/** RegularExpression Id. */
- int CAST = 70;
+ int IN = 70;
/** RegularExpression Id. */
- int CALL = 71;
+ int IF = 71;
/** RegularExpression Id. */
- int MULTI = 72;
+ int BNODE = 72;
/** RegularExpression Id. */
- int SHORTEST = 73;
+ int IRI = 73;
/** RegularExpression Id. */
- int STR = 74;
+ int URI = 74;
/** RegularExpression Id. */
- int STRLANG = 75;
+ int CAST = 75;
/** RegularExpression Id. */
- int STRDT = 76;
+ int CALL = 76;
/** RegularExpression Id. */
- int DTYPE = 77;
+ int MULTI = 77;
/** RegularExpression Id. */
- int LANG = 78;
+ int SHORTEST = 78;
/** RegularExpression Id. */
- int LANGMATCHES = 79;
+ int STR = 79;
/** RegularExpression Id. */
- int IS_URI = 80;
+ int STRLANG = 80;
/** RegularExpression Id. */
- int IS_IRI = 81;
+ int STRDT = 81;
/** RegularExpression Id. */
- int IS_BLANK = 82;
+ int DTYPE = 82;
/** RegularExpression Id. */
- int IS_LITERAL = 83;
+ int LANG = 83;
/** RegularExpression Id. */
- int IS_NUMERIC = 84;
+ int LANGMATCHES = 84;
/** RegularExpression Id. */
- int REGEX = 85;
+ int IS_URI = 85;
/** RegularExpression Id. */
- int SAME_TERM = 86;
+ int IS_IRI = 86;
/** RegularExpression Id. */
- int RAND = 87;
+ int IS_BLANK = 87;
/** RegularExpression Id. */
- int ABS = 88;
+ int IS_LITERAL = 88;
/** RegularExpression Id. */
- int CEIL = 89;
+ int IS_NUMERIC = 89;
/** RegularExpression Id. */
- int FLOOR = 90;
+ int REGEX = 90;
/** RegularExpression Id. */
- int ROUND = 91;
+ int SAME_TERM = 91;
/** RegularExpression Id. */
- int CONCAT = 92;
+ int RAND = 92;
/** RegularExpression Id. */
- int SUBSTR = 93;
+ int ABS = 93;
/** RegularExpression Id. */
- int STRLEN = 94;
+ int CEIL = 94;
/** RegularExpression Id. */
- int REPLACE = 95;
+ int FLOOR = 95;
/** RegularExpression Id. */
- int UCASE = 96;
+ int ROUND = 96;
/** RegularExpression Id. */
- int LCASE = 97;
+ int CONCAT = 97;
/** RegularExpression Id. */
- int ENCODE_FOR_URI = 98;
+ int SUBSTR = 98;
/** RegularExpression Id. */
- int CONTAINS = 99;
+ int STRLEN = 99;
/** RegularExpression Id. */
- int STRSTARTS = 100;
+ int REPLACE = 100;
/** RegularExpression Id. */
- int STRENDS = 101;
+ int UCASE = 101;
/** RegularExpression Id. */
- int STRBEFORE = 102;
+ int LCASE = 102;
/** RegularExpression Id. */
- int STRAFTER = 103;
+ int ENCODE_FOR_URI = 103;
/** RegularExpression Id. */
- int YEAR = 104;
+ int CONTAINS = 104;
/** RegularExpression Id. */
- int MONTH = 105;
+ int STRSTARTS = 105;
/** RegularExpression Id. */
- int DAY = 106;
+ int STRENDS = 106;
/** RegularExpression Id. */
- int HOURS = 107;
+ int STRBEFORE = 107;
/** RegularExpression Id. */
- int MINUTES = 108;
+ int STRAFTER = 108;
/** RegularExpression Id. */
- int SECONDS = 109;
+ int YEAR = 109;
/** RegularExpression Id. */
- int TIMEZONE = 110;
+ int MONTH = 110;
/** RegularExpression Id. */
- int TZ = 111;
+ int DAY = 111;
/** RegularExpression Id. */
- int NOW = 112;
+ int HOURS = 112;
/** RegularExpression Id. */
- int UUID = 113;
+ int MINUTES = 113;
/** RegularExpression Id. */
- int STRUUID = 114;
+ int SECONDS = 114;
/** RegularExpression Id. */
- int VERSION = 115;
+ int TIMEZONE = 115;
/** RegularExpression Id. */
- int MD5 = 116;
+ int TZ = 116;
/** RegularExpression Id. */
- int SHA1 = 117;
+ int NOW = 117;
/** RegularExpression Id. */
- int SHA224 = 118;
+ int UUID = 118;
/** RegularExpression Id. */
- int SHA256 = 119;
+ int STRUUID = 119;
/** RegularExpression Id. */
- int SHA384 = 120;
+ int VERSION = 120;
/** RegularExpression Id. */
- int SHA512 = 121;
+ int MD5 = 121;
/** RegularExpression Id. */
- int TRUE = 122;
+ int SHA1 = 122;
/** RegularExpression Id. */
- int FALSE = 123;
+ int SHA224 = 123;
/** RegularExpression Id. */
- int DATA = 124;
+ int SHA256 = 124;
/** RegularExpression Id. */
- int INSERT = 125;
+ int SHA384 = 125;
/** RegularExpression Id. */
- int DELETE = 126;
+ int SHA512 = 126;
/** RegularExpression Id. */
- int INSERT_DATA = 127;
+ int TRUE = 127;
/** RegularExpression Id. */
- int DELETE_DATA = 128;
+ int FALSE = 128;
/** RegularExpression Id. */
- int DELETE_WHERE = 129;
+ int DATA = 129;
/** RegularExpression Id. */
- int LOAD = 130;
+ int INSERT = 130;
/** RegularExpression Id. */
- int CLEAR = 131;
+ int DELETE = 131;
/** RegularExpression Id. */
- int CREATE = 132;
+ int INSERT_DATA = 132;
/** RegularExpression Id. */
- int ADD = 133;
+ int DELETE_DATA = 133;
/** RegularExpression Id. */
- int MOVE = 134;
+ int DELETE_WHERE = 134;
/** RegularExpression Id. */
- int COPY = 135;
+ int LOAD = 135;
/** RegularExpression Id. */
- int META = 136;
+ int CLEAR = 136;
/** RegularExpression Id. */
- int SILENT = 137;
+ int CREATE = 137;
/** RegularExpression Id. */
- int DROP = 138;
+ int ADD = 138;
/** RegularExpression Id. */
- int INTO = 139;
+ int MOVE = 139;
/** RegularExpression Id. */
- int TO = 140;
+ int COPY = 140;
/** RegularExpression Id. */
- int DFT = 141;
+ int META = 141;
/** RegularExpression Id. */
- int ALL = 142;
+ int SILENT = 142;
/** RegularExpression Id. */
- int WITH = 143;
+ int DROP = 143;
/** RegularExpression Id. */
- int USING = 144;
+ int INTO = 144;
/** RegularExpression Id. */
- int DIGITS = 145;
+ int TO = 145;
/** RegularExpression Id. */
- int INTEGER = 146;
+ int DFT = 146;
/** RegularExpression Id. */
- int DECIMAL = 147;
+ int ALL = 147;
/** RegularExpression Id. */
- int DOUBLE = 148;
+ int WITH = 148;
/** RegularExpression Id. */
- int INTEGER_POSITIVE = 149;
+ int USING = 149;
/** RegularExpression Id. */
- int DECIMAL_POSITIVE = 150;
+ int DIGITS = 150;
/** RegularExpression Id. */
- int DOUBLE_POSITIVE = 151;
+ int INTEGER = 151;
/** RegularExpression Id. */
- int INTEGER_NEGATIVE = 152;
+ int DECIMAL = 152;
/** RegularExpression Id. */
- int DECIMAL_NEGATIVE = 153;
+ int DOUBLE = 153;
/** RegularExpression Id. */
- int DOUBLE_NEGATIVE = 154;
+ int INTEGER_POSITIVE = 154;
/** RegularExpression Id. */
- int EXPONENT = 155;
+ int DECIMAL_POSITIVE = 155;
/** RegularExpression Id. */
- int QUOTE_3D = 156;
+ int DOUBLE_POSITIVE = 156;
/** RegularExpression Id. */
- int QUOTE_3S = 157;
+ int INTEGER_NEGATIVE = 157;
/** RegularExpression Id. */
- int ECHAR = 158;
+ int DECIMAL_NEGATIVE = 158;
/** RegularExpression Id. */
- int STRING_LITERAL1 = 159;
+ int DOUBLE_NEGATIVE = 159;
/** RegularExpression Id. */
- int STRING_LITERAL2 = 160;
+ int EXPONENT = 160;
/** RegularExpression Id. */
- int STRING_LITERAL_LONG1 = 161;
+ int QUOTE_3D = 161;
/** RegularExpression Id. */
- int STRING_LITERAL_LONG2 = 162;
+ int QUOTE_3S = 162;
/** RegularExpression Id. */
- int LPAREN = 163;
+ int ECHAR = 163;
/** RegularExpression Id. */
- int RPAREN = 164;
+ int STRING_LITERAL1 = 164;
/** RegularExpression Id. */
- int NIL = 165;
+ int STRING_LITERAL2 = 165;
/** RegularExpression Id. */
- int LBRACE = 166;
+ int STRING_LITERAL_LONG1 = 166;
/** RegularExpression Id. */
- int RBRACE = 167;
+ int STRING_LITERAL_LONG2 = 167;
/** RegularExpression Id. */
- int LBRACKET = 168;
+ int LPAREN = 168;
/** RegularExpression Id. */
- int RBRACKET = 169;
+ int RPAREN = 169;
/** RegularExpression Id. */
- int ANON = 170;
+ int NIL = 170;
/** RegularExpression Id. */
- int SEMICOLON = 171;
+ int LBRACE = 171;
/** RegularExpression Id. */
- int COMMA = 172;
+ int RBRACE = 172;
/** RegularExpression Id. */
- int DOT = 173;
+ int LBRACKET = 173;
/** RegularExpression Id. */
- int EQ = 174;
+ int RBRACKET = 174;
/** RegularExpression Id. */
- int NE = 175;
+ int ANON = 175;
/** RegularExpression Id. */
- int GT = 176;
+ int SEMICOLON = 176;
/** RegularExpression Id. */
- int LT = 177;
+ int COMMA = 177;
/** RegularExpression Id. */
- int LE = 178;
+ int DOT = 178;
/** RegularExpression Id. */
- int GE = 179;
+ int EQ = 179;
/** RegularExpression Id. */
- int BANG = 180;
+ int NE = 180;
/** RegularExpression Id. */
- int TILDE = 181;
+ int GT = 181;
/** RegularExpression Id. */
- int COLON = 182;
+ int LT = 182;
/** RegularExpression Id. */
- int SC_OR = 183;
+ int LE = 183;
/** RegularExpression Id. */
- int SC_AND = 184;
+ int GE = 184;
/** RegularExpression Id. */
- int PLUS = 185;
+ int BANG = 185;
/** RegularExpression Id. */
- int MINUS = 186;
+ int TILDE = 186;
/** RegularExpression Id. */
- int STAR = 187;
+ int COLON = 187;
/** RegularExpression Id. */
- int SLASH = 188;
+ int SC_OR = 188;
/** RegularExpression Id. */
- int DATATYPE = 189;
+ int SC_AND = 189;
/** RegularExpression Id. */
- int AT = 190;
+ int PLUS = 190;
/** RegularExpression Id. */
- int ASSIGN = 191;
+ int MINUS = 191;
/** RegularExpression Id. */
- int VBAR = 192;
+ int STAR = 192;
/** RegularExpression Id. */
- int CARAT = 193;
+ int SLASH = 193;
/** RegularExpression Id. */
- int FPATH = 194;
+ int DATATYPE = 194;
/** RegularExpression Id. */
- int RPATH = 195;
+ int AT = 195;
/** RegularExpression Id. */
- int QMARK = 196;
+ int ASSIGN = 196;
/** RegularExpression Id. */
- int PN_CHARS_BASE = 197;
+ int VBAR = 197;
/** RegularExpression Id. */
- int PN_CHARS_U = 198;
+ int CARAT = 198;
/** RegularExpression Id. */
- int PN_CHARS = 199;
+ int FPATH = 199;
/** RegularExpression Id. */
- int PN_PREFIX = 200;
+ int RPATH = 200;
/** RegularExpression Id. */
- int PN_LOCAL = 201;
+ int QMARK = 201;
/** RegularExpression Id. */
- int VARNAME = 202;
+ int PN_CHARS_BASE = 202;
/** RegularExpression Id. */
- int PN_LOCAL_ESC = 203;
+ int PN_CHARS_U = 203;
/** RegularExpression Id. */
- int PLX = 204;
+ int PN_CHARS = 204;
/** RegularExpression Id. */
- int HEX = 205;
+ int PN_PREFIX = 205;
/** RegularExpression Id. */
- int PERCENT = 206;
+ int PN_LOCAL = 206;
/** RegularExpression Id. */
- int UNKNOWN = 207;
+ int VARNAME = 207;
+ /** RegularExpression Id. */
+ int PN_LOCAL_ESC = 208;
+ /** RegularExpression Id. */
+ int PLX = 209;
+ /** RegularExpression Id. */
+ int HEX = 210;
+ /** RegularExpression Id. */
+ int PERCENT = 211;
+ /** RegularExpression Id. */
+ int UNKNOWN = 212;
/** Lexical state. */
int DEFAULT = 0;
@@ -480,6 +490,11 @@ public interface ARQParserConstants {
"\"sum\"",
"\"avg\"",
"\"stdev\"",
+ "\"stdev_samp\"",
+ "\"stdev_pop\"",
+ "\"variance\"",
+ "\"var_samp\"",
+ "\"var_pop\"",
"\"sample\"",
"\"group_concat\"",
"\"filter\"",
[08/16] jena git commit: JENA-1156: Use standard SQL naming. Add
keywords to extended SPARQL.
Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/jena/blob/6e588daa/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/SPARQLParser11.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/SPARQLParser11.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/SPARQLParser11.java
index 31691e9..c3d04b4 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/SPARQLParser11.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/SPARQLParser11.java
@@ -7,6 +7,7 @@ import org.apache.jena.sparql.syntax.* ;
import org.apache.jena.sparql.expr.* ;
import org.apache.jena.sparql.path.* ;
import org.apache.jena.sparql.expr.aggregate.* ;
+import org.apache.jena.sparql.expr.aggregate.lib.* ;
import org.apache.jena.update.* ;
import org.apache.jena.sparql.modify.request.* ;
@@ -4923,22 +4924,22 @@ public class SPARQLParser11 extends SPARQLParser11Base implements SPARQLParser11
jj_la1_0 = new int[] {0xe400000,0x200,0x300000,0x300000,0x0,0x1800000,0x1800000,0xc000,0xc000,0xc000,0x0,0x0,0xfc00,0x0,0xdc00,0xdc00,0x0,0x0,0x0,0x1c00,0x0,0x0,0x0,0x40000000,0x30000000,0xdc00,0x0,0xdc00,0x1c00,0xdc00,0x0,0xdc00,0xdc00,0x20000000,0x10000000,0x30000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1c00,0x0,0x1c00,0x0,0xfc00,0x0,0x0,0xfc00,0xfc00,0xfc00,0x0,0x400000,0xfc00,0x0,0x0,0xfc00,0xfc00,0x0,0x0,0x0,0xc000,0x1c00,0xc000,0x0,0x0,0x1c00,0x0,0x1c00,0x0,0x1c00,0x800000,0x0,0x0,0x0,0x0,0xfc00,0xfc00,0x0,0xfc00,0x8dc00,0x0,0x8dc00,0x8dc00,0x0,0xfc00,0x8dc00,0x8dc00,0x0,0x8dc00,0x8dc00,0x0,0x0,0x0,0x0,0x81c00,0x0,0x81c00,0x0,0x81c00,0x81c00,0x81c00,0x81c00,0x0,0x0,0xfc00,0xfc00,0xfc00,0xfc00,0xfc00,0xdc00,0xfc00,0xc000,0x3c00,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xdc00,0xdc00,0x0,0x0,0x0,0x0,0x0,0x800000,0xdc00,0x800000,0x800000,0x800000,0x800000,0x800000,0x800000,0x0,0x0,0x0,0x10000,0x10000,0x0,0x0,0x0,0x0,0x0,0x0,0x1c00,0x1800,0x200
0,};
}
private static void jj_la1_init_1() {
- jj_la1_1 = new int[] {0x0,0x0,0x0,0x0,0x20,0x0,0x0,0x0,0x0,0x0,0x20,0x20,0x0,0x60,0x0,0x0,0x20,0x40,0x20,0x10,0x40,0x20000,0x40000,0x0,0x0,0xdbe0c000,0x10000,0xdbe0c000,0xdbe0c000,0xdbe0c00c,0xc,0xdbe0c000,0xdbe0c00c,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10,0x100,0x100,0x110,0x0,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20003b01,0x0,0x0,0x0,0x0,0x20003b01,0x0,0x0,0x2,0x0,0x0,0x0,0x2,0x0,0x2,0x400,0xdbe0c000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8000,0x8000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xdbe0c000,0xdbe0c000,0x0,0xdbe0c000,0x0,0x0,0x0,0x0,0xdbe0c000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1be00000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
+ jj_la1_1 = new int[] {0x0,0x0,0x0,0x0,0x20,0x0,0x0,0x0,0x0,0x0,0x20,0x20,0x0,0x60,0x0,0x0,0x20,0x40,0x20,0x10,0x40,0x20000,0x40000,0x0,0x0,0x3e0c000,0x10000,0x3e0c000,0x3e0c000,0x3e0c00c,0xc,0x3e0c000,0x3e0c00c,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10,0x100,0x100,0x110,0x0,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3b01,0x0,0x0,0x0,0x0,0x3b01,0x0,0x0,0x2,0x0,0x0,0x0,0x2,0x0,0x2,0x400,0x3e0c000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8000,0x8000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3e0c000,0x3e0c000,0x0,0x3e0c000,0x0,0x0,0x0,0x0,0x3e0c000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3e00000,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,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfffffffe,0x0,0xfffffffe,0xfffffffe,0xfffffffe,0x0,0xfffffffe,0xfffffffe,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfffffffe,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,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,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfffffffe,0xfffffffe,0x0,0xfffffffe,0x0,0x0,0x0,0x0,0xfffffffe,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,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xffffffdb,0x0,0xffffffdb,0xffffffdb,0xffffffdb,0x0,0xffffffdb,0xffffffdb,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,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,0xffffffdb,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,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,0x20,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xffffffdb,0xffffffdb,0x0,0xffffffdb,0x0,0x0,0x0,0x0,0xffffffdb,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3,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,0x0,0x0,0x0,0x0,0x0,0x0,0x300000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xeffff,0x0,0xeffff,0xeffff,0xeffff,0x0,0xeffff,0xeffff,0x0,0x0,0x0,0x0,0x0,0xff800000,0xff800000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800000,0x1800000,0x0,0x0,0x0,0x0,0x0,0x300000,0x0,0x0,0x300000,0x300000,0x300000,0x0,0x0,0x300000,0x0,0x0,0x300000,0x300000,0x0,0x0,0x0,0x0,0x300000,0x0,0x0,0x0,0x300000,0x0,0x300000,0x0,0xeffff,0x0,0x0,0x0,0x0,0x0,0x300000,0x300000,0x0,0x300000,0x0,0x0,0x0,0x0,0x0,0x300000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x300000,0x300000,0x300000,0x300000,0x300000,0x0,0x0,0x0,0x300000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3effff,0x3effff,0x0,0xeffff,0x0,0x0,0x0,0x0,0x3effff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x300000,0x0,0x0,0x0,0x0,};
+ jj_la1_3 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x6000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1dfffff,0x0,0x1dfffff,0x1dfffff,0x1dfffff,0x0,0x1dfffff,0x1dfffff,0x0,0x0,0x0,0x0,0x0,0xf0000000,0xf0000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10000000,0x30000000,0x0,0x0,0x0,0x0,0x0,0x6000000,0x0,0x0,0x6000000,0x6000000,0x6000000,0x0,0x0,0x6000000,0x0,0x0,0x6000000,0x6000000,0x0,0x0,0x0,0x0,0x6000000,0x0,0x0,0x0,0x6000000,0x0,0x6000000,0x0,0x1dfffff,0x0,0x0,0x0,0x0,0x0,0x6000000,0x6000000,0x0,0x6000000,0x0,0x0,0x0,0x0,0x0,0x6000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x6000000,0x6000000,0x6000000,0x6000000,0x6000000,0x0,0x0,0x0,0x6000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7dfffff,0x7dfffff,0x0,0x1dfffff,0x0,0x0,0x0,0x0,0x7dfffff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x6000000,0x0,0x0,0x0,0x0,};
}
private static void jj_la1_init_4() {
- jj_la1_4 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20000000,0x20000000,0x20000000,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,0x0,0x213,0x213,0x8,0x20,0x8,0x8,0x8,0x8,0x8,0x8,0x200,0x0,0x0,0x400,0x0,0x0,0x80,0x180,0xbe1ff000,0x0,0x0,0xbe1ff000,0xbe1ff000,0xbe1ff000,0x0,0x0,0xbe1ff000,0x0,0x0,0xbe1ff000,0xbe1ff000,0x0,0x0,0x8,0xa0000000,0x1e1ff000,0x0,0xa0000000,0xa0000000,0x1e1ff000,0xa0000000,0x1e1ff000,0x0,0x20000000,0x0,0x0,0xa0000000,0x0,0xa0000000,0xbe1ff000,0xbe1ff000,0x0,0xbe1ff000,0x0,0x0,0x0,0x0,0x0,0xbe1ff000,0x20000000,0x20000000,0x0,0x20000000,0x20000000,0x0,0x0,0x0,0x0,0x20000000,0x0,0x20000000,0x0,0x0,0x20000000,0x0,0x0,0x20000000,0x20000000,0xbe1ff000,0xbe1ff000,0xbe1ff000,0xbe1ff000,0x9e1ff000,0x0,0x0,0x0,0x9e1ff000,0x0,0x0,0x0,0x0,0x1f8000,0x1f8000,0x0,0x0,0x1f8000,0x0,0x0,0x3e1ff000,0x3e1ff000,0xa0000000,0x0,0x0,0x0,0x0,0x0,0x3e1ff000,0x0,0x0,0x0,
0x0,0x0,0x0,0x0,0x0,0xa0000000,0x0,0x0,0x1ff000,0x7000,0x38000,0x1c0000,0x0,0x1e000000,0x0,0x0,0x0,};
+ jj_la1_4 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,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,0x427f,0x427f,0x100,0x400,0x100,0x100,0x100,0x100,0x100,0x100,0x4000,0x0,0x0,0x8000,0x0,0x0,0x1000,0x3000,0xc3fe0000,0x0,0x0,0xc3fe0000,0xc3fe0000,0xc3fe0000,0x0,0x0,0xc3fe0000,0x0,0x0,0xc3fe0000,0xc3fe0000,0x0,0x0,0x100,0x0,0xc3fe0000,0x0,0x0,0x0,0xc3fe0000,0x0,0xc3fe0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc3fe0000,0xc3fe0000,0x0,0xc3fe0000,0x0,0x0,0x0,0x0,0x0,0xc3fe0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc3fe0000,0xc3fe0000,0xc3fe0000,0xc3fe0000,0xc3fe0000,0x0,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,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,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,0x20,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x14,0x0,0x80,0x14,0x14,0x14,0x80,0x0,0x14,0x1,0x80,0x14,0x14,0x80,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40,0x0,0x40,0x0,0x14,0x14,0x80,0x14,0x0,0x20,0x0,0x0,0x40,0x14,0x4004000,0x4004000,0x20,0x4004000,0x4004000,0x40,0x2000000,0x400000,0x20280000,0x4004000,0x20280000,0x4000,0x2000000,0x4000000,0x4000000,0x0,0x4000000,0x4,0x4,0x14,0x14,0x14,0x14,0x10,0x0,0x10,0x0,0x10,0x20000,0x40000,0x3f00,0x3f00,0x180000,0x0,0x600000,0x600000,0x180000,0x600000,0x600000,0x184000,0x0,0x0,0x0,0x40,0x40,0x40,0x0,0x384000,0x0,0x0,0x0,0x0,0x0,0x0,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,0x4,0x4,0x4000004,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,0x400,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x297,0x0,0x1000,0x297,0x297,0x297,0x1000,0x0,0x297,0x20,0x1000,0x297,0x297,0x1000,0x20,0x0,0x14,0x3,0x0,0x14,0x14,0x3,0x14,0x3,0x0,0x4,0x0,0x800,0x14,0x800,0x14,0x297,0x297,0x1000,0x297,0x0,0x400,0x0,0x0,0x800,0x297,0x80080004,0x80080004,0x400,0x80080004,0x80080004,0x800,0x40000000,0x8000000,0x5000000,0x80080004,0x5000000,0x80004,0x40000000,0x80000000,0x80000004,0x0,0x80000000,0x84,0x84,0x297,0x297,0x297,0x297,0x213,0x0,0x200,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,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,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,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,0x4,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,0x0,0x0,};
}
/** Constructor with InputStream. */
@@ -5055,7 +5056,7 @@ public class SPARQLParser11 extends SPARQLParser11Base implements SPARQLParser11
/** Generate ParseException. */
public ParseException generateParseException() {
jj_expentries.clear();
- boolean[] la1tokens = new boolean[201];
+ boolean[] la1tokens = new boolean[206];
if (jj_kind >= 0) {
la1tokens[jj_kind] = true;
jj_kind = -1;
@@ -5087,7 +5088,7 @@ public class SPARQLParser11 extends SPARQLParser11Base implements SPARQLParser11
}
}
}
- for (int i = 0; i < 201; i++) {
+ for (int i = 0; i < 206; i++) {
if (la1tokens[i]) {
jj_expentry = new int[1];
jj_expentry[0] = i;
http://git-wip-us.apache.org/repos/asf/jena/blob/6e588daa/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/SPARQLParser11Constants.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/SPARQLParser11Constants.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/SPARQLParser11Constants.java
index 56bcfbd..7c44eb4 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/SPARQLParser11Constants.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/SPARQLParser11Constants.java
@@ -115,291 +115,301 @@ public interface SPARQLParser11Constants {
/** RegularExpression Id. */
int AVG = 57;
/** RegularExpression Id. */
- int STDDEV = 58;
+ int STDEV = 58;
/** RegularExpression Id. */
- int SAMPLE = 59;
+ int STDEV_SAMP = 59;
/** RegularExpression Id. */
- int GROUP_CONCAT = 60;
+ int STDEV_POP = 60;
/** RegularExpression Id. */
- int FILTER = 61;
+ int VARIANCE = 61;
/** RegularExpression Id. */
- int BOUND = 62;
+ int VAR_SAMP = 62;
/** RegularExpression Id. */
- int COALESCE = 63;
+ int VAR_POP = 63;
/** RegularExpression Id. */
- int IN = 64;
+ int SAMPLE = 64;
/** RegularExpression Id. */
- int IF = 65;
+ int GROUP_CONCAT = 65;
/** RegularExpression Id. */
- int BNODE = 66;
+ int FILTER = 66;
/** RegularExpression Id. */
- int IRI = 67;
+ int BOUND = 67;
/** RegularExpression Id. */
- int URI = 68;
+ int COALESCE = 68;
/** RegularExpression Id. */
- int STR = 69;
+ int IN = 69;
/** RegularExpression Id. */
- int STRLANG = 70;
+ int IF = 70;
/** RegularExpression Id. */
- int STRDT = 71;
+ int BNODE = 71;
/** RegularExpression Id. */
- int DTYPE = 72;
+ int IRI = 72;
/** RegularExpression Id. */
- int LANG = 73;
+ int URI = 73;
/** RegularExpression Id. */
- int LANGMATCHES = 74;
+ int STR = 74;
/** RegularExpression Id. */
- int IS_URI = 75;
+ int STRLANG = 75;
/** RegularExpression Id. */
- int IS_IRI = 76;
+ int STRDT = 76;
/** RegularExpression Id. */
- int IS_BLANK = 77;
+ int DTYPE = 77;
/** RegularExpression Id. */
- int IS_LITERAL = 78;
+ int LANG = 78;
/** RegularExpression Id. */
- int IS_NUMERIC = 79;
+ int LANGMATCHES = 79;
/** RegularExpression Id. */
- int REGEX = 80;
+ int IS_URI = 80;
/** RegularExpression Id. */
- int SAME_TERM = 81;
+ int IS_IRI = 81;
/** RegularExpression Id. */
- int RAND = 82;
+ int IS_BLANK = 82;
/** RegularExpression Id. */
- int ABS = 83;
+ int IS_LITERAL = 83;
/** RegularExpression Id. */
- int CEIL = 84;
+ int IS_NUMERIC = 84;
/** RegularExpression Id. */
- int FLOOR = 85;
+ int REGEX = 85;
/** RegularExpression Id. */
- int ROUND = 86;
+ int SAME_TERM = 86;
/** RegularExpression Id. */
- int CONCAT = 87;
+ int RAND = 87;
/** RegularExpression Id. */
- int SUBSTR = 88;
+ int ABS = 88;
/** RegularExpression Id. */
- int STRLEN = 89;
+ int CEIL = 89;
/** RegularExpression Id. */
- int REPLACE = 90;
+ int FLOOR = 90;
/** RegularExpression Id. */
- int UCASE = 91;
+ int ROUND = 91;
/** RegularExpression Id. */
- int LCASE = 92;
+ int CONCAT = 92;
/** RegularExpression Id. */
- int ENCODE_FOR_URI = 93;
+ int SUBSTR = 93;
/** RegularExpression Id. */
- int CONTAINS = 94;
+ int STRLEN = 94;
/** RegularExpression Id. */
- int STRSTARTS = 95;
+ int REPLACE = 95;
/** RegularExpression Id. */
- int STRENDS = 96;
+ int UCASE = 96;
/** RegularExpression Id. */
- int STRBEFORE = 97;
+ int LCASE = 97;
/** RegularExpression Id. */
- int STRAFTER = 98;
+ int ENCODE_FOR_URI = 98;
/** RegularExpression Id. */
- int YEAR = 99;
+ int CONTAINS = 99;
/** RegularExpression Id. */
- int MONTH = 100;
+ int STRSTARTS = 100;
/** RegularExpression Id. */
- int DAY = 101;
+ int STRENDS = 101;
/** RegularExpression Id. */
- int HOURS = 102;
+ int STRBEFORE = 102;
/** RegularExpression Id. */
- int MINUTES = 103;
+ int STRAFTER = 103;
/** RegularExpression Id. */
- int SECONDS = 104;
+ int YEAR = 104;
/** RegularExpression Id. */
- int TIMEZONE = 105;
+ int MONTH = 105;
/** RegularExpression Id. */
- int TZ = 106;
+ int DAY = 106;
/** RegularExpression Id. */
- int NOW = 107;
+ int HOURS = 107;
/** RegularExpression Id. */
- int UUID = 108;
+ int MINUTES = 108;
/** RegularExpression Id. */
- int STRUUID = 109;
+ int SECONDS = 109;
/** RegularExpression Id. */
- int MD5 = 110;
+ int TIMEZONE = 110;
/** RegularExpression Id. */
- int SHA1 = 111;
+ int TZ = 111;
/** RegularExpression Id. */
- int SHA224 = 112;
+ int NOW = 112;
/** RegularExpression Id. */
- int SHA256 = 113;
+ int UUID = 113;
/** RegularExpression Id. */
- int SHA384 = 114;
+ int STRUUID = 114;
/** RegularExpression Id. */
- int SHA512 = 115;
+ int MD5 = 115;
/** RegularExpression Id. */
- int TRUE = 116;
+ int SHA1 = 116;
/** RegularExpression Id. */
- int FALSE = 117;
+ int SHA224 = 117;
/** RegularExpression Id. */
- int DATA = 118;
+ int SHA256 = 118;
/** RegularExpression Id. */
- int INSERT = 119;
+ int SHA384 = 119;
/** RegularExpression Id. */
- int DELETE = 120;
+ int SHA512 = 120;
/** RegularExpression Id. */
- int INSERT_DATA = 121;
+ int TRUE = 121;
/** RegularExpression Id. */
- int DELETE_DATA = 122;
+ int FALSE = 122;
/** RegularExpression Id. */
- int DELETE_WHERE = 123;
+ int DATA = 123;
/** RegularExpression Id. */
- int LOAD = 124;
+ int INSERT = 124;
/** RegularExpression Id. */
- int CLEAR = 125;
+ int DELETE = 125;
/** RegularExpression Id. */
- int CREATE = 126;
+ int INSERT_DATA = 126;
/** RegularExpression Id. */
- int ADD = 127;
+ int DELETE_DATA = 127;
/** RegularExpression Id. */
- int MOVE = 128;
+ int DELETE_WHERE = 128;
/** RegularExpression Id. */
- int COPY = 129;
+ int LOAD = 129;
/** RegularExpression Id. */
- int META = 130;
+ int CLEAR = 130;
/** RegularExpression Id. */
- int SILENT = 131;
+ int CREATE = 131;
/** RegularExpression Id. */
- int DROP = 132;
+ int ADD = 132;
/** RegularExpression Id. */
- int INTO = 133;
+ int MOVE = 133;
/** RegularExpression Id. */
- int TO = 134;
+ int COPY = 134;
/** RegularExpression Id. */
- int DFT = 135;
+ int META = 135;
/** RegularExpression Id. */
- int ALL = 136;
+ int SILENT = 136;
/** RegularExpression Id. */
- int WITH = 137;
+ int DROP = 137;
/** RegularExpression Id. */
- int USING = 138;
+ int INTO = 138;
/** RegularExpression Id. */
- int DIGITS = 139;
+ int TO = 139;
/** RegularExpression Id. */
- int INTEGER = 140;
+ int DFT = 140;
/** RegularExpression Id. */
- int DECIMAL = 141;
+ int ALL = 141;
/** RegularExpression Id. */
- int DOUBLE = 142;
+ int WITH = 142;
/** RegularExpression Id. */
- int INTEGER_POSITIVE = 143;
+ int USING = 143;
/** RegularExpression Id. */
- int DECIMAL_POSITIVE = 144;
+ int DIGITS = 144;
/** RegularExpression Id. */
- int DOUBLE_POSITIVE = 145;
+ int INTEGER = 145;
/** RegularExpression Id. */
- int INTEGER_NEGATIVE = 146;
+ int DECIMAL = 146;
/** RegularExpression Id. */
- int DECIMAL_NEGATIVE = 147;
+ int DOUBLE = 147;
/** RegularExpression Id. */
- int DOUBLE_NEGATIVE = 148;
+ int INTEGER_POSITIVE = 148;
/** RegularExpression Id. */
- int EXPONENT = 149;
+ int DECIMAL_POSITIVE = 149;
/** RegularExpression Id. */
- int QUOTE_3D = 150;
+ int DOUBLE_POSITIVE = 150;
/** RegularExpression Id. */
- int QUOTE_3S = 151;
+ int INTEGER_NEGATIVE = 151;
/** RegularExpression Id. */
- int ECHAR = 152;
+ int DECIMAL_NEGATIVE = 152;
/** RegularExpression Id. */
- int STRING_LITERAL1 = 153;
+ int DOUBLE_NEGATIVE = 153;
/** RegularExpression Id. */
- int STRING_LITERAL2 = 154;
+ int EXPONENT = 154;
/** RegularExpression Id. */
- int STRING_LITERAL_LONG1 = 155;
+ int QUOTE_3D = 155;
/** RegularExpression Id. */
- int STRING_LITERAL_LONG2 = 156;
+ int QUOTE_3S = 156;
/** RegularExpression Id. */
- int LPAREN = 157;
+ int ECHAR = 157;
/** RegularExpression Id. */
- int RPAREN = 158;
+ int STRING_LITERAL1 = 158;
/** RegularExpression Id. */
- int NIL = 159;
+ int STRING_LITERAL2 = 159;
/** RegularExpression Id. */
- int LBRACE = 160;
+ int STRING_LITERAL_LONG1 = 160;
/** RegularExpression Id. */
- int RBRACE = 161;
+ int STRING_LITERAL_LONG2 = 161;
/** RegularExpression Id. */
- int LBRACKET = 162;
+ int LPAREN = 162;
/** RegularExpression Id. */
- int RBRACKET = 163;
+ int RPAREN = 163;
/** RegularExpression Id. */
- int ANON = 164;
+ int NIL = 164;
/** RegularExpression Id. */
- int SEMICOLON = 165;
+ int LBRACE = 165;
/** RegularExpression Id. */
- int COMMA = 166;
+ int RBRACE = 166;
/** RegularExpression Id. */
- int DOT = 167;
+ int LBRACKET = 167;
/** RegularExpression Id. */
- int EQ = 168;
+ int RBRACKET = 168;
/** RegularExpression Id. */
- int NE = 169;
+ int ANON = 169;
/** RegularExpression Id. */
- int GT = 170;
+ int SEMICOLON = 170;
/** RegularExpression Id. */
- int LT = 171;
+ int COMMA = 171;
/** RegularExpression Id. */
- int LE = 172;
+ int DOT = 172;
/** RegularExpression Id. */
- int GE = 173;
+ int EQ = 173;
/** RegularExpression Id. */
- int BANG = 174;
+ int NE = 174;
/** RegularExpression Id. */
- int TILDE = 175;
+ int GT = 175;
/** RegularExpression Id. */
- int COLON = 176;
+ int LT = 176;
/** RegularExpression Id. */
- int SC_OR = 177;
+ int LE = 177;
/** RegularExpression Id. */
- int SC_AND = 178;
+ int GE = 178;
/** RegularExpression Id. */
- int PLUS = 179;
+ int BANG = 179;
/** RegularExpression Id. */
- int MINUS = 180;
+ int TILDE = 180;
/** RegularExpression Id. */
- int STAR = 181;
+ int COLON = 181;
/** RegularExpression Id. */
- int SLASH = 182;
+ int SC_OR = 182;
/** RegularExpression Id. */
- int DATATYPE = 183;
+ int SC_AND = 183;
/** RegularExpression Id. */
- int AT = 184;
+ int PLUS = 184;
/** RegularExpression Id. */
- int VBAR = 185;
+ int MINUS = 185;
/** RegularExpression Id. */
- int CARAT = 186;
+ int STAR = 186;
/** RegularExpression Id. */
- int FPATH = 187;
+ int SLASH = 187;
/** RegularExpression Id. */
- int RPATH = 188;
+ int DATATYPE = 188;
/** RegularExpression Id. */
- int QMARK = 189;
+ int AT = 189;
/** RegularExpression Id. */
- int PN_CHARS_BASE = 190;
+ int VBAR = 190;
/** RegularExpression Id. */
- int PN_CHARS_U = 191;
+ int CARAT = 191;
/** RegularExpression Id. */
- int PN_CHARS = 192;
+ int FPATH = 192;
/** RegularExpression Id. */
- int PN_PREFIX = 193;
+ int RPATH = 193;
/** RegularExpression Id. */
- int PN_LOCAL = 194;
+ int QMARK = 194;
/** RegularExpression Id. */
- int VARNAME = 195;
+ int PN_CHARS_BASE = 195;
/** RegularExpression Id. */
- int PN_LOCAL_ESC = 196;
+ int PN_CHARS_U = 196;
/** RegularExpression Id. */
- int PLX = 197;
+ int PN_CHARS = 197;
/** RegularExpression Id. */
- int HEX = 198;
+ int PN_PREFIX = 198;
/** RegularExpression Id. */
- int PERCENT = 199;
+ int PN_LOCAL = 199;
/** RegularExpression Id. */
- int UNKNOWN = 200;
+ int VARNAME = 200;
+ /** RegularExpression Id. */
+ int PN_LOCAL_ESC = 201;
+ /** RegularExpression Id. */
+ int PLX = 202;
+ /** RegularExpression Id. */
+ int HEX = 203;
+ /** RegularExpression Id. */
+ int PERCENT = 204;
+ /** RegularExpression Id. */
+ int UNKNOWN = 205;
/** Lexical state. */
int DEFAULT = 0;
@@ -465,6 +475,11 @@ public interface SPARQLParser11Constants {
"\"sum\"",
"\"avg\"",
"\"stdev\"",
+ "\"stdev_samp\"",
+ "\"stdev_pop\"",
+ "\"variance\"",
+ "\"var_samp\"",
+ "\"var_pop\"",
"\"sample\"",
"\"group_concat\"",
"\"filter\"",
[13/16] jena git commit: Update comment.
Posted by an...@apache.org.
Update comment.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/69ef0a7c
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/69ef0a7c
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/69ef0a7c
Branch: refs/heads/master
Commit: 69ef0a7cd1e94862421f9ec67b3ed1e08dda8b29
Parents: 7cc7e0e
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Mar 12 18:04:48 2016 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Mar 13 17:22:25 2016 +0000
----------------------------------------------------------------------
.../org/apache/jena/sparql/function/StandardFunctions.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/69ef0a7c/jena-arq/src/main/java/org/apache/jena/sparql/function/StandardFunctions.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/function/StandardFunctions.java b/jena-arq/src/main/java/org/apache/jena/sparql/function/StandardFunctions.java
index c860f47..d124204 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/function/StandardFunctions.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/function/StandardFunctions.java
@@ -34,8 +34,11 @@ public class StandardFunctions
String math = ARQConstants.mathPrefix ;
String sparqlfn = ARQConstants.fnSparql ;
- // See http://www.w3.org/TR/xpath-datamodel/#types-hierarchy
- // No durations here
+ // Update documentation in xsd-support.md
+
+ // See also:
+ // http://www.w3.org/TR/xpath-datamodel/#types-hierarchy
+ // https://www.w3.org/TR/xpath-datamodel-3/
addCastNumeric(registry, XSDDatatype.XSDdecimal) ;
addCastNumeric(registry, XSDDatatype.XSDinteger) ;
[12/16] jena git commit: Add hs_err_* to gitignore
Posted by an...@apache.org.
Add hs_err_* to gitignore
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/41f40549
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/41f40549
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/41f40549
Branch: refs/heads/master
Commit: 41f405496e6802d60304043c1b1fbc1f834985af
Parents: 9538e47
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Mar 12 09:21:40 2016 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Mar 13 17:22:25 2016 +0000
----------------------------------------------------------------------
.gitignore | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/41f40549/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index fc05569..8615814 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,9 @@ target/
# Other
.DS_Store
+hs_err_*
+
+# Binaries
*.jar
# Backups
[05/16] jena git commit: JENA-1156: add agg:stdev, agg:stdev_samp,
agg:stdev_pop and variance.
Posted by an...@apache.org.
JENA-1156: add agg:stdev, agg:stdev_samp, agg:stdev_pop and variance.
And DISINCT versions: URI + "d"
Contributes to JENA-803.
Includes refactoring in the gramamr for SPARQL 1.1.
Includes fixes and changes to the grammar for the ARQ language.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/9538e473
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/9538e473
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/9538e473
Branch: refs/heads/master
Commit: 9538e47368e886d3710f22b41ff9f409d1a86626
Parents: afd4ed6
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Mar 11 18:05:01 2016 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Mar 13 17:21:00 2016 +0000
----------------------------------------------------------------------
jena-arq/Grammar/arq.jj | 63 +-
jena-arq/Grammar/master.jj | 62 +-
jena-arq/Grammar/sparql_11.jj | 46 +-
.../jena/sparql/expr/aggregate/Accumulator.java | 1 -
.../expr/aggregate/AccumulatorFactory.java | 6 +-
.../jena/sparql/expr/aggregate/AggCustom.java | 8 +-
.../expr/aggregate/AggregateRegistry.java | 12 +-
.../jena/sparql/expr/aggregate/Aggregator.java | 2 +-
.../expr/aggregate/AggregatorFactory.java | 8 +-
.../apache/jena/sparql/expr/aggregate/Args.java | 28 +
.../sparql/expr/aggregate/lib/AccStatBase.java | 99 +++
.../sparql/expr/aggregate/lib/AccStatLib.java | 46 +
.../aggregate/lib/AccStatStdDevPopulation.java | 34 +
.../expr/aggregate/lib/AccStatStdDevSample.java | 34 +
.../aggregate/lib/AccStatVarPopulation.java | 34 +
.../expr/aggregate/lib/AccStatVarSample.java | 34 +
.../aggregate/lib/StandardCustomAggregates.java | 64 ++
.../jena/sparql/function/StandardFunctions.java | 3 +
.../apache/jena/sparql/lang/arq/ARQParser.java | 866 ++++++++-----------
.../sparql/lang/sparql_11/SPARQLParser11.java | 39 +-
.../jena/sparql/sse/builders/BuilderExpr.java | 2 +-
.../org/apache/jena/sparql/expr/TS_Expr.java | 1 +
.../jena/sparql/expr/TestCustomAggregates.java | 4 +-
.../sparql/expr/TestStatisticsAggregates.java | 215 +++++
24 files changed, 1074 insertions(+), 637 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/9538e473/jena-arq/Grammar/arq.jj
----------------------------------------------------------------------
diff --git a/jena-arq/Grammar/arq.jj b/jena-arq/Grammar/arq.jj
index 562c5d4..1d30d0f 100644
--- a/jena-arq/Grammar/arq.jj
+++ b/jena-arq/Grammar/arq.jj
@@ -754,7 +754,7 @@ Expr Constraint() : { Expr c ; }
)
{ return c ; }
}
-Expr FunctionCall() : { String fname ; ExprList a ; }
+Expr FunctionCall() : { String fname ; Args a ; }
{
fname = iri()
a = ArgList()
@@ -762,21 +762,20 @@ Expr FunctionCall() : { String fname ; ExprList a ; }
if ( AggregateRegistry.isRegistered(fname) ) {
if ( ! getAllowAggregatesInExpressions() )
throwParseException("Aggregate expression not legal at this point : "+fname, -1, -1) ;
- Aggregator agg = AggregatorFactory.createCustom(true, false, fname, a) ;
+ Aggregator agg = AggregatorFactory.createCustom(fname, a) ;
Expr exprAgg = getQuery().allocAggregate(agg) ;
return exprAgg ;
}
return new E_Function(fname, a) ;
}
}
-ExprList ArgList() : { Expr expr ; boolean distinct = false ;
- ExprList args = new ExprList() ; Token t ; }
+Args ArgList() : { Expr expr ; Args args = new Args() ; Token t ; }
{
(
<NIL>
|
<LPAREN>
- (t = <DISTINCT> { distinct = true ; }
+ (t = <DISTINCT> { args.distinct = true ; }
{ int beginLine = t.beginLine; int beginColumn = t.beginColumn; t = null; }
{
if ( ! getAllowAggregatesInExpressions() )
@@ -790,17 +789,17 @@ ExprList ArgList() : { Expr expr ; boolean distinct = false ;
)
{ return args ; }
}
-ExprList ExpressionList() : { Expr expr = null ; ExprList args = new ExprList() ;}
+ExprList ExpressionList() : { Expr expr = null ; ExprList exprList = new ExprList() ;}
{
(
<NIL>
|
<LPAREN>
- expr = Expression() { args.add(expr) ; }
- (<COMMA> expr = Expression() { args.add(expr) ; } )*
+ expr = Expression() { exprList.add(expr) ; }
+ (<COMMA> expr = Expression() { exprList.add(expr) ; } )*
<RPAREN>
)
- { return args ; }
+ { return exprList ; }
}
Template ConstructTemplate() : { QuadAcc acc = new QuadAcc() ;
Template t = new Template (acc);}
@@ -1429,9 +1428,8 @@ Expr NotExistsFunc() : { Element el ; }
{ return createExprNotExists(el) ; }
}
Expr Aggregate() : { Aggregator agg = null ; String sep = null ;
- boolean distinct = false ;
Expr expr = null ; Expr expr2 = null ;
- ExprList a = new ExprList() ;
+ boolean distinct = false ;
ExprList ordered = new ExprList() ;
Token t ; }
{
@@ -1455,7 +1453,7 @@ Expr Aggregate() : { Aggregator agg = null ; String sep = null ;
| t = <GROUP_CONCAT>
<LPAREN>
(t = <DISTINCT> { distinct = true ; })?
- expr = Expression() { a.add(expr) ; }
+ expr = Expression()
(LOOKAHEAD(2)
( <SEMICOLON> <SEPARATOR> <EQ> sep=String()
(<SEMICOLON> <ORDER><BY> expr2 = Expression() { ordered.add(expr2) ; })?
@@ -1465,29 +1463,22 @@ Expr Aggregate() : { Aggregator agg = null ; String sep = null ;
)?
<RPAREN>
{ agg = AggregatorFactory.createGroupConcat(distinct, expr, sep, ordered) ; }
- | t = <AGG>
- { String iri ; }
- iri = iri()
- <LPAREN>
- ( <DISTINCT> { distinct = true ; } )?
- (
- expr = Expression() { a.add(expr) ; }
- (<COMMA> expr = Expression() { a.add(expr) ; } )*
- )?
- <RPAREN>
- { agg = AggregatorFactory.createCustom(false, distinct, iri, a) ; }
- )
- {
- if ( ! getAllowAggregatesInExpressions() )
- throwParseException("Aggregate expression not legal at this point",
- t.beginLine, t.beginColumn) ;
- }
- { Expr exprAgg = getQuery().allocAggregate(agg) ;
- return exprAgg ; }
-}
-Expr iriOrFunction() : { String iri ; ExprList a = null ;
- ExprList params = null ;
- boolean distinct = false ; }
+ | t = <AGG>
+ { String iri ; }
+ iri = iri()
+ { Args a = new Args() ; }
+ a = ArgList()
+ { agg = AggregatorFactory.createCustom(iri, a) ; }
+ )
+ {
+ if ( ! getAllowAggregatesInExpressions() )
+ throwParseException("Aggregate expression not legal at this point",
+ t.beginLine, t.beginColumn) ;
+ }
+ { Expr exprAgg = getQuery().allocAggregate(agg) ;
+ return exprAgg ; }
+}
+Expr iriOrFunction() : { String iri ; Args a = null ; }
{
iri = iri()
(a = ArgList())?
@@ -1496,7 +1487,7 @@ Expr iriOrFunction() : { String iri ; ExprList a = null ;
if ( AggregateRegistry.isRegistered(iri) ) {
if ( ! getAllowAggregatesInExpressions() )
throwParseException("Aggregate expression not legal at this point : "+iri, -1, -1) ;
- Aggregator agg = AggregatorFactory.createCustom(true, false, iri, a) ;
+ Aggregator agg = AggregatorFactory.createCustom(iri, a) ;
Expr exprAgg = getQuery().allocAggregate(agg) ;
return exprAgg ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/9538e473/jena-arq/Grammar/master.jj
----------------------------------------------------------------------
diff --git a/jena-arq/Grammar/master.jj b/jena-arq/Grammar/master.jj
index 8d1adcb..c04d1ca 100644
--- a/jena-arq/Grammar/master.jj
+++ b/jena-arq/Grammar/master.jj
@@ -1058,17 +1058,16 @@ Expr Constraint() : { Expr c ; }
{ return c ; }
}
-Expr FunctionCall() : { String fname ; ExprList a ; }
+Expr FunctionCall() : { String fname ; Args a ; }
{
fname = iri()
a = ArgList()
-
{
if ( AggregateRegistry.isRegistered(fname) ) {
// aggregates
if ( ! getAllowAggregatesInExpressions() )
throwParseException("Aggregate expression not legal at this point : "+fname, -1, -1) ;
- Aggregator agg = AggregatorFactory.createCustom(true, false, fname, a) ;
+ Aggregator agg = AggregatorFactory.createCustom(fname, a) ;
Expr exprAgg = getQuery().allocAggregate(agg) ;
return exprAgg ;
}
@@ -1076,14 +1075,13 @@ Expr FunctionCall() : { String fname ; ExprList a ; }
}
}
-ExprList ArgList() : { Expr expr ; boolean distinct = false ;
- ExprList args = new ExprList() ; Token t ; }
+Args ArgList() : { Expr expr ; Args args = new Args() ; Token t ; }
{
(
<NIL>
|
<LPAREN>
- (t = <DISTINCT> { distinct = true ; }
+ (t = <DISTINCT> { args.distinct = true ; }
{ int beginLine = t.beginLine; int beginColumn = t.beginColumn; t = null; }
{
if ( ! getAllowAggregatesInExpressions() )
@@ -1098,17 +1096,17 @@ ExprList ArgList() : { Expr expr ; boolean distinct = false ;
{ return args ; }
}
-ExprList ExpressionList() : { Expr expr = null ; ExprList args = new ExprList() ;}
+ExprList ExpressionList() : { Expr expr = null ; ExprList exprList = new ExprList() ;}
{
(
<NIL>
|
<LPAREN>
- expr = Expression() { args.add(expr) ; }
- (<COMMA> expr = Expression() { args.add(expr) ; } )*
+ expr = Expression() { exprList.add(expr) ; }
+ (<COMMA> expr = Expression() { exprList.add(expr) ; } )*
<RPAREN>
)
- { return args ; }
+ { return exprList ; }
}
@@ -1983,9 +1981,8 @@ Expr NotExistsFunc() : { Element el ; }
}
Expr Aggregate() : { Aggregator agg = null ; String sep = null ;
- boolean distinct = false ;
Expr expr = null ; Expr expr2 = null ;
- ExprList a = new ExprList() ;
+ boolean distinct = false ;
ExprList ordered = new ExprList() ;
Token t ; }
{
@@ -2018,7 +2015,7 @@ Expr Aggregate() : { Aggregator agg = null ; String sep = null ;
| t = <GROUP_CONCAT>
<LPAREN>
(t = <DISTINCT> { distinct = true ; })?
- expr = Expression() { a.add(expr) ; }
+ expr = Expression()
#ifdef SPARQL_11
// Single arg version
(<SEMICOLON> <SEPARATOR> <EQ> sep=String())?
@@ -2038,36 +2035,29 @@ Expr Aggregate() : { Aggregator agg = null ; String sep = null ;
#ifdef ARQ
/* Explicit syntax (aggregate even if not registered) */
- | t = <AGG>
- { String iri ; }
- iri = iri()
- <LPAREN>
- ( <DISTINCT> { distinct = true ; } )?
- (
- expr = Expression() { a.add(expr) ; }
- (<COMMA> expr = Expression() { a.add(expr) ; } )*
- )?
- <RPAREN>
- { agg = AggregatorFactory.createCustom(false, distinct, iri, a) ; }
+ | t = <AGG>
+ { String iri ; }
+ iri = iri()
+ { Args a = new Args() ; }
+ a = ArgList()
+ { agg = AggregatorFactory.createCustom(iri, a) ; }
#endif
- )
+ )
- {
- if ( ! getAllowAggregatesInExpressions() )
- throwParseException("Aggregate expression not legal at this point",
- t.beginLine, t.beginColumn) ;
- }
- { Expr exprAgg = getQuery().allocAggregate(agg) ;
- return exprAgg ; }
+ {
+ if ( ! getAllowAggregatesInExpressions() )
+ throwParseException("Aggregate expression not legal at this point",
+ t.beginLine, t.beginColumn) ;
+ }
+ { Expr exprAgg = getQuery().allocAggregate(agg) ;
+ return exprAgg ; }
}
// See also FunctionCall.
// The case of "q:name()" or "q:agg()" or just "q:name"
// by expanding out FunctionCall()
-Expr iriOrFunction() : { String iri ; ExprList a = null ;
- ExprList params = null ;
- boolean distinct = false ; }
+Expr iriOrFunction() : { String iri ; Args a = null ; }
{
iri = iri()
(a = ArgList())?
@@ -2077,7 +2067,7 @@ Expr iriOrFunction() : { String iri ; ExprList a = null ;
// aggregates
if ( ! getAllowAggregatesInExpressions() )
throwParseException("Aggregate expression not legal at this point : "+iri, -1, -1) ;
- Aggregator agg = AggregatorFactory.createCustom(true, false, iri, a) ;
+ Aggregator agg = AggregatorFactory.createCustom(iri, a) ;
Expr exprAgg = getQuery().allocAggregate(agg) ;
return exprAgg ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/9538e473/jena-arq/Grammar/sparql_11.jj
----------------------------------------------------------------------
diff --git a/jena-arq/Grammar/sparql_11.jj b/jena-arq/Grammar/sparql_11.jj
index 4e14be5..7f19c46 100644
--- a/jena-arq/Grammar/sparql_11.jj
+++ b/jena-arq/Grammar/sparql_11.jj
@@ -679,7 +679,7 @@ Expr Constraint() : { Expr c ; }
)
{ return c ; }
}
-Expr FunctionCall() : { String fname ; ExprList a ; }
+Expr FunctionCall() : { String fname ; Args a ; }
{
fname = iri()
a = ArgList()
@@ -687,21 +687,20 @@ Expr FunctionCall() : { String fname ; ExprList a ; }
if ( AggregateRegistry.isRegistered(fname) ) {
if ( ! getAllowAggregatesInExpressions() )
throwParseException("Aggregate expression not legal at this point : "+fname, -1, -1) ;
- Aggregator agg = AggregatorFactory.createCustom(true, false, fname, a) ;
+ Aggregator agg = AggregatorFactory.createCustom(fname, a) ;
Expr exprAgg = getQuery().allocAggregate(agg) ;
return exprAgg ;
}
return new E_Function(fname, a) ;
}
}
-ExprList ArgList() : { Expr expr ; boolean distinct = false ;
- ExprList args = new ExprList() ; Token t ; }
+Args ArgList() : { Expr expr ; Args args = new Args() ; Token t ; }
{
(
<NIL>
|
<LPAREN>
- (t = <DISTINCT> { distinct = true ; }
+ (t = <DISTINCT> { args.distinct = true ; }
{ int beginLine = t.beginLine; int beginColumn = t.beginColumn; t = null; }
{
if ( ! getAllowAggregatesInExpressions() )
@@ -715,17 +714,17 @@ ExprList ArgList() : { Expr expr ; boolean distinct = false ;
)
{ return args ; }
}
-ExprList ExpressionList() : { Expr expr = null ; ExprList args = new ExprList() ;}
+ExprList ExpressionList() : { Expr expr = null ; ExprList exprList = new ExprList() ;}
{
(
<NIL>
|
<LPAREN>
- expr = Expression() { args.add(expr) ; }
- (<COMMA> expr = Expression() { args.add(expr) ; } )*
+ expr = Expression() { exprList.add(expr) ; }
+ (<COMMA> expr = Expression() { exprList.add(expr) ; } )*
<RPAREN>
)
- { return args ; }
+ { return exprList ; }
}
Template ConstructTemplate() : { TripleCollectorBGP acc = new TripleCollectorBGP();
Template t = new Template(acc.getBGP()) ; }
@@ -1298,9 +1297,8 @@ Expr NotExistsFunc() : { Element el ; }
{ return createExprNotExists(el) ; }
}
Expr Aggregate() : { Aggregator agg = null ; String sep = null ;
- boolean distinct = false ;
Expr expr = null ; Expr expr2 = null ;
- ExprList a = new ExprList() ;
+ boolean distinct = false ;
ExprList ordered = new ExprList() ;
Token t ; }
{
@@ -1324,22 +1322,20 @@ Expr Aggregate() : { Aggregator agg = null ; String sep = null ;
| t = <GROUP_CONCAT>
<LPAREN>
(t = <DISTINCT> { distinct = true ; })?
- expr = Expression() { a.add(expr) ; }
+ expr = Expression()
(<SEMICOLON> <SEPARATOR> <EQ> sep=String())?
<RPAREN>
{ agg = AggregatorFactory.createGroupConcat(distinct, expr, sep, ordered) ; }
- )
- {
- if ( ! getAllowAggregatesInExpressions() )
- throwParseException("Aggregate expression not legal at this point",
- t.beginLine, t.beginColumn) ;
- }
- { Expr exprAgg = getQuery().allocAggregate(agg) ;
- return exprAgg ; }
-}
-Expr iriOrFunction() : { String iri ; ExprList a = null ;
- ExprList params = null ;
- boolean distinct = false ; }
+ )
+ {
+ if ( ! getAllowAggregatesInExpressions() )
+ throwParseException("Aggregate expression not legal at this point",
+ t.beginLine, t.beginColumn) ;
+ }
+ { Expr exprAgg = getQuery().allocAggregate(agg) ;
+ return exprAgg ; }
+}
+Expr iriOrFunction() : { String iri ; Args a = null ; }
{
iri = iri()
(a = ArgList())?
@@ -1348,7 +1344,7 @@ Expr iriOrFunction() : { String iri ; ExprList a = null ;
if ( AggregateRegistry.isRegistered(iri) ) {
if ( ! getAllowAggregatesInExpressions() )
throwParseException("Aggregate expression not legal at this point : "+iri, -1, -1) ;
- Aggregator agg = AggregatorFactory.createCustom(true, false, iri, a) ;
+ Aggregator agg = AggregatorFactory.createCustom(iri, a) ;
Expr exprAgg = getQuery().allocAggregate(agg) ;
return exprAgg ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/9538e473/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/Accumulator.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/Accumulator.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/Accumulator.java
index 1004716..974dbfb 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/Accumulator.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/Accumulator.java
@@ -30,5 +30,4 @@ public interface Accumulator
{
public void accumulate(Binding binding, FunctionEnv functionEnv) ;
public NodeValue getValue() ;
- //public QueryIterator results() ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/9538e473/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AccumulatorFactory.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AccumulatorFactory.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AccumulatorFactory.java
index ed398e3..a9b9438 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AccumulatorFactory.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AccumulatorFactory.java
@@ -22,10 +22,6 @@ package org.apache.jena.sparql.expr.aggregate;
* processor for one group key for one execution.
*/
public interface AccumulatorFactory {
- /**
- *
- * @return Accumulator
- */
- public Accumulator createAccumulator(AggCustom agg) ;
+ public Accumulator createAccumulator(AggCustom agg, boolean distinct) ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/9538e473/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggCustom.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggCustom.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggCustom.java
index 9a2b2ec..40e8ed3 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggCustom.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggCustom.java
@@ -42,13 +42,13 @@ public class AggCustom extends AggregatorBase
private final String iri ;
- public AggCustom(String iri, ExprList exprs) {
- super("AGG", false, exprs) ;
+ public AggCustom(String iri, boolean distinct, ExprList exprs) {
+ super("AGG", distinct, exprs) ;
this.iri = iri ;
}
@Override
- public Aggregator copy(ExprList exprs) { return new AggCustom(iri, exprs) ; }
+ public Aggregator copy(ExprList exprs) { return new AggCustom(iri, isDistinct, exprs) ; }
@Override
public String asSparqlExpr(SerializationContext sCxt) {
@@ -104,7 +104,7 @@ public class AggCustom extends AggregatorBase
AccumulatorFactory f = AggregateRegistry.getAccumulatorFactory(iri) ;
if ( f == null )
throw new QueryExecException("Unregistered aggregate: "+iri) ;
- return f.createAccumulator(this) ;
+ return f.createAccumulator(this, isDistinct) ;
}
@Override
http://git-wip-us.apache.org/repos/asf/jena/blob/9538e473/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggregateRegistry.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggregateRegistry.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggregateRegistry.java
index cd63e76..322a489 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggregateRegistry.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggregateRegistry.java
@@ -29,8 +29,8 @@ import org.apache.jena.graph.Node ;
*/
public class AggregateRegistry {
- private static Map<String, AccumulatorFactory> registry = new HashMap<>() ;
- private static Map<String, Node> noGroupValues = new HashMap<>() ;
+ private static Map<String, AccumulatorFactory> registry = new HashMap<>() ;
+ private static Map<String, Node> noGroupValues = new HashMap<>() ;
/**
* Register a custom aggregate, with its associated factory for accumulators.
@@ -44,9 +44,7 @@ public class AggregateRegistry {
noGroupValues.put(uri, noGroupValue) ;
}
- /**
- * Remove a registration.
- */
+ /** Remove a registration. */
public static void unregister(String uri) {
registry.remove(uri) ;
noGroupValues.remove(uri) ;
@@ -57,12 +55,12 @@ public class AggregateRegistry {
return registry.get(uri) ;
}
- /** Return the AccumulatorFactory for a registered custom aggregate. */
+ /** Return the registered "no groups" value */
public static Node getNoGroupValue(String uri) {
return noGroupValues.get(uri) ;
}
- /** Return the AccumulatorFactory for a registered custom aggregate. */
+ /** Is the URI registered as an aggregate function? */
public static boolean isRegistered(String uri) {
return registry.containsKey(uri) ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/9538e473/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/Aggregator.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/Aggregator.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/Aggregator.java
index 0449913..6bd02dd 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/Aggregator.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/Aggregator.java
@@ -34,7 +34,7 @@ public interface Aggregator
/** Create an accumulator for this aggregator */
public Accumulator createAccumulator() ;
- /** Value if there are no elements in any group : return null for no result */
+ /** Value if there are no groups : return null for no result */
public Node getValueEmpty() ;
public String toPrefixString() ;
http://git-wip-us.apache.org/repos/asf/jena/blob/9538e473/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggregatorFactory.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggregatorFactory.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggregatorFactory.java
index a268f49..d055929 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggregatorFactory.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/AggregatorFactory.java
@@ -63,9 +63,13 @@ public class AggregatorFactory {
return new AggNull() ;
}
- public static Aggregator createCustom(boolean usedAsFunction, boolean distinct, String iri, ExprList a) {
+ public static Aggregator createCustom(String iri, Args a) {
+ return createCustom(iri, a.distinct, ExprList.copy(a)) ;
+ }
+
+ public static Aggregator createCustom(String iri, boolean distinct, ExprList exprs) {
if ( ! AggregateRegistry.isRegistered(iri) )
Log.warn(AggregatorFactory.class, "Not registered: custom aggregate <"+iri+">") ;
- return new AggCustom(iri, a) ;
+ return new AggCustom(iri, distinct, exprs) ;
}
}
http://git-wip-us.apache.org/repos/asf/jena/blob/9538e473/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/Args.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/Args.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/Args.java
new file mode 100644
index 0000000..4a4d5db
--- /dev/null
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/Args.java
@@ -0,0 +1,28 @@
+/*
+ * 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 org.apache.jena.sparql.expr.aggregate;
+
+import org.apache.jena.sparql.expr.ExprList ;
+
+/** An Args is an ExprList with a flag for DISTINCT.
+ * Only used for rule ArgList in the SPARQl grammar.
+ */
+public class Args extends ExprList {
+ public boolean distinct = false ;
+}
http://git-wip-us.apache.org/repos/asf/jena/blob/9538e473/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/lib/AccStatBase.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/lib/AccStatBase.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/lib/AccStatBase.java
new file mode 100644
index 0000000..ade562d
--- /dev/null
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/lib/AccStatBase.java
@@ -0,0 +1,99 @@
+/*
+ * 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 org.apache.jena.sparql.expr.aggregate.lib;
+
+import org.apache.jena.sparql.engine.binding.Binding ;
+import org.apache.jena.sparql.expr.Expr ;
+import org.apache.jena.sparql.expr.ExprEvalException ;
+import org.apache.jena.sparql.expr.NodeValue ;
+import org.apache.jena.sparql.expr.aggregate.AccumulatorExpr ;
+import org.apache.jena.sparql.function.FunctionEnv ;
+
+/** Base for statistics aggregations */
+abstract class AccStatBase extends AccumulatorExpr {
+ // Could also be used for AVG and SUM but those came before this.
+
+ private static final NodeValue noValuesToAvg = NodeValue.nvZERO ; // null? NaN?
+ private static final NodeValue errorValue = null ;
+
+ public AccStatBase(Expr expr, boolean distinct) {
+ // Merge "distinct" into AccumulatorExpr
+ super(expr, distinct);
+ }
+ protected long count = 0 ;
+ protected double K = 0 ;
+ // https://en.wikipedia.org/wiki/Algorithms_for_calculating_variance
+ // Var = (SumSq − (Sum × Sum) / n) / (n − 1)
+ // These are offset by K.
+ protected double sum = 0 ;
+ protected double sumSquared = 0 ;
+
+ @Override
+ final protected NodeValue getAccValue() {
+ if ( super.errorCount != 0 )
+ //throw new ExprEvalException("avg: error in group") ;
+ return null ;
+ if ( count <= 0 ) return noValuesToAvg ;
+ try {
+ double x1 = calc() ;
+ return NodeValue.makeDouble(x1) ;
+ } catch (ExprEvalException ex) { return errorValue ; }
+ }
+
+ abstract protected double calc() ;
+
+ /** Calculate the variance (sample) */
+ final protected double calcVarianceSample() {
+ // (N*sum(?x*?x) - sum(?x) ) / N*(N-1)
+ return AccStatLib.calcVarianceSample(sumSquared, sum, count) ;
+ }
+
+ /** Calculate the variance (population) */
+ final protected double calcVariancePop() {
+ // (N*sum(?x*?x) - sum(?x) ) / N*N
+ return AccStatLib.calcVariancePopulation(sumSquared, sum, count) ;
+ }
+
+ @Override
+ protected void accumulate(NodeValue nv, Binding binding, FunctionEnv functionEnv) {
+ // shifted_data_variance
+ if ( nv.isNumber() ) {
+ double d = nv.getDouble() ;
+ count++ ;
+ if ( count == 1 ) {
+ K = d ;
+ sum = (d-K) ; // == 0 of K set.
+ sumSquared = (d-K)*(d-K) ; // == 0
+ return ;
+ }
+ else {
+ double dk = (d-K) ;
+ double dk2 = dk * dk ;
+ sum = sum + dk ;
+ sumSquared = sumSquared + dk2 ;
+ }
+ }
+ else
+ throw new ExprEvalException("Not a number: "+nv) ;
+ }
+
+ @Override
+ protected void accumulateError(Binding binding, FunctionEnv functionEnv)
+ {}
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jena/blob/9538e473/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/lib/AccStatLib.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/lib/AccStatLib.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/lib/AccStatLib.java
new file mode 100644
index 0000000..bfd3e3c
--- /dev/null
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/lib/AccStatLib.java
@@ -0,0 +1,46 @@
+/*
+ * 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 org.apache.jena.sparql.expr.aggregate.lib;
+
+import org.apache.jena.sparql.expr.ExprEvalException ;
+
+public class AccStatLib {
+ /** Calculate the variance (sample) */
+ public static double calcVarianceSample(double sumSquared, double sum, long count) {
+ // (N*sum(?x*?x) - sum(?x) ) / N*(N-1)
+ return calcVariance$(sumSquared, sum, count, count-1) ;
+ }
+
+ /** Calculate the variance (population) */
+ public static double calcVariancePopulation(double sumSquared, double sum, long N) {
+ return calcVariance$(sumSquared, sum, N, N) ;
+ }
+
+ // Engine.
+ static private double calcVariance$(double sumSquared, double sum, long N, long N1) {
+// System.out.printf("sum = %f, sumSq = %f, N=%d\n", sum, sumSquared, N) ;
+ if ( N <= 0 )
+ throw new ExprEvalException("N= "+N) ;
+ if ( N1 == 0 )
+ throw new ExprEvalException("Sample size one") ;
+ double x = sumSquared - (sum*sum)/N ;
+ x = x / N1 ;
+ return x ;
+ }
+}
http://git-wip-us.apache.org/repos/asf/jena/blob/9538e473/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/lib/AccStatStdDevPopulation.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/lib/AccStatStdDevPopulation.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/lib/AccStatStdDevPopulation.java
new file mode 100644
index 0000000..2058147
--- /dev/null
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/lib/AccStatStdDevPopulation.java
@@ -0,0 +1,34 @@
+/*
+ * 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 org.apache.jena.sparql.expr.aggregate.lib;
+
+import org.apache.jena.sparql.expr.Expr ;
+
+/** Aggregate - statistical standard deviation - population (i.e. N) */
+public class AccStatStdDevPopulation extends AccStatVarPopulation {
+
+ public AccStatStdDevPopulation(Expr expr, boolean distinct) {
+ super(expr, distinct);
+ }
+
+ @Override
+ protected double calc() {
+ return Math.sqrt(super.calc());
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jena/blob/9538e473/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/lib/AccStatStdDevSample.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/lib/AccStatStdDevSample.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/lib/AccStatStdDevSample.java
new file mode 100644
index 0000000..940d5da
--- /dev/null
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/lib/AccStatStdDevSample.java
@@ -0,0 +1,34 @@
+/*
+ * 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 org.apache.jena.sparql.expr.aggregate.lib;
+
+import org.apache.jena.sparql.expr.Expr ;
+
+/** Aggregate - statistical standard deviation - sample (i.e. N-1) */
+public class AccStatStdDevSample extends AccStatVarSample {
+
+ public AccStatStdDevSample(Expr expr, boolean distinct) {
+ super(expr, distinct);
+ }
+
+ @Override
+ protected double calc() {
+ return Math.sqrt(super.calc());
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jena/blob/9538e473/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/lib/AccStatVarPopulation.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/lib/AccStatVarPopulation.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/lib/AccStatVarPopulation.java
new file mode 100644
index 0000000..8172baf
--- /dev/null
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/lib/AccStatVarPopulation.java
@@ -0,0 +1,34 @@
+/*
+ * 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 org.apache.jena.sparql.expr.aggregate.lib;
+
+import org.apache.jena.sparql.expr.Expr ;
+
+/** Aggregate - statistical variance - population (i.e. N) */
+public class AccStatVarPopulation extends AccStatVarSample {
+
+ public AccStatVarPopulation(Expr expr, boolean distinct) {
+ super(expr, distinct);
+ }
+
+ @Override
+ protected double calc() {
+ return super.calcVariancePop();
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jena/blob/9538e473/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/lib/AccStatVarSample.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/lib/AccStatVarSample.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/lib/AccStatVarSample.java
new file mode 100644
index 0000000..8f5e1a8
--- /dev/null
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/lib/AccStatVarSample.java
@@ -0,0 +1,34 @@
+/*
+ * 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 org.apache.jena.sparql.expr.aggregate.lib;
+
+import org.apache.jena.sparql.expr.Expr ;
+
+/** Aggregate - statistical variance - sample (i.e. N-1) */
+public class AccStatVarSample extends AccStatBase {
+
+ public AccStatVarSample(Expr expr, boolean distinct) {
+ super(expr, distinct);
+ }
+
+ @Override
+ protected double calc() {
+ return super.calcVarianceSample() ;
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jena/blob/9538e473/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/lib/StandardCustomAggregates.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/lib/StandardCustomAggregates.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/lib/StandardCustomAggregates.java
new file mode 100644
index 0000000..0a396d4
--- /dev/null
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/aggregate/lib/StandardCustomAggregates.java
@@ -0,0 +1,64 @@
+/*
+ * 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 org.apache.jena.sparql.expr.aggregate.lib;
+
+import org.apache.jena.sparql.ARQConstants ;
+import org.apache.jena.sparql.expr.aggregate.AccumulatorFactory ;
+import org.apache.jena.sparql.expr.aggregate.AggregateRegistry ;
+
+/** Register custom aggregates.
+ * This includes the statistics aggregate functions as custom aggregates,
+ * as {@code <http://jena.apache.org/ARQ/function#stdev} etc.
+ * This is commonly abbreviated {@code afn:stdev}.
+ */
+public class StandardCustomAggregates {
+
+ public static String BASE = ARQConstants.ARQFunctionLibraryURI ;
+
+ public static void register() {
+ // Non-DISTINCT
+ AccumulatorFactory f_VarP = (agg, distinct) -> new AccStatVarPopulation(agg.getExpr(), distinct) ;
+ AccumulatorFactory f_Var = (agg, distinct) -> new AccStatVarSample(agg.getExpr(), distinct) ;
+ AccumulatorFactory f_StdevP = (agg, distinct) -> new AccStatStdDevPopulation(agg.getExpr(), distinct) ;
+ AccumulatorFactory f_Stdev = (agg, distinct) -> new AccStatStdDevSample(agg.getExpr(), distinct) ;
+
+// AggregateRegistry.register(BASE+"stddevp", f_StdevP, null) ; // Common? typo
+// AggregateRegistry.register(BASE+"stddev", f_Stdev, null) ; // Common? typo
+ AggregateRegistry.register(BASE+"stdevp", f_StdevP, null) ; // SQL spelling
+ AggregateRegistry.register(BASE+"stdev", f_Stdev, null) ; // SQL spelling
+
+// AggregateRegistry.register(BASE+"variancep", f_VarP, null) ; // Longer
+// AggregateRegistry.register(BASE+"variance", f_Var, null) ; // Longer
+ AggregateRegistry.register(BASE+"varp", f_VarP, null) ; // SQL spelling
+ AggregateRegistry.register(BASE+"var", f_Var, null) ; // SQL spelling
+
+ // DISTINCT versions for
+ //
+ AccumulatorFactory f_VarP_d = (agg, distinct) -> new AccStatVarPopulation(agg.getExpr(), true) ;
+ AccumulatorFactory f_Var_d = (agg, distinct) -> new AccStatVarSample(agg.getExpr(), true) ;
+ AccumulatorFactory f_StdevP_d = (agg, distinct) -> new AccStatStdDevPopulation(agg.getExpr(), true) ;
+ AccumulatorFactory f_Stdev_d = (agg, distinct) -> new AccStatStdDevSample(agg.getExpr(), true) ;
+
+ AggregateRegistry.register(BASE+"varpd", f_VarP_d, null) ;
+ AggregateRegistry.register(BASE+"vard", f_Var_d, null) ;
+ AggregateRegistry.register(BASE+"stdevpd", f_StdevP_d, null) ;
+ AggregateRegistry.register(BASE+"stdevd", f_Stdev_d, null) ;
+
+ }
+}
http://git-wip-us.apache.org/repos/asf/jena/blob/9538e473/jena-arq/src/main/java/org/apache/jena/sparql/function/StandardFunctions.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/function/StandardFunctions.java b/jena-arq/src/main/java/org/apache/jena/sparql/function/StandardFunctions.java
index c860f47..1d5d9f4 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/function/StandardFunctions.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/function/StandardFunctions.java
@@ -20,6 +20,7 @@ package org.apache.jena.sparql.function;
import org.apache.jena.datatypes.xsd.XSDDatatype ;
import org.apache.jena.sparql.ARQConstants ;
+import org.apache.jena.sparql.expr.aggregate.lib.StandardCustomAggregates ;
import org.apache.jena.sparql.function.library.* ;
import org.apache.jena.sparql.function.library.sqrt ;
import org.apache.jena.sparql.function.library.leviathan.* ;
@@ -34,6 +35,8 @@ public class StandardFunctions
String math = ARQConstants.mathPrefix ;
String sparqlfn = ARQConstants.fnSparql ;
+ StandardCustomAggregates.register();
+
// See http://www.w3.org/TR/xpath-datamodel/#types-hierarchy
// No durations here