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 2015/12/16 20:58:47 UTC
[2/2] jena git commit: Reformat
Reformat
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/4607faeb
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/4607faeb
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/4607faeb
Branch: refs/heads/master
Commit: 4607faeb6e22561d3924170b1c16bf5d7ef1fa56
Parents: 35a493f
Author: Andy Seaborne <an...@apache.org>
Authored: Wed Dec 16 19:57:37 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed Dec 16 19:57:37 2015 +0000
----------------------------------------------------------------------
.../sparql/engine/iterator/QueryIterAssign.java | 49 ++++++++------------
.../engine/iterator/QueryIterExtendByVar.java | 35 ++++++--------
2 files changed, 35 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/4607faeb/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterAssign.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterAssign.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterAssign.java
index da903a2..2e71958 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterAssign.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterAssign.java
@@ -39,13 +39,11 @@ public class QueryIterAssign extends QueryIterProcessBinding
private VarExprList exprs ;
private final boolean mustBeNewVar ;
- public QueryIterAssign(QueryIterator input, Var var, Expr expr, ExecutionContext qCxt)
- {
+ public QueryIterAssign(QueryIterator input, Var var, Expr expr, ExecutionContext qCxt) {
this(input, new VarExprList(var, expr) , qCxt, false) ;
}
- public QueryIterAssign(QueryIterator input, VarExprList exprs, ExecutionContext qCxt, boolean mustBeNewVar)
- {
+ public QueryIterAssign(QueryIterator input, VarExprList exprs, ExecutionContext qCxt, boolean mustBeNewVar) {
// mustBeNewVar : any variable introduced must not already exist.
// true => BIND
// false => LET
@@ -56,29 +54,24 @@ public class QueryIterAssign extends QueryIterProcessBinding
}
@Override
- public Binding accept(Binding binding)
- {
- BindingMap b = BindingFactory.create(binding) ;
- for ( Var v : exprs.getVars() )
- {
- // Not this, where expressions do not see the new bindings.
- // Node n = exprs.get(v, bind, funcEnv) ;
- // which gives (Lisp) "let" semantics, not "let*" semantics
- Node n = exprs.get(v, b, getExecContext()) ;
-
+ public Binding accept(Binding binding) {
+ BindingMap b = BindingFactory.create(binding);
+ for ( Var v : exprs.getVars() ) {
+ // if "binding", not "b" used, we get (Lisp) "let"
+ // semantics, not the desired "let*" semantics
+ Node n = exprs.get(v, b, getExecContext());
+
if ( n == null )
// Expression failed to evaluate - no assignment
- continue ;
-
+ continue;
+
// Check is already has a value; if so, must be sameValueAs
- if ( b.contains(v) )
- {
- // Optimization may linearize to push a stream through an (extend).
+ if ( b.contains(v) ) {
+ // Optimization may linearize to push a stream through an (extend).
if ( false && mustBeNewVar )
- throw new QueryExecException("Already set: "+v) ;
-
- Node n2 = b.get(v) ;
- if ( ! n2.sameValueAs(n) )
+ throw new QueryExecException("Already set: " + v);
+ Node n2 = b.get(v);
+ if ( !n2.sameValueAs(n) )
//throw new QueryExecException("Already set: "+v) ;
// Error in single assignment.
return null ;
@@ -90,11 +83,9 @@ public class QueryIterAssign extends QueryIterProcessBinding
}
@Override
- protected void details(IndentedWriter out, SerializationContext cxt)
- {
- out.print(Lib.className(this)) ;
- out.print(" ") ;
- out.print(exprs.toString()) ;
+ protected void details(IndentedWriter out, SerializationContext cxt) {
+ out.print(Lib.className(this));
+ out.print(" ");
+ out.print(exprs.toString());
}
-
}
http://git-wip-us.apache.org/repos/asf/jena/blob/4607faeb/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterExtendByVar.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterExtendByVar.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterExtendByVar.java
index f004e55..e1283ee 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterExtendByVar.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterExtendByVar.java
@@ -37,37 +37,32 @@ public class QueryIterExtendByVar extends QueryIter
private Var var ;
private Iterator<Node> members ;
- public QueryIterExtendByVar(Binding binding, Var var, Iterator<Node> members, ExecutionContext execCxt)
- {
- super(execCxt) ;
+ public QueryIterExtendByVar(Binding binding, Var var, Iterator<Node> members, ExecutionContext execCxt) {
+ super(execCxt);
if ( true ) { // Assume not too costly.
if ( binding.contains(var) )
- throw new ARQInternalErrorException("Var "+var+" already set in "+binding) ;
+ throw new ARQInternalErrorException("Var " + var + " already set in " + binding);
}
- this.binding = binding ;
- this.var = var ;
- this.members = members ;
+ this.binding = binding;
+ this.var = var;
+ this.members = members;
}
@Override
- protected boolean hasNextBinding()
- {
- return members.hasNext() ;
+ protected boolean hasNextBinding() {
+ return members.hasNext();
}
@Override
- protected Binding moveToNextBinding()
- {
- Node n = members.next() ;
- Binding b = BindingFactory.binding(binding, var, n) ;
- return b ;
+ protected Binding moveToNextBinding() {
+ Node n = members.next();
+ Binding b = BindingFactory.binding(binding, var, n);
+ return b;
}
@Override
- protected void closeIterator()
- { }
-
+ protected void closeIterator() {}
+
@Override
- protected void requestCancel()
- { }
+ protected void requestCancel() {}
}