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:54 UTC
[08/16] jena git commit: JENA-1156: Use standard SQL naming. Add
keywords to extended SPARQL.
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\"",