parse: enforce strict-package — reject package-less files (#24a)
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:
@@ -11,6 +11,7 @@
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
#include "wwtestpkg.h"
|
||||
|
||||
static int
|
||||
must_parse(const char *src)
|
||||
@@ -18,10 +19,12 @@ must_parse(const char *src)
|
||||
Arena *a = newarena();
|
||||
Lex l;
|
||||
Parser p;
|
||||
lexinit(&l, a, "<test>", src, strlen(src));
|
||||
char *ws = wwtest_wrap(src);
|
||||
lexinit(&l, a, "<test>", ws, strlen(ws));
|
||||
parserinit(&p, a, &l);
|
||||
Node *n = parsefile(&p);
|
||||
int ok = (n != NULL && p.errs == 0 && l.errs == 0);
|
||||
free(ws);
|
||||
freearena(a);
|
||||
return ok;
|
||||
}
|
||||
@@ -32,7 +35,8 @@ parse_to_str(const char *src, int *errs)
|
||||
Arena *a = newarena();
|
||||
Lex l;
|
||||
Parser p;
|
||||
lexinit(&l, a, "<test>", src, strlen(src));
|
||||
char *ws = wwtest_wrap(src);
|
||||
lexinit(&l, a, "<test>", ws, strlen(ws));
|
||||
parserinit(&p, a, &l);
|
||||
Node *n = parsefile(&p);
|
||||
*errs = p.errs + l.errs;
|
||||
@@ -41,6 +45,7 @@ parse_to_str(const char *src, int *errs)
|
||||
size_t len = 0;
|
||||
FILE *f = open_memstream(&buf, &len);
|
||||
if (f == NULL) {
|
||||
free(ws);
|
||||
freearena(a);
|
||||
return NULL;
|
||||
}
|
||||
@@ -51,6 +56,7 @@ parse_to_str(const char *src, int *errs)
|
||||
memcpy(out, buf, len);
|
||||
out[len] = '\0';
|
||||
free(buf);
|
||||
free(ws);
|
||||
freearena(a);
|
||||
return out;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user