eed2f99f76
Give top-level ENUM and UNION decls per-decl nominal identity so two same-name flat enums/unions intern DISTINCT nominal TypeIds instead of collapsing to one global last-wins entry. Establishes the reusable non-struct register path the later E6 kind-steps (E6b error-set, E6c protocol, E6d foreign-class) extend. Registration side (was: stateless `type_bridge.resolveInlineEnum/Union` `findByName` last-wins short-circuit, no Lowering access): - Split the type_bridge inline builders into a body-BUILDER (`buildEnumInfo` / `buildUnionInfo`) + the existing thin interner wrappers (field-type positions keep the legacy single-slot path). - Add `Lowering.registerEnumDecl` / `registerUnionDecl` mirroring `registerStructDecl`: build the TypeInfo, intern via `internNamedTypeDecl(decl_key, name_id, info, nominal_id)` under the per-decl nominal identity (reserved slot id, else `shadowNominalId`). - Reroute all six enum/union registration dispatch sites (scanDecls const-wrapped + top-level, lowerDecls/comptime, block-local, local const) to the new path. Shared infra generalized ONCE: - Pass-0b genuine-shadow pre-pass now reserves struct/enum/union shadow slots of the MATCHING kind, grouped by (kind, name), via a kind-generic `topLevelTypeDecl` / `reserveShadowSlot`. A forward/self/mutual ref to a shadow name binds to the reserved nominal TypeId. - `namedRefTid` consults `type_decl_tids` for `.enum_decl`/`.union_decl` before the global `findByName`. No new per-kind resolution path: selectNominalLeaf / headTypeGate / flatTypeAuthorCount already gate every kind. Single-author / phantom-double-spelling names keep nominal_id 0 (byte-identical corpus). Regressions 0795-0798 (enum + union: ambiguity over every bare-type form, and own-wins with distinct nominal TypeIds), fail-before/pass-after: 0795/0797 exit 0 -> exit 1 with the loud "type is ambiguous" diagnostic; 0796 silently printed `own=.east` -> correct `own=.north`; 0798 hard `field 'm' not found` error -> correct `own=5 dep=9`. Gate: zig build && zig build test (423/423) && run_examples.sh (537/537) all exit 0; m3te ios-sim build via the main binary exit 0.
24 lines
994 B
Plaintext
24 lines
994 B
Plaintext
// E6a — own-wins-over-flat for UNION per-decl nominal identity. `main` flat-imports
|
|
// `dep.sx` (which authors `Pair { a }`) AND authors its OWN `Pair { m }`. A bare
|
|
// `Pair` reference in `main` resolves to `main`'s OWN author, not the flat-imported
|
|
// one (the querying source's author wins outright — no ambiguity), so `p : Pair`
|
|
// here binds `main`'s union (whose `m` field dep's `Pair` lacks) while `dep_pair()`
|
|
// uses dep's DISTINCT `Pair`.
|
|
//
|
|
// Fail-before (pre-E6a): the stateless `type_bridge.resolveInlineUnion` `findByName`
|
|
// short-circuit interned ONE global last-wins `Pair`, so `main`'s `Pair` and dep's
|
|
// `Pair` collapsed to a single nominal — `p.m` would resolve against whichever
|
|
// author won the global slot, silently wrong with no diagnostic.
|
|
|
|
#import "modules/std.sx";
|
|
#import "0798-modules-same-name-union-own-wins/dep.sx";
|
|
|
|
Pair :: union { m: s32; }
|
|
|
|
main :: () -> s32 {
|
|
p : Pair = ---;
|
|
p.m = 5;
|
|
print("own={} dep={}\n", p.m, dep_pair());
|
|
0
|
|
}
|