Hojun-Cho/ww
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

w6c,ww: re-emit ... union-spread marker in .wwi producer (M4 E3, #95)

Browse Source 
The N_TTAGGED serializer emitted each variant via wwi_type but never
re-emitted the `...` prefix for TK_ELLIPSIS spread variants, so an
exported `(...inner | str)` round-tripped through .wwi as `(inner | str)`.
The consumer's checker then could not flatten inner's members into the
alias and variadic-assignability rejected bare members — under separate
compilation this broke fmt/log/getopt. Re-emit `...` before the variant
type, both stages; the producer stays purely syntactic (flatten/dedup
remain the consumer's type-store job, per ref/hare/hare/unparse/type.ha:290-300).

Gate: test/wcc/989_wwispread_sep.c — table-driven (2-arm + 3-arm spreads)
x both stages, asserts the marker survives the .wwi, the consumer binds
bare members under --sep (exit 0), and cs==ww .wwi byte-identity.
This commit is contained in:
Hojun-Cho
2026-06-18 09:52:19 +09:00
parent f4d809dc79
commit 24ca570a7e
9 changed files with 244 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
selfhost/cmd/w6c/main.combined.ww
View File

@@ -45855,6 +45855,10 @@ fn wwitype(fd: i32, t: *syntax.node) void = {
let e: *syntax.node = t.list;
for (e != nil) {
if (e != t.list) { wputs(fd, " | "); };
// #95: re-emit the spread marker purely syntactically;
// the consumer's type-store flattens
// (ref/hare/hare/unparse/type.ha:290-300).
if (e.op == syntax.tkind.TK_ELLIPSIS) { wputs(fd, "..."); };
wwitype(fd, e);
e = e.next;
};

4
selfhost/cmd/wcc/wwi.ww
View File

@@ -365,6 +365,10 @@ fn wwitype(fd: i32, t: *syntax.node) void = {
let e: *syntax.node = t.list;
for (e != nil) {
if (e != t.list) { wputs(fd, " | "); };
// #95: re-emit the spread marker purely syntactically;
// the consumer's type-store flattens
// (ref/hare/hare/unparse/type.ha:290-300).
if (e.op == syntax.tkind.TK_ELLIPSIS) { wputs(fd, "..."); };
wwitype(fd, e);
e = e.next;
};