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/07/17 18:53:03 UTC
svn commit: r1362566 - in /jena/trunk/jena-arq: Grammar/
src/main/java/com/hp/hpl/jena/sparql/lang/arq/
src/main/java/com/hp/hpl/jena/sparql/lang/sparql_11/
Author: andy
Date: Tue Jul 17 16:53:03 2012
New Revision: 1362566
URL: http://svn.apache.org/viewvc?rev=1362566&view=rev
Log:
Spec bug fix - SPARQL Grammar (colons in prefix part of prefixed name should not be there)
Modified:
jena/trunk/jena-arq/Grammar/arq.jj
jena/trunk/jena-arq/Grammar/jj2tokens
jena/trunk/jena-arq/Grammar/master.jj
jena/trunk/jena-arq/Grammar/sparql_11.jj
jena/trunk/jena-arq/Grammar/tokens.txt
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/arq/ARQParserConstants.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/arq/ARQParserTokenManager.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/sparql_11/SPARQLParser11Constants.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/sparql_11/SPARQLParser11TokenManager.java
Modified: jena/trunk/jena-arq/Grammar/arq.jj
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/Grammar/arq.jj?rev=1362566&r1=1362565&r2=1362566&view=diff
==============================================================================
--- jena/trunk/jena-arq/Grammar/arq.jj (original)
+++ jena/trunk/jena-arq/Grammar/arq.jj Tue Jul 17 16:53:03 2012
@@ -1931,19 +1931,6 @@ TOKEN :
// See XML chars.txt for notes
TOKEN:
{
- // ARQ extensions to the PN_LOCAL token.
- < #HEX: ["0"-"9"] | ["A"-"F"] | ["a"-"f"] >
-|
- < #PERCENT: "%" <HEX> <HEX> >
-|
- // Prefixed Name, Local Part, charcater escape sequences
- // Align with QueryParseBase unescapePName.
- < #PN_LOCAL_ESC: "\\"
- ( "_" |
- "~" | "." | "-" | "!" | "$" | "&" | "'" |
- "(" | ")" | "*" | "+" | "," | ";" | "=" |
- "/" | "?" | "#" | "@" | "%" ) >
-|
// XML 1.1 NCNameStartChar without "_"
<#PN_CHARS_BASE:
["A"-"Z"] | ["a"-"z"] |
@@ -1954,31 +1941,40 @@ TOKEN:
>
// [#x10000-#xEFFFF]
|
- <#PN_CHARS_U: <PN_CHARS_BASE> | "_" | ":" >
+ // With underscore
+ <#PN_CHARS_U: <PN_CHARS_BASE> | "_" >
|
-// No DOT
<#PN_CHARS: (<PN_CHARS_U> | "-" | ["0"-"9"] | "\u00B7" |
["\u0300"-"\u036F"] | ["\u203F"-"\u2040"] ) >
|
// No leading "_", no trailing ".", can have dot inside prefix name.
<#PN_PREFIX: <PN_CHARS_BASE> ((<PN_CHARS>|".")* <PN_CHARS>)? >
|
- <#PLX: <PERCENT> | <PN_LOCAL_ESC> >
-|
- // If goes ahead, consolidate
- <#PN_LOCAL: (<PN_CHARS_U> | ["0"-"9"] | <PLX> )
- ( (<PN_CHARS>|"."| <PLX> )*
- (<PN_CHARS>|<PLX>) )? >
+ // Local part.
+ <#PN_LOCAL: (<PN_CHARS_U> | ":" | ["0"-"9"] | <PLX> )
+ ( (<PN_CHARS> | "." |":" | <PLX> )*
+ (<PN_CHARS> | ":" | <PLX>) )? >
|
- // NCNAME without "-" and ".", allowing leading digits.
<#VARNAME: ( <PN_CHARS_U> | ["0"-"9"] )
( <PN_CHARS_U> | ["0"-"9"] | "\u00B7" |
["\u0300"-"\u036F"] | ["\u203F"-"\u2040"] )* >
+|
+ // Align with QueryParseBase unescapePName.
+ < #PN_LOCAL_ESC: "\\"
+ ( "_" |
+ "~" | "." | "-" | "!" | "$" | "&" | "'" |
+ "(" | ")" | "*" | "+" | "," | ";" | "=" |
+ "/" | "?" | "#" | "@" | "%" ) >
+|
+ <#PLX: <PERCENT> | <PN_LOCAL_ESC> >
+|
+ < #HEX: ["0"-"9"] | ["A"-"F"] | ["a"-"f"] >
+|
+ < #PERCENT: "%" <HEX> <HEX> >
}
// Catch-all tokens. Must be last.
// Any non-whitespace. Causes a parser exception, rather than a
-// token manager error (with hidden line numbers).
-// Only bad IRIs (e.g. spaces) now give unhelpful parse errors.
+// token manager error (which hides the line numbers).
TOKEN:
{
<#UNKNOWN: (~[" ","\t","\n","\r","\f" ])+ >
Modified: jena/trunk/jena-arq/Grammar/jj2tokens
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/Grammar/jj2tokens?rev=1362566&r1=1362565&r2=1362566&view=diff
==============================================================================
--- jena/trunk/jena-arq/Grammar/jj2tokens (original)
+++ jena/trunk/jena-arq/Grammar/jj2tokens Tue Jul 17 16:53:03 2012
@@ -1,45 +1,45 @@
-#!/bin/perl
-# Extract tokens (will need more editting)
-
-$/ = undef ;
-$_ = <> ;
-s!//.*!!g ;
-
-# Not greedy to find end brace
-@t = m/TOKEN\s*(?:\[IGNORE_CASE\])?\s*:\s*\n\{(.*?)\n\}/sg ;
-
-#{\s*([^{}]*)}/sg ;
-
-# Fixups:
-
-for $t (@t)
-{
- $t =~ s/\r//g ;
-
- #print "\nTEXT:\nT:",$t,":\n" ;
-
-
- @s = split(/\n\|/,$t) ;
- for $s (@s)
- {
- ($name, $rule) = split(/:/,$s,2) ;
-
- ## Leading < and excess whitespace
- $name =~ s/^\s*\<\s*// ;
- $name =~ s/\s+$// ;
-
- ## Trailing > and excess whitespace
- $rule =~ s/^\s+// ;
- $rule =~ s/\s*\>\s*$// ;
-
- $rule =~ s/\|\s*\n\s*/\|/sg ;
- $rule =~ s/\n\s*\|/\|/sg ;
-
-## print "NAME: /",$name , "/\n" ;
-## print "--> ", $rule , "\n" ;
-
- $spc = ' ' x (10-length($name)) ;
-
- print "<",$name,">", $spc, " ::= ",$rule,"\n" ;
- }
-}
+#!/usr/bin/perl
+# Extract tokens (will need more editting)
+
+$/ = undef ;
+$_ = <> ;
+s!//.*!!g ;
+
+# Not greedy to find end brace
+@t = m/TOKEN\s*(?:\[IGNORE_CASE\])?\s*:\s*\n\{(.*?)\n\}/sg ;
+
+#{\s*([^{}]*)}/sg ;
+
+# Fixups:
+
+for $t (@t)
+{
+ $t =~ s/\r//g ;
+
+ #print "\nTEXT:\nT:",$t,":\n" ;
+
+
+ @s = split(/\n\|/,$t) ;
+ for $s (@s)
+ {
+ ($name, $rule) = split(/:/,$s,2) ;
+
+ ## Leading < and excess whitespace
+ $name =~ s/^\s*\<\s*// ;
+ $name =~ s/\s+$// ;
+
+ ## Trailing > and excess whitespace
+ $rule =~ s/^\s+// ;
+ $rule =~ s/\s*\>\s*$// ;
+
+ $rule =~ s/\|\s*\n\s*/\|/sg ;
+ $rule =~ s/\n\s*\|/\|/sg ;
+
+## print "NAME: /",$name , "/\n" ;
+## print "--> ", $rule , "\n" ;
+
+ $spc = ' ' x (10-length($name)) ;
+
+ print "<",$name,">", $spc, " ::= ",$rule,"\n" ;
+ }
+}
Modified: jena/trunk/jena-arq/Grammar/master.jj
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/Grammar/master.jj?rev=1362566&r1=1362565&r2=1362566&view=diff
==============================================================================
--- jena/trunk/jena-arq/Grammar/master.jj (original)
+++ jena/trunk/jena-arq/Grammar/master.jj Tue Jul 17 16:53:03 2012
@@ -2453,19 +2453,6 @@ TOKEN :
TOKEN:
{
- // ARQ extensions to the PN_LOCAL token.
- < #HEX: ["0"-"9"] | ["A"-"F"] | ["a"-"f"] >
-|
- < #PERCENT: "%" <HEX> <HEX> >
-|
- // Prefixed Name, Local Part, charcater escape sequences
- // Align with QueryParseBase unescapePName.
- < #PN_LOCAL_ESC: "\\"
- ( "_" |
- "~" | "." | "-" | "!" | "$" | "&" | "'" |
- "(" | ")" | "*" | "+" | "," | ";" | "=" |
- "/" | "?" | "#" | "@" | "%" ) >
-|
// XML 1.1 NCNameStartChar without "_"
<#PN_CHARS_BASE:
["A"-"Z"] | ["a"-"z"] |
@@ -2476,32 +2463,41 @@ TOKEN:
>
// [#x10000-#xEFFFF]
|
- <#PN_CHARS_U: <PN_CHARS_BASE> | "_" | ":" >
+ // With underscore
+ <#PN_CHARS_U: <PN_CHARS_BASE> | "_" >
|
-// No DOT
<#PN_CHARS: (<PN_CHARS_U> | "-" | ["0"-"9"] | "\u00B7" |
["\u0300"-"\u036F"] | ["\u203F"-"\u2040"] ) >
|
// No leading "_", no trailing ".", can have dot inside prefix name.
<#PN_PREFIX: <PN_CHARS_BASE> ((<PN_CHARS>|".")* <PN_CHARS>)? >
|
- <#PLX: <PERCENT> | <PN_LOCAL_ESC> >
-|
- // If goes ahead, consolidate
- <#PN_LOCAL: (<PN_CHARS_U> | ["0"-"9"] | <PLX> )
- ( (<PN_CHARS>|"."| <PLX> )*
- (<PN_CHARS>|<PLX>) )? >
+ // Local part.
+ <#PN_LOCAL: (<PN_CHARS_U> | ":" | ["0"-"9"] | <PLX> )
+ ( (<PN_CHARS> | "." |":" | <PLX> )*
+ (<PN_CHARS> | ":" | <PLX>) )? >
|
- // NCNAME without "-" and ".", allowing leading digits.
<#VARNAME: ( <PN_CHARS_U> | ["0"-"9"] )
( <PN_CHARS_U> | ["0"-"9"] | "\u00B7" |
["\u0300"-"\u036F"] | ["\u203F"-"\u2040"] )* >
+|
+ // Align with QueryParseBase unescapePName.
+ < #PN_LOCAL_ESC: "\\"
+ ( "_" |
+ "~" | "." | "-" | "!" | "$" | "&" | "'" |
+ "(" | ")" | "*" | "+" | "," | ";" | "=" |
+ "/" | "?" | "#" | "@" | "%" ) >
+|
+ <#PLX: <PERCENT> | <PN_LOCAL_ESC> >
+|
+ < #HEX: ["0"-"9"] | ["A"-"F"] | ["a"-"f"] >
+|
+ < #PERCENT: "%" <HEX> <HEX> >
}
// Catch-all tokens. Must be last.
// Any non-whitespace. Causes a parser exception, rather than a
-// token manager error (with hidden line numbers).
-// Only bad IRIs (e.g. spaces) now give unhelpful parse errors.
+// token manager error (which hides the line numbers).
TOKEN:
{
<#UNKNOWN: (~[" ","\t","\n","\r","\f" ])+ >
Modified: jena/trunk/jena-arq/Grammar/sparql_11.jj
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/Grammar/sparql_11.jj?rev=1362566&r1=1362565&r2=1362566&view=diff
==============================================================================
--- jena/trunk/jena-arq/Grammar/sparql_11.jj (original)
+++ jena/trunk/jena-arq/Grammar/sparql_11.jj Tue Jul 17 16:53:03 2012
@@ -1780,19 +1780,6 @@ TOKEN :
// See XML chars.txt for notes
TOKEN:
{
- // ARQ extensions to the PN_LOCAL token.
- < #HEX: ["0"-"9"] | ["A"-"F"] | ["a"-"f"] >
-|
- < #PERCENT: "%" <HEX> <HEX> >
-|
- // Prefixed Name, Local Part, charcater escape sequences
- // Align with QueryParseBase unescapePName.
- < #PN_LOCAL_ESC: "\\"
- ( "_" |
- "~" | "." | "-" | "!" | "$" | "&" | "'" |
- "(" | ")" | "*" | "+" | "," | ";" | "=" |
- "/" | "?" | "#" | "@" | "%" ) >
-|
// XML 1.1 NCNameStartChar without "_"
<#PN_CHARS_BASE:
["A"-"Z"] | ["a"-"z"] |
@@ -1803,31 +1790,40 @@ TOKEN:
>
// [#x10000-#xEFFFF]
|
- <#PN_CHARS_U: <PN_CHARS_BASE> | "_" | ":" >
+ // With underscore
+ <#PN_CHARS_U: <PN_CHARS_BASE> | "_" >
|
-// No DOT
<#PN_CHARS: (<PN_CHARS_U> | "-" | ["0"-"9"] | "\u00B7" |
["\u0300"-"\u036F"] | ["\u203F"-"\u2040"] ) >
|
// No leading "_", no trailing ".", can have dot inside prefix name.
<#PN_PREFIX: <PN_CHARS_BASE> ((<PN_CHARS>|".")* <PN_CHARS>)? >
|
- <#PLX: <PERCENT> | <PN_LOCAL_ESC> >
-|
- // If goes ahead, consolidate
- <#PN_LOCAL: (<PN_CHARS_U> | ["0"-"9"] | <PLX> )
- ( (<PN_CHARS>|"."| <PLX> )*
- (<PN_CHARS>|<PLX>) )? >
+ // Local part.
+ <#PN_LOCAL: (<PN_CHARS_U> | ":" | ["0"-"9"] | <PLX> )
+ ( (<PN_CHARS> | "." |":" | <PLX> )*
+ (<PN_CHARS> | ":" | <PLX>) )? >
|
- // NCNAME without "-" and ".", allowing leading digits.
<#VARNAME: ( <PN_CHARS_U> | ["0"-"9"] )
( <PN_CHARS_U> | ["0"-"9"] | "\u00B7" |
["\u0300"-"\u036F"] | ["\u203F"-"\u2040"] )* >
+|
+ // Align with QueryParseBase unescapePName.
+ < #PN_LOCAL_ESC: "\\"
+ ( "_" |
+ "~" | "." | "-" | "!" | "$" | "&" | "'" |
+ "(" | ")" | "*" | "+" | "," | ";" | "=" |
+ "/" | "?" | "#" | "@" | "%" ) >
+|
+ <#PLX: <PERCENT> | <PN_LOCAL_ESC> >
+|
+ < #HEX: ["0"-"9"] | ["A"-"F"] | ["a"-"f"] >
+|
+ < #PERCENT: "%" <HEX> <HEX> >
}
// Catch-all tokens. Must be last.
// Any non-whitespace. Causes a parser exception, rather than a
-// token manager error (with hidden line numbers).
-// Only bad IRIs (e.g. spaces) now give unhelpful parse errors.
+// token manager error (which hides the line numbers).
TOKEN:
{
<#UNKNOWN: (~[" ","\t","\n","\r","\f" ])+ >
Modified: jena/trunk/jena-arq/Grammar/tokens.txt
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/Grammar/tokens.txt?rev=1362566&r1=1362565&r2=1362566&view=diff
==============================================================================
--- jena/trunk/jena-arq/Grammar/tokens.txt (original)
+++ jena/trunk/jena-arq/Grammar/tokens.txt Tue Jul 17 16:53:03 2012
@@ -247,8 +247,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] )*
@@ -256,7 +255,7 @@
<#PN_PREFIX> ::= <PN_CHARS_BASE> ((<PN_CHARS>|'.')* <PN_CHARS>)?
-<#PN_LOCAL> ::= (<PN_CHARS_U> | [0-9] | <PLX> ) ( ( <PN_CHARS> | '.' | <PLX> )* ( <PN_CHARS> | <PLX> ) ) ?
+<#PN_LOCAL> ::= (<PN_CHARS_U> | ':' | [0-9] | <PLX> ) ((<PN_CHARS> | "." | ":" | <PLX>)* (<PN_CHARS> | ":" | <PLX>) )?
<#PLX> ::= <PERCENT> | <PN_LOCAL_ESC>
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/arq/ARQParserConstants.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/arq/ARQParserConstants.java?rev=1362566&r1=1362565&r2=1362566&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/arq/ARQParserConstants.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/arq/ARQParserConstants.java Tue Jul 17 16:53:03 2012
@@ -412,25 +412,25 @@ public interface ARQParserConstants {
/** RegularExpression Id. */
int QMARK = 197;
/** RegularExpression Id. */
- int HEX = 198;
+ int PN_CHARS_BASE = 198;
/** RegularExpression Id. */
- int PERCENT = 199;
+ int PN_CHARS_U = 199;
/** RegularExpression Id. */
- int PN_LOCAL_ESC = 200;
+ int PN_CHARS = 200;
/** RegularExpression Id. */
- int PN_CHARS_BASE = 201;
+ int PN_PREFIX = 201;
/** RegularExpression Id. */
- int PN_CHARS_U = 202;
+ int PN_LOCAL = 202;
/** RegularExpression Id. */
- int PN_CHARS = 203;
+ int VARNAME = 203;
/** RegularExpression Id. */
- int PN_PREFIX = 204;
+ int PN_LOCAL_ESC = 204;
/** RegularExpression Id. */
int PLX = 205;
/** RegularExpression Id. */
- int PN_LOCAL = 206;
+ int HEX = 206;
/** RegularExpression Id. */
- int VARNAME = 207;
+ int PERCENT = 207;
/** RegularExpression Id. */
int UNKNOWN = 208;
@@ -637,16 +637,16 @@ public interface ARQParserConstants {
"\"->\"",
"\"<-\"",
"\"?\"",
- "<HEX>",
- "<PERCENT>",
- "<PN_LOCAL_ESC>",
"<PN_CHARS_BASE>",
"<PN_CHARS_U>",
"<PN_CHARS>",
"<PN_PREFIX>",
- "<PLX>",
"<PN_LOCAL>",
"<VARNAME>",
+ "<PN_LOCAL_ESC>",
+ "<PLX>",
+ "<HEX>",
+ "<PERCENT>",
"<UNKNOWN>",
};
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/arq/ARQParserTokenManager.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/arq/ARQParserTokenManager.java?rev=1362566&r1=1362565&r2=1362566&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/arq/ARQParserTokenManager.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/arq/ARQParserTokenManager.java Tue Jul 17 16:53:03 2012
@@ -2413,18 +2413,18 @@ private int jjMoveNfa_0(int startState,
jjstateSet[jjnewStateCnt++] = 9;
break;
case 9:
- if ((0x7ff000000000000L & l) == 0L)
+ if ((0x3ff000000000000L & l) == 0L)
break;
if (kind > 12)
kind = 12;
jjCheckNAddTwoStates(10, 11);
break;
case 10:
- if ((0x7ff600000000000L & l) != 0L)
+ if ((0x3ff600000000000L & l) != 0L)
jjCheckNAddTwoStates(10, 11);
break;
case 11:
- if ((0x7ff200000000000L & l) != 0L && kind > 12)
+ if ((0x3ff200000000000L & 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 ((0x7ff000000000000L & l) == 0L)
+ if ((0x3ff000000000000L & l) == 0L)
break;
if (kind > 13)
kind = 13;
@@ -2445,7 +2445,7 @@ private int jjMoveNfa_0(int startState,
break;
case 17:
case 18:
- if ((0x7ff000000000000L & l) == 0L)
+ if ((0x3ff000000000000L & 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 ((0x7ff600000000000L & l) != 0L)
+ if ((0x3ff600000000000L & l) != 0L)
jjAddStates(68, 69);
break;
case 91:
- if ((0x7ff200000000000L & l) != 0L)
+ if ((0x3ff200000000000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 92;
break;
case 92:
@@ -2665,11 +2665,11 @@ private int jjMoveNfa_0(int startState,
kind = 10;
break;
case 93:
- if ((0x7ff600000000000L & l) != 0L)
+ if ((0x3ff600000000000L & l) != 0L)
jjAddStates(70, 71);
break;
case 94:
- if ((0x7ff200000000000L & l) != 0L)
+ if ((0x3ff200000000000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 95;
break;
case 95:
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/sparql_11/SPARQLParser11Constants.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/sparql_11/SPARQLParser11Constants.java?rev=1362566&r1=1362565&r2=1362566&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/sparql_11/SPARQLParser11Constants.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/sparql_11/SPARQLParser11Constants.java Tue Jul 17 16:53:03 2012
@@ -394,25 +394,25 @@ public interface SPARQLParser11Constants
/** RegularExpression Id. */
int QMARK = 188;
/** RegularExpression Id. */
- int HEX = 189;
+ int PN_CHARS_BASE = 189;
/** RegularExpression Id. */
- int PERCENT = 190;
+ int PN_CHARS_U = 190;
/** RegularExpression Id. */
- int PN_LOCAL_ESC = 191;
+ int PN_CHARS = 191;
/** RegularExpression Id. */
- int PN_CHARS_BASE = 192;
+ int PN_PREFIX = 192;
/** RegularExpression Id. */
- int PN_CHARS_U = 193;
+ int PN_LOCAL = 193;
/** RegularExpression Id. */
- int PN_CHARS = 194;
+ int VARNAME = 194;
/** RegularExpression Id. */
- int PN_PREFIX = 195;
+ int PN_LOCAL_ESC = 195;
/** RegularExpression Id. */
int PLX = 196;
/** RegularExpression Id. */
- int PN_LOCAL = 197;
+ int HEX = 197;
/** RegularExpression Id. */
- int VARNAME = 198;
+ int PERCENT = 198;
/** RegularExpression Id. */
int UNKNOWN = 199;
@@ -610,16 +610,16 @@ public interface SPARQLParser11Constants
"\"->\"",
"\"<-\"",
"\"?\"",
- "<HEX>",
- "<PERCENT>",
- "<PN_LOCAL_ESC>",
"<PN_CHARS_BASE>",
"<PN_CHARS_U>",
"<PN_CHARS>",
"<PN_PREFIX>",
- "<PLX>",
"<PN_LOCAL>",
"<VARNAME>",
+ "<PN_LOCAL_ESC>",
+ "<PLX>",
+ "<HEX>",
+ "<PERCENT>",
"<UNKNOWN>",
};
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/sparql_11/SPARQLParser11TokenManager.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/sparql_11/SPARQLParser11TokenManager.java?rev=1362566&r1=1362565&r2=1362566&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/sparql_11/SPARQLParser11TokenManager.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/sparql_11/SPARQLParser11TokenManager.java Tue Jul 17 16:53:03 2012
@@ -2328,18 +2328,18 @@ private int jjMoveNfa_0(int startState,
jjstateSet[jjnewStateCnt++] = 9;
break;
case 9:
- if ((0x7ff000000000000L & l) == 0L)
+ if ((0x3ff000000000000L & l) == 0L)
break;
if (kind > 12)
kind = 12;
jjCheckNAddTwoStates(10, 11);
break;
case 10:
- if ((0x7ff600000000000L & l) != 0L)
+ if ((0x3ff600000000000L & l) != 0L)
jjCheckNAddTwoStates(10, 11);
break;
case 11:
- if ((0x7ff200000000000L & l) != 0L && kind > 12)
+ if ((0x3ff200000000000L & l) != 0L && kind > 12)
kind = 12;
break;
case 13:
@@ -2348,7 +2348,7 @@ private int jjMoveNfa_0(int startState,
break;
case 14:
case 15:
- if ((0x7ff000000000000L & l) == 0L)
+ if ((0x3ff000000000000L & l) == 0L)
break;
if (kind > 13)
kind = 13;
@@ -2360,7 +2360,7 @@ private int jjMoveNfa_0(int startState,
break;
case 17:
case 18:
- if ((0x7ff000000000000L & l) == 0L)
+ if ((0x3ff000000000000L & l) == 0L)
break;
if (kind > 14)
kind = 14;
@@ -2568,11 +2568,11 @@ private int jjMoveNfa_0(int startState,
jjstateSet[jjnewStateCnt++] = 87;
break;
case 90:
- if ((0x7ff600000000000L & l) != 0L)
+ if ((0x3ff600000000000L & l) != 0L)
jjAddStates(68, 69);
break;
case 91:
- if ((0x7ff200000000000L & l) != 0L)
+ if ((0x3ff200000000000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 92;
break;
case 92:
@@ -2580,11 +2580,11 @@ private int jjMoveNfa_0(int startState,
kind = 10;
break;
case 93:
- if ((0x7ff600000000000L & l) != 0L)
+ if ((0x3ff600000000000L & l) != 0L)
jjAddStates(70, 71);
break;
case 94:
- if ((0x7ff200000000000L & l) != 0L)
+ if ((0x3ff200000000000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 95;
break;
case 95: