You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2012/04/23 17:07:51 UTC
svn commit: r1329271 [1/2] - in /incubator/jena/Jena2/ARQ/trunk: Grammar/
src/main/java/com/hp/hpl/jena/sparql/lang/arq/
src/main/java/com/hp/hpl/jena/sparql/lang/sparql_11/ testing/ARQ/Distinct/
Author: andy
Date: Mon Apr 23 15:07:50 2012
New Revision: 1329271
URL: http://svn.apache.org/viewvc?rev=1329271&view=rev
Log:
Updates for SPARQL 1.1 changes in SPARQL-WG.
Added:
incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Distinct/distinct-multi-2.arq
incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Distinct/no-distinct-multi-2.arq
incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Distinct/reduced-multi-2.arq
Removed:
incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Distinct/distinct-multi-2.rq
incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Distinct/no-distinct-multi-2.rq
incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Distinct/reduced-multi-2.rq
Modified:
incubator/jena/Jena2/ARQ/trunk/Grammar/arq.jj
incubator/jena/Jena2/ARQ/trunk/Grammar/master.jj
incubator/jena/Jena2/ARQ/trunk/Grammar/sparql_11.jj
incubator/jena/Jena2/ARQ/trunk/Grammar/tokens.txt
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/arq/ARQParserTokenManager.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/sparql_11/SPARQLParser11.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/sparql_11/SPARQLParser11Constants.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/sparql_11/SPARQLParser11TokenManager.java
incubator/jena/Jena2/ARQ/trunk/testing/ARQ/Distinct/manifest.ttl
Modified: incubator/jena/Jena2/ARQ/trunk/Grammar/arq.jj
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/Grammar/arq.jj?rev=1329271&r1=1329270&r2=1329271&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/Grammar/arq.jj (original)
+++ incubator/jena/Jena2/ARQ/trunk/Grammar/arq.jj Mon Apr 23 15:07:50 2012
@@ -1860,7 +1860,7 @@ TOKEN:
( "_" |
"~" | "." | "-" | "!" | "$" | "&" | "'" |
"(" | ")" | "*" | "+" | "," | ";" | "=" |
- ":" | "/" | "?" | "#" | "@" | "%" ) >
+ "/" | "?" | "#" | "@" | "%" ) >
|
// XML 1.1 NCNameStartChar without "_"
<#PN_CHARS_BASE:
@@ -1872,7 +1872,7 @@ TOKEN:
>
// [#x10000-#xEFFFF]
|
- <#PN_CHARS_U: <PN_CHARS_BASE> | "_" >
+ <#PN_CHARS_U: <PN_CHARS_BASE> | "_" | ":" >
|
// No DOT
<#PN_CHARS: (<PN_CHARS_U> | "-" | ["0"-"9"] | "\u00B7" |
Modified: incubator/jena/Jena2/ARQ/trunk/Grammar/master.jj
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/Grammar/master.jj?rev=1329271&r1=1329270&r2=1329271&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/Grammar/master.jj (original)
+++ incubator/jena/Jena2/ARQ/trunk/Grammar/master.jj Mon Apr 23 15:07:50 2012
@@ -1259,6 +1259,7 @@ Path PathMod(Path p) : { long i1 ; long
( <QMARK> { return PathFactory.pathZeroOrOne(p) ; }
| <STAR> { return PathFactory.pathZeroOrMore1(p) ; }
| <PLUS> { return PathFactory.pathOneOrMore1(p) ; }
+#ifdef ARQ
| <LBRACE>
//{*}
( <STAR> <RBRACE> { return PathFactory.pathZeroOrMoreN(p) ; }
@@ -1284,6 +1285,7 @@ Path PathMod(Path p) : { long i1 ; long
<RBRACE>
{ return PathFactory.pathMod(p, PathFactory.UNSET, i2) ; }
)
+#endif
)
}
@@ -1718,12 +1720,11 @@ Expr BuiltInCall() : { Expr expr ; Expr
| <TZ> <LPAREN> expr1 = Expression() <RPAREN> { return new E_DateTimeTZ(expr1) ; }
| <NOW> <NIL> { return new E_Now() ; }
-#ifdef ARQ
+
| <UUID> <NIL> { return new E_UUID() ; }
| <STRUUID> <NIL> { return new E_StrUUID() ; }
-#endif
- | <MD5> <LPAREN> expr1 = Expression() <RPAREN> { return new E_MD5(expr1) ; }
+ | <MD5> <LPAREN> expr1 = Expression() <RPAREN> { return new E_MD5(expr1) ; }
| <SHA1> <LPAREN> expr1 = Expression() <RPAREN> { return new E_SHA1(expr1) ; }
#if 0
| <SHA224> <LPAREN> expr1 = Expression() <RPAREN> { return new E_SHA224(expr1) ; }
@@ -2204,9 +2205,9 @@ TOKEN [IGNORE_CASE] :
| < TIMEZONE: "TIMEZONE" >
| < TZ: "TZ" >
| < NOW: "NOW" >
-#ifdef ARQ
| < UUID: "UUID" >
| < STRUUID: "STRUUID" >
+#ifdef ARQ
| < VERSION: "VERSION" >
#endif
@@ -2378,7 +2379,7 @@ TOKEN:
( "_" |
"~" | "." | "-" | "!" | "$" | "&" | "'" |
"(" | ")" | "*" | "+" | "," | ";" | "=" |
- ":" | "/" | "?" | "#" | "@" | "%" ) >
+ "/" | "?" | "#" | "@" | "%" ) >
|
// XML 1.1 NCNameStartChar without "_"
<#PN_CHARS_BASE:
@@ -2390,7 +2391,7 @@ TOKEN:
>
// [#x10000-#xEFFFF]
|
- <#PN_CHARS_U: <PN_CHARS_BASE> | "_" >
+ <#PN_CHARS_U: <PN_CHARS_BASE> | "_" | ":" >
|
// No DOT
<#PN_CHARS: (<PN_CHARS_U> | "-" | ["0"-"9"] | "\u00B7" |
Modified: incubator/jena/Jena2/ARQ/trunk/Grammar/sparql_11.jj
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/Grammar/sparql_11.jj?rev=1329271&r1=1329270&r2=1329271&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/Grammar/sparql_11.jj (original)
+++ incubator/jena/Jena2/ARQ/trunk/Grammar/sparql_11.jj Mon Apr 23 15:07:50 2012
@@ -902,31 +902,6 @@ Path PathMod(Path p) : { long i1 ; long
( <QMARK> { return PathFactory.pathZeroOrOne(p) ; }
| <STAR> { return PathFactory.pathZeroOrMore1(p) ; }
| <PLUS> { return PathFactory.pathOneOrMore1(p) ; }
- | <LBRACE>
- //{*}
- ( <STAR> <RBRACE> { return PathFactory.pathZeroOrMoreN(p) ; }
- // {+}
- | <PLUS> <RBRACE> { return PathFactory.pathOneOrMoreN(p) ; }
- | // {N} {N,M} {N,}
- i1 = Integer()
- ( <COMMA>
- ( // case {N,}
- <RBRACE>
- { return PathFactory.pathMod(p, i1, PathFactory.UNSET) ; }
- | // case {N,M}
- i2 = Integer() <RBRACE> // case {N,M}
- { return PathFactory.pathMod(p, i1, i2) ; }
- )
- |
- <RBRACE> // {N}
- { return PathFactory.pathFixedLength(p, i1) ; }
- )
- | // {,N}
- <COMMA>
- i2 = Integer()
- <RBRACE>
- { return PathFactory.pathMod(p, PathFactory.UNSET, i2) ; }
- )
)
}
Path PathPrimary() : { String str ; Path p ; Node n ; }
@@ -1249,6 +1224,8 @@ Expr BuiltInCall() : { Expr expr ; Expr
| <TIMEZONE> <LPAREN> expr1 = Expression() <RPAREN> { return new E_DateTimeTimezone(expr1) ; }
| <TZ> <LPAREN> expr1 = Expression() <RPAREN> { return new E_DateTimeTZ(expr1) ; }
| <NOW> <NIL> { return new E_Now() ; }
+ | <UUID> <NIL> { return new E_UUID() ; }
+ | <STRUUID> <NIL> { return new E_StrUUID() ; }
| <MD5> <LPAREN> expr1 = Expression() <RPAREN> { return new E_MD5(expr1) ; }
| <SHA1> <LPAREN> expr1 = Expression() <RPAREN> { return new E_SHA1(expr1) ; }
| <SHA256> <LPAREN> expr1 = Expression() <RPAREN> { return new E_SHA256(expr1) ; }
@@ -1600,6 +1577,8 @@ TOKEN [IGNORE_CASE] :
| < TIMEZONE: "TIMEZONE" >
| < TZ: "TZ" >
| < NOW: "NOW" >
+| < UUID: "UUID" >
+| < STRUUID: "STRUUID" >
| < MD5: "MD5" >
| < SHA1: "SHA1" >
| < SHA224: "SHA224" >
@@ -1734,7 +1713,7 @@ TOKEN:
( "_" |
"~" | "." | "-" | "!" | "$" | "&" | "'" |
"(" | ")" | "*" | "+" | "," | ";" | "=" |
- ":" | "/" | "?" | "#" | "@" | "%" ) >
+ "/" | "?" | "#" | "@" | "%" ) >
|
// XML 1.1 NCNameStartChar without "_"
<#PN_CHARS_BASE:
@@ -1746,7 +1725,7 @@ TOKEN:
>
// [#x10000-#xEFFFF]
|
- <#PN_CHARS_U: <PN_CHARS_BASE> | "_" >
+ <#PN_CHARS_U: <PN_CHARS_BASE> | "_" | ":" >
|
// No DOT
<#PN_CHARS: (<PN_CHARS_U> | "-" | ["0"-"9"] | "\u00B7" |
Modified: incubator/jena/Jena2/ARQ/trunk/Grammar/tokens.txt
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/Grammar/tokens.txt?rev=1329271&r1=1329270&r2=1329271&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/Grammar/tokens.txt (original)
+++ incubator/jena/Jena2/ARQ/trunk/Grammar/tokens.txt Mon Apr 23 15:07:50 2012
@@ -134,7 +134,7 @@
[<TZ>] ::= 'TZ'
[<NOW>] ::= 'NOW'
[<UUID>] ::= 'UUID'
-[<STRUUID>] ::= 'StrUUID'
+[<STRUUID>] ::= 'STRUUID'
[<VERSION>] ::= 'VERSION'
[<CAST>] ::= 'CAST'
[<CALL>] ::= 'CALL'
@@ -235,7 +235,7 @@
<#PN_CHARS_BASE> ::= [A-Z] | [a-z] | [#x00C0-#x00D6] | [#x00D8-#x00F6] | [#x00F8-#x02FF] | [#x0370-#x037D] | [#x037F-#x1FFF] | [#x200C-#x200D] | [#x2070-#x218F] | [#x2C00-#x2FEF] | [#x3001-#xD7FF] | [#xF900-#xFDCF] | [#xFDF0-#xFFFD] | [#x10000-#xEFFFF]
-<#PN_CHARS_U> ::= <PN_CHARS_BASE> | '_'
+<#PN_CHARS_U> ::= <PN_CHARS_BASE> | '_' | ':'
<#VARNAME> ::= ( <PN_CHARS_U> | [0-9] ) ( <PN_CHARS_U> | [0-9] | #x00B7 | [#x0300-#x036F] | [#x203F-#x2040] )*
@@ -250,4 +250,4 @@
<PERCENT> ::= '%' <HEX> <HEX>
<HEX> ::= [0-9] | [A-F] | [a-f]
-<PN_LOCAL_ESC> ::= '\' ( '_' | '~' | '.' | '-' | '!' | '$' | '&' | "'" | '(' | ')' | '*' | '+' | ',' | ';' | '=' | ':' | '/' | '?' | '#' | '@' | '%' )
+<PN_LOCAL_ESC> ::= '\' ( '_' | '~' | '.' | '-' | '!' | '$' | '&' | "'" | '(' | ')' | '*' | '+' | ',' | ';' | '=' | '/' | '?' | '#' | '@' | '%' )
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/arq/ARQParserTokenManager.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/arq/ARQParserTokenManager.java?rev=1329271&r1=1329270&r2=1329271&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/arq/ARQParserTokenManager.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/arq/ARQParserTokenManager.java Mon Apr 23 15:07:50 2012
@@ -2413,18 +2413,18 @@ private int jjMoveNfa_0(int startState,
jjstateSet[jjnewStateCnt++] = 9;
break;
case 9:
- if ((0x3ff000000000000L & l) == 0L)
+ if ((0x7ff000000000000L & l) == 0L)
break;
if (kind > 12)
kind = 12;
jjCheckNAddTwoStates(10, 11);
break;
case 10:
- if ((0x3ff600000000000L & l) != 0L)
+ if ((0x7ff600000000000L & l) != 0L)
jjCheckNAddTwoStates(10, 11);
break;
case 11:
- if ((0x3ff200000000000L & l) != 0L && kind > 12)
+ if ((0x7ff200000000000L & l) != 0L && kind > 12)
kind = 12;
break;
case 13:
@@ -2433,7 +2433,7 @@ private int jjMoveNfa_0(int startState,
break;
case 14:
case 15:
- if ((0x3ff000000000000L & l) == 0L)
+ if ((0x7ff000000000000L & l) == 0L)
break;
if (kind > 13)
kind = 13;
@@ -2445,7 +2445,7 @@ private int jjMoveNfa_0(int startState,
break;
case 17:
case 18:
- if ((0x3ff000000000000L & l) == 0L)
+ if ((0x7ff000000000000L & l) == 0L)
break;
if (kind > 14)
kind = 14;
@@ -2653,11 +2653,11 @@ private int jjMoveNfa_0(int startState,
jjstateSet[jjnewStateCnt++] = 87;
break;
case 90:
- if ((0x3ff600000000000L & l) != 0L)
+ if ((0x7ff600000000000L & l) != 0L)
jjAddStates(68, 69);
break;
case 91:
- if ((0x3ff200000000000L & l) != 0L)
+ if ((0x7ff200000000000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 92;
break;
case 92:
@@ -2665,11 +2665,11 @@ private int jjMoveNfa_0(int startState,
kind = 10;
break;
case 93:
- if ((0x3ff600000000000L & l) != 0L)
+ if ((0x7ff600000000000L & l) != 0L)
jjAddStates(70, 71);
break;
case 94:
- if ((0x3ff200000000000L & l) != 0L)
+ if ((0x7ff200000000000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 95;
break;
case 95:
@@ -2677,23 +2677,22 @@ private int jjMoveNfa_0(int startState,
jjCheckNAddStates(17, 19);
break;
case 96:
- case 111:
- if ((0x3ff000000000000L & l) == 0L)
+ if ((0x7ff000000000000L & l) == 0L)
break;
if (kind > 11)
kind = 11;
jjCheckNAddStates(72, 75);
break;
case 97:
- if ((0x3ff600000000000L & l) != 0L)
+ if ((0x7ff600000000000L & l) != 0L)
jjCheckNAddStates(72, 75);
break;
case 98:
- if ((0x3ff200000000000L & l) != 0L && kind > 11)
+ if ((0x7ff200000000000L & l) != 0L && kind > 11)
kind = 11;
break;
case 100:
- if ((0xac00fffa00000000L & l) != 0L)
+ if ((0xa800fffa00000000L & l) != 0L)
jjCheckNAddStates(72, 75);
break;
case 101:
@@ -2717,11 +2716,11 @@ private int jjMoveNfa_0(int startState,
kind = 11;
break;
case 106:
- if ((0xac00fffa00000000L & l) != 0L && kind > 11)
+ if ((0xa800fffa00000000L & l) != 0L && kind > 11)
kind = 11;
break;
case 108:
- if ((0xac00fffa00000000L & l) == 0L)
+ if ((0xa800fffa00000000L & l) == 0L)
break;
if (kind > 11)
kind = 11;
@@ -2735,6 +2734,13 @@ private int jjMoveNfa_0(int startState,
if ((0x3ff000000000000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 111;
break;
+ case 111:
+ if ((0x3ff000000000000L & l) == 0L)
+ break;
+ if (kind > 11)
+ kind = 11;
+ jjCheckNAddStates(72, 75);
+ break;
case 112:
if (curChar != 58)
break;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/sparql_11/SPARQLParser11.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/sparql_11/SPARQLParser11.java?rev=1329271&r1=1329270&r2=1329271&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/sparql_11/SPARQLParser11.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/sparql_11/SPARQLParser11.java Mon Apr 23 15:07:50 2012
@@ -547,6 +547,8 @@ public class SPARQLParser11 extends SPAR
case TIMEZONE:
case TZ:
case NOW:
+ case UUID:
+ case STRUUID:
case MD5:
case SHA1:
case SHA256:
@@ -619,6 +621,8 @@ public class SPARQLParser11 extends SPAR
case TIMEZONE:
case TZ:
case NOW:
+ case UUID:
+ case STRUUID:
case MD5:
case SHA1:
case SHA256:
@@ -724,6 +728,8 @@ public class SPARQLParser11 extends SPAR
case TIMEZONE:
case TZ:
case NOW:
+ case UUID:
+ case STRUUID:
case MD5:
case SHA1:
case SHA256:
@@ -815,6 +821,8 @@ public class SPARQLParser11 extends SPAR
case TIMEZONE:
case TZ:
case NOW:
+ case UUID:
+ case STRUUID:
case MD5:
case SHA1:
case SHA256:
@@ -912,6 +920,8 @@ public class SPARQLParser11 extends SPAR
case TIMEZONE:
case TZ:
case NOW:
+ case UUID:
+ case STRUUID:
case MD5:
case SHA1:
case SHA256:
@@ -976,6 +986,8 @@ public class SPARQLParser11 extends SPAR
case TIMEZONE:
case TZ:
case NOW:
+ case UUID:
+ case STRUUID:
case MD5:
case SHA1:
case SHA256:
@@ -2160,6 +2172,8 @@ public class SPARQLParser11 extends SPAR
case TIMEZONE:
case TZ:
case NOW:
+ case UUID:
+ case STRUUID:
case MD5:
case SHA1:
case SHA256:
@@ -2712,7 +2726,6 @@ public class SPARQLParser11 extends SPAR
String str ; Node n ; Path p ;
p = PathPrimary();
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case LBRACE:
case PLUS:
case STAR:
case QMARK:
@@ -2768,66 +2781,8 @@ public class SPARQLParser11 extends SPAR
jj_consume_token(PLUS);
{if (true) return PathFactory.pathOneOrMore1(p) ;}
break;
- case LBRACE:
- jj_consume_token(LBRACE);
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case STAR:
- jj_consume_token(STAR);
- jj_consume_token(RBRACE);
- {if (true) return PathFactory.pathZeroOrMoreN(p) ;}
- break;
- case PLUS:
- jj_consume_token(PLUS);
- jj_consume_token(RBRACE);
- {if (true) return PathFactory.pathOneOrMoreN(p) ;}
- break;
- case INTEGER:
- // {N} {N,M} {N,}
- i1 = Integer();
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case COMMA:
- jj_consume_token(COMMA);
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case RBRACE:
- jj_consume_token(RBRACE);
- {if (true) return PathFactory.pathMod(p, i1, PathFactory.UNSET) ;}
- break;
- case INTEGER:
- // case {N,M}
- i2 = Integer();
- jj_consume_token(RBRACE);
- {if (true) return PathFactory.pathMod(p, i1, i2) ;}
- break;
- default:
- jj_la1[102] = jj_gen;
- jj_consume_token(-1);
- throw new ParseException();
- }
- break;
- case RBRACE:
- jj_consume_token(RBRACE);
- {if (true) return PathFactory.pathFixedLength(p, i1) ;}
- break;
- default:
- jj_la1[103] = jj_gen;
- jj_consume_token(-1);
- throw new ParseException();
- }
- break;
- case COMMA:
- jj_consume_token(COMMA);
- i2 = Integer();
- jj_consume_token(RBRACE);
- {if (true) return PathFactory.pathMod(p, PathFactory.UNSET, i2) ;}
- break;
- default:
- jj_la1[104] = jj_gen;
- jj_consume_token(-1);
- throw new ParseException();
- }
- break;
default:
- jj_la1[105] = jj_gen;
+ jj_la1[102] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -2864,7 +2819,7 @@ public class SPARQLParser11 extends SPAR
jj_consume_token(RPAREN);
break;
default:
- jj_la1[106] = jj_gen;
+ jj_la1[103] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -2901,7 +2856,7 @@ public class SPARQLParser11 extends SPAR
;
break;
default:
- jj_la1[107] = jj_gen;
+ jj_la1[104] = jj_gen;
break label_26;
}
jj_consume_token(VBAR);
@@ -2910,13 +2865,13 @@ public class SPARQLParser11 extends SPAR
}
break;
default:
- jj_la1[108] = jj_gen;
+ jj_la1[105] = jj_gen;
;
}
jj_consume_token(RPAREN);
break;
default:
- jj_la1[109] = jj_gen;
+ jj_la1[106] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -2951,13 +2906,13 @@ public class SPARQLParser11 extends SPAR
{if (true) return new P_ReverseLink(nRDFtype) ;}
break;
default:
- jj_la1[110] = jj_gen;
+ jj_la1[107] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
break;
default:
- jj_la1[111] = jj_gen;
+ jj_la1[108] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -2986,7 +2941,7 @@ public class SPARQLParser11 extends SPAR
{if (true) return n ;}
break;
default:
- jj_la1[112] = jj_gen;
+ jj_la1[109] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -3015,7 +2970,7 @@ public class SPARQLParser11 extends SPAR
{if (true) return n ;}
break;
default:
- jj_la1[113] = jj_gen;
+ jj_la1[110] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -3076,7 +3031,7 @@ public class SPARQLParser11 extends SPAR
;
break;
default:
- jj_la1[114] = jj_gen;
+ jj_la1[111] = jj_gen;
break label_27;
}
}
@@ -3123,7 +3078,7 @@ public class SPARQLParser11 extends SPAR
{if (true) return n ;}
break;
default:
- jj_la1[115] = jj_gen;
+ jj_la1[112] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -3161,7 +3116,7 @@ public class SPARQLParser11 extends SPAR
n = GraphTerm();
break;
default:
- jj_la1[116] = jj_gen;
+ jj_la1[113] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -3184,7 +3139,7 @@ public class SPARQLParser11 extends SPAR
n = createNode(iri) ;
break;
default:
- jj_la1[117] = jj_gen;
+ jj_la1[114] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -3202,7 +3157,7 @@ public class SPARQLParser11 extends SPAR
t = jj_consume_token(VAR2);
break;
default:
- jj_la1[118] = jj_gen;
+ jj_la1[115] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -3253,7 +3208,7 @@ public class SPARQLParser11 extends SPAR
{if (true) return nRDFnil ;}
break;
default:
- jj_la1[119] = jj_gen;
+ jj_la1[116] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -3278,7 +3233,7 @@ public class SPARQLParser11 extends SPAR
;
break;
default:
- jj_la1[120] = jj_gen;
+ jj_la1[117] = jj_gen;
break label_28;
}
jj_consume_token(SC_OR);
@@ -3299,7 +3254,7 @@ public class SPARQLParser11 extends SPAR
;
break;
default:
- jj_la1[121] = jj_gen;
+ jj_la1[118] = jj_gen;
break label_29;
}
jj_consume_token(SC_AND);
@@ -3372,13 +3327,13 @@ public class SPARQLParser11 extends SPAR
expr1 = new E_NotOneOf(expr1, a) ;
break;
default:
- jj_la1[122] = jj_gen;
+ jj_la1[119] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
break;
default:
- jj_la1[123] = jj_gen;
+ jj_la1[120] = jj_gen;
;
}
{if (true) return expr1 ;}
@@ -3409,7 +3364,7 @@ public class SPARQLParser11 extends SPAR
;
break;
default:
- jj_la1[124] = jj_gen;
+ jj_la1[121] = jj_gen;
break label_30;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -3447,7 +3402,7 @@ public class SPARQLParser11 extends SPAR
addition = false ;
break;
default:
- jj_la1[125] = jj_gen;
+ jj_la1[122] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -3459,7 +3414,7 @@ public class SPARQLParser11 extends SPAR
;
break;
default:
- jj_la1[126] = jj_gen;
+ jj_la1[123] = jj_gen;
break label_31;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -3474,7 +3429,7 @@ public class SPARQLParser11 extends SPAR
expr2 = new E_Divide(expr2, expr3) ;
break;
default:
- jj_la1[127] = jj_gen;
+ jj_la1[124] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -3485,7 +3440,7 @@ public class SPARQLParser11 extends SPAR
expr1 = new E_Subtract(expr1, expr2) ;
break;
default:
- jj_la1[128] = jj_gen;
+ jj_la1[125] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -3505,7 +3460,7 @@ public class SPARQLParser11 extends SPAR
;
break;
default:
- jj_la1[129] = jj_gen;
+ jj_la1[126] = jj_gen;
break label_32;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -3520,7 +3475,7 @@ public class SPARQLParser11 extends SPAR
expr1 = new E_Divide(expr1, expr2) ;
break;
default:
- jj_la1[130] = jj_gen;
+ jj_la1[127] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -3606,6 +3561,8 @@ public class SPARQLParser11 extends SPAR
case TIMEZONE:
case TZ:
case NOW:
+ case UUID:
+ case STRUUID:
case MD5:
case SHA1:
case SHA256:
@@ -3631,7 +3588,7 @@ public class SPARQLParser11 extends SPAR
{if (true) return expr ;}
break;
default:
- jj_la1[131] = jj_gen;
+ jj_la1[128] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -3699,6 +3656,8 @@ public class SPARQLParser11 extends SPAR
case TIMEZONE:
case TZ:
case NOW:
+ case UUID:
+ case STRUUID:
case MD5:
case SHA1:
case SHA256:
@@ -3743,7 +3702,7 @@ public class SPARQLParser11 extends SPAR
{if (true) return asExpr(gn) ;}
break;
default:
- jj_la1[132] = jj_gen;
+ jj_la1[129] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -3838,7 +3797,7 @@ public class SPARQLParser11 extends SPAR
{if (true) return new E_BNode() ;}
break;
default:
- jj_la1[133] = jj_gen;
+ jj_la1[130] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -4023,6 +3982,16 @@ public class SPARQLParser11 extends SPAR
jj_consume_token(NIL);
{if (true) return new E_Now() ;}
break;
+ case UUID:
+ jj_consume_token(UUID);
+ jj_consume_token(NIL);
+ {if (true) return new E_UUID() ;}
+ break;
+ case STRUUID:
+ jj_consume_token(STRUUID);
+ jj_consume_token(NIL);
+ {if (true) return new E_StrUUID() ;}
+ break;
case MD5:
jj_consume_token(MD5);
jj_consume_token(LPAREN);
@@ -4150,7 +4119,7 @@ public class SPARQLParser11 extends SPAR
{if (true) return expr ;}
break;
default:
- jj_la1[134] = jj_gen;
+ jj_la1[131] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -4170,7 +4139,7 @@ public class SPARQLParser11 extends SPAR
flagsExpr = Expression();
break;
default:
- jj_la1[135] = jj_gen;
+ jj_la1[132] = jj_gen;
;
}
jj_consume_token(RPAREN);
@@ -4191,7 +4160,7 @@ public class SPARQLParser11 extends SPAR
expr3 = Expression();
break;
default:
- jj_la1[136] = jj_gen;
+ jj_la1[133] = jj_gen;
;
}
jj_consume_token(RPAREN);
@@ -4214,7 +4183,7 @@ public class SPARQLParser11 extends SPAR
expr4 = Expression();
break;
default:
- jj_la1[137] = jj_gen;
+ jj_la1[134] = jj_gen;
;
}
jj_consume_token(RPAREN);
@@ -4256,7 +4225,7 @@ public class SPARQLParser11 extends SPAR
distinct = true ;
break;
default:
- jj_la1[138] = jj_gen;
+ jj_la1[135] = jj_gen;
;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -4322,6 +4291,8 @@ public class SPARQLParser11 extends SPAR
case TIMEZONE:
case TZ:
case NOW:
+ case UUID:
+ case STRUUID:
case MD5:
case SHA1:
case SHA256:
@@ -4349,7 +4320,7 @@ public class SPARQLParser11 extends SPAR
expr = Expression();
break;
default:
- jj_la1[139] = jj_gen;
+ jj_la1[136] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -4366,7 +4337,7 @@ public class SPARQLParser11 extends SPAR
distinct = true ;
break;
default:
- jj_la1[140] = jj_gen;
+ jj_la1[137] = jj_gen;
;
}
expr = Expression();
@@ -4382,7 +4353,7 @@ public class SPARQLParser11 extends SPAR
distinct = true ;
break;
default:
- jj_la1[141] = jj_gen;
+ jj_la1[138] = jj_gen;
;
}
expr = Expression();
@@ -4398,7 +4369,7 @@ public class SPARQLParser11 extends SPAR
distinct = true ;
break;
default:
- jj_la1[142] = jj_gen;
+ jj_la1[139] = jj_gen;
;
}
expr = Expression();
@@ -4414,7 +4385,7 @@ public class SPARQLParser11 extends SPAR
distinct = true ;
break;
default:
- jj_la1[143] = jj_gen;
+ jj_la1[140] = jj_gen;
;
}
expr = Expression();
@@ -4430,7 +4401,7 @@ public class SPARQLParser11 extends SPAR
distinct = true ;
break;
default:
- jj_la1[144] = jj_gen;
+ jj_la1[141] = jj_gen;
;
}
expr = Expression();
@@ -4446,7 +4417,7 @@ public class SPARQLParser11 extends SPAR
distinct = true ;
break;
default:
- jj_la1[145] = jj_gen;
+ jj_la1[142] = jj_gen;
;
}
expr = Expression();
@@ -4459,14 +4430,14 @@ public class SPARQLParser11 extends SPAR
sep = String();
break;
default:
- jj_la1[146] = jj_gen;
+ jj_la1[143] = jj_gen;
;
}
jj_consume_token(RPAREN);
agg = AggregatorFactory.createGroupConcat(distinct, expr, sep, ordered) ;
break;
default:
- jj_la1[147] = jj_gen;
+ jj_la1[144] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -4492,7 +4463,7 @@ public class SPARQLParser11 extends SPAR
a = ArgList();
break;
default:
- jj_la1[148] = jj_gen;
+ jj_la1[145] = jj_gen;
;
}
if ( a == null )
@@ -4518,13 +4489,13 @@ public class SPARQLParser11 extends SPAR
uri = iri();
break;
default:
- jj_la1[149] = jj_gen;
+ jj_la1[146] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
break;
default:
- jj_la1[150] = jj_gen;
+ jj_la1[147] = jj_gen;
;
}
{if (true) return createLiteral(lex, lang, uri) ;}
@@ -4550,7 +4521,7 @@ public class SPARQLParser11 extends SPAR
n = NumericLiteralNegative();
break;
default:
- jj_la1[151] = jj_gen;
+ jj_la1[148] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -4574,7 +4545,7 @@ public class SPARQLParser11 extends SPAR
{if (true) return createLiteralDouble(t.image) ;}
break;
default:
- jj_la1[152] = jj_gen;
+ jj_la1[149] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -4597,7 +4568,7 @@ public class SPARQLParser11 extends SPAR
{if (true) return createLiteralDouble(t.image) ;}
break;
default:
- jj_la1[153] = jj_gen;
+ jj_la1[150] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -4620,7 +4591,7 @@ public class SPARQLParser11 extends SPAR
{if (true) return createLiteralDouble(t.image) ;}
break;
default:
- jj_la1[154] = jj_gen;
+ jj_la1[151] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -4638,7 +4609,7 @@ public class SPARQLParser11 extends SPAR
{if (true) return XSD_FALSE ;}
break;
default:
- jj_la1[155] = jj_gen;
+ jj_la1[152] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -4665,7 +4636,7 @@ public class SPARQLParser11 extends SPAR
lex = stripQuotes3(t.image) ;
break;
default:
- jj_la1[156] = jj_gen;
+ jj_la1[153] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -4687,7 +4658,7 @@ public class SPARQLParser11 extends SPAR
{if (true) return iri ;}
break;
default:
- jj_la1[157] = jj_gen;
+ jj_la1[154] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -4706,7 +4677,7 @@ public class SPARQLParser11 extends SPAR
{if (true) return resolvePName(t.image, t.beginLine, t.beginColumn) ;}
break;
default:
- jj_la1[158] = jj_gen;
+ jj_la1[155] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -4726,7 +4697,7 @@ public class SPARQLParser11 extends SPAR
{if (true) return createBNode(t.beginLine, t.beginColumn) ;}
break;
default:
- jj_la1[159] = jj_gen;
+ jj_la1[156] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -4749,7 +4720,7 @@ public class SPARQLParser11 extends SPAR
public Token jj_nt;
private int jj_ntk;
private int jj_gen;
- final private int[] jj_la1 = new int[160];
+ final private int[] jj_la1 = new int[157];
static private int[] jj_la1_0;
static private int[] jj_la1_1;
static private int[] jj_la1_2;
@@ -4767,25 +4738,25 @@ public class SPARQLParser11 extends SPAR
jj_la1_init_6();
}
private static void jj_la1_init_0() {
- jj_la1_0 = new int[] {0x7200000,0x180000,0x180000,0x0,0xc00000,0xc00000,0x6000,0x6000,0x6000,0x0,0x0,0x7e00,0x0,0x6e00,0x6e00,0x0,0x0,0x0,0xe00,0x0,0x0,0x0,0x20000000,0x18000000,0x6e00,0x0,0x6e00,0xe00,0x6e00,0x0,0x6e00,0x6e00,0x10000000,0x8000000,0x18000000,0x80000000,0x6000,0x0,0xe00,0x0,0xe00,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xe00,0x0,0xe00,0x0,0x7e00,0x0,0x0,0x7e00,0x7e00,0x7e00,0x0,0x200000,0x7e00,0x0,0x0,0x7e00,0x7e00,0x0,0x0,0x0,0x0,0xe00,0x400000,0x0,0x0,0x0,0x0,0x7e00,0x7e00,0x0,0x7e00,0x0,0x46e00,0x46e00,0x0,0x46e00,0x7e00,0x446e00,0x0,0x446e00,0x446e00,0x446e00,0x0,0x0,0x0,0x440e00,0x0,0x0,0x0,0x0,0x440e00,0x0,0x40e00,0x40e00,0x40e00,0x40e00,0x0,0x0,0x7e00,0x7e00,0x7e00,0x6e00,0x6000,0x1e00,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x6e00,0x6e00,0x0,0x0,0x0,0x0,0x0,0x400000,0x6e00,0x400000,0x400000,0x400000,0x400000,0x400000,0x400000,0x0,0x0,0x0,0x8000,0x8000,0x0,0x0,0x0,0x0,0x0,0x0,0xe00,0xc00,0x1000,};
+ jj_la1_0 = new int[] {0x7200000,0x180000,0x180000,0x0,0xc00000,0xc00000,0x6000,0x6000,0x6000,0x0,0x0,0x7e00,0x0,0x6e00,0x6e00,0x0,0x0,0x0,0xe00,0x0,0x0,0x0,0x20000000,0x18000000,0x6e00,0x0,0x6e00,0xe00,0x6e00,0x0,0x6e00,0x6e00,0x10000000,0x8000000,0x18000000,0x80000000,0x6000,0x0,0xe00,0x0,0xe00,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xe00,0x0,0xe00,0x0,0x7e00,0x0,0x0,0x7e00,0x7e00,0x7e00,0x0,0x200000,0x7e00,0x0,0x0,0x7e00,0x7e00,0x0,0x0,0x0,0x0,0xe00,0x400000,0x0,0x0,0x0,0x0,0x7e00,0x7e00,0x0,0x7e00,0x0,0x46e00,0x46e00,0x0,0x46e00,0x7e00,0x446e00,0x0,0x446e00,0x446e00,0x446e00,0x0,0x0,0x0,0x440e00,0x0,0x440e00,0x0,0x40e00,0x40e00,0x40e00,0x40e00,0x0,0x0,0x7e00,0x7e00,0x7e00,0x6e00,0x6000,0x1e00,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x6e00,0x6e00,0x0,0x0,0x0,0x0,0x0,0x400000,0x6e00,0x400000,0x400000,0x400000,0x400000,0x400000,0x400000,0x0,0x0,0x0,0x8000,0x8000,0x0,0x0,0x0,0x0,0x0,0x0,0xe00,0xc00,0x1000,};
}
private static void jj_la1_init_1() {
- jj_la1_1 = new int[] {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,0x0,0x0,0x0,0x2,0x0,0x2,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,0x20003b00,0x0,0x0,0x0,0x0,0x20003b00,0x0,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,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,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,0x0,0x0,0x0,0x2,0x0,0x2,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,0x20003b00,0x0,0x0,0x0,0x0,0x20003b00,0x0,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,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,};
}
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,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,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,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,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,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,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,};
}
private static void jj_la1_init_3() {
- jj_la1_3 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3bfff,0x0,0x3bfff,0x3bfff,0x3bfff,0x0,0x3bfff,0x3bfff,0x0,0x0,0x0,0x0,0x0,0x0,0xc0000,0x0,0xc0000,0x0,0xffe00000,0xffe00000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x200000,0x600000,0x0,0x0,0x0,0x0,0x0,0xc0000,0x0,0x0,0xc0000,0xc0000,0xc0000,0x0,0x0,0xc0000,0x0,0x0,0xc0000,0xc0000,0x0,0x0,0x0,0x0,0x3bfff,0x0,0x0,0x0,0x0,0x0,0xc0000,0xc0000,0x0,0xc0000,0x0,0x0,0x0,0x0,0x0,0xc0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc0000,0xc0000,0xc0000,0x0,0x0,0xc0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfbfff,0xfbfff,0x0,0x3bfff,0x0,0x0,0x0,0x0,0xfbfff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc0000,0x0,0x0,0x0,0x0,};
+ jj_la1_3 = new int[] {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,0x0,0x300000,0x0,0x300000,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,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,0x300000,0x300000,0x300000,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,};
}
private static void jj_la1_init_4() {
- jj_la1_4 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x8000000,0x8000000,0x8000000,0x0,0x0,0x2f87fc00,0x40000000,0x0,0x0,0x0,0x40000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8000000,0x0,0x8000000,0x8000000,0x8000000,0x0,0x8000000,0x8000000,0x0,0x0,0x0,0x0,0x0,0x28000000,0x787fc00,0x28000000,0x787fc00,0x0,0x84,0x84,0x2,0x8,0x2,0x2,0x2,0x2,0x2,0x2,0x80,0x0,0x0,0x100,0x0,0x0,0x20,0x60,0x2f87fc00,0x0,0x0,0x2f87fc00,0x2f87fc00,0x2f87fc00,0x0,0x0,0x2f87fc00,0x40000000,0x0,0x2f87fc00,0x2f87fc00,0x0,0x40000000,0x2,0x0,0x8000000,0x0,0x0,0x28000000,0x0,0x28000000,0x2f87fc00,0x2f87fc00,0x0,0x2f87fc00,0x0,0x0,0x0,0x0,0x0,0x2f87fc00,0x8000000,0x0,0x8000000,0x8000000,0x8000000,0x0,0x0,0x40000000,0x8000000,0x80000400,0x80000000,0x400,0x40000000,0x8000000,0x0,0x0,0x8000000,0x0,0x0,0x8000000,0x8000000,0x2f87fc00,0x2f87fc00,0x2787fc00,0x0,0x0,0x2787fc00,0x0,0x0,0x0,0x0,0x7e000,0x7e000,0x0,0x0,0x7e000,0x0,0x0,0xf87fc00,0xf87fc00,0x28000000,0x0,0x0,0x0,0x0,0x0,0xf87fc00,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0
x28000000,0x0,0x0,0x7fc00,0x1c00,0xe000,0x70000,0x0,0x7800000,0x0,0x0,0x0,};
+ jj_la1_4 = new int[] {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,0xa0000000,0x1e1ff000,0xa0000000,0x1e1ff000,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,0x0,0x20000000,0x0,0x0,0xa0000000,0x0,0xa0000000,0xbe1ff000,0xbe1ff000,0x0,0xbe1ff000,0x0,0x0,0x0,0x0,0x0,0xbe1ff000,0x20000000,0x0,0x20000000,0x20000000,0x20000000,0x0,0x0,0x0,0x20000000,0x0,0x20000000,0x0,0x0,0x20000000,0x0,0x0,0x20000000,0x20000000,0xbe1ff000,0xbe1ff000,0x9e1ff000,0x0,0x0,0x9e1ff000,0x0,0x0,0x0,0x0,0x1f8000,0x1f8000,0x0,0x0,0x1f8000,0x0,0x0,0x3e1ff000,0x3e1ff000,0xa0000000,0x0,0x0,0x0,0x0,0x0,0x3e1ff000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xa0000000,0x0,0x0,0x1ff000,0x7000,0x38
000,0x1c0000,0x0,0x1e000000,0x0,0x0,0x0,};
}
private static void jj_la1_init_5() {
- jj_la1_5 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80000,0x0,0x0,0x5,0x0,0x0,0x80000,0x0,0x0,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,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x5,0x0,0x20,0x5,0x5,0x5,0x20,0x0,0x5,0x0,0x20,0x5,0x5,0x20,0x0,0x0,0x0,0x0,0x0,0x10,0x0,0x10,0x0,0x5,0x5,0x20,0x5,0x8,0x0,0x0,0x10,0x0,0x5,0x1001000,0x8,0x1001000,0x1001000,0x1001000,0x800000,0x100000,0x80a0000,0x1001000,0x0,0x10,0xa0010,0x80a0000,0x1000,0x800000,0x1000000,0x1000000,0x0,0x1000000,0x1,0x1,0x5,0x5,0x4,0x0,0x0,0x4,0x8000,0x10000,0xfc0,0xfc0,0x60000,0x0,0x180000,0x180000,0x60000,0x180000,0x180000,0x61000,0x0,0x0,0x0,0x10,0x10,0x10,0x0,0xe1000,0x0,0x0,0x0,0x0,0x0,0x0,0x8,0x0,0x0,0x200000,0x200000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4,};
+ jj_la1_5 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x200000,0x0,0x0,0x14,0x1,0x0,0x200000,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x14,0x0,0x80,0x14,0x14,0x14,0x80,0x0,0x14,0x1,0x80,0x14,0x14,0x80,0x1,0x0,0x0,0x0,0x0,0x40,0x0,0x40,0x0,0x14,0x14,0x80,0x14,0x20,0x0,0x0,0x40,0x0,0x14,0x4004000,0x20,0x4004000,0x4004000,0x4004000,0x2000000,0x400000,0x20280000,0x4004000,0x20280000,0x4000,0x2000000,0x4000000,0x4000000,0x0,0x4000000,0x4,0x4,0x14,0x14,0x10,0x0,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,};
}
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,};
+ 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,};
}
/** Constructor with InputStream. */
@@ -4799,7 +4770,7 @@ public class SPARQLParser11 extends SPAR
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 160; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 157; i++) jj_la1[i] = -1;
}
/** Reinitialise. */
@@ -4813,7 +4784,7 @@ public class SPARQLParser11 extends SPAR
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 160; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 157; i++) jj_la1[i] = -1;
}
/** Constructor. */
@@ -4823,7 +4794,7 @@ public class SPARQLParser11 extends SPAR
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 160; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 157; i++) jj_la1[i] = -1;
}
/** Reinitialise. */
@@ -4833,7 +4804,7 @@ public class SPARQLParser11 extends SPAR
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 160; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 157; i++) jj_la1[i] = -1;
}
/** Constructor with generated Token Manager. */
@@ -4842,7 +4813,7 @@ public class SPARQLParser11 extends SPAR
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 160; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 157; i++) jj_la1[i] = -1;
}
/** Reinitialise. */
@@ -4851,7 +4822,7 @@ public class SPARQLParser11 extends SPAR
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 160; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 157; i++) jj_la1[i] = -1;
}
private Token jj_consume_token(int kind) throws ParseException {
@@ -4902,12 +4873,12 @@ public class SPARQLParser11 extends SPAR
/** Generate ParseException. */
public ParseException generateParseException() {
jj_expentries.clear();
- boolean[] la1tokens = new boolean[199];
+ boolean[] la1tokens = new boolean[201];
if (jj_kind >= 0) {
la1tokens[jj_kind] = true;
jj_kind = -1;
}
- for (int i = 0; i < 160; i++) {
+ for (int i = 0; i < 157; i++) {
if (jj_la1[i] == jj_gen) {
for (int j = 0; j < 32; j++) {
if ((jj_la1_0[i] & (1<<j)) != 0) {
@@ -4934,7 +4905,7 @@ public class SPARQLParser11 extends SPAR
}
}
}
- for (int i = 0; i < 199; i++) {
+ for (int i = 0; i < 201; i++) {
if (la1tokens[i]) {
jj_expentry = new int[1];
jj_expentry[0] = i;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/sparql_11/SPARQLParser11Constants.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/sparql_11/SPARQLParser11Constants.java?rev=1329271&r1=1329270&r2=1329271&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/sparql_11/SPARQLParser11Constants.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/sparql_11/SPARQLParser11Constants.java Mon Apr 23 15:07:50 2012
@@ -232,187 +232,191 @@ public interface SPARQLParser11Constants
/** RegularExpression Id. */
int NOW = 107;
/** RegularExpression Id. */
- int MD5 = 108;
+ int UUID = 108;
/** RegularExpression Id. */
- int SHA1 = 109;
+ int STRUUID = 109;
/** RegularExpression Id. */
- int SHA224 = 110;
+ int MD5 = 110;
/** RegularExpression Id. */
- int SHA256 = 111;
+ int SHA1 = 111;
/** RegularExpression Id. */
- int SHA384 = 112;
+ int SHA224 = 112;
/** RegularExpression Id. */
- int SHA512 = 113;
+ int SHA256 = 113;
/** RegularExpression Id. */
- int TRUE = 114;
+ int SHA384 = 114;
/** RegularExpression Id. */
- int FALSE = 115;
+ int SHA512 = 115;
/** RegularExpression Id. */
- int DATA = 116;
+ int TRUE = 116;
/** RegularExpression Id. */
- int INSERT = 117;
+ int FALSE = 117;
/** RegularExpression Id. */
- int DELETE = 118;
+ int DATA = 118;
/** RegularExpression Id. */
- int INSERT_DATA = 119;
+ int INSERT = 119;
/** RegularExpression Id. */
- int DELETE_DATA = 120;
+ int DELETE = 120;
/** RegularExpression Id. */
- int DELETE_WHERE = 121;
+ int INSERT_DATA = 121;
/** RegularExpression Id. */
- int LOAD = 122;
+ int DELETE_DATA = 122;
/** RegularExpression Id. */
- int CLEAR = 123;
+ int DELETE_WHERE = 123;
/** RegularExpression Id. */
- int CREATE = 124;
+ int LOAD = 124;
/** RegularExpression Id. */
- int ADD = 125;
+ int CLEAR = 125;
/** RegularExpression Id. */
- int MOVE = 126;
+ int CREATE = 126;
/** RegularExpression Id. */
- int COPY = 127;
+ int ADD = 127;
/** RegularExpression Id. */
- int META = 128;
+ int MOVE = 128;
/** RegularExpression Id. */
- int SILENT = 129;
+ int COPY = 129;
/** RegularExpression Id. */
- int DROP = 130;
+ int META = 130;
/** RegularExpression Id. */
- int INTO = 131;
+ int SILENT = 131;
/** RegularExpression Id. */
- int TO = 132;
+ int DROP = 132;
/** RegularExpression Id. */
- int DFT = 133;
+ int INTO = 133;
/** RegularExpression Id. */
- int ALL = 134;
+ int TO = 134;
/** RegularExpression Id. */
- int WITH = 135;
+ int DFT = 135;
/** RegularExpression Id. */
- int USING = 136;
+ int ALL = 136;
/** RegularExpression Id. */
- int DIGITS = 137;
+ int WITH = 137;
/** RegularExpression Id. */
- int INTEGER = 138;
+ int USING = 138;
/** RegularExpression Id. */
- int DECIMAL = 139;
+ int DIGITS = 139;
/** RegularExpression Id. */
- int DOUBLE = 140;
+ int INTEGER = 140;
/** RegularExpression Id. */
- int INTEGER_POSITIVE = 141;
+ int DECIMAL = 141;
/** RegularExpression Id. */
- int DECIMAL_POSITIVE = 142;
+ int DOUBLE = 142;
/** RegularExpression Id. */
- int DOUBLE_POSITIVE = 143;
+ int INTEGER_POSITIVE = 143;
/** RegularExpression Id. */
- int INTEGER_NEGATIVE = 144;
+ int DECIMAL_POSITIVE = 144;
/** RegularExpression Id. */
- int DECIMAL_NEGATIVE = 145;
+ int DOUBLE_POSITIVE = 145;
/** RegularExpression Id. */
- int DOUBLE_NEGATIVE = 146;
+ int INTEGER_NEGATIVE = 146;
/** RegularExpression Id. */
- int EXPONENT = 147;
+ int DECIMAL_NEGATIVE = 147;
/** RegularExpression Id. */
- int QUOTE_3D = 148;
+ int DOUBLE_NEGATIVE = 148;
/** RegularExpression Id. */
- int QUOTE_3S = 149;
+ int EXPONENT = 149;
/** RegularExpression Id. */
- int ECHAR = 150;
+ int QUOTE_3D = 150;
/** RegularExpression Id. */
- int STRING_LITERAL1 = 151;
+ int QUOTE_3S = 151;
/** RegularExpression Id. */
- int STRING_LITERAL2 = 152;
+ int ECHAR = 152;
/** RegularExpression Id. */
- int STRING_LITERAL_LONG1 = 153;
+ int STRING_LITERAL1 = 153;
/** RegularExpression Id. */
- int STRING_LITERAL_LONG2 = 154;
+ int STRING_LITERAL2 = 154;
/** RegularExpression Id. */
- int LPAREN = 155;
+ int STRING_LITERAL_LONG1 = 155;
/** RegularExpression Id. */
- int RPAREN = 156;
+ int STRING_LITERAL_LONG2 = 156;
/** RegularExpression Id. */
- int NIL = 157;
+ int LPAREN = 157;
/** RegularExpression Id. */
- int LBRACE = 158;
+ int RPAREN = 158;
/** RegularExpression Id. */
- int RBRACE = 159;
+ int NIL = 159;
/** RegularExpression Id. */
- int LBRACKET = 160;
+ int LBRACE = 160;
/** RegularExpression Id. */
- int RBRACKET = 161;
+ int RBRACE = 161;
/** RegularExpression Id. */
- int ANON = 162;
+ int LBRACKET = 162;
/** RegularExpression Id. */
- int SEMICOLON = 163;
+ int RBRACKET = 163;
/** RegularExpression Id. */
- int COMMA = 164;
+ int ANON = 164;
/** RegularExpression Id. */
- int DOT = 165;
+ int SEMICOLON = 165;
/** RegularExpression Id. */
- int EQ = 166;
+ int COMMA = 166;
/** RegularExpression Id. */
- int NE = 167;
+ int DOT = 167;
/** RegularExpression Id. */
- int GT = 168;
+ int EQ = 168;
/** RegularExpression Id. */
- int LT = 169;
+ int NE = 169;
/** RegularExpression Id. */
- int LE = 170;
+ int GT = 170;
/** RegularExpression Id. */
- int GE = 171;
+ int LT = 171;
/** RegularExpression Id. */
- int BANG = 172;
+ int LE = 172;
/** RegularExpression Id. */
- int TILDE = 173;
+ int GE = 173;
/** RegularExpression Id. */
- int COLON = 174;
+ int BANG = 174;
/** RegularExpression Id. */
- int SC_OR = 175;
+ int TILDE = 175;
/** RegularExpression Id. */
- int SC_AND = 176;
+ int COLON = 176;
/** RegularExpression Id. */
- int PLUS = 177;
+ int SC_OR = 177;
/** RegularExpression Id. */
- int MINUS = 178;
+ int SC_AND = 178;
/** RegularExpression Id. */
- int STAR = 179;
+ int PLUS = 179;
/** RegularExpression Id. */
- int SLASH = 180;
+ int MINUS = 180;
/** RegularExpression Id. */
- int DATATYPE = 181;
+ int STAR = 181;
/** RegularExpression Id. */
- int AT = 182;
+ int SLASH = 182;
/** RegularExpression Id. */
- int VBAR = 183;
+ int DATATYPE = 183;
/** RegularExpression Id. */
- int CARAT = 184;
+ int AT = 184;
/** RegularExpression Id. */
- int FPATH = 185;
+ int VBAR = 185;
/** RegularExpression Id. */
- int RPATH = 186;
+ int CARAT = 186;
/** RegularExpression Id. */
- int QMARK = 187;
+ int FPATH = 187;
/** RegularExpression Id. */
- int HEX = 188;
+ int RPATH = 188;
/** RegularExpression Id. */
- int PERCENT = 189;
+ int QMARK = 189;
/** RegularExpression Id. */
- int PN_LOCAL_ESC = 190;
+ int HEX = 190;
/** RegularExpression Id. */
- int PN_CHARS_BASE = 191;
+ int PERCENT = 191;
/** RegularExpression Id. */
- int PN_CHARS_U = 192;
+ int PN_LOCAL_ESC = 192;
/** RegularExpression Id. */
- int PN_CHARS = 193;
+ int PN_CHARS_BASE = 193;
/** RegularExpression Id. */
- int PN_PREFIX = 194;
+ int PN_CHARS_U = 194;
/** RegularExpression Id. */
- int PLX = 195;
+ int PN_CHARS = 195;
/** RegularExpression Id. */
- int PN_LOCAL = 196;
+ int PN_PREFIX = 196;
/** RegularExpression Id. */
- int VARNAME = 197;
+ int PLX = 197;
/** RegularExpression Id. */
- int UNKNOWN = 198;
+ int PN_LOCAL = 198;
+ /** RegularExpression Id. */
+ int VARNAME = 199;
+ /** RegularExpression Id. */
+ int UNKNOWN = 200;
/** Lexical state. */
int DEFAULT = 0;
@@ -527,6 +531,8 @@ public interface SPARQLParser11Constants
"\"TIMEZONE\"",
"\"TZ\"",
"\"NOW\"",
+ "\"UUID\"",
+ "\"STRUUID\"",
"\"MD5\"",
"\"SHA1\"",
"\"SHA224\"",