Replace the cmd/ww + selfhost driver's file-walk import resolver with true directory enumeration. `import encoding.utf8;` now finds the lib/encoding/utf8/ directory and concatenates every *.ww file in it (excluding *test.ww and the driver's *.combined.ww artifacts) in byte-wise sorted order, instead of just finding the single lib/encoding/utf8/utf8.ww file. Mirrors Hare's hare/module/srcs.ha:183 _findsrcs minus tag handling. Lookup order in both stages: (1) <dir>/<dot-as-slash>/ as directory → enumerate. (2) <dir>/<dot-as-slash>.ww as file. The legacy <dir>/<name>/<name>.ww shape from #18's retained divergence is dropped per rule-9 Hare-fidelity — Hare has no foo/foo.ha fallback; a module IS the directory. Symmetric across cstage (cmd/ww/main.c via opendir+qsort+stat) and wwstage (selfhost/cmd/ww/main.ww via existing lib/os.getdents64 + os.stat — no new lib/os surface needed; the rundirtests() walker in main.ww from #18 was the model). Bootstrap ww2.s==ww3.s==ww4.s byte-identical post-change. Bundling justification (rule 11): strict-same-package validation is bundled because the failure mode is dir-enum's own (a non-dir-enum compilation unit cannot trigger mismatch across enumerated files). The natural enforcement site is the driver — the parser can't distinguish dir-enum concat from file-walk concat. Both stages peek each file's first `package <name>;` line in expand_dir / expanddir and exit(1) on mismatch with a precise error pointing at the offending file. Hare's hare/module/srcs.ha:131 has the same constraint via its README gate. Other half of #23 (strict missing-package error tightening — 63 inline-source test wrappers blocker) stays deferred per its filing. Parser side (cmd/wcc/parse.c parseuse + lib/ww/parse/decl.ww parseuse): n->str now carries only the LEAF identifier from a dotted import. With the driver translating the full dotted path to a directory walk, the checker only needs the package bareword (last component) for the N_USE → decl disambiguation walk in check.c's src_imports / decl_mod. Mirrors Hare's `use encoding::utf8;` → `utf8::name` semantics (ref/hare/hare/ast/import.ha:7). Migration: lib/ww/sym.ww drops `import typ; import ast;`; lib/ww/parse/parse.ww drops `import expr; import stmt; import decl;`; lib/ww/lex/lex.ww drops `import tok;` — all sibling imports auto-resolve via the new dir-enum when callers import the package directory. lib/strings/, lib/encoding/utf8/utf8test.ww migrate `import utf8;` → `import encoding.utf8;`. Makefile drops -I lib/encoding/utf8 stopgap from wwdump_ww + w6c_ww. Seven test wrappers (700_e2e, 966_strings_run, 970_fmt_run, 971_log_run, 972_fnmatch_run, 982_getopt_run, 990_selfhost) and 995_self_rebuild drop the -I lib/encoding/utf8 runtime stopgap. Tests: new 737_direnum C wrapper + test/wcc/data/direnum/ fixtures pin (a) cross-pkg multi-file dir-enum build at runtime (both stages must succeed) and (b) strict-same-package mismatch error (both stages must surface "differs from" + exit non-zero). 738_module_decl gains row 6 pinning the n_use->str leaf-only storage post-parser change. Retained workaround at selfhost/cmd/ww/main.ww expanddir loop: `names[i][k]` nested-deref-then-index split into `let nm: *u8 = names[i]; nm[k]` because wwstage cgen miscompiles the chained form (treats inner u8 element as 8B sizeof *u8 instead of 1B sizeof u8: extra MOVQ $8 + IMULQ on the inner index, MOVQ instead of MOVZBQ load). Inline rule-8 WHY comment cites task #24 (wwstage cgen chained-index inner element size on **T). Two-step form routes through the bare-pointer index path which both stages handle byte-identically. Class A wwstage cgen UNDER (chained-index inner element size on **T) surfaced first time the codebase exercises the **T[i][k] shape via enumeratedir() — corpus-coverage-blind landmine pattern, same family as the trio (#27/#28/#31) from STATUS-5. 112/112 ok. ww2 == ww3 == ww4 byte-id holds.
143 lines
3.8 KiB
C
143 lines
3.8 KiB
C
/*
|
|
* 737_direnum — driver-level sentinel for task #22 directory-as-
|
|
* module enumeration. Two row families pinning the contract:
|
|
*
|
|
* ok — multi-file dir is concatenated by both stages; the entry
|
|
* reads cross-pkg bare-leaf fns from sibling files. Build
|
|
* must succeed for both C-built `ww` and ww-built `ww_ww`.
|
|
* bad — multi-file dir with mismatched `package <name>;` decls
|
|
* triggers the strict-same-package error (task #25 subset
|
|
* bundled with #22 because the failure mode is dir-enum's
|
|
* own; cross-stage symmetric).
|
|
*
|
|
* Asm-presence isn't checked separately — 968_utf8_run, 966_strings_
|
|
* run, 995_self_rebuild already exercise dir-enum end-to-end at
|
|
* binary level. This file pins the cstage/wwstage symmetric error
|
|
* path so a regression on either driver fails loud.
|
|
*/
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#include <sys/wait.h>
|
|
|
|
static int
|
|
runwait(const char *cmd)
|
|
{
|
|
int rc = system(cmd);
|
|
if (rc == -1) return -1;
|
|
if (WIFEXITED(rc)) return WEXITSTATUS(rc);
|
|
return 1;
|
|
}
|
|
|
|
static int
|
|
runbuild(const char *driver, const char *src, const char *outbin)
|
|
{
|
|
char cmd[2048];
|
|
snprintf(cmd, sizeof cmd, "%s build %s -o /dev/null >/dev/null 2>%s",
|
|
driver, src, outbin);
|
|
return runwait(cmd);
|
|
}
|
|
|
|
static int
|
|
stderr_contains(const char *path, const char *needle)
|
|
{
|
|
FILE *f = fopen(path, "rb");
|
|
if (!f) return 0;
|
|
char buf[4096];
|
|
size_t n = fread(buf, 1, sizeof buf - 1, f);
|
|
fclose(f);
|
|
buf[n] = '\0';
|
|
return strstr(buf, needle) != NULL;
|
|
}
|
|
|
|
int
|
|
main(void)
|
|
{
|
|
const char *bin = getenv("BIN");
|
|
if (!bin) bin = "out/bin";
|
|
char absbin[1024];
|
|
if (bin[0] != '/') {
|
|
char cwd[1024];
|
|
if (getcwd(cwd, sizeof cwd) == NULL) return 1;
|
|
snprintf(absbin, sizeof absbin, "%s/%s", cwd, bin);
|
|
bin = absbin;
|
|
}
|
|
|
|
char ww[1280], ww_ww[1280];
|
|
snprintf(ww, sizeof ww, "%s/ww", bin);
|
|
snprintf(ww_ww, sizeof ww_ww, "%s/ww_ww", bin);
|
|
|
|
int total = 0, fail = 0;
|
|
char errp[64];
|
|
|
|
/* ok: cross-pkg bare-leaf via dir-enum, both stages. */
|
|
{
|
|
const char *src = "test/wcc/data/direnum/entry.ww";
|
|
char tmp[64];
|
|
snprintf(tmp, sizeof tmp, "/tmp/direnum_%d_ok", getpid());
|
|
char cmd[2048];
|
|
|
|
snprintf(cmd, sizeof cmd, "%s run %s >/dev/null 2>&1", ww, src);
|
|
total++;
|
|
if (runwait(cmd) != 0) {
|
|
fprintf(stderr, "737[ok-cstage]: ww run %s failed\n", src);
|
|
fail++;
|
|
}
|
|
|
|
if (access(ww_ww, X_OK) == 0) {
|
|
snprintf(cmd, sizeof cmd, "%s run %s >/dev/null 2>&1",
|
|
ww_ww, src);
|
|
total++;
|
|
if (runwait(cmd) != 0) {
|
|
fprintf(stderr, "737[ok-wwstage]: ww_ww run %s failed\n", src);
|
|
fail++;
|
|
}
|
|
}
|
|
(void)tmp;
|
|
}
|
|
|
|
/* bad: mismatched package decls in same dir → strict-same-package
|
|
* error. Both stages must surface "differs from" in stderr. */
|
|
{
|
|
const char *src = "test/wcc/data/direnum/bad_entry.ww";
|
|
snprintf(errp, sizeof errp, "/tmp/direnum_%d_bad.err", getpid());
|
|
|
|
char cmd[2048];
|
|
snprintf(cmd, sizeof cmd, "%s build %s 2>%s >/dev/null",
|
|
ww, src, errp);
|
|
int rc = runwait(cmd);
|
|
total++;
|
|
if (rc == 0) {
|
|
fprintf(stderr, "737[bad-cstage]: expected build failure, succeeded\n");
|
|
fail++;
|
|
} else if (!stderr_contains(errp, "differs from")) {
|
|
fprintf(stderr, "737[bad-cstage]: stderr missing 'differs from'\n");
|
|
fail++;
|
|
}
|
|
unlink(errp);
|
|
|
|
if (access(ww_ww, X_OK) == 0) {
|
|
snprintf(cmd, sizeof cmd, "%s build %s 2>%s >/dev/null",
|
|
ww_ww, src, errp);
|
|
rc = runwait(cmd);
|
|
total++;
|
|
if (rc == 0) {
|
|
fprintf(stderr, "737[bad-wwstage]: expected build failure, succeeded\n");
|
|
fail++;
|
|
} else if (!stderr_contains(errp, "differs from")) {
|
|
fprintf(stderr, "737[bad-wwstage]: stderr missing 'differs from'\n");
|
|
fail++;
|
|
}
|
|
unlink(errp);
|
|
}
|
|
}
|
|
|
|
if (fail) {
|
|
fprintf(stderr, "737_direnum: %d/%d fixtures failed\n", fail, total);
|
|
return 1;
|
|
}
|
|
printf("737_direnum: %d/%d ok\n", total, total);
|
|
return 0;
|
|
}
|