[FIX] XQuery, GH-1424: Fixes Closure copying.

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

@@ -227,18 +227,28 @@ public Expr inline(final Var var, final Expr ex, final CompileContext cc) throws
 
   @Override
   public Expr copy(final CompileContext cc, final IntObjMap<Var> vm) {
-    cc.pushScope(new VarScope(vs.sc));
+    final VarScope innerScope = new VarScope(vs.sc);
+
+    final HashMap<Var, Expr> outer = new HashMap<>();
+    for(final Entry<Var, Expr> e : global.entrySet()) {
+      outer.put(e.getKey(), e.getValue().copy(cc, vm));
+    }
+
+    cc.pushScope(innerScope);
     try {
-      vs.copy(cc, vm);
+      final IntObjMap<Var> innerVars = new IntObjMap<>();
+      vs.copy(cc, innerVars);
+
       final HashMap<Var, Expr> nl = new HashMap<>();
-      for(final Entry<Var, Expr> e : global.entrySet()) {
-        nl.put(vm.get(e.getKey().id), e.getValue().copy(cc, vm));
+      for(final Entry<Var, Expr> e : outer.entrySet()) {
+        nl.put(innerVars.get(e.getKey().id), e.getValue());
       }
+
       final Var[] vars = args.clone();
       final int vl = vars.length;
-      for(int v = 0; v < vl; v++) vars[v] = vm.get(vars[v].id);
+      for(int v = 0; v < vl; v++) vars[v] = innerVars.get(vars[v].id);
 
-      final Expr e = expr.copy(cc, vm);
+      final Expr e = expr.copy(cc, innerVars);
       e.markTailCalls(null);
       return copyType(new Closure(info, name, type, vars, e, anns, nl, cc.vs()));
     } finally {

basex-core/src/test/java/org/basex/query/ast/InlineTest.java

@@ -143,4 +143,19 @@ public final class InlineTest extends QueryPlanTest {
         "count(//Window) eq 1",
         "//Let << //Window");
   }
+
+  /** Checks that inlining a nested closure works properly. */
+  @Test public void gh1424() {
+    check("declare function local:f() {"
+        + "  let $func := function($key) { map { $key: 'ok' }($key) }"
+        + "  let $input := <ok/>"
+        + "  let $call := $func(name($input))"
+        + "  return function() { $call }"
+        + "};"
+        + "local:f()()",
+        "ok",
+        "exists(/*/DynFuncCall)",
+        "empty(//StaticFunc)",
+        "exists(/*/DynFuncCall/GFLWOR/Closure)");
+  }
 }