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

wcc+ww: //ww:module-reset boundary directive; package-less files keep module "" (#16 PREP-main)

Browse Source 
Driver twins emit the line-comment directive only before package-less
files (peekpackage==nil); both lexers tokenize it (TK_MODRESET, appended
=87 so existing token values hold) and both parsers reset curmod — a
package-less file's decls get module "" instead of inheriting the last
bundled package (the sticky-curmod leak, task #11). Withdrawn
alternative: injecting 'package main' flips non-entry symbols
bare->main-prefixed (FFI-visible, broke 764). Codegen-neutral by proof:
bare symbols preserved, both stages emit byte-identical asm for a
directive-bearing combined. Transitional until strict-package rejects
package-less files outright. Includes 737 bad-deep pin for the
PREP-peek >2048 edge + 904/toktest rows for the new token.
This commit is contained in:
Hojun-Cho
2026-06-10 14:07:35 +09:00
parent 2227d698c6
commit 49a5173f3f
17 changed files with 358 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cmd/wcc/parse.c
View File

@@ -1363,6 +1363,19 @@ parsefile(Parser *p)
p->curmod = name;
continue;
}
/* `//ww:module-reset` — bundle boundary before a package-less
* file. Reset curmod to NULL so the file's decls (and its own
* `import os;`) are attributed to the primary module (""), not
* the preceding bundled package. Codegen-neutral: NULL curmod
* keeps bare symbols. (#16 option-B; closes task #11.)
* Driver-emitted ONLY before package-less files; a hand-placed
* directive after a mid-file `package` would strip subsequent
* decls to bare — that usage is deliberate-only. */
if (p->cur.kind == TK_MODRESET) {
advance(p);
p->curmod = NULL;
continue;
}
Node *attrs = parseattrs(p);
int exp = accept(p, TK_EXPORT);
Node *d = NULL;