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/08/08 18:54:11 UTC
svn commit: r1370836 - in /jena/trunk/jena-arq: Grammar/arq.jj
Grammar/master.jj Grammar/sparql_11.jj
src/main/java/com/hp/hpl/jena/sparql/lang/arq/ARQParser.java
Author: andy
Date: Wed Aug 8 16:54:10 2012
New Revision: 1370836
URL: http://svn.apache.org/viewvc?rev=1370836&view=rev
Log:
Fix compatibility for old-style syntax (SPARQL 1.1 untouched)
Modified:
jena/trunk/jena-arq/Grammar/arq.jj
jena/trunk/jena-arq/Grammar/master.jj
jena/trunk/jena-arq/Grammar/sparql_11.jj
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/arq/ARQParser.java
Modified: jena/trunk/jena-arq/Grammar/arq.jj
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/Grammar/arq.jj?rev=1370836&r1=1370835&r2=1370836&view=diff
==============================================================================
--- jena/trunk/jena-arq/Grammar/arq.jj (original)
+++ jena/trunk/jena-arq/Grammar/arq.jj Wed Aug 8 16:54:10 2012
@@ -385,7 +385,6 @@ void Update1() : { Update up ; }
}
Update Load() : { String url ; Node dest = null ; boolean silent = false ; }
{
- // Should be +?
// <LOAD> ( iri() )+
<LOAD> (<SILENT> { silent = true ; })? url = iri()
{ String iri ; }
@@ -434,7 +433,7 @@ Update InsertData() : { QuadDataAcc qd =
t = <INSERT_DATA>
{ startDataInsert(qd, t.beginLine, t.beginColumn) ; }
OptionalIntoTarget(qd)
- QuadPattern(qd)
+ QuadData(qd)
{
finishDataInsert(qd, t.beginLine, t.beginColumn) ;
return new UpdateDataInsert(qd) ;
Modified: jena/trunk/jena-arq/Grammar/master.jj
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/Grammar/master.jj?rev=1370836&r1=1370835&r2=1370836&view=diff
==============================================================================
--- jena/trunk/jena-arq/Grammar/master.jj (original)
+++ jena/trunk/jena-arq/Grammar/master.jj Wed Aug 8 16:54:10 2012
@@ -482,12 +482,10 @@ void Update1() : { Update up ; }
emitUpdate(up) ;
finishUpdateOperation() ;
}
-
}
Update Load() : { String url ; Node dest = null ; boolean silent = false ; }
{
- // Should be +?
// <LOAD> ( iri() )+
<LOAD> (<SILENT> { silent = true ; })? url = iri()
#ifndef ARQ_UPDATE
@@ -551,7 +549,7 @@ Update InsertData() : { QuadDataAcc qd =
QuadData(qd)
#else
OptionalIntoTarget(qd)
- QuadPattern(qd)
+ QuadData(qd)
#endif
{
finishDataInsert(qd, t.beginLine, t.beginColumn) ;
Modified: jena/trunk/jena-arq/Grammar/sparql_11.jj
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/Grammar/sparql_11.jj?rev=1370836&r1=1370835&r2=1370836&view=diff
==============================================================================
--- jena/trunk/jena-arq/Grammar/sparql_11.jj (original)
+++ jena/trunk/jena-arq/Grammar/sparql_11.jj Wed Aug 8 16:54:10 2012
@@ -371,7 +371,6 @@ void Update1() : { Update up ; }
}
Update Load() : { String url ; Node dest = null ; boolean silent = false ; }
{
- // Should be +?
// <LOAD> ( iri() )+
<LOAD> (<SILENT> { silent = true ; })? url = iri()
(<INTO> dest = GraphRef() )?
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/arq/ARQParser.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/arq/ARQParser.java?rev=1370836&r1=1370835&r2=1370836&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/arq/ARQParser.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/arq/ARQParser.java Wed Aug 8 16:54:10 2012
@@ -1630,7 +1630,7 @@ public class ARQParser extends ARQParser
t = jj_consume_token(INSERT_DATA);
startDataInsert(qd, t.beginLine, t.beginColumn) ;
OptionalIntoTarget(qd);
- QuadPattern(qd);
+ QuadData(qd);
finishDataInsert(qd, t.beginLine, t.beginColumn) ;
{if (true) return new UpdateDataInsert(qd) ;}
throw new Error("Missing return statement in function");