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:56 UTC
[10/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/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\"",