You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by sa...@apache.org on 2013/01/31 04:35:33 UTC
svn commit: r1440838 - in
/jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql:
lang/sparql_10/SPARQLParser10.java syntax/ElementTriplesBlock.java
syntax/TripleCollectorBGP.java
Author: sallen
Date: Thu Jan 31 03:35:33 2013
New Revision: 1440838
URL: http://svn.apache.org/viewvc?rev=1440838&view=rev
Log:
JENA-330 Ensure SPARQLParser10 behavior remains unchanged.
Modified:
jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/sparql_10/SPARQLParser10.java
jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/syntax/ElementTriplesBlock.java
jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/syntax/TripleCollectorBGP.java
Modified: jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/sparql_10/SPARQLParser10.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/sparql_10/SPARQLParser10.java?rev=1440838&r1=1440837&r2=1440838&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/sparql_10/SPARQLParser10.java (original)
+++ jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/sparql_10/SPARQLParser10.java Thu Jan 31 03:35:33 2013
@@ -920,7 +920,7 @@ public class SPARQLParser10 extends SPAR
throw new Error("Missing return statement in function");
}
- final public void ConstructTriples(TripleCollector acc) throws ParseException {
+ final public void ConstructTriples(TripleCollectorMark acc) throws ParseException {
TriplesSameSubject(acc);
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case DOT:
@@ -966,7 +966,7 @@ public class SPARQLParser10 extends SPAR
// -------- Triple lists with property and object lists
// -------- Without paths: entry: TriplesSameSubject
- final public void TriplesSameSubject(TripleCollector acc) throws ParseException {
+ final public void TriplesSameSubject(TripleCollectorMark acc) throws ParseException {
Node s ;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case IRIref:
@@ -1008,7 +1008,7 @@ public class SPARQLParser10 extends SPAR
}
}
- final public void PropertyListNotEmpty(Node s, TripleCollector acc) throws ParseException {
+ final public void PropertyListNotEmpty(Node s, TripleCollectorMark acc) throws ParseException {
Node p = null ;
p = Verb();
ObjectList(s, p, null, acc);
@@ -1040,7 +1040,7 @@ public class SPARQLParser10 extends SPAR
}
}
- final public void PropertyList(Node s, TripleCollector acc) throws ParseException {
+ final public void PropertyList(Node s, TripleCollectorMark acc) throws ParseException {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case IRIref:
case PNAME_NS:
@@ -1056,7 +1056,7 @@ public class SPARQLParser10 extends SPAR
}
}
- final public void ObjectList(Node s, Node p, Path path, TripleCollector acc) throws ParseException {
+ final public void ObjectList(Node s, Node p, Path path, TripleCollectorMark acc) throws ParseException {
Node o ;
Object(s, p, path, acc);
label_14:
@@ -1074,10 +1074,11 @@ public class SPARQLParser10 extends SPAR
}
}
- final public void Object(Node s, Node p, Path path, TripleCollector acc) throws ParseException {
+ final public void Object(Node s, Node p, Path path, TripleCollectorMark acc) throws ParseException {
Node o ;
+ int mark = acc.mark() ;
o = GraphNode(acc);
- insert(acc, s, p, path, o) ;
+ insert(acc, mark, s, p, path, o) ;
}
final public Node Verb() throws ParseException {
@@ -1110,7 +1111,7 @@ public class SPARQLParser10 extends SPAR
// Anything that can stand in a node slot and which is
// a number of triples
- final public Node TriplesNode(TripleCollector acc) throws ParseException {
+ final public Node TriplesNode(TripleCollectorMark acc) throws ParseException {
Node n ;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case LPAREN:
@@ -1129,7 +1130,7 @@ public class SPARQLParser10 extends SPAR
throw new Error("Missing return statement in function");
}
- final public Node BlankNodePropertyList(TripleCollector acc) throws ParseException {
+ final public Node BlankNodePropertyList(TripleCollectorMark acc) throws ParseException {
Token t ;
t = jj_consume_token(LBRACKET);
Node n = createBNode(t.beginLine, t.beginColumn) ;
@@ -1140,8 +1141,8 @@ public class SPARQLParser10 extends SPAR
}
// ------- RDF collections
- final public Node Collection(TripleCollector acc) throws ParseException {
- Node listHead = nRDFnil ; Node lastCell = null ; Node n ; Token t ;
+ final public Node Collection(TripleCollectorMark acc) throws ParseException {
+ Node listHead = nRDFnil ; Node lastCell = null ; int mark ; Node n ; Token t ;
t = jj_consume_token(LPAREN);
label_15:
while (true) {
@@ -1150,8 +1151,9 @@ public class SPARQLParser10 extends SPAR
listHead = cell ;
if ( lastCell != null )
insert(acc, lastCell, nRDFrest, cell) ;
+ mark = acc.mark() ;
n = GraphNode(acc);
- insert(acc, cell, nRDFfirst, n) ;
+ insert(acc, mark, cell, nRDFfirst, n) ;
lastCell = cell ;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case IRIref:
@@ -1194,7 +1196,7 @@ public class SPARQLParser10 extends SPAR
}
// -------- Nodes in a graph pattern or template
- final public Node GraphNode(TripleCollector acc) throws ParseException {
+ final public Node GraphNode(TripleCollectorMark acc) throws ParseException {
Node n ;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case IRIref:
Modified: jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/syntax/ElementTriplesBlock.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/syntax/ElementTriplesBlock.java?rev=1440838&r1=1440837&r2=1440838&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/syntax/ElementTriplesBlock.java (original)
+++ jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/syntax/ElementTriplesBlock.java Thu Jan 31 03:35:33 2013
@@ -28,7 +28,7 @@ import com.hp.hpl.jena.sparql.util.NodeI
/** The syntax eleemnt for a SPARQL BasicGraphPattern */
-public class ElementTriplesBlock extends Element implements TripleCollector
+public class ElementTriplesBlock extends Element implements TripleCollectorMark
{
private final BasicPattern pattern ;
@@ -49,9 +49,20 @@ public class ElementTriplesBlock extends
{ pattern.add(t) ; }
@Override
+ public int mark() { return pattern.size() ; }
+
+ @Override
+ public void addTriple(int index, Triple t)
+ { pattern.add(index, t) ; }
+
+ @Override
public void addTriplePath(TriplePath path)
{ throw new ARQException("Triples-only collector") ; }
+ @Override
+ public void addTriplePath(int index, TriplePath path)
+ { throw new ARQException("Triples-only collector") ; }
+
public BasicPattern getPattern() { return pattern ; }
public Iterator<Triple> patternElts() { return pattern.iterator(); }
Modified: jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/syntax/TripleCollectorBGP.java
URL: http://svn.apache.org/viewvc/jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/syntax/TripleCollectorBGP.java?rev=1440838&r1=1440837&r2=1440838&view=diff
==============================================================================
--- jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/syntax/TripleCollectorBGP.java (original)
+++ jena/branches/streaming-update/jena-arq/src/main/java/com/hp/hpl/jena/sparql/syntax/TripleCollectorBGP.java Thu Jan 31 03:35:33 2013
@@ -25,7 +25,7 @@ import com.hp.hpl.jena.sparql.core.Tripl
/** A triples-only TripleCollector. */
-public class TripleCollectorBGP implements TripleCollector
+public class TripleCollectorBGP implements TripleCollectorMark
{
BasicPattern bgp = new BasicPattern() ;
@@ -37,6 +37,16 @@ public class TripleCollectorBGP implemen
public void addTriple(Triple t) { bgp.add(t) ; }
@Override
+ public int mark() { return bgp.size() ; }
+
+ @Override
+ public void addTriple(int index, Triple t) { bgp.add(index, t) ; }
+
+ @Override
public void addTriplePath(TriplePath path)
{ throw new ARQException("Triples-only collector") ; }
+
+ @Override
+ public void addTriplePath(int index, TriplePath path)
+ { throw new ARQException("Triples-only collector") ; }
}