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/03/14 15:27:31 UTC
svn commit: r1300559 - 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/
Author: andy
Date: Wed Mar 14 14:27:31 2012
New Revision: 1300559
URL: http://svn.apache.org/viewvc?rev=1300559&view=rev
Log: (empty)
Modified:
incubator/jena/Jena2/ARQ/trunk/Grammar/arq.jj
incubator/jena/Jena2/ARQ/trunk/Grammar/jj2html
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/ARQParser.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/sparql_11/SPARQLParser11.java
Modified: incubator/jena/Jena2/ARQ/trunk/Grammar/arq.jj
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/Grammar/arq.jj?rev=1300559&r1=1300558&r2=1300559&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/Grammar/arq.jj (original)
+++ incubator/jena/Jena2/ARQ/trunk/Grammar/arq.jj Wed Mar 14 14:27:31 2012
@@ -102,12 +102,12 @@ void Prologue() : {}
}
void BaseDecl() : { String iri ; }
{
- <BASE> iri = IRI_REF()
+ <BASE> iri = IRIREF()
{ getPrologue().setBaseURI(iri) ; }
}
void PrefixDecl() : { Token t ; String iri ; }
{
- <PREFIX> t = <PNAME_NS> iri = IRI_REF()
+ <PREFIX> t = <PNAME_NS> iri = IRIREF()
{ String s = fixupPrefix(t.image, t.beginLine, t.beginColumn) ;
getPrologue().setPrefix(s, iri) ; }
}
@@ -213,7 +213,7 @@ void DescribeQuery() : { Node n ; }
<DESCRIBE>
{ getQuery().setQueryDescribeType() ; }
(
- ( n = VarOrIRIref() { getQuery().addDescribeNode(n) ; } )+
+ ( n = VarOrIri() { getQuery().addDescribeNode(n) ; } )+
{ getQuery().setQueryResultStar(false) ; }
|
<STAR>
@@ -255,7 +255,7 @@ void NamedGraphClause() : { String iri ;
}
String SourceSelector() : { String iri ; }
{
- iri = IRIref() { return iri ; }
+ iri = iri() { return iri ; }
}
void WhereClause() : { Element el ; }
{
@@ -369,7 +369,7 @@ void BindingsClause() : { Var v ; Node n
}
Node BindingValue() : { Node n ; String iri ; }
{
- iri = IRIref() { return createNode(iri) ; }
+ iri = iri() { return createNode(iri) ; }
| n = RDFLiteral() { return n ; }
| n = NumericLiteral() { return n ; }
| n = BooleanLiteral() { return n ; }
@@ -407,10 +407,10 @@ void Update1() : { Update up ; }
Update Load() : { String url ; Node dest = null ; boolean silent = false ; }
{
// Should be +?
- // <LOAD> ( IRIref() )+
- <LOAD> (<SILENT> { silent = true ; })? url = IRIref()
+ // <LOAD> ( iri() )+
+ <LOAD> (<SILENT> { silent = true ; })? url = iri()
{ String iri ; }
- (<INTO> (<GRAPH>)? iri = IRIref() { dest = createNode(iri) ; })?
+ (<INTO> (<GRAPH>)? iri = iri() { dest = createNode(iri) ; })?
{ return new UpdateLoad(url, dest, silent) ; }
}
Update Clear() : { boolean silent = false ; Target target ; }
@@ -483,7 +483,7 @@ Update DeleteWhere() : { QuadAcc qp = ne
Update Modify() : { Element el ; String iri = null ;
UpdateModify up = new UpdateModify() ; }
{
- ( <WITH> iri = IRIref() { Node n = createNode(iri) ; up.setWithIRI(n) ; } )?
+ ( <WITH> iri = iri() { Node n = createNode(iri) ; up.setWithIRI(n) ; } )?
( DeleteClause(up) ( InsertClause(up) )?
| InsertClause(up)
)
@@ -496,7 +496,7 @@ Update ModifyOld() :
{ UpdateModify up = new UpdateModify() ; String iri ; Template template ; Element el ; }
{
<MODIFY>
- ( iri = IRIref() { Node n = createNode(iri) ; up.setWithIRI(n) ; } )?
+ ( iri = iri() { Node n = createNode(iri) ; up.setWithIRI(n) ; } )?
(DeleteClause(up))?
(InsertClause(up))?
<WHERE>
@@ -524,23 +524,23 @@ void InsertClause(UpdateModify up) : { Q
void OptionalIntoTarget(QuadAcc qp) : { String iri ; }
{
( (<INTO>)?
- iri = IRIref()
+ iri = iri()
{ Node gn = createNode(iri) ; setAccGraph(qp, gn) ; }
)?
}
void OptionalFromTarget(QuadAcc qp) : { String iri ; }
{
( (<FROM>)?
- iri = IRIref()
+ iri = iri()
{ Node gn = createNode(iri) ; setAccGraph(qp, gn) ; }
)?
}
void UsingClause(UpdateWithUsing update) : { String iri ; Node n ; }
{
<USING>
- ( iri = IRIref()
+ ( iri = iri()
{ n = createNode(iri) ; update.addUsing(n) ; }
- | <NAMED> iri = IRIref()
+ | <NAMED> iri = iri()
{ n = createNode(iri) ; update.addUsingNamed(n) ; }
)
}
@@ -548,13 +548,13 @@ Target GraphOrDefault() : { String iri ;
{
( <DFT> { return Target.DEFAULT ; }
| (<GRAPH>)?
- iri = IRIref()
+ iri = iri()
{ return Target.create(createNode(iri)) ; }
)
}
Node GraphRef() : { String iri ; }
{
- <GRAPH> iri = IRIref()
+ <GRAPH> iri = iri()
{ return createNode(iri) ; }
}
Target GraphRefAll() : { Node iri ; }
@@ -592,7 +592,7 @@ void Quads(QuadAcc acc) : { }
}
void QuadsNotTriples(QuadAcc acc) : {Node gn ; Node prev = acc.getGraph() ; }
{
- <GRAPH> gn = VarOrIRIref()
+ <GRAPH> gn = VarOrIri()
{ setAccGraph(acc, gn) ; }
<LBRACE>
(TriplesTemplate(acc))?
@@ -695,7 +695,7 @@ Element OptionalGraphPattern() : { Eleme
}
Element GraphGraphPattern() : { Element el ; Node n ;}
{
- <GRAPH> n = VarOrIRIref() el = GroupGraphPattern()
+ <GRAPH> n = VarOrIri() el = GroupGraphPattern()
{ return new ElementNamedGraph(n, el) ; }
}
Element ServiceGraphPattern() : { Element el ; Node n ; boolean silent = false ; }
@@ -704,7 +704,7 @@ Element ServiceGraphPattern() : { Elemen
(<SILENT>
{ silent=true; }
)?
- n = VarOrIRIref()
+ n = VarOrIri()
el = GroupGraphPattern()
{ return new ElementService(n, el, silent) ; }
}
@@ -787,7 +787,7 @@ Expr Constraint() : { Expr c ; }
}
Expr FunctionCall() : { String fname ; ExprList a ; }
{
- fname = IRIref()
+ fname = iri()
a = ArgList()
{ return new E_Function(fname, a) ; }
}
@@ -882,8 +882,8 @@ void Object(Node s, Node p, Path path, T
Node Verb() : { Node p ;}
{
// Blank nodes as predicates
-// ( p = VarOrBlankNodeOrIRIref() | <KW_A> { p = nRDFtype ; } )
- ( p = VarOrIRIref() | <KW_A> { p = nRDFtype ; } )
+// ( p = VarOrBlankNodeOriri() | <KW_A> { p = nRDFtype ; } )
+ ( p = VarOrIri() | <KW_A> { p = nRDFtype ; } )
{ return p ; }
}
// -------- BGPs with paths.
@@ -1014,7 +1014,7 @@ Path PathMod(Path p) : { long i1 ; long
Path PathPrimary() : { String str ; Path p ; Node n ; }
{
(
- str = IRIref()
+ str = iri()
{ n = createNode(str) ; p = PathFactory.pathLink(n) ; }
| <KW_A>
{ p = PathFactory.pathLink(nRDFtype) ; }
@@ -1053,11 +1053,11 @@ Path PathNegatedPropertySet() : { P_Path
}
P_Path0 PathOneInPropertySet() : { String str ; Node n ; }
{
- ( str = IRIref() { n = createNode(str) ; return new P_Link(n) ; }
+ ( str = iri() { n = createNode(str) ; return new P_Link(n) ; }
| <KW_A> { return new P_Link(nRDFtype) ; }
// This is the !(^:property) form.
| <CARAT>
- ( str = IRIref() { n = createNode(str) ; return new P_ReverseLink(n) ; }
+ ( str = iri() { n = createNode(str) ; return new P_ReverseLink(n) ; }
| <KW_A> { return new P_ReverseLink(nRDFtype) ; }
)
)
@@ -1136,9 +1136,9 @@ Node VarOrTerm() : {Node n = null ; }
{ return n ; }
}
// Property (if no bNodes) + DESCRIBE
-Node VarOrIRIref() : {Node n = null ; String iri ; }
+Node VarOrIri() : {Node n = null ; String iri ; }
{
- ( n = Var() | iri = IRIref() { n = createNode(iri) ; } )
+ ( n = Var() | iri = iri() { n = createNode(iri) ; } )
{ return n ; }
}
Var Var() : { Token t ;}
@@ -1148,7 +1148,7 @@ Var Var() : { Token t ;}
}
Node GraphTerm() : { Node n ; String iri ; }
{
- iri = IRIref() { return createNode(iri) ; }
+ iri = iri() { return createNode(iri) ; }
| n = RDFLiteral() { return n ; }
| n = NumericLiteral() { return n ; }
| n = BooleanLiteral() { return n ; }
@@ -1271,9 +1271,9 @@ Expr PrimaryExpression() : { Expr expr ;
{
( expr = BrackettedExpression() { return expr ; }
| expr = BuiltInCall() { return expr ; }
- | expr = IRIrefOrFunction() { return expr ; }
+ | expr = iriOrFunction() { return expr ; }
// NOT | gn = VarOrTerm() { return asExpr(gn) ; }
-// Because of IRIrefOrFunction
+// Because of iriOrFunction
| gn = RDFLiteral() { return asExpr(gn) ; }
| gn = NumericLiteral() { return asExpr(gn) ; }
| gn = BooleanLiteral() { return asExpr(gn) ; }
@@ -1476,11 +1476,11 @@ Expr Aggregate() : { Aggregator agg = nu
// See also FunctionCall.
// The case of "q:name()" or "q:agg()" or just "q:name"
// by expanding out FunctionCall()
-Expr IRIrefOrFunction() : { String iri ; ExprList a = null ;
- ExprList params = null ;
- boolean distinct = false ; }
+Expr iriOrFunction() : { String iri ; ExprList a = null ;
+ ExprList params = null ;
+ boolean distinct = false ; }
{
- iri = IRIref()
+ iri = iri()
(a = ArgList())?
{ if ( a == null )
return asExpr(createNode(iri)) ;
@@ -1495,7 +1495,7 @@ Node RDFLiteral() : { Token t ; String l
(
( t = <LANGTAG> { lang = stripChars(t.image, 1) ; } )
|
- ( <DATATYPE> uri = IRIref() )
+ ( <DATATYPE> uri = iri() )
)?
{ return createLiteral(lex, lang, uri) ; }
}
@@ -1544,9 +1544,9 @@ String String() : { Token t ; String lex
return lex ;
}
}
-String IRIref() : { String iri ; }
+String iri() : { String iri ; }
{
- iri = IRI_REF() { return iri ; }
+ iri = IRIREF() { return iri ; }
|
iri = PrefixedName() { return iri ; }
}
@@ -1567,7 +1567,7 @@ Node BlankNode() : { Token t = null ; }
// <LBRACKET> <RBRACKET> { return createBNode(t.beginLine, t.beginColumn) ; }
t = <ANON> { return createBNode(t.beginLine, t.beginColumn) ; }
}
-String IRI_REF() : { Token t ; }
+String IRIREF() : { Token t ; }
{
t = <IRIref>
{ return resolveQuotedIRI(t.image, t.beginLine, t.beginColumn) ; }
Modified: incubator/jena/Jena2/ARQ/trunk/Grammar/jj2html
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/Grammar/jj2html?rev=1300559&r1=1300558&r2=1300559&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/Grammar/jj2html (original)
+++ incubator/jena/Jena2/ARQ/trunk/Grammar/jj2html Wed Mar 14 14:27:31 2012
@@ -13,8 +13,6 @@ if ( $#ARGV != 1 )
exit 1 ;
}
-
-
$/ = undef ;
# Just table or full page.
$TABLE = 1 ;
@@ -263,7 +261,7 @@ for $r (@rules)
$rn = anchor("r-".$rulename, $rulename) ;
$rn = fixupHead($rn) ;
- if($rulename eq 'IRI_REF')
+ if($rulename eq 'IRIREF')
{
print " </tbody></table>\n" ;
print "</div>\n" ;
Modified: incubator/jena/Jena2/ARQ/trunk/Grammar/master.jj
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/Grammar/master.jj?rev=1300559&r1=1300558&r2=1300559&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/Grammar/master.jj (original)
+++ incubator/jena/Jena2/ARQ/trunk/Grammar/master.jj Wed Mar 14 14:27:31 2012
@@ -148,13 +148,13 @@ void Prologue() : {}
void BaseDecl() : { String iri ; }
{
- <BASE> iri = IRI_REF()
+ <BASE> iri = IRIREF()
{ getPrologue().setBaseURI(iri) ; }
}
void PrefixDecl() : { Token t ; String iri ; }
{
- <PREFIX> t = <PNAME_NS> iri = IRI_REF()
+ <PREFIX> t = <PNAME_NS> iri = IRIREF()
{ String s = fixupPrefix(t.image, t.beginLine, t.beginColumn) ;
getPrologue().setPrefix(s, iri) ; }
}
@@ -279,7 +279,7 @@ void DescribeQuery() : { Node n ; }
<DESCRIBE>
{ getQuery().setQueryDescribeType() ; }
(
- ( n = VarOrIRIref() { getQuery().addDescribeNode(n) ; } )+
+ ( n = VarOrIri() { getQuery().addDescribeNode(n) ; } )+
{ getQuery().setQueryResultStar(false) ; }
|
<STAR>
@@ -327,7 +327,7 @@ void NamedGraphClause() : { String iri ;
String SourceSelector() : { String iri ; }
{
- iri = IRIref() { return iri ; }
+ iri = iri() { return iri ; }
}
@@ -457,7 +457,7 @@ void BindingsClause() : { Var v ; Node n
Node BindingValue() : { Node n ; String iri ; }
{
- iri = IRIref() { return createNode(iri) ; }
+ iri = iri() { return createNode(iri) ; }
| n = RDFLiteral() { return n ; }
| n = NumericLiteral() { return n ; }
| n = BooleanLiteral() { return n ; }
@@ -512,13 +512,13 @@ void Update1() : { Update up ; }
Update Load() : { String url ; Node dest = null ; boolean silent = false ; }
{
// Should be +?
- // <LOAD> ( IRIref() )+
- <LOAD> (<SILENT> { silent = true ; })? url = IRIref()
+ // <LOAD> ( iri() )+
+ <LOAD> (<SILENT> { silent = true ; })? url = iri()
#ifndef ARQ_UPDATE
(<INTO> dest = GraphRef() )?
#else
{ String iri ; }
- (<INTO> (<GRAPH>)? iri = IRIref() { dest = createNode(iri) ; })?
+ (<INTO> (<GRAPH>)? iri = iri() { dest = createNode(iri) ; })?
#endif
{ return new UpdateLoad(url, dest, silent) ; }
}
@@ -611,7 +611,7 @@ Update DeleteWhere() : { QuadAcc qp = ne
Update Modify() : { Element el ; String iri = null ;
UpdateModify up = new UpdateModify() ; }
{
- ( <WITH> iri = IRIref() { Node n = createNode(iri) ; up.setWithIRI(n) ; } )?
+ ( <WITH> iri = iri() { Node n = createNode(iri) ; up.setWithIRI(n) ; } )?
( DeleteClause(up) ( InsertClause(up) )?
| InsertClause(up)
)
@@ -626,7 +626,7 @@ Update ModifyOld() :
{ UpdateModify up = new UpdateModify() ; String iri ; Template template ; Element el ; }
{
<MODIFY>
- ( iri = IRIref() { Node n = createNode(iri) ; up.setWithIRI(n) ; } )?
+ ( iri = iri() { Node n = createNode(iri) ; up.setWithIRI(n) ; } )?
(DeleteClause(up))?
(InsertClause(up))?
<WHERE>
@@ -667,7 +667,7 @@ void InsertClause(UpdateModify up) : { Q
void OptionalIntoTarget(QuadAcc qp) : { String iri ; }
{
( (<INTO>)?
- iri = IRIref()
+ iri = iri()
{ Node gn = createNode(iri) ; setAccGraph(qp, gn) ; }
)?
}
@@ -675,7 +675,7 @@ void OptionalIntoTarget(QuadAcc qp) : {
void OptionalFromTarget(QuadAcc qp) : { String iri ; }
{
( (<FROM>)?
- iri = IRIref()
+ iri = iri()
{ Node gn = createNode(iri) ; setAccGraph(qp, gn) ; }
)?
}
@@ -684,9 +684,9 @@ void OptionalFromTarget(QuadAcc qp) : {
void UsingClause(UpdateWithUsing update) : { String iri ; Node n ; }
{
<USING>
- ( iri = IRIref()
+ ( iri = iri()
{ n = createNode(iri) ; update.addUsing(n) ; }
- | <NAMED> iri = IRIref()
+ | <NAMED> iri = iri()
{ n = createNode(iri) ; update.addUsingNamed(n) ; }
)
}
@@ -695,14 +695,14 @@ Target GraphOrDefault() : { String iri ;
{
( <DFT> { return Target.DEFAULT ; }
| (<GRAPH>)?
- iri = IRIref()
+ iri = iri()
{ return Target.create(createNode(iri)) ; }
)
}
Node GraphRef() : { String iri ; }
{
- <GRAPH> iri = IRIref()
+ <GRAPH> iri = iri()
{ return createNode(iri) ; }
}
@@ -747,7 +747,7 @@ void Quads(QuadAcc acc) : { }
void QuadsNotTriples(QuadAcc acc) : {Node gn ; Node prev = acc.getGraph() ; }
{
- <GRAPH> gn = VarOrIRIref()
+ <GRAPH> gn = VarOrIri()
{ setAccGraph(acc, gn) ; }
<LBRACE>
(TriplesTemplate(acc))?
@@ -878,7 +878,7 @@ Element OptionalGraphPattern() : { Eleme
Element GraphGraphPattern() : { Element el ; Node n ;}
{
- <GRAPH> n = VarOrIRIref() el = GroupGraphPattern()
+ <GRAPH> n = VarOrIri() el = GroupGraphPattern()
{ return new ElementNamedGraph(n, el) ; }
}
@@ -889,7 +889,7 @@ Element ServiceGraphPattern() : { Elemen
(<SILENT>
{ silent=true; }
)?
- n = VarOrIRIref()
+ n = VarOrIri()
el = GroupGraphPattern()
{ return new ElementService(n, el, silent) ; }
}
@@ -922,7 +922,7 @@ Element Assignment() : { Var v ; Expr ex
Element FetchGraph() : { Node n ; }
{
<FETCH>
- n = VarOrIRIref()
+ n = VarOrIri()
{ return new ElementFetch(n) ; }
}
#endif
@@ -998,7 +998,7 @@ Expr Constraint() : { Expr c ; }
Expr FunctionCall() : { String fname ; ExprList a ; }
{
- fname = IRIref()
+ fname = iri()
a = ArgList()
{ return new E_Function(fname, a) ; }
}
@@ -1114,8 +1114,8 @@ void Object(Node s, Node p, Path path, T
Node Verb() : { Node p ;}
{
// Blank nodes as predicates
-// ( p = VarOrBlankNodeOrIRIref() | <KW_A> { p = nRDFtype ; } )
- ( p = VarOrIRIref() | <KW_A> { p = nRDFtype ; } )
+// ( p = VarOrBlankNodeOriri() | <KW_A> { p = nRDFtype ; } )
+ ( p = VarOrIri() | <KW_A> { p = nRDFtype ; } )
{ return p ; }
}
@@ -1271,7 +1271,7 @@ Path PathMod(Path p) : { long i1 ; long
Path PathPrimary() : { String str ; Path p ; Node n ; }
{
(
- str = IRIref()
+ str = iri()
{ n = createNode(str) ; p = PathFactory.pathLink(n) ; }
| <KW_A>
{ p = PathFactory.pathLink(nRDFtype) ; }
@@ -1315,11 +1315,11 @@ Path PathNegatedPropertySet() : { P_Path
P_Path0 PathOneInPropertySet() : { String str ; Node n ; }
{
- ( str = IRIref() { n = createNode(str) ; return new P_Link(n) ; }
+ ( str = iri() { n = createNode(str) ; return new P_Link(n) ; }
| <KW_A> { return new P_Link(nRDFtype) ; }
// This is the !(^:property) form.
| <CARAT>
- ( str = IRIref() { n = createNode(str) ; return new P_ReverseLink(n) ; }
+ ( str = iri() { n = createNode(str) ; return new P_ReverseLink(n) ; }
| <KW_A> { return new P_ReverseLink(nRDFtype) ; }
)
)
@@ -1444,9 +1444,9 @@ Node VarOrTerm() : {Node n = null ; }
}
// Property (if no bNodes) + DESCRIBE
-Node VarOrIRIref() : {Node n = null ; String iri ; }
+Node VarOrIri() : {Node n = null ; String iri ; }
{
- ( n = Var() | iri = IRIref() { n = createNode(iri) ; } )
+ ( n = Var() | iri = iri() { n = createNode(iri) ; } )
{ return n ; }
}
@@ -1458,7 +1458,7 @@ Var Var() : { Token t ;}
Node GraphTerm() : { Node n ; String iri ; }
{
- iri = IRIref() { return createNode(iri) ; }
+ iri = iri() { return createNode(iri) ; }
| n = RDFLiteral() { return n ; }
| n = NumericLiteral() { return n ; }
| n = BooleanLiteral() { return n ; }
@@ -1595,10 +1595,10 @@ Expr PrimaryExpression() : { Expr expr ;
{
( expr = BrackettedExpression() { return expr ; }
| expr = BuiltInCall() { return expr ; }
- | expr = IRIrefOrFunction() { return expr ; }
+ | expr = iriOrFunction() { return expr ; }
// NOT | gn = VarOrTerm() { return asExpr(gn) ; }
-// Because of IRIrefOrFunction
+// Because of iriOrFunction
| gn = RDFLiteral() { return asExpr(gn) ; }
| gn = NumericLiteral() { return asExpr(gn) ; }
| gn = BooleanLiteral() { return asExpr(gn) ; }
@@ -1886,11 +1886,11 @@ Expr Aggregate() : { Aggregator agg = nu
// The case of "q:name()" or "q:agg()" or just "q:name"
// by expanding out FunctionCall()
-Expr IRIrefOrFunction() : { String iri ; ExprList a = null ;
- ExprList params = null ;
- boolean distinct = false ; }
+Expr iriOrFunction() : { String iri ; ExprList a = null ;
+ ExprList params = null ;
+ boolean distinct = false ; }
{
- iri = IRIref()
+ iri = iri()
(a = ArgList())?
{ if ( a == null )
return asExpr(createNode(iri)) ;
@@ -1920,7 +1920,7 @@ Node RDFLiteral() : { Token t ; String l
(
( t = <LANGTAG> { lang = stripChars(t.image, 1) ; } )
|
- ( <DATATYPE> uri = IRIref() )
+ ( <DATATYPE> uri = iri() )
)?
{ return createLiteral(lex, lang, uri) ; }
}
@@ -1979,9 +1979,9 @@ String String() : { Token t ; String lex
}
}
-String IRIref() : { String iri ; }
+String iri() : { String iri ; }
{
- iri = IRI_REF() { return iri ; }
+ iri = IRIREF() { return iri ; }
|
iri = PrefixedName() { return iri ; }
}
@@ -2006,7 +2006,7 @@ Node BlankNode() : { Token t = null ; }
}
-String IRI_REF() : { Token t ; }
+String IRIREF() : { Token t ; }
{
t = <IRIref>
{ return resolveQuotedIRI(t.image, t.beginLine, t.beginColumn) ; }
@@ -2048,7 +2048,7 @@ TOKEN: {
TOKEN:
{
// Includes # for relative URIs
- <IRIref: "<" (~[ ">","<", "\"", "{", "}", "^", "\\", "|", "`",
+ <IRIref: "<" (~[ ">","<", "\"", "{", "}", "^", "\\", "|", "`",
"\u0000"-"\u0020"])* ">" >
| <PNAME_NS: (<PN_PREFIX>)? ":" >
| <PNAME_LN: <PNAME_NS> <PN_LOCAL> >
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=1300559&r1=1300558&r2=1300559&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/Grammar/sparql_11.jj (original)
+++ incubator/jena/Jena2/ARQ/trunk/Grammar/sparql_11.jj Wed Mar 14 14:27:31 2012
@@ -102,12 +102,12 @@ void Prologue() : {}
}
void BaseDecl() : { String iri ; }
{
- <BASE> iri = IRI_REF()
+ <BASE> iri = IRIREF()
{ getPrologue().setBaseURI(iri) ; }
}
void PrefixDecl() : { Token t ; String iri ; }
{
- <PREFIX> t = <PNAME_NS> iri = IRI_REF()
+ <PREFIX> t = <PNAME_NS> iri = IRIREF()
{ String s = fixupPrefix(t.image, t.beginLine, t.beginColumn) ;
getPrologue().setPrefix(s, iri) ; }
}
@@ -200,7 +200,7 @@ void DescribeQuery() : { Node n ; }
<DESCRIBE>
{ getQuery().setQueryDescribeType() ; }
(
- ( n = VarOrIRIref() { getQuery().addDescribeNode(n) ; } )+
+ ( n = VarOrIri() { getQuery().addDescribeNode(n) ; } )+
{ getQuery().setQueryResultStar(false) ; }
|
<STAR>
@@ -242,7 +242,7 @@ void NamedGraphClause() : { String iri ;
}
String SourceSelector() : { String iri ; }
{
- iri = IRIref() { return iri ; }
+ iri = iri() { return iri ; }
}
void WhereClause() : { Element el ; }
{
@@ -356,7 +356,7 @@ void BindingsClause() : { Var v ; Node n
}
Node BindingValue() : { Node n ; String iri ; }
{
- iri = IRIref() { return createNode(iri) ; }
+ iri = iri() { return createNode(iri) ; }
| n = RDFLiteral() { return n ; }
| n = NumericLiteral() { return n ; }
| n = BooleanLiteral() { return n ; }
@@ -393,8 +393,8 @@ void Update1() : { Update up ; }
Update Load() : { String url ; Node dest = null ; boolean silent = false ; }
{
// Should be +?
- // <LOAD> ( IRIref() )+
- <LOAD> (<SILENT> { silent = true ; })? url = IRIref()
+ // <LOAD> ( iri() )+
+ <LOAD> (<SILENT> { silent = true ; })? url = iri()
(<INTO> dest = GraphRef() )?
{ return new UpdateLoad(url, dest, silent) ; }
}
@@ -466,7 +466,7 @@ Update DeleteWhere() : { QuadAcc qp = ne
Update Modify() : { Element el ; String iri = null ;
UpdateModify up = new UpdateModify() ; }
{
- ( <WITH> iri = IRIref() { Node n = createNode(iri) ; up.setWithIRI(n) ; } )?
+ ( <WITH> iri = iri() { Node n = createNode(iri) ; up.setWithIRI(n) ; } )?
( DeleteClause(up) ( InsertClause(up) )?
| InsertClause(up)
)
@@ -494,9 +494,9 @@ void InsertClause(UpdateModify up) : { Q
void UsingClause(UpdateWithUsing update) : { String iri ; Node n ; }
{
<USING>
- ( iri = IRIref()
+ ( iri = iri()
{ n = createNode(iri) ; update.addUsing(n) ; }
- | <NAMED> iri = IRIref()
+ | <NAMED> iri = iri()
{ n = createNode(iri) ; update.addUsingNamed(n) ; }
)
}
@@ -504,13 +504,13 @@ Target GraphOrDefault() : { String iri ;
{
( <DFT> { return Target.DEFAULT ; }
| (<GRAPH>)?
- iri = IRIref()
+ iri = iri()
{ return Target.create(createNode(iri)) ; }
)
}
Node GraphRef() : { String iri ; }
{
- <GRAPH> iri = IRIref()
+ <GRAPH> iri = iri()
{ return createNode(iri) ; }
}
Target GraphRefAll() : { Node iri ; }
@@ -546,7 +546,7 @@ void Quads(QuadAcc acc) : { }
}
void QuadsNotTriples(QuadAcc acc) : {Node gn ; Node prev = acc.getGraph() ; }
{
- <GRAPH> gn = VarOrIRIref()
+ <GRAPH> gn = VarOrIri()
{ setAccGraph(acc, gn) ; }
<LBRACE>
(TriplesTemplate(acc))?
@@ -642,7 +642,7 @@ Element OptionalGraphPattern() : { Eleme
}
Element GraphGraphPattern() : { Element el ; Node n ;}
{
- <GRAPH> n = VarOrIRIref() el = GroupGraphPattern()
+ <GRAPH> n = VarOrIri() el = GroupGraphPattern()
{ return new ElementNamedGraph(n, el) ; }
}
Element ServiceGraphPattern() : { Element el ; Node n ; boolean silent = false ; }
@@ -651,7 +651,7 @@ Element ServiceGraphPattern() : { Elemen
(<SILENT>
{ silent=true; }
)?
- n = VarOrIRIref()
+ n = VarOrIri()
el = GroupGraphPattern()
{ return new ElementService(n, el, silent) ; }
}
@@ -712,7 +712,7 @@ Expr Constraint() : { Expr c ; }
}
Expr FunctionCall() : { String fname ; ExprList a ; }
{
- fname = IRIref()
+ fname = iri()
a = ArgList()
{ return new E_Function(fname, a) ; }
}
@@ -806,8 +806,8 @@ void Object(Node s, Node p, Path path, T
Node Verb() : { Node p ;}
{
// Blank nodes as predicates
-// ( p = VarOrBlankNodeOrIRIref() | <KW_A> { p = nRDFtype ; } )
- ( p = VarOrIRIref() | <KW_A> { p = nRDFtype ; } )
+// ( p = VarOrBlankNodeOriri() | <KW_A> { p = nRDFtype ; } )
+ ( p = VarOrIri() | <KW_A> { p = nRDFtype ; } )
{ return p ; }
}
// -------- BGPs with paths.
@@ -929,7 +929,7 @@ Path PathMod(Path p) : { long i1 ; long
Path PathPrimary() : { String str ; Path p ; Node n ; }
{
(
- str = IRIref()
+ str = iri()
{ n = createNode(str) ; p = PathFactory.pathLink(n) ; }
| <KW_A>
{ p = PathFactory.pathLink(nRDFtype) ; }
@@ -958,11 +958,11 @@ Path PathNegatedPropertySet() : { P_Path
}
P_Path0 PathOneInPropertySet() : { String str ; Node n ; }
{
- ( str = IRIref() { n = createNode(str) ; return new P_Link(n) ; }
+ ( str = iri() { n = createNode(str) ; return new P_Link(n) ; }
| <KW_A> { return new P_Link(nRDFtype) ; }
// This is the !(^:property) form.
| <CARAT>
- ( str = IRIref() { n = createNode(str) ; return new P_ReverseLink(n) ; }
+ ( str = iri() { n = createNode(str) ; return new P_ReverseLink(n) ; }
| <KW_A> { return new P_ReverseLink(nRDFtype) ; }
)
)
@@ -1041,9 +1041,9 @@ Node VarOrTerm() : {Node n = null ; }
{ return n ; }
}
// Property (if no bNodes) + DESCRIBE
-Node VarOrIRIref() : {Node n = null ; String iri ; }
+Node VarOrIri() : {Node n = null ; String iri ; }
{
- ( n = Var() | iri = IRIref() { n = createNode(iri) ; } )
+ ( n = Var() | iri = iri() { n = createNode(iri) ; } )
{ return n ; }
}
Var Var() : { Token t ;}
@@ -1053,7 +1053,7 @@ Var Var() : { Token t ;}
}
Node GraphTerm() : { Node n ; String iri ; }
{
- iri = IRIref() { return createNode(iri) ; }
+ iri = iri() { return createNode(iri) ; }
| n = RDFLiteral() { return n ; }
| n = NumericLiteral() { return n ; }
| n = BooleanLiteral() { return n ; }
@@ -1176,9 +1176,9 @@ Expr PrimaryExpression() : { Expr expr ;
{
( expr = BrackettedExpression() { return expr ; }
| expr = BuiltInCall() { return expr ; }
- | expr = IRIrefOrFunction() { return expr ; }
+ | expr = iriOrFunction() { return expr ; }
// NOT | gn = VarOrTerm() { return asExpr(gn) ; }
-// Because of IRIrefOrFunction
+// Because of iriOrFunction
| gn = RDFLiteral() { return asExpr(gn) ; }
| gn = NumericLiteral() { return asExpr(gn) ; }
| gn = BooleanLiteral() { return asExpr(gn) ; }
@@ -1372,11 +1372,11 @@ Expr Aggregate() : { Aggregator agg = nu
// See also FunctionCall.
// The case of "q:name()" or "q:agg()" or just "q:name"
// by expanding out FunctionCall()
-Expr IRIrefOrFunction() : { String iri ; ExprList a = null ;
- ExprList params = null ;
- boolean distinct = false ; }
+Expr iriOrFunction() : { String iri ; ExprList a = null ;
+ ExprList params = null ;
+ boolean distinct = false ; }
{
- iri = IRIref()
+ iri = iri()
(a = ArgList())?
{ if ( a == null )
return asExpr(createNode(iri)) ;
@@ -1391,7 +1391,7 @@ Node RDFLiteral() : { Token t ; String l
(
( t = <LANGTAG> { lang = stripChars(t.image, 1) ; } )
|
- ( <DATATYPE> uri = IRIref() )
+ ( <DATATYPE> uri = iri() )
)?
{ return createLiteral(lex, lang, uri) ; }
}
@@ -1440,9 +1440,9 @@ String String() : { Token t ; String lex
return lex ;
}
}
-String IRIref() : { String iri ; }
+String iri() : { String iri ; }
{
- iri = IRI_REF() { return iri ; }
+ iri = IRIREF() { return iri ; }
|
iri = PrefixedName() { return iri ; }
}
@@ -1463,7 +1463,7 @@ Node BlankNode() : { Token t = null ; }
// <LBRACKET> <RBRACKET> { return createBNode(t.beginLine, t.beginColumn) ; }
t = <ANON> { return createBNode(t.beginLine, t.beginColumn) ; }
}
-String IRI_REF() : { Token t ; }
+String IRIREF() : { Token t ; }
{
t = <IRIref>
{ return resolveQuotedIRI(t.image, t.beginLine, t.beginColumn) ; }
Modified: incubator/jena/Jena2/ARQ/trunk/Grammar/tokens.txt
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/Grammar/tokens.txt?rev=1300559&r1=1300558&r2=1300559&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/Grammar/tokens.txt (original)
+++ incubator/jena/Jena2/ARQ/trunk/Grammar/tokens.txt Wed Mar 14 14:27:31 2012
@@ -182,7 +182,6 @@
[<SILENT>] ::= 'SILENT'
[<DROP>] ::= 'DROP'
[<TO>] ::= 'TO'
-[<INTO>] ::= 'INTO'
[<BEGIN>] ::= 'BEGIN'
[<COMMIT>] ::= 'COMMIT'
[<ABORT>] ::= 'ABORT'
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/arq/ARQParser.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/arq/ARQParser.java?rev=1300559&r1=1300558&r2=1300559&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/arq/ARQParser.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/arq/ARQParser.java Wed Mar 14 14:27:31 2012
@@ -103,7 +103,7 @@ public class ARQParser extends ARQParser
final public void BaseDecl() throws ParseException {
String iri ;
jj_consume_token(BASE);
- iri = IRI_REF();
+ iri = IRIREF();
getPrologue().setBaseURI(iri) ;
}
@@ -111,7 +111,7 @@ public class ARQParser extends ARQParser
Token t ; String iri ;
jj_consume_token(PREFIX);
t = jj_consume_token(PNAME_NS);
- iri = IRI_REF();
+ iri = IRIREF();
String s = fixupPrefix(t.image, t.beginLine, t.beginColumn) ;
getPrologue().setPrefix(s, iri) ;
}
@@ -610,8 +610,8 @@ public class ARQParser extends ARQParser
case VAR2:
label_6:
while (true) {
- n = VarOrIRIref();
- getQuery().addDescribeNode(n) ;
+ n = VarOrIri();
+ getQuery().addDescribeNode(n) ;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case IRIref:
case PNAME_NS:
@@ -715,8 +715,8 @@ public class ARQParser extends ARQParser
final public String SourceSelector() throws ParseException {
String iri ;
- iri = IRIref();
- {if (true) return iri ;}
+ iri = iri();
+ {if (true) return iri ;}
throw new Error("Missing return statement in function");
}
@@ -1454,8 +1454,8 @@ public class ARQParser extends ARQParser
case IRIref:
case PNAME_NS:
case PNAME_LN:
- iri = IRIref();
- {if (true) return createNode(iri) ;}
+ iri = iri();
+ {if (true) return createNode(iri) ;}
break;
case STRING_LITERAL1:
case STRING_LITERAL2:
@@ -1597,7 +1597,7 @@ public class ARQParser extends ARQParser
jj_la1[46] = jj_gen;
;
}
- url = IRIref();
+ url = iri();
String iri ;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case INTO:
@@ -1610,8 +1610,8 @@ public class ARQParser extends ARQParser
jj_la1[47] = jj_gen;
;
}
- iri = IRIref();
- dest = createNode(iri) ;
+ iri = iri();
+ dest = createNode(iri) ;
break;
default:
jj_la1[48] = jj_gen;
@@ -1774,8 +1774,8 @@ public class ARQParser extends ARQParser
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case WITH:
jj_consume_token(WITH);
- iri = IRIref();
- Node n = createNode(iri) ; up.setWithIRI(n) ;
+ iri = iri();
+ Node n = createNode(iri) ; up.setWithIRI(n) ;
break;
default:
jj_la1[55] = jj_gen;
@@ -1827,8 +1827,8 @@ public class ARQParser extends ARQParser
case IRIref:
case PNAME_NS:
case PNAME_LN:
- iri = IRIref();
- Node n = createNode(iri) ; up.setWithIRI(n) ;
+ iri = iri();
+ Node n = createNode(iri) ; up.setWithIRI(n) ;
break;
default:
jj_la1[59] = jj_gen;
@@ -1892,7 +1892,7 @@ public class ARQParser extends ARQParser
jj_la1[62] = jj_gen;
;
}
- iri = IRIref();
+ iri = iri();
Node gn = createNode(iri) ; setAccGraph(qp, gn) ;
break;
default:
@@ -1916,7 +1916,7 @@ public class ARQParser extends ARQParser
jj_la1[64] = jj_gen;
;
}
- iri = IRIref();
+ iri = iri();
Node gn = createNode(iri) ; setAccGraph(qp, gn) ;
break;
default:
@@ -1932,12 +1932,12 @@ public class ARQParser extends ARQParser
case IRIref:
case PNAME_NS:
case PNAME_LN:
- iri = IRIref();
+ iri = iri();
n = createNode(iri) ; update.addUsing(n) ;
break;
case NAMED:
jj_consume_token(NAMED);
- iri = IRIref();
+ iri = iri();
n = createNode(iri) ; update.addUsingNamed(n) ;
break;
default:
@@ -1966,7 +1966,7 @@ public class ARQParser extends ARQParser
jj_la1[67] = jj_gen;
;
}
- iri = IRIref();
+ iri = iri();
{if (true) return Target.create(createNode(iri)) ;}
break;
default:
@@ -1980,7 +1980,7 @@ public class ARQParser extends ARQParser
final public Node GraphRef() throws ParseException {
String iri ;
jj_consume_token(GRAPH);
- iri = IRIref();
+ iri = iri();
{if (true) return createNode(iri) ;}
throw new Error("Missing return statement in function");
}
@@ -2126,7 +2126,7 @@ public class ARQParser extends ARQParser
final public void QuadsNotTriples(QuadAcc acc) throws ParseException {
Node gn ; Node prev = acc.getGraph() ;
jj_consume_token(GRAPH);
- gn = VarOrIRIref();
+ gn = VarOrIri();
setAccGraph(acc, gn) ;
jj_consume_token(LBRACE);
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -2423,7 +2423,7 @@ public class ARQParser extends ARQParser
final public Element GraphGraphPattern() throws ParseException {
Element el ; Node n ;
jj_consume_token(GRAPH);
- n = VarOrIRIref();
+ n = VarOrIri();
el = GroupGraphPattern();
{if (true) return new ElementNamedGraph(n, el) ;}
throw new Error("Missing return statement in function");
@@ -2441,7 +2441,7 @@ public class ARQParser extends ARQParser
jj_la1[85] = jj_gen;
;
}
- n = VarOrIRIref();
+ n = VarOrIri();
el = GroupGraphPattern();
{if (true) return new ElementService(n, el, silent) ;}
throw new Error("Missing return statement in function");
@@ -2626,7 +2626,7 @@ public class ARQParser extends ARQParser
final public Expr FunctionCall() throws ParseException {
String fname ; ExprList a ;
- fname = IRIref();
+ fname = iri();
a = ArgList();
{if (true) return new E_Function(fname, a) ;}
throw new Error("Missing return statement in function");
@@ -2906,11 +2906,11 @@ public class ARQParser extends ARQParser
case PNAME_LN:
case VAR1:
case VAR2:
- p = VarOrIRIref();
+ p = VarOrIri();
break;
case KW_A:
jj_consume_token(KW_A);
- p = nRDFtype ;
+ p = nRDFtype ;
break;
default:
jj_la1[100] = jj_gen;
@@ -3293,7 +3293,7 @@ public class ARQParser extends ARQParser
case IRIref:
case PNAME_NS:
case PNAME_LN:
- str = IRIref();
+ str = iri();
n = createNode(str) ; p = PathFactory.pathLink(n) ;
break;
case KW_A:
@@ -3397,8 +3397,8 @@ public class ARQParser extends ARQParser
case IRIref:
case PNAME_NS:
case PNAME_LN:
- str = IRIref();
- n = createNode(str) ; {if (true) return new P_Link(n) ;}
+ str = iri();
+ n = createNode(str) ; {if (true) return new P_Link(n) ;}
break;
case KW_A:
jj_consume_token(KW_A);
@@ -3410,8 +3410,8 @@ public class ARQParser extends ARQParser
case IRIref:
case PNAME_NS:
case PNAME_LN:
- str = IRIref();
- n = createNode(str) ; {if (true) return new P_ReverseLink(n) ;}
+ str = iri();
+ n = createNode(str) ; {if (true) return new P_ReverseLink(n) ;}
break;
case KW_A:
jj_consume_token(KW_A);
@@ -3637,8 +3637,8 @@ public class ARQParser extends ARQParser
}
// Property (if no bNodes) + DESCRIBE
- final public Node VarOrIRIref() throws ParseException {
- Node n = null ; String iri ;
+ final public Node VarOrIri() throws ParseException {
+ Node n = null ; String iri ;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case VAR1:
case VAR2:
@@ -3647,8 +3647,8 @@ public class ARQParser extends ARQParser
case IRIref:
case PNAME_NS:
case PNAME_LN:
- iri = IRIref();
- n = createNode(iri) ;
+ iri = iri();
+ n = createNode(iri) ;
break;
default:
jj_la1[127] = jj_gen;
@@ -3683,8 +3683,8 @@ public class ARQParser extends ARQParser
case IRIref:
case PNAME_NS:
case PNAME_LN:
- iri = IRIref();
- {if (true) return createNode(iri) ;}
+ iri = iri();
+ {if (true) return createNode(iri) ;}
break;
case STRING_LITERAL1:
case STRING_LITERAL2:
@@ -4179,8 +4179,8 @@ public class ARQParser extends ARQParser
case IRIref:
case PNAME_NS:
case PNAME_LN:
- expr = IRIrefOrFunction();
- {if (true) return expr ;}
+ expr = iriOrFunction();
+ {if (true) return expr ;}
break;
case STRING_LITERAL1:
case STRING_LITERAL2:
@@ -4996,11 +4996,11 @@ public class ARQParser extends ARQParser
// See also FunctionCall.
// The case of "q:name()" or "q:agg()" or just "q:name"
// by expanding out FunctionCall()
- final public Expr IRIrefOrFunction() throws ParseException {
- String iri ; ExprList a = null ;
- ExprList params = null ;
- boolean distinct = false ;
- iri = IRIref();
+ final public Expr iriOrFunction() throws ParseException {
+ String iri ; ExprList a = null ;
+ ExprList params = null ;
+ boolean distinct = false ;
+ iri = iri();
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case LPAREN:
case NIL:
@@ -5030,7 +5030,7 @@ public class ARQParser extends ARQParser
break;
case DATATYPE:
jj_consume_token(DATATYPE);
- uri = IRIref();
+ uri = iri();
break;
default:
jj_la1[161] = jj_gen;
@@ -5189,12 +5189,12 @@ public class ARQParser extends ARQParser
throw new Error("Missing return statement in function");
}
- final public String IRIref() throws ParseException {
- String iri ;
+ final public String iri() throws ParseException {
+ String iri ;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case IRIref:
- iri = IRI_REF();
- {if (true) return iri ;}
+ iri = IRIREF();
+ {if (true) return iri ;}
break;
case PNAME_NS:
case PNAME_LN:
@@ -5248,8 +5248,8 @@ public class ARQParser extends ARQParser
throw new Error("Missing return statement in function");
}
- final public String IRI_REF() throws ParseException {
- Token t ;
+ final public String IRIREF() throws ParseException {
+ Token t ;
t = jj_consume_token(IRIref);
{if (true) return resolveQuotedIRI(t.image, t.beginLine, t.beginColumn) ;}
throw new Error("Missing return statement in function");
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=1300559&r1=1300558&r2=1300559&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 Wed Mar 14 14:27:31 2012
@@ -103,7 +103,7 @@ public class SPARQLParser11 extends SPAR
final public void BaseDecl() throws ParseException {
String iri ;
jj_consume_token(BASE);
- iri = IRI_REF();
+ iri = IRIREF();
getPrologue().setBaseURI(iri) ;
}
@@ -111,7 +111,7 @@ public class SPARQLParser11 extends SPAR
Token t ; String iri ;
jj_consume_token(PREFIX);
t = jj_consume_token(PNAME_NS);
- iri = IRI_REF();
+ iri = IRIREF();
String s = fixupPrefix(t.image, t.beginLine, t.beginColumn) ;
getPrologue().setPrefix(s, iri) ;
}
@@ -321,8 +321,8 @@ public class SPARQLParser11 extends SPAR
case VAR2:
label_6:
while (true) {
- n = VarOrIRIref();
- getQuery().addDescribeNode(n) ;
+ n = VarOrIri();
+ getQuery().addDescribeNode(n) ;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case IRIref:
case PNAME_NS:
@@ -426,8 +426,8 @@ public class SPARQLParser11 extends SPAR
final public String SourceSelector() throws ParseException {
String iri ;
- iri = IRIref();
- {if (true) return iri ;}
+ iri = iri();
+ {if (true) return iri ;}
throw new Error("Missing return statement in function");
}
@@ -1147,8 +1147,8 @@ public class SPARQLParser11 extends SPAR
case IRIref:
case PNAME_NS:
case PNAME_LN:
- iri = IRIref();
- {if (true) return createNode(iri) ;}
+ iri = iri();
+ {if (true) return createNode(iri) ;}
break;
case STRING_LITERAL1:
case STRING_LITERAL2:
@@ -1282,7 +1282,7 @@ public class SPARQLParser11 extends SPAR
jj_la1[44] = jj_gen;
;
}
- url = IRIref();
+ url = iri();
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case INTO:
jj_consume_token(INTO);
@@ -1447,8 +1447,8 @@ public class SPARQLParser11 extends SPAR
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case WITH:
jj_consume_token(WITH);
- iri = IRIref();
- Node n = createNode(iri) ; up.setWithIRI(n) ;
+ iri = iri();
+ Node n = createNode(iri) ; up.setWithIRI(n) ;
break;
default:
jj_la1[52] = jj_gen;
@@ -1518,12 +1518,12 @@ public class SPARQLParser11 extends SPAR
case IRIref:
case PNAME_NS:
case PNAME_LN:
- iri = IRIref();
+ iri = iri();
n = createNode(iri) ; update.addUsing(n) ;
break;
case NAMED:
jj_consume_token(NAMED);
- iri = IRIref();
+ iri = iri();
n = createNode(iri) ; update.addUsingNamed(n) ;
break;
default:
@@ -1552,7 +1552,7 @@ public class SPARQLParser11 extends SPAR
jj_la1[57] = jj_gen;
;
}
- iri = IRIref();
+ iri = iri();
{if (true) return Target.create(createNode(iri)) ;}
break;
default:
@@ -1566,7 +1566,7 @@ public class SPARQLParser11 extends SPAR
final public Node GraphRef() throws ParseException {
String iri ;
jj_consume_token(GRAPH);
- iri = IRIref();
+ iri = iri();
{if (true) return createNode(iri) ;}
throw new Error("Missing return statement in function");
}
@@ -1701,7 +1701,7 @@ public class SPARQLParser11 extends SPAR
final public void QuadsNotTriples(QuadAcc acc) throws ParseException {
Node gn ; Node prev = acc.getGraph() ;
jj_consume_token(GRAPH);
- gn = VarOrIRIref();
+ gn = VarOrIri();
setAccGraph(acc, gn) ;
jj_consume_token(LBRACE);
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -2008,7 +2008,7 @@ public class SPARQLParser11 extends SPAR
final public Element GraphGraphPattern() throws ParseException {
Element el ; Node n ;
jj_consume_token(GRAPH);
- n = VarOrIRIref();
+ n = VarOrIri();
el = GroupGraphPattern();
{if (true) return new ElementNamedGraph(n, el) ;}
throw new Error("Missing return statement in function");
@@ -2026,7 +2026,7 @@ public class SPARQLParser11 extends SPAR
jj_la1[75] = jj_gen;
;
}
- n = VarOrIRIref();
+ n = VarOrIri();
el = GroupGraphPattern();
{if (true) return new ElementService(n, el, silent) ;}
throw new Error("Missing return statement in function");
@@ -2179,7 +2179,7 @@ public class SPARQLParser11 extends SPAR
final public Expr FunctionCall() throws ParseException {
String fname ; ExprList a ;
- fname = IRIref();
+ fname = iri();
a = ArgList();
{if (true) return new E_Function(fname, a) ;}
throw new Error("Missing return statement in function");
@@ -2481,11 +2481,11 @@ public class SPARQLParser11 extends SPAR
case PNAME_LN:
case VAR1:
case VAR2:
- p = VarOrIRIref();
+ p = VarOrIri();
break;
case KW_A:
jj_consume_token(KW_A);
- p = nRDFtype ;
+ p = nRDFtype ;
break;
default:
jj_la1[91] = jj_gen;
@@ -2836,7 +2836,7 @@ public class SPARQLParser11 extends SPAR
case IRIref:
case PNAME_NS:
case PNAME_LN:
- str = IRIref();
+ str = iri();
n = createNode(str) ; p = PathFactory.pathLink(n) ;
break;
case KW_A:
@@ -2926,8 +2926,8 @@ public class SPARQLParser11 extends SPAR
case IRIref:
case PNAME_NS:
case PNAME_LN:
- str = IRIref();
- n = createNode(str) ; {if (true) return new P_Link(n) ;}
+ str = iri();
+ n = createNode(str) ; {if (true) return new P_Link(n) ;}
break;
case KW_A:
jj_consume_token(KW_A);
@@ -2939,8 +2939,8 @@ public class SPARQLParser11 extends SPAR
case IRIref:
case PNAME_NS:
case PNAME_LN:
- str = IRIref();
- n = createNode(str) ; {if (true) return new P_ReverseLink(n) ;}
+ str = iri();
+ n = createNode(str) ; {if (true) return new P_ReverseLink(n) ;}
break;
case KW_A:
jj_consume_token(KW_A);
@@ -3166,8 +3166,8 @@ public class SPARQLParser11 extends SPAR
}
// Property (if no bNodes) + DESCRIBE
- final public Node VarOrIRIref() throws ParseException {
- Node n = null ; String iri ;
+ final public Node VarOrIri() throws ParseException {
+ Node n = null ; String iri ;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case VAR1:
case VAR2:
@@ -3176,8 +3176,8 @@ public class SPARQLParser11 extends SPAR
case IRIref:
case PNAME_NS:
case PNAME_LN:
- iri = IRIref();
- n = createNode(iri) ;
+ iri = iri();
+ n = createNode(iri) ;
break;
default:
jj_la1[117] = jj_gen;
@@ -3212,8 +3212,8 @@ public class SPARQLParser11 extends SPAR
case IRIref:
case PNAME_NS:
case PNAME_LN:
- iri = IRIref();
- {if (true) return createNode(iri) ;}
+ iri = iri();
+ {if (true) return createNode(iri) ;}
break;
case STRING_LITERAL1:
case STRING_LITERAL2:
@@ -3702,8 +3702,8 @@ public class SPARQLParser11 extends SPAR
case IRIref:
case PNAME_NS:
case PNAME_LN:
- expr = IRIrefOrFunction();
- {if (true) return expr ;}
+ expr = iriOrFunction();
+ {if (true) return expr ;}
break;
case STRING_LITERAL1:
case STRING_LITERAL2:
@@ -4473,11 +4473,11 @@ public class SPARQLParser11 extends SPAR
// See also FunctionCall.
// The case of "q:name()" or "q:agg()" or just "q:name"
// by expanding out FunctionCall()
- final public Expr IRIrefOrFunction() throws ParseException {
- String iri ; ExprList a = null ;
- ExprList params = null ;
- boolean distinct = false ;
- iri = IRIref();
+ final public Expr iriOrFunction() throws ParseException {
+ String iri ; ExprList a = null ;
+ ExprList params = null ;
+ boolean distinct = false ;
+ iri = iri();
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case LPAREN:
case NIL:
@@ -4507,7 +4507,7 @@ public class SPARQLParser11 extends SPAR
break;
case DATATYPE:
jj_consume_token(DATATYPE);
- uri = IRIref();
+ uri = iri();
break;
default:
jj_la1[149] = jj_gen;
@@ -4666,12 +4666,12 @@ public class SPARQLParser11 extends SPAR
throw new Error("Missing return statement in function");
}
- final public String IRIref() throws ParseException {
- String iri ;
+ final public String iri() throws ParseException {
+ String iri ;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case IRIref:
- iri = IRI_REF();
- {if (true) return iri ;}
+ iri = IRIREF();
+ {if (true) return iri ;}
break;
case PNAME_NS:
case PNAME_LN:
@@ -4725,8 +4725,8 @@ public class SPARQLParser11 extends SPAR
throw new Error("Missing return statement in function");
}
- final public String IRI_REF() throws ParseException {
- Token t ;
+ final public String IRIREF() throws ParseException {
+ Token t ;
t = jj_consume_token(IRIref);
{if (true) return resolveQuotedIRI(t.image, t.beginLine, t.beginColumn) ;}
throw new Error("Missing return statement in function");