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

parse: enforce strict-package — reject package-less files (#24a)

Browse Source 
Flip the soft-default to a hard "missing package clause" error symmetrically in
both stages (cmd/wcc/parse.c + lib/ww/syntax/parse.ww): the first real decl of a
primary section with empty pathmod/resetmod and no seen clause is now rejected.
Closes the documented soft-default divergence (the 63-wrapper carve-out).

The gate flip can't be split from the migration it breaks, so this is one atomic
commit: ~80 test/wcc wrappers gain `package main;` via a shared wwtestpkg.h
helper, 6 data fixtures plus 17 asm-grep assertions update for the bare->main.<leaf>
root-helper mangle shift, and rt/ declares `package rt;` with @symbol pinning the
bare rt_ensure/rt_malloc linker names.

Root mangling narrows: the executable entry `main` stays bare (existing
carve-out), but root helper symbols become main.X. The #84 cluster is rewritten
to assert main.run distinct from aa.run/test.run; its cgen fix and bare machinery
are retained — still load-bearing for package-less module-reset deps. New
table-driven test 782_strict_package.c (6 rows, both stages).

Retiring //ww:module-reset is deferred to #24b: it is load-bearing (clears the
.wwi pathmod so the body's package clause asserts), not a vestige; fusing its
removal here would be a silent mismatch.

All byte-id gates green; full make test reports "all 335 tests passed".
This commit is contained in:
Hojun-Cho
2026-06-29 03:55:26 +09:00
parent d34c90d932
commit 7b9488706b
95 changed files with 579 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
test/wcc/993_ww_ww.c
View File

@@ -17,6 +17,7 @@
#include <unistd.h>
#include <sys/stat.h>
#include <sys/wait.h>
#include "wwtestpkg.h"
static int
runwait(const char *cmd)
@@ -129,7 +130,8 @@ run_exit_code(const char *bin, const char *driver, int code)
snprintf(src, sizeof src, "/tmp/ww_rc_%d_%d.ww", getpid(), code);
FILE *f = fopen(src, "w");
if (!f) return -1;
fprintf(f, "export fn main() i32 = {\n\treturn %d;\n};\n", code);
fprintf(f, "package main;\nexport fn main() i32 = {\n\treturn %d;\n};\n",
code);
fclose(f);
char cmd[256];
@@ -151,7 +153,7 @@ run_build_fail(const char *bin, const char *driver)
snprintf(src, sizeof src, "/tmp/ww_badbuild_%d.ww", getpid());
FILE *f = fopen(src, "w");
if (!f) return -1;
fputs("export fn main() i32 = {\n\treturn 1\n", f); /* no ; no } */
wwtest_fputs("export fn main() i32 = {\n\treturn 1\n", f); /* no ; no } */
fclose(f);
char cmd[256];
@@ -178,7 +180,7 @@ run_missing_pkg(const char *bin, const char *driver)
snprintf(rmcmd, sizeof rmcmd, "rm -rf %s", tmpdir);
FILE *f = fopen(src, "w");
if (!f) { runwait(rmcmd); return 1; }
fputs("import nosuchpkg;\nexport fn main() i32 = { return 0; };\n", f);
wwtest_fputs("import nosuchpkg;\nexport fn main() i32 = { return 0; };\n", f);
fclose(f);
/* #8: the sep scratch is mkdir'd before the import-resolution failure,
@@ -225,7 +227,7 @@ main(void)
{
FILE *f = fopen(hello_src, "w");
if (!f) return 1;
fputs("import os;\n\n"
wwtest_fputs("import os;\n\n"
"export fn main() i32 = {\n"
"\tos.write(1, \"hi\\n\".ptr, 3u64);\n"
"\treturn 0;\n"