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/05/14 17:08:35 UTC
svn commit: r1338242 [7/7] - in /jena/trunk/jena-arq: ./ Grammar/ src/main/java/com/hp/hpl/jena/query/ src/main/java/com/hp/hpl/jena/sparql/algebra/ src/main/java/com/hp/hpl/jena/sparql/core/ src/main/java/com/hp/hpl/jena/sparql/lang/ src/main/java/com...

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/serializer/QuerySerializer.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/serializer/QuerySerializer.java?rev=1338242&r1=1338241&r2=1338242&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/serializer/QuerySerializer.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/serializer/QuerySerializer.java Mon May 14 15:08:33 2012
@@ -255,12 +255,12 @@ public class QuerySerializer implements 
     }
     
     @Override
-    public void visitBindings(Query query)
+    public void visitValues(Query query)
     {
-        if ( query.hasBindings() )
+        if ( query.hasValues() )
         {
-            out.print("BINDINGS") ;
-            outputDataBlock(out, query.getBindingsVariables(), query.getBindingsData(), query) ;
+            out.print("VALUES") ;
+            outputDataBlock(out, query.getValuesVariables(), query.getValuesData(), query) ;
         }
     }
 

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/builders/BuilderNode.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/builders/BuilderNode.java?rev=1338242&r1=1338241&r2=1338242&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/builders/BuilderNode.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/builders/BuilderNode.java Mon May 14 15:08:33 2012
@@ -79,6 +79,9 @@ public class BuilderNode
         
     public static List<Var> buildVarList(ItemList list)
     {
+        if ( list.size() > 0 && list.getFirst().isSymbol(Tags.tagVars) )
+            list = list.cdr() ;
+        
         List<Var> vars = new ArrayList<Var>() ;
         for (Item x : list)
         {

Modified: jena/trunk/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/manifest.ttl
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/manifest.ttl?rev=1338242&r1=1338241&r2=1338242&view=diff
==============================================================================
Binary files - no diff available.

Copied: jena/trunk/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/syntax-values-01.rq (from r1336107, jena/trunk/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/syntax-bindings-01.rq)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/syntax-values-01.rq?p2=jena/trunk/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/syntax-values-01.rq&p1=jena/trunk/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/syntax-bindings-01.rq&r1=1336107&r2=1338242&rev=1338242&view=diff
==============================================================================
--- jena/trunk/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/syntax-bindings-01.rq (original)
+++ jena/trunk/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/syntax-values-01.rq Mon May 14 15:08:33 2012
@@ -1 +1,4 @@
-SELECT ?Z { ?s ?p ?o . BIND(?o+1 AS ?Z) }
+SELECT *
+{
+   VALUES ?x { 1 2 3 UNDEF }
+}

Copied: jena/trunk/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/syntax-values-02.rq (from r1336107, jena/trunk/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/syntax-bindings-02.rq)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/syntax-values-02.rq?p2=jena/trunk/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/syntax-values-02.rq&p1=jena/trunk/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/syntax-bindings-02.rq&r1=1336107&r2=1338242&rev=1338242&view=diff
==============================================================================
--- jena/trunk/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/syntax-bindings-02.rq (original)
+++ jena/trunk/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/syntax-values-02.rq Mon May 14 15:08:33 2012
@@ -1 +1,6 @@
-SELECT * { } BINDINGS { }
+SELECT * { 
+  VALUES (?x ?y) 
+  {
+    (1 2) (<x> <y>) (UNDEF <z>)
+  }
+}

Copied: jena/trunk/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/syntax-values-03.rq (from r1336107, jena/trunk/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/syntax-bindings-03.rq)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/syntax-values-03.rq?p2=jena/trunk/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/syntax-values-03.rq&p1=jena/trunk/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/syntax-bindings-03.rq&r1=1336107&r2=1338242&rev=1338242&view=diff
==============================================================================
--- jena/trunk/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/syntax-bindings-03.rq (original)
+++ jena/trunk/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/syntax-values-03.rq Mon May 14 15:08:33 2012
@@ -1 +1,3 @@
-SELECT * { } BINDINGS { () }
+SELECT * {
+  VALUES () { () }
+}

Copied: jena/trunk/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/syntax-values-04.rq (from r1336107, jena/trunk/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/syntax-bindings-04.rq)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/syntax-values-04.rq?p2=jena/trunk/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/syntax-values-04.rq&p1=jena/trunk/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/syntax-bindings-04.rq&r1=1336107&r2=1338242&rev=1338242&view=diff
==============================================================================
--- jena/trunk/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/syntax-bindings-04.rq (original)
+++ jena/trunk/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/syntax-values-04.rq Mon May 14 15:08:33 2012
@@ -1 +1,6 @@
-SELECT * { } BINDINGS { }
+SELECT *
+{ }
+VALUES (?x ?y) {
+ (1 2 )
+}
+

Copied: jena/trunk/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/syntax-values-05.rq (from r1336107, jena/trunk/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/syntax-bindings-05.rq)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/syntax-values-05.rq?p2=jena/trunk/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/syntax-values-05.rq&p1=jena/trunk/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/syntax-bindings-05.rq&r1=1336107&r2=1338242&rev=1338242&view=diff
==============================================================================
--- jena/trunk/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/syntax-bindings-05.rq (original)
+++ jena/trunk/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/syntax-values-05.rq Mon May 14 15:08:33 2012
@@ -1 +1,3 @@
-SELECT * { } BINDINGS ?x ?y { (1 2) }
+SELECT * { } 
+VALUES ?x { }
+

Copied: jena/trunk/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/syntax-values-09.rq (from r1336107, jena/trunk/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/syntax-bindings-09.rq)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/syntax-values-09.rq?p2=jena/trunk/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/syntax-values-09.rq&p1=jena/trunk/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/syntax-bindings-09.rq&r1=1336107&r2=1338242&rev=1338242&view=diff
==============================================================================
--- jena/trunk/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/syntax-bindings-09.rq (original)
+++ jena/trunk/jena-arq/testing/ARQ/Syntax/Syntax-SPARQL_11/syntax-values-09.rq Mon May 14 15:08:33 2012
@@ -1 +1 @@
-SELECT * { } BINDINGS ?x ?y { (1 2) (3) }
+SELECT * { } VALUES (?x ?y) { (1 2) (3) }