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.
21 lines
832 B
Plaintext
21 lines
832 B
Plaintext
// Two top-level structs each carry an inline anonymous-struct field named
|
|
// `inner`, but of DIFFERENT shapes. Each `inner` must resolve to its OWN
|
|
// anonymous type (`A.inner` has `x`; `B.inner` has `y, z`) — they must not
|
|
// cross-bind on the shared field spelling.
|
|
//
|
|
// Regression (folded from the Phase-D `replaceKeyedInfo` re-key, which made the
|
|
// per-parent anon rename key-safe): on master 7ffc0c1 the two anon types
|
|
// cross-bound and `b.inner.y` failed with "field 'y' not found on type
|
|
// 'B.inner'". Pins fail-before / pass-after.
|
|
#import "modules/std.sx";
|
|
|
|
A :: struct { inner: struct { x: s64; }; }
|
|
B :: struct { inner: struct { y: s64; z: s64; }; }
|
|
|
|
main :: () -> s32 {
|
|
a := A.{ inner = .{ x = 1 } };
|
|
b := B.{ inner = .{ y = 2, z = 3 } };
|
|
print("{} {} {}\n", a.inner.x, b.inner.y, b.inner.z);
|
|
0
|
|
}
|