bd24996d8b
Final 0102 sub-step. fix-0102c landed resolveBareCallee and routed the primary call path + parameter target typing through it, leaving four other bare-name consumer sites on the old first-wins path. Route the SAME resolver through all four, gated exactly as the call path (plain top-level identifier, no scope-mangle / UFCS alias / local shadow; act on .func / .ambiguous, fall through on .none so single-author / local / std / qualified / foreign-single resolution is byte-for-byte unchanged): 1. Default-argument expansion (expandCallDefaults): omitted trailing args fill from the RESOLVED author's defaults, not the winner's. 2. Function-value conversion (closure(fn) and the bare-fn-as-value func_ref / fn-ptr / closure-coercion path): captures the resolved author's FuncId. 3. Free-function UFCS (recv.fn() -> fn(recv, ...)): dispatches the resolved author for the receiver's source. 4. Comptime #run of a bare call: lowerMainAndComptime now sets current_source_file per decl, so a `NAME :: #run f()` in an imported module resolves f from THAT module's flat imports (own-author wins) instead of the main file's perspective (which made it spuriously ambiguous). Regression tests: examples/0730-0734 (default-arg, closure+fn-value, UFCS, comptime #run, UFCS-ambiguity), each fails on pre-fix code and passes after. issues/0102-flat-import-same-signature-collision.md written RESOLVED with the 4-sub-step root cause and regression-test paths.
23 lines
1.1 KiB
Plaintext
23 lines
1.1 KiB
Plaintext
// fix-0102d site 2 (issue 0102): two flat FILE imports each author a same-name
|
|
// free function `pick` (a.sx returns 1, b.sx returns 2). Each module takes
|
|
// `pick` as a function VALUE — both as `closure(pick)` and as a bare-name
|
|
// fn-pointer binding (`g : () -> s64 = pick`). The captured FuncId must be the
|
|
// RESOLVED author's (own-author wins), not the first-wins winner's. Before the
|
|
// fix, b.sx's `closure(pick)` / `pick`-as-value both captured a.sx's winner
|
|
// (1). Regression: per-source function-value conversion (closure + func_ref).
|
|
#import "modules/std.sx";
|
|
#import "0731-modules-flat-same-name-closure/a.sx";
|
|
#import "0731-modules-flat-same-name-closure/b.sx";
|
|
|
|
report :: (label: string, ok: bool) {
|
|
if ok { print("{}: ok\n", label); } else { print("{}: FAIL\n", label); }
|
|
}
|
|
|
|
main :: () -> s32 {
|
|
report("from_a closure binds a.pick (1)", from_a_closure() == 1);
|
|
report("from_b closure binds b.pick (2)", from_b_closure() == 2);
|
|
report("from_a fn-value binds a.pick (1)", from_a_value() == 1);
|
|
report("from_b fn-value binds b.pick (2)", from_b_value() == 2);
|
|
0
|
|
}
|