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 2011/11/30 13:08:15 UTC
svn commit: r1208401 - in /incubator/jena/Jena2/ARQ/trunk/Grammar: arq.jj
master.jj sparql_11.jj
Author: andy
Date: Wed Nov 30 12:08:14 2011
New Revision: 1208401
URL: http://svn.apache.org/viewvc?rev=1208401&view=rev
Log:
Re-enable the prefix local name escapes (ARQ syntax)
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
Modified: incubator/jena/Jena2/ARQ/trunk/Grammar/arq.jj
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/Grammar/arq.jj?rev=1208401&r1=1208400&r2=1208401&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/Grammar/arq.jj (original)
+++ incubator/jena/Jena2/ARQ/trunk/Grammar/arq.jj Wed Nov 30 12:08:14 2011
@@ -1802,11 +1802,13 @@ 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 Par, Escape
+ // Align with QueryParseBase unescapePName.
< #PLNE: "\\"
("~" | "." | "-" | "!" | "$" | "&" | "'" |
"(" | ")" | "*" | "+" | "," | ";" | "=" |
@@ -1832,6 +1834,7 @@ TOKEN:
<#PN_PREFIX: <PN_CHARS_BASE> ((<PN_CHARS>|".")* <PN_CHARS>)? >
|
<#PLX: <PERCENT> | <PLNE> >
+ //<#PLX: <PERCENT> >
|
// If goes ahead, consolidate
<#PN_LOCAL: (<PN_CHARS_U> | ["0"-"9"] | <PLX> )
Modified: incubator/jena/Jena2/ARQ/trunk/Grammar/master.jj
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/Grammar/master.jj?rev=1208401&r1=1208400&r2=1208401&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/Grammar/master.jj (original)
+++ incubator/jena/Jena2/ARQ/trunk/Grammar/master.jj Wed Nov 30 12:08:14 2011
@@ -2303,7 +2303,7 @@ TOKEN:
< #PERCENT: "%" <HEX> <HEX> >
|
// Prefixed Name, Local Par, Escape
- / Align with QueryParseBase unescapePName.
+ // Align with QueryParseBase unescapePName.
< #PLNE: "\\"
("~" | "." | "-" | "!" | "$" | "&" | "'" |
"(" | ")" | "*" | "+" | "," | ";" | "=" |
@@ -2334,8 +2334,8 @@ TOKEN:
<#PN_LOCAL: (<PN_CHARS_U> | ["0"-"9"]) ((<PN_CHARS>|".")* <PN_CHARS>)? >
#endif
#ifdef ARQ
- //<#PLX: <PERCENT> | <PLNE> >
- <#PLX: <PERCENT> >
+ <#PLX: <PERCENT> | <PLNE> >
+ //<#PLX: <PERCENT> >
|
// If goes ahead, consolidate
<#PN_LOCAL: (<PN_CHARS_U> | ["0"-"9"] | <PLX> )
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=1208401&r1=1208400&r2=1208401&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/Grammar/sparql_11.jj (original)
+++ incubator/jena/Jena2/ARQ/trunk/Grammar/sparql_11.jj Wed Nov 30 12:08:14 2011
@@ -1700,6 +1700,7 @@ TOKEN :
// See XML chars.txt for notes
TOKEN:
{
+ // ARQ extensions to the PN_LOCAL token.
// XML 1.1 NCNameStartChar without "_"
<#PN_CHARS_BASE:
["A"-"Z"] | ["a"-"z"] |