[MIN] XQuery, simplifications

Author: ChristianGruen

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

@@ -43,9 +43,8 @@ public final void checkUp() throws QueryException {
 
   @Override
   public final boolean has(final Flag... flags) {
-    if(Flag.FCS.oneOf(flags) || root.has(flags)) return true;
-    final Flag[] flgs = Flag.remove(flags, Flag.FCS, Flag.POS, Flag.CTX);
-    return flgs.length != 0 && super.has(flgs);
+    return Flag.FCS.oneOf(flags) || root.has(flags) ||
+        super.has(Flag.remove(flags, Flag.FCS, Flag.POS, Flag.CTX));
   }
 
   @Override

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

@@ -51,8 +51,10 @@ public Expr compile(final CompileContext cc) throws QueryException {
 
   @Override
   public boolean has(final Flag... flags) {
-    for(final Expr expr : exprs) {
-      if(expr.has(flags)) return true;
+    if(flags.length != 0) {
+      for(final Expr expr : exprs) {
+        if(expr.has(flags)) return true;
+      }
     }
     return false;
   }

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

@@ -64,12 +64,10 @@ public final Expr compile(final CompileContext cc) throws QueryException {
   public final boolean has(final Flag... flags) {
     // Context dependency, positional access: only check first expression.
     // Examples: . ! abc, position() ! a
-    if(Flag.FCS.oneOf(flags) ||
-       Flag.CTX.oneOf(flags) && exprs[0].has(Flag.CTX) ||
-       Flag.POS.oneOf(flags) && exprs[0].has(Flag.POS)) return true;
-    // check remaining flags
-    final Flag[] flgs = Flag.remove(flags, Flag.POS, Flag.CTX);
-    return flgs.length != 0 && super.has(flgs);
+    return Flag.FCS.oneOf(flags) ||
+           Flag.CTX.oneOf(flags) && exprs[0].has(Flag.CTX) ||
+           Flag.POS.oneOf(flags) && exprs[0].has(Flag.POS) ||
+           super.has(Flag.remove(flags, Flag.POS, Flag.CTX));
   }
 
   @Override

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

@@ -155,10 +155,7 @@ public boolean ddo() {
 
   @Override
   public boolean has(final Flag... flags) {
-    for(final Catch ctch : catches) {
-      if(ctch.has(flags)) return true;
-    }
-    return super.has(flags);
+    return ((Checks<Catch>) ctch -> ctch.has(flags)).any(catches) || super.has(flags);
   }
 
   @Override

basex-core/src/main/java/org/basex/query/func/DynFuncCall.java

@@ -143,10 +143,9 @@ FItem evalFunc(final QueryContext qc) throws QueryException {
 
   @Override
   public boolean has(final Flag... flags) {
-    if(Flag.UPD.oneOf(flags) && (updating || sc().mixUpdates)) return true;
-    if(Flag.NDT.oneOf(flags) && (ndt || updating || sc().mixUpdates)) return true;
-    final Flag[] flgs = Flag.remove(flags, Flag.UPD);
-    return flgs.length != 0 && super.has(flgs);
+    return Flag.UPD.oneOf(flags) && (updating || sc().mixUpdates) ||
+           Flag.NDT.oneOf(flags) && (ndt || updating || sc().mixUpdates) ||
+           super.has(Flag.remove(flags, Flag.UPD));
   }
 
   @Override

basex-core/src/main/java/org/basex/query/func/StandardFunc.java

@@ -207,8 +207,7 @@ public final boolean has(final Flag... flags) {
       if(definition.has(flag)) return true;
     }
     // check arguments (without function invocation; it only applies to function itself)
-    final Flag[] flgs = Flag.remove(flags, Flag.HOF);
-    return flgs.length != 0 && super.has(flgs);
+    return super.has(Flag.remove(flags, Flag.HOF));
   }
 
   /**

basex-core/src/main/java/org/basex/query/func/java/StaticJavaCall.java

@@ -93,10 +93,10 @@ public StaticJavaCall copy(final CompileContext cc, final IntObjMap<Var> vm) {
   @Override
   public boolean has(final Flag... flags) {
     return Flag.UPD.oneOf(flags) && method.getAnnotation(Updating.class) != null ||
-      Flag.NDT.oneOf(flags) && method.getAnnotation(Deterministic.class) == null ||
-      (Flag.CTX.oneOf(flags) || Flag.POS.oneOf(flags)) &&
-      method.getAnnotation(FocusDependent.class) != null ||
-      super.has(flags);
+           Flag.NDT.oneOf(flags) && method.getAnnotation(Deterministic.class) == null ||
+           (Flag.CTX.oneOf(flags) || Flag.POS.oneOf(flags)) &&
+             method.getAnnotation(FocusDependent.class) != null ||
+           super.has(flags);
   }
 
   @Override

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

@@ -41,11 +41,6 @@ public void checkUp() throws QueryException {
     if(!modify.vacuous() && !modify.has(Flag.UPD)) throw UPMODIFY.get(info);
   }
 
-  @Override
-  public boolean has(final Flag... flags) {
-    return flags.length != 0 && super.has(flags);
-  }
-
   /**
    * Returns the position of the updating expression.
    * @return result expression

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

@@ -92,13 +92,10 @@ public Value value(final QueryContext qc) throws QueryException {
 
   @Override
   public boolean has(final Flag... flags) {
-    for(final Let copy : copies) {
-      if(copy.has(flags)) return true;
-    }
-    if(Flag.CNS.oneOf(flags) ||
-        Flag.UPD.oneOf(flags) && arg(target()).has(Flag.UPD)) return true;
-    final Flag[] flgs = Flag.remove(flags, Flag.UPD);
-    return flgs.length != 0 && super.has(flgs);
+    return ((Checks<Let>) copy -> copy.has(flags)).any(copies) ||
+           Flag.CNS.oneOf(flags) ||
+           Flag.UPD.oneOf(flags) && arg(target()).has(Flag.UPD) ||
+           super.has(Flag.remove(flags, Flag.UPD));
   }
 
   @Override

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

@@ -88,11 +88,10 @@ public Value value(final QueryContext qc) throws QueryException {
   public boolean has(final Flag... flags) {
     // Context dependency, positional access: only check first expression.
     // Example: . update { delete node a }
-    if(Flag.CNS.oneOf(flags) ||
-        Flag.CTX.oneOf(flags) && arg(target()).has(Flag.CTX) ||
-        Flag.POS.oneOf(flags) && arg(target()).has(Flag.POS)) return true;
-    final Flag[] flgs = Flag.remove(flags, Flag.UPD, Flag.POS, Flag.CTX);
-    return flgs.length != 0 && super.has(flgs);
+    return Flag.CNS.oneOf(flags) ||
+           Flag.CTX.oneOf(flags) && arg(target()).has(Flag.CTX) ||
+           Flag.POS.oneOf(flags) && arg(target()).has(Flag.POS) ||
+           super.has(Flag.remove(flags, Flag.UPD, Flag.POS, Flag.CTX));
   }
 
   @Override