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.
20 lines
888 B
Plaintext
20 lines
888 B
Plaintext
// fix-0102d site 3 (issue 0102): two flat FILE imports each author a same-name
|
|
// free function `bump` (a.sx adds 1, b.sx adds 100). Each module dispatches it
|
|
// via free-function UFCS — `v.bump()` lowers to `bump(v)`. The dispatched
|
|
// author must be the RESOLVED one for the receiver's source (own-author wins),
|
|
// not the first-wins winner. Before the fix, b.sx's `v.bump()` dispatched
|
|
// a.sx's winner (+1 → 11). Regression: per-source free-function UFCS dispatch.
|
|
#import "modules/std.sx";
|
|
#import "0732-modules-flat-same-name-ufcs/a.sx";
|
|
#import "0732-modules-flat-same-name-ufcs/b.sx";
|
|
|
|
report :: (label: string, ok: bool) {
|
|
if ok { print("{}: ok\n", label); } else { print("{}: FAIL\n", label); }
|
|
}
|
|
|
|
main :: () -> s32 {
|
|
report("from_a v.bump() binds a.bump (+1)", from_a_ufcs() == 11);
|
|
report("from_b v.bump() binds b.bump (+100)", from_b_ufcs() == 110);
|
|
0
|
|
}
|