d98ad5c14f
Make same-name top-level types in different sources DISTINCT nominal types instead of collapsing last-wins in the type table (issue 0105). Registration: - internNamedTypeDecl assigns a per-decl nominal_id and populates type_decl_tids. The first author of a name keeps nominal_id 0 (byte-identical to pre-E2); a genuine cross-module shadow (>=2 distinct normalized-path authors per the import facts) gets a fresh id -> a distinct TypeId. - mergeFlat/addOwnDecl stop first-wins-dropping per-source decls (named types + non-fn const_decls) so every same-name author reaches registration; functions and var_decls (incl. #foreign extern globals) keep first-wins. Resolution (selectNominalLeaf): - own-author wins; else flatTypeAuthorCount over the transitive flat closure: >=2 distinct -> .ambiguous (loud diagnostic + poison); exactly one -> resolved; a flat author not yet findByName-registered -> .undeclared stub (not a leak). - struct-literal type names route through the same source-aware leaf. - lazyLowerFunction pins the function's own source before resolving its return type, so a shadowed signature type resolves in its module, not the caller's. Codegen: - mangleTypeName appends __n<id> for nonzero nominal_id so same-name shadows get distinct monomorph symbols (struct_to_string__Box vs __Box__n1). Library hygiene: - rename trace.sx's compiler-contracted Frame -> TraceFrame (+ the two compiler findByName sites) so it never collides with a UI/geometry Frame; the layout is structural (getFrameStructType / SxFrame), name-independent. Examples: 0752-0756 pin the five 0105 cases (distinct fields / same fields / own-wins / ambiguous / alias per-source); 0170 pins the folded anon-struct-field regression.
16 lines
622 B
Plaintext
16 lines
622 B
Plaintext
// issue 0105 case 3 — own-wins-over-flat. `main` flat-imports `dep.sx` (which
|
|
// authors `Widget { a }`) AND authors its OWN `Widget { m }`. A bare `Widget`
|
|
// reference in `main` resolves to `main`'s OWN author, not the flat-imported one
|
|
// (the querying source's author wins outright — no ambiguity), so `Widget.{ m }`
|
|
// builds `main`'s type while `dep_widget()` returns `dep`'s distinct `Widget`.
|
|
#import "modules/std.sx";
|
|
#import "0754-modules-same-name-struct-own-wins/dep.sx";
|
|
|
|
Widget :: struct { m: s64; }
|
|
|
|
main :: () -> s32 {
|
|
w := Widget.{ m = 5 };
|
|
print("own={} dep={}\n", w, dep_widget());
|
|
0
|
|
}
|