[FIX] XQuery: check nested transform expressions for inconsistencies

Author: ChristianGruen

basex-core/src/main/java/org/basex/query/expr/Arr.java

@@ -31,7 +31,7 @@ protected Arr(final InputInfo ii, final Expr... e) {
 
   @Override
   public void checkUp() throws QueryException {
-    checkNoUp();
+    checkNoneUp(expr);
   }
 
   @Override
@@ -59,8 +59,8 @@ public VarUsage count(final Var v) {
   }
 
   @Override
-  public Expr inline(final QueryContext ctx, final VarScope scp,
-      final Var v, final Expr e) throws QueryException {
+  public Expr inline(final QueryContext ctx, final VarScope scp, final Var v, final Expr e)
+      throws QueryException {
     return inlineAll(ctx, scp, expr, v, e) ? optimize(ctx, scp) : null;
   }
 
@@ -74,8 +74,8 @@ public Expr inline(final QueryContext ctx, final VarScope scp,
    * @return deep copy of the array
    */
   @SuppressWarnings("unchecked")
-  public static <T extends Expr> T[] copyAll(final QueryContext ctx,
-      final VarScope scp, final IntObjMap<Var> vs, final T[] arr) {
+  public static <T extends Expr> T[] copyAll(final QueryContext ctx, final VarScope scp,
+      final IntObjMap<Var> vs, final T[] arr) {
     final T[] copy = arr.clone();
     for(int i = 0; i < copy.length; i++) copy[i] = (T) copy[i].copy(ctx, scp, vs);
     return copy;
@@ -106,14 +106,6 @@ final boolean oneIsEmpty() {
     return false;
   }
 
-  /**
-   * Checks if none of the expressions are updating expressions.
-   * @throws QueryException query exception
-   */
-  final void checkNoUp() throws QueryException {
-    checkNoneUp(expr);
-  }
-
   @Override
   public void plan(final FElem plan) {
     addPlan(plan, planElem(), expr);

basex-core/src/main/java/org/basex/query/expr/CComm.java

@@ -17,7 +17,7 @@
  * @author BaseX Team 2005-13, BSD License
  * @author Christian Gruen
  */
-public final class CComm extends CFrag {
+public final class CComm extends CNode {
   /**
    * Constructor.
    * @param sctx static context

basex-core/src/main/java/org/basex/query/expr/CDoc.java

@@ -16,7 +16,7 @@
  * @author BaseX Team 2005-13, BSD License
  * @author Christian Gruen
  */
-public final class CDoc extends CFrag {
+public final class CDoc extends CNode {
   /**
    * Constructor.
    * @param sctx static context

basex-core/src/main/java/org/basex/query/expr/CName.java

@@ -17,7 +17,7 @@
  * @author BaseX Team 2005-13, BSD License
  * @author Christian Gruen
  */
-public abstract class CName extends CFrag {
+public abstract class CName extends CNode {
   /** Description. */
   private final String desc;
   /** QName. */

basex-core/src/main/java/org/basex/query/expr/CFrag.java basex-core/src/main/java/org/basex/query/expr/CNode.java

@@ -7,12 +7,12 @@
 import org.basex.util.*;
 
 /**
- * Fragment constructor.
+ * Node constructor.
  *
  * @author BaseX Team 2005-13, BSD License
  * @author Christian Gruen
  */
-public abstract class CFrag extends Arr {
+public abstract class CNode extends Arr {
   /** Static context. */
   final StaticContext sc;
   /**
@@ -21,7 +21,7 @@ public abstract class CFrag extends Arr {
    * @param ii input info
    * @param n name
    */
-  CFrag(final StaticContext sctx, final InputInfo ii, final Expr... n) {
+  CNode(final StaticContext sctx, final InputInfo ii, final Expr... n) {
     super(ii, n);
     sc = sctx;
     size = 1;

basex-core/src/main/java/org/basex/query/expr/CTxt.java

@@ -17,7 +17,7 @@
  * @author BaseX Team 2005-13, BSD License
  * @author Christian Gruen
  */
-public final class CTxt extends CFrag {
+public final class CTxt extends CNode {
   /**
    * Constructor.
    * @param sctx static context

basex-core/src/main/java/org/basex/query/expr/Catch.java

@@ -93,8 +93,7 @@ public Expr copy(final QueryContext ctx, final VarScope scp, final IntObjMap<Var
   }
 
   @Override
-  public Catch inline(final QueryContext ctx, final VarScope scp, final Var v,
-      final Expr e) {
+  public Catch inline(final QueryContext ctx, final VarScope scp, final Var v, final Expr e) {
     try {
       final Expr sub = expr.inline(ctx, scp, v, e);
       if(sub == null) return null;

basex-core/src/main/java/org/basex/query/expr/ParseExpr.java

@@ -153,26 +153,32 @@ protected static Expr compBln(final Expr e, final InputInfo ii) {
   /**
    * Ensures that the specified expression performs no updates.
    * Otherwise, throws an exception.
-   * @param e expression (may be {@code null})
+   * @param expr expression (may be {@code null})
    * @throws QueryException query exception
    */
-  protected void checkNoUp(final Expr e) throws QueryException {
-    if(e != null && e.has(Flag.UPD)) throw UPNOT.get(info, description());
+  protected void checkNoUp(final Expr expr) throws QueryException {
+    if(expr == null) return;
+    expr.checkUp();
+    if(expr.has(Flag.UPD)) throw UPNOT.get(info, description());
   }
 
   /**
    * Ensures that none of the specified expressions performs an update.
    * Otherwise, throws an exception.
-   * @param expr expressions (may contain {@code null} references)
+   * @param expr expressions (may be {@code null}, and may contain {@code null} references)
    * @throws QueryException query exception
    */
   protected final void checkNoneUp(final Expr... expr) throws QueryException {
-    if(expr != null) for(final Expr e : expr) checkNoUp(e);
+    if(expr == null) return;
+    checkAllUp(expr);
+    for(final Expr e : expr) {
+      if(e != null && e.has(Flag.UPD)) throw UPNOT.get(info, description());
+    }
   }
 
   /**
-   * Ensures that all specified expressions are either updating and vacuous or
-   * non-updating. Otherwise, throws an exception.
+   * Ensures that all specified expressions are vacuous or either updating or non-updating.
+   * Otherwise, throws an exception.
    * @param expr expressions to be checked
    * @throws QueryException query exception
    */

basex-core/src/main/java/org/basex/query/expr/Single.java

@@ -53,8 +53,8 @@ public VarUsage count(final Var v) {
   }
 
   @Override
-  public Expr inline(final QueryContext ctx, final VarScope scp,
-      final Var v, final Expr e) throws QueryException {
+  public Expr inline(final QueryContext ctx, final VarScope scp, final Var v, final Expr e)
+      throws QueryException {
     final Expr sub = expr.inline(ctx, scp, v, e);
     if(sub == null) return null;
     expr = sub;

basex-core/src/main/java/org/basex/query/expr/Try.java

@@ -33,7 +33,7 @@ public Try(final InputInfo ii, final Expr t, final Catch[] c) {
 
   @Override
   public void checkUp() throws QueryException {
-    // check if none or all try/catch expressions are updating
+    // check if no or all try/catch expressions are updating
     final Expr[] tmp = new Expr[ctch.length + 1];
     tmp[0] = expr;
     for(int c = 0; c < ctch.length; ++c) tmp[c + 1] = ctch[c].expr;

basex-core/src/main/java/org/basex/query/gflwor/OrderBy.java

@@ -167,16 +167,15 @@ public VarUsage count(final Var v) {
   }
 
   @Override
-  public GFLWOR.Clause inline(final QueryContext ctx, final VarScope scp,
-      final Var v, final Expr e) throws QueryException {
+  public GFLWOR.Clause inline(final QueryContext ctx, final VarScope scp, final Var v,
+      final Expr e) throws QueryException {
     for(int i = refs.length; --i >= 0;)
       if(v.is(refs[i].var)) refs = Array.delete(refs, i);
     return inlineAll(ctx, scp, keys, v, e) ? optimize(ctx, scp) : null;
   }
 
   @Override
-  public OrderBy copy(final QueryContext ctx, final VarScope scp,
-      final IntObjMap<Var> vs) {
+  public OrderBy copy(final QueryContext ctx, final VarScope scp, final IntObjMap<Var> vs) {
     return new OrderBy(Arr.copyAll(ctx, scp, vs, refs),
         Arr.copyAll(ctx, scp, vs, keys), info);
   }

basex-core/src/main/java/org/basex/query/up/expr/Rename.java

@@ -44,7 +44,7 @@ public Item item(final QueryContext ctx, final InputInfo ii) throws QueryExcepti
     if(i == null) throw UPSEQEMP.get(info, Util.className(this));
     if(t.next() != null) throw UPWRTRGTYP.get(info);
 
-    final CFrag ex;
+    final CNode ex;
     if(i.type == NodeType.ELM) {
       ex = new CElem(sc, info, expr[1], null);
     } else if(i.type == NodeType.ATT) {

basex-core/src/test/java/org/basex/query/up/UpdateTest.java

@@ -1102,6 +1102,10 @@ public void evalFItem() {
   public void modifyCheck() {
     error("copy $c:= <a>X</a> modify 'a' return $c", Err.UPMODIFY);
     error("copy $c:= <a>X</a> modify(delete node $c/text(),'a') return $c", Err.UPALL);
+
+    error("text { <a/> update (delete node <a/>,<b/>) }", Err.UPALL);
+    error("1[<a/> update (delete node <a/>,<b/>)]", Err.UPALL);
+    error("for $i in 1 order by (<a/> update (delete node <a/>,<b/>)) return $i", Err.UPALL);
   }
 
   /** Tests adding an attribute and thus crossing the {@link IO#MAXATTS} line (GH-752). */

pom.xml

@@ -124,11 +124,6 @@
         <artifactId>commons-fileupload</artifactId>
         <version>1.2.2</version>
       </dependency>
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-nop</artifactId>
-        <version>1.7.5</version>
-      </dependency>
       <dependency>
         <groupId>com.vividsolutions</groupId>
         <artifactId>jts</artifactId>