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

lib/ww,wcc: consolidate frontend into one syntax package (Go-compiler model, #74)

Browse Source 
The ww compiler frontend was split across packages lex (lex+tok), ww
(ast+sym+typ), and parse — mirroring Hare's ref/hare/hare/{ast,lex,parse}.
That split's only payoff is third-party reuse, which ww has zero of: the
frontend is consumed by exactly one client, the wcc backend. The split's
cost is a wide cross-package export surface — every fn over a sibling
package's type must export it, and under separate compilation that
re-triggers check_exported_type, plus a phantom `import tok;` (tok lives
in package lex). Consolidate into ONE package lib/ww/syntax/, modelled on
Go's cmd/compile/internal/syntax. The 9 files move in (package syntax);
the intra-frontend mutual references become same-package; wcc and the
tool mains import syntax. No cstage C change (the C frontend mangles from
the source package clause). Internal data shapes (AST kinds, token model,
lexer/parser state) still mirror ref/hare/hare per rule 6/12 — only the
module decomposition collapses; the stdlib is untouched.

USER-approved (#74); spec .ai/rob-frontend-reorg.md (drew2 fidelity-
confirmed). Rule-6 carve-out documented in CLAUDE.md. Dissolves the tok
phantom import; collapses the intra-frontend export sprawl. Byte-id
rebaseline (lex.X/parse.X/ww.X -> syntax.X); cs==ww held. The residual
syntax->wcc export surface (10 types) + the unqualified-ref question are
separate follow-ups (#72/#75).
This commit is contained in:
Hojun-Cho
2026-06-16 19:56:34 +09:00
parent 10d005ef58
commit 7a8acfb952
31 changed files with 3647 additions and 3747 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
test/wcc/905_nkname_run.c
View File

@@ -9,9 +9,9 @@
* which the 990_selfhost wwdump diff only covers for kinds that appear
* in its corpus.
*
* Unlike 904_tok_run, the fixture imports `ast` (package ww), whose
* printer references tok's tkind/tokname, so the run needs
* `-I lib/ww/lex` to resolve that transitive import.
* Unlike 904_tok_run, the fixture imports the `syntax` package, whose
* printer references the token tkind/tokname, so the run needs
* `-I lib/ww` to resolve the `import syntax` directory package.
*/
#include <stdio.h>
#include <stdlib.h>
@@ -42,10 +42,10 @@ main(void)
char cwd[1024];
if (getcwd(cwd, sizeof cwd) == NULL) return 1;
const char *src = "lib/ww/asttest.ww";
const char *src = "lib/ww/syntax/asttest.ww";
char path[1024], inc[1024], cmd[3072];
snprintf(path, sizeof path, "%s/%s", cwd, src);
snprintf(inc, sizeof inc, "%s/lib/ww/lex", cwd);
snprintf(inc, sizeof inc, "%s/lib/ww", cwd);
snprintf(cmd, sizeof cmd, "%s/ww test -I %s %s", bin, inc, path);
int rc = runwait(cmd);
if (rc != 0) {