Skip to content

Fix DynFuncCall argument type check and StructFilter context setting #2549

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ChristianGruen merged 1 commit into from
Nov 25, 2025
Merged

Fix DynFuncCall argument type check and StructFilter context setting #2549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion basex-core/src/main/java/org/basex/query/expr/AFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@ public final Expr inline(final InlineContext ic) throws QueryException {
if(changed) root = inlined;

// do not inline context reference in predicates
changed |= ic.var != null && ic.cc.ok(root, true, () -> ic.inline(exprs));
final Expr ctx = this instanceof StructFilter ? null : root;
changed |= ic.var != null && ic.cc.ok(ctx, true, () -> ic.inline(exprs));

return changed ? optimize(ic.cc) : null;
}
Expand Down
4 changes: 2 additions & 2 deletions basex-core/src/main/java/org/basex/query/func/DynFuncCall.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
import org.basex.query.util.list.*;
import org.basex.query.value.*;
import org.basex.query.value.item.*;
import org.basex.query.value.map.*;
import org.basex.query.value.type.*;
import org.basex.query.var.*;
import org.basex.util.*;
Expand Down Expand Up @@ -92,7 +91,8 @@ public Expr optimize(final CompileContext cc) throws QueryException {
final int arity = ft.argTypes.length;
if(nargs != arity) throw arityError(func, nargs, arity, false, info);
for(int a = 0; a < arity; ++a) {
final SeqType st = func instanceof XQMap ? Types.ANY_ATOMIC_TYPE_O : ft.argTypes[a];
final SeqType st = func.seqType().type instanceof MapType
? Types.ANY_ATOMIC_TYPE_O : ft.argTypes[a];
exprs[a] = new TypeCheck(info, exprs[a], st).compile(cc);
}
}
Expand Down
8 changes: 8 additions & 0 deletions basex-core/src/test/java/org/basex/query/ast/FuncItemTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,4 +421,12 @@ declare record local:rec(i as xs:integer, inc as fn(local:rec) as local:rec := f
};
local:self(identity#1)""", INVCONVERT_X_X_X);
}

/** Map lookup causing double to integer comparison; StructFilter context setting. */
@Test public void gh2546() {
query("let $m := { 1: 0 } return $m({ \"x\": 1e0 }?x)", "0");
query("let $m := { 1: 0 } return $m(1e0)", "0");
query("let $filter := fn($k, $v) { $k = $v }\n"
+ "return { 0: 0 }?[$filter(?key, ?value)]", "{0:0}");
}
}