1ce3a4e9e0
S0 of the ratified Fork C plan (zero-legacy name-resolution redesign, S0→S6).
Pure setup/documentation: NO production code change, NO behavior change.
Single-author output byte-identical to wt-stdlib-base by construction.
Deliverables under docs/fork-c/ (docs/, not current/, because current/ is
gitignored and the contract must be committed):
S0.1 — byte-baseline + commit-discipline: the committed examples/expected/*
snapshots are the single-author byte-identity reference; the zero-diff repro is
`zig build && zig build test && bash tests/run_examples.sh`. Resolver-target set
explicitly excluded + listed. Commit-classification rule: mirror | consumer-cutover | deletion.
S0.2 — E6b disposition + two-corpus partition: transitional E6b src NOT merged
(grep-clean: no resolveRegistrationSigTypeInSource / sig_registration_mode /
e6br_gate.test.zig on baseline). Harvested 0811–0829 trees + goldens (never the
src), empirically partitioned by running each through the base compiler vs the
E6b target:
- baseline-green (mirror-equivalence): 0795–0798 (merged) + 0823, 0828 — given
examples/expected/ markers, locked into the S0 baseline.
- resolver-target (known-wrong old behavior): 0811–0822, 0824–0827, 0829 + the
re-filed E6BR-5 nested-pattern regression — a listed xfail harness under
tests/resolver-target/ (manifest + TARGET goldens, NO active marker), flips
active+green at S3.9. 0811/0829 noted as old-selector-wrong on the E6b-unmerged
base; E6BR-5 subsumed by the whole-AST resolver, NOT an E6b attempt-6.
S0.3 — A–E6 reuse/delete ledger: every load-bearing A–E6 artifact mapped REUSED
(Fork C home) or DELETED/TRANSITIONAL (S3/S6 phase); E6c/d/e dropped, F/H/I/K
absorbed/superseded.
Gate over the baseline-green corpus: zig build + zig build test (LSP corpus sweep
574 files, no crash) + bash tests/run_examples.sh (540 passed, 0 failed) all exit 0.
79 lines
3.0 KiB
Plaintext
79 lines
3.0 KiB
Plaintext
// E6BR-4 (own-wins) — a protocol method-signature names a same-name `Box` under
|
|
// every WRAPPER / COMPOUND form, and each must resolve SOURCE-AWARE (pinned to the
|
|
// protocol's defining module = main), selecting main's OWN `Box { m }` rather than
|
|
// the global last-wins `Box { a }` from the flat-imported `dep.sx`.
|
|
//
|
|
// The reconciled choke-point (resolveRegistrationSigTypeInSource → the recursive
|
|
// source-aware engine) recurses every structural shape and resolves the leaf
|
|
// author own-wins. The E6BR-4 RED CELL is the WRAPPED RETURN `() -> *Box`: pre-fix
|
|
// the wrapped sig fell to the no-author `type_bridge.resolveTemplateSignatureType`
|
|
// (global last-wins) and typed the result as `dep`'s `Box { a }`, so `bp.m` was
|
|
// `field 'm' not found on type 'Box'`. Discriminating returns: `*Box`, `?Box`,
|
|
// `(Box,Box)`, `[2]Box` (each observed by a `.m` access). Routing-only params:
|
|
// `*Box`, `?Box`, `[]Box`, `[2]Box`, `(Box,Box)`, nested `*?[]Box` — all resolved
|
|
// through the same `resolveCompound` recursion at protocol-decl registration.
|
|
|
|
#import "modules/std.sx";
|
|
#import "0824-protocols-same-name-method-wrapped-own-wins/dep.sx";
|
|
|
|
Box :: struct { m: s32; }
|
|
Holder :: struct { b: Box = ---; }
|
|
|
|
Provider :: protocol {
|
|
// discriminating wrapped/compound RETURNS
|
|
getp :: () -> *Box;
|
|
geto :: () -> ?Box;
|
|
gett :: () -> (Box, Box);
|
|
geta :: () -> [2]Box;
|
|
// routing-only wrapped/compound PARAMS
|
|
sump :: (p: *Box) -> s32;
|
|
sumo :: (o: ?Box) -> s32;
|
|
sums :: (s: []Box) -> s32;
|
|
suma :: (a: [2]Box) -> s32;
|
|
sumt :: (t: (Box, Box)) -> s32;
|
|
sumn :: (n: *?[]Box) -> s32;
|
|
}
|
|
|
|
impl Provider for Holder {
|
|
getp :: (self: *Holder) -> *Box { @self.b }
|
|
geto :: (self: *Holder) -> ?Box { self.b }
|
|
gett :: (self: *Holder) -> (Box, Box) { (self.b, self.b) }
|
|
geta :: (self: *Holder) -> [2]Box { r : [2]Box = ---; r[0] = self.b; r[1] = self.b; r }
|
|
sump :: (self: *Holder, p: *Box) -> s32 { p.m }
|
|
sumo :: (self: *Holder, o: ?Box) -> s32 { o!.m }
|
|
sums :: (self: *Holder, s: []Box) -> s32 { s[0].m }
|
|
suma :: (self: *Holder, a: [2]Box) -> s32 { a[0].m }
|
|
sumt :: (self: *Holder, t: (Box, Box)) -> s32 { t.0.m }
|
|
sumn :: (self: *Holder, n: *?[]Box) -> s32 { if n == null { 0 } else { 6 } }
|
|
}
|
|
|
|
main :: () -> s32 {
|
|
h : Holder = ---;
|
|
h.b.m = 7;
|
|
p : Provider = xx @h;
|
|
|
|
// discriminating returns — `.m` only resolves if each binds main's `Box`
|
|
bp := p.getp();
|
|
bo := p.geto();
|
|
bt := p.gett();
|
|
ba := p.geta();
|
|
|
|
// routing-only params, constructed in main and passed through the protocol
|
|
one : Box = ---; one.m = 1;
|
|
arr : [2]Box = ---; arr[0].m = 2; arr[1].m = 3;
|
|
sl : []Box = arr[0..2];
|
|
osl : ?[]Box = sl;
|
|
tup : (Box, Box) = (one, one);
|
|
|
|
sp := p.sump(@one);
|
|
so := p.sumo(one);
|
|
ss := p.sums(sl);
|
|
sa := p.suma(arr);
|
|
st := p.sumt(tup);
|
|
sn := p.sumn(@osl);
|
|
|
|
print("p={} o={} t={} a={} | sp={} so={} ss={} sa={} st={} sn={} dep={}\n",
|
|
bp.m, bo!.m, bt.0.m, ba[0].m, sp, so, ss, sa, st, sn, dep_box());
|
|
0
|
|
}
|