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.
38 lines
1.3 KiB
Plaintext
38 lines
1.3 KiB
Plaintext
// E6a — per-decl nominal identity for ENUM decls. A bare ENUM reference is
|
|
// non-transitive AND ambiguity-checked at every site, exactly like the struct
|
|
// leaf (0755) and the non-leaf struct forms (0767). `main` flat-imports two
|
|
// modules that each author a same-name `Dir` enum and authors none itself, so
|
|
// EACH of the following bare ENUM forms is a genuine collision the source cannot
|
|
// disambiguate — and each must emit the LOUD "type 'Dir' is ambiguous" diagnostic
|
|
// and poison the result, NEVER silently pick a global `findByName` last-wins
|
|
// author:
|
|
//
|
|
// - reflection / type-arg slot `size_of(Dir)`
|
|
// - typed enum-value annotation `d : Dir = .north`
|
|
// - type-as-value `t : Type = Dir`
|
|
// - type-category match arm `case Dir:`
|
|
//
|
|
// Fail-before (pre-E6a): the stateless `type_bridge.resolveInlineEnum`
|
|
// `findByName` short-circuit interned ONE global last-wins `Dir`, so every bare
|
|
// form silently resolved to it and the program exited 0.
|
|
|
|
#import "modules/std.sx";
|
|
#import "0795-modules-same-name-enum-ambiguous/a.sx";
|
|
#import "0795-modules-same-name-enum-ambiguous/b.sx";
|
|
|
|
describe :: ($T: Type) -> s32 {
|
|
r := if T == {
|
|
case Dir: 1;
|
|
else: 0;
|
|
}
|
|
r
|
|
}
|
|
|
|
main :: () -> s32 {
|
|
sz := size_of(Dir);
|
|
d : Dir = .north;
|
|
t : Type = Dir;
|
|
k := describe(s64);
|
|
0
|
|
}
|