test: migrate defdim len/cap family to test/lang @test, retire C twins (fold-2)

Continue fold-2: migrate drew's Family 2 (def-dimensioned array len/cap/slice
resolution) from bespoke build+run C twins to test/lang @test, retiring each
twin in the same commit. Runtime coverage MOVES from $(TESTS) to test-lang (T1
runs+asserts via `ww test`) + test-lang-byteid (T2 keeps cs==ww .s byte-id);
coverage is preserved, the $(TESTS) headline drops 3 (425->422). All asserts are
primitive int comparisons (no fmt/strconv in the assert path); the defcap rows
poison cap != len and assert both words so a dropped cap word FAILS.

  989_defdim_field_run.c    -> defdim_field_test.ww    (`.len` field-read on a def-dim [MAX]T resolves from the type table: local/let-global/def cgdot arms + sum)
  989_defdim_slice_run.c    -> defdim_slice_test.ww    (slicing a def-dim [MAX]T resolves len AND cap from the type table: default-hi + cgbasecap, local+global)
  989_defdim_argslice_run.c -> defdim_argslice_test.ww (def-dim slice passed as a call arg resolves default-hi len in the N_SLICE arg-push arms; litctrl pins the N_INTLIT path)

Bump LANGBYTEID_EXPECTED_MIN 31->34 to ratchet the new corpus floor.
This commit is contained in:
2026-06-22 12:04:03 +09:00
parent 438efab8c6
commit a367bf984e
7 changed files with 120 additions and 546 deletions

View File

@@ -1,165 +0,0 @@
/*
* 989_defdim_argslice_run (#56, c4) — passing a slice of a `def`-dimensioned
* array (`take(buf[1:])` on `[MAX]T`) as a call argument must resolve the
* default-hi length from the type table, the N_SLICE arg-push member of the
* def-dim family.
*
* THE BUG (wwstage only): pushargsrev's N_SLICE default-hi arms (cgenutil.ww
* local ~643 / global ~690) read the array dimension straight off the AST
* tnode and only handled an N_INTLIT dim. The #60 bu60 fallback fires ONLY for
* NAMED-alias bases (bt60.kind == TY_NAMED), so a PLAIN `[MAX]u8` base reached
* the N_INTLIT arm, emitted nothing, and the slice header's len word was left
* stale — the callee read garbage. cstage reads the resolved bu->alen. THE
* FIX: when the dim is not N_INTLIT, read alen from the stamped array tinfo
* (rule-13), in both the local and global arg-push arms — the same shape as
* the #21 cgslice and #56 cgdot fixes.
*
* row | shape | exit (cs==ww)
* --------+--------------------------------------------+--------------
* local | def MAX=5; let buf:[MAX]u8; take(buf[1:]) | 4 (was ww 135)
* global | def MAX=5; let g:[MAX]u8; take(g[1:]) | 4 (was ww 255)
* litctrl | let buf:[5]u8; take(buf[1:]) | 4 (no regress)
* The litctrl row pins the literal-dim path so the new else-arm can't double-
* emit or perturb it.
*/
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <sys/stat.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;
}
struct row { const char *label; const char *src; int want_exit; };
static const struct row rows[] = {
{ "local",
"package main;\n"
"def MAX: i32 = 5;\n"
"fn take(s: []u8) i32 = { return s.len: i32; };\n"
"export fn main() i32 = {\n"
" let buf: [MAX]u8 = [1, 2, 3, 4, 5];\n"
" return take(buf[1:]);\n"
"};\n",
4 },
{ "global",
"package main;\n"
"def MAX: i32 = 5;\n"
"let g: [MAX]u8 = [1, 2, 3, 4, 5];\n"
"fn take(s: []u8) i32 = { return s.len: i32; };\n"
"export fn main() i32 = {\n"
" return take(g[1:]);\n"
"};\n",
4 },
{ "litctrl",
"package main;\n"
"fn take(s: []u8) i32 = { return s.len: i32; };\n"
"export fn main() i32 = {\n"
" let buf: [5]u8 = [1, 2, 3, 4, 5];\n"
" return take(buf[1:]);\n"
"};\n",
4 },
};
static int
run_build(const char *driver, const struct row *r, int i)
{
char src[64], tmpdir[64], cmd[1024];
snprintf(src, sizeof src, "/tmp/dda_%d_%d.ww", getpid(), i);
snprintf(tmpdir, sizeof tmpdir, "/tmp/dda_%d_d_%d", getpid(), i);
FILE *f = fopen(src, "wb");
if (!f) return -2;
fputs(r->src, f);
fclose(f);
mkdir(tmpdir, 0755);
snprintf(cmd, sizeof cmd, "cd %s && %s build %s 2>/dev/null",
tmpdir, driver, src);
int brc = runwait(cmd);
const char *base = strrchr(src, '/');
base = base ? base + 1 : src;
char outbin[128];
snprintf(outbin, sizeof outbin, "%s/%s", tmpdir, base);
char *dot = strrchr(outbin, '.');
if (dot && strcmp(dot, ".ww") == 0) *dot = '\0';
int got = -1;
if (brc == 0) got = runwait(outbin);
unlink(src); unlink(outbin); rmdir(tmpdir);
return brc == 0 ? got : -1;
}
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 cdrv[1024], wdrv[1024];
snprintf(cdrv, sizeof cdrv, "%s/ww", bin);
snprintf(wdrv, sizeof wdrv, "%s/ww_ww", bin);
int have_ww = (access(wdrv, X_OK) == 0);
int n = (int)(sizeof rows / sizeof rows[0]);
int total = 0, fail = 0;
for (int i = 0; i < n; i++) {
total++;
int gc = run_build(cdrv, &rows[i], i);
if (gc < 0) {
fprintf(stderr, "defdim_argslice[cstage][%s]: build/run failed "
"(got %d)\n", rows[i].label, gc);
fail++;
continue;
}
if (gc != rows[i].want_exit) {
fprintf(stderr, "defdim_argslice[cstage][%s]: exit=%d want=%d\n",
rows[i].label, gc, rows[i].want_exit);
fail++;
}
if (!have_ww) {
fprintf(stderr, "defdim_argslice: skip wwstage (no %s)\n", wdrv);
continue;
}
int gw = run_build(wdrv, &rows[i], i);
if (gw != gc) {
fprintf(stderr, "defdim_argslice[%s]: cs=%d != ww=%d "
"(def-dim arg-push default-hi divergence — #56 c4)\n",
rows[i].label, gc, gw);
fail++;
}
if (gw != rows[i].want_exit) {
fprintf(stderr, "defdim_argslice[wwstage][%s]: exit=%d want=%d\n",
rows[i].label, gw, rows[i].want_exit);
fail++;
}
}
if (fail) {
fprintf(stderr, "defdim_argslice_run: %d/%d checks failed\n",
fail, total);
return 1;
}
printf("defdim_argslice_run: %d/%d ok\n", total, total);
return 0;
}

View File

@@ -1,170 +0,0 @@
/*
* 989_defdim_field_run (#56) — `.len` field-read on an array whose dimension
* is a `def` constant (`[MAX]T`) must resolve the length from the type table,
* the cgdot sibling of the #21 cgslice fix.
*
* THE BUG (wwstage only): the cgdot `.len` arms (local / let-global / def) and
* letemitsize read the array dimension straight off the AST tnode and only
* handled an N_INTLIT dim. A `def MAX` dim arrives as a non-literal node, so
* `.len` folded to MOVQ $0 (ww returned 0 where cstage returns the resolved
* length). cstage reads the resolved bu->alen. THE FIX: when the dim is not an
* N_INTLIT node, read the length from the stamped array tinfo (rule-13), in
* each of the local/global/def cgdot arms + letemitsize.
*
* row | shape | exit (cs==ww)
* --------+----------------------------------------+--------------
* local | def MAX=5; let buf:[MAX]u8; buf.len | 5 (was ww 0)
* global | def MAX=5; let g:[MAX]u8; g.len | 5 (was ww 0)
* defarr | def MAX=5; def A:[MAX]u8; A.len | 5 (was ww 0)
* sum | local + global + def .len (one fn) | 15
*/
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <sys/stat.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;
}
struct row { const char *label; const char *src; int want_exit; };
static const struct row rows[] = {
{ "local",
"package main;\n"
"def MAX: i32 = 5;\n"
"export fn main() i32 = {\n"
" let buf: [MAX]u8 = [1, 2, 3, 4, 5];\n"
" return buf.len: i32;\n"
"};\n",
5 },
{ "global",
"package main;\n"
"def MAX: i32 = 5;\n"
"let g: [MAX]u8 = [1, 2, 3, 4, 5];\n"
"export fn main() i32 = {\n"
" return g.len: i32;\n"
"};\n",
5 },
{ "defarr",
"package main;\n"
"def MAX: i32 = 5;\n"
"def A: [MAX]u8 = [1, 2, 3, 4, 5];\n"
"export fn main() i32 = {\n"
" return A.len: i32;\n"
"};\n",
5 },
{ "sum",
"package main;\n"
"def MAX: i32 = 5;\n"
"let g: [MAX]u8 = [1, 2, 3, 4, 5];\n"
"def A: [MAX]u8 = [1, 2, 3, 4, 5];\n"
"export fn main() i32 = {\n"
" let buf: [MAX]u8 = [1, 2, 3, 4, 5];\n"
" return (buf.len + g.len + A.len): i32;\n"
"};\n",
15 },
};
static int
run_build(const char *driver, const struct row *r, int i)
{
char src[64], tmpdir[64], cmd[1024];
snprintf(src, sizeof src, "/tmp/ddf_%d_%d.ww", getpid(), i);
snprintf(tmpdir, sizeof tmpdir, "/tmp/ddf_%d_d_%d", getpid(), i);
FILE *f = fopen(src, "wb");
if (!f) return -2;
fputs(r->src, f);
fclose(f);
mkdir(tmpdir, 0755);
snprintf(cmd, sizeof cmd, "cd %s && %s build %s 2>/dev/null",
tmpdir, driver, src);
int brc = runwait(cmd);
const char *base = strrchr(src, '/');
base = base ? base + 1 : src;
char outbin[128];
snprintf(outbin, sizeof outbin, "%s/%s", tmpdir, base);
char *dot = strrchr(outbin, '.');
if (dot && strcmp(dot, ".ww") == 0) *dot = '\0';
int got = -1;
if (brc == 0) got = runwait(outbin);
unlink(src); unlink(outbin); rmdir(tmpdir);
return brc == 0 ? got : -1;
}
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 cdrv[1024], wdrv[1024];
snprintf(cdrv, sizeof cdrv, "%s/ww", bin);
snprintf(wdrv, sizeof wdrv, "%s/ww_ww", bin);
int have_ww = (access(wdrv, X_OK) == 0);
int n = (int)(sizeof rows / sizeof rows[0]);
int total = 0, fail = 0;
for (int i = 0; i < n; i++) {
total++;
int gc = run_build(cdrv, &rows[i], i);
if (gc < 0) {
fprintf(stderr, "defdim_field[cstage][%s]: build/run failed "
"(got %d)\n", rows[i].label, gc);
fail++;
continue;
}
if (gc != rows[i].want_exit) {
fprintf(stderr, "defdim_field[cstage][%s]: exit=%d want=%d\n",
rows[i].label, gc, rows[i].want_exit);
fail++;
}
if (!have_ww) {
fprintf(stderr, "defdim_field: skip wwstage (no %s)\n", wdrv);
continue;
}
int gw = run_build(wdrv, &rows[i], i);
if (gw != gc) {
fprintf(stderr, "defdim_field[%s]: cs=%d != ww=%d "
"(def-dim .len field-read divergence — #56)\n",
rows[i].label, gc, gw);
fail++;
}
if (gw != rows[i].want_exit) {
fprintf(stderr, "defdim_field[wwstage][%s]: exit=%d want=%d\n",
rows[i].label, gw, rows[i].want_exit);
fail++;
}
}
if (fail) {
fprintf(stderr, "defdim_field_run: %d/%d checks failed\n",
fail, total);
return 1;
}
printf("defdim_field_run: %d/%d ok\n", total, total);
return 0;
}

View File

@@ -1,175 +0,0 @@
/*
* 989_defdim_slice_run (#21) — slicing an array whose dimension is a `def`
* constant (`[MAX]T`) must resolve the length AND the capacity from the type
* table, not the AST dimension node.
*
* THE BUG (wwstage only): cgslice's default-hi and cgbasecap both read the
* array dimension straight off the AST tnode and only handled an N_INTLIT
* dim. A `def MAX` dim arrives as a non-literal node, so default-hi fell to
* `MOVQ $0` (len 0 → underflow, exit 255) and cgbasecap returned false (cap
* fell back to len). cstage reads the resolved bu->alen. THE FIX: when the
* dim is not an N_INTLIT node, read the length from the stamped array tinfo
* (rule-13), in both the local and global arms of both helpers.
*
* row | shape | exit (cs==ww)
* --------------+------------------------------------+--------------
* deflen_local | def MAX=4; buf[1:].len (local) | 3 (4-1)
* deflen_global | def MAX=4; g[1:].len (global) | 3 (4-1)
* defcap | def MAX=6; s=buf[2:4]; len*100+cap | 204 (len2,cap4)
* defcap_global | def MAX=6; g[2:4]; len*100+cap | 204 (cgbasecap global)
* Pre-fix: deflen_* ww=255 (len 0/underflow); defcap cap diverged from cs.
* All four cgen arms (default-hi local+global, cgbasecap local+global) are
* pinned: defcap teeth the cap≠len word the global arm could drop.
*/
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <sys/stat.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;
}
struct row { const char *label; const char *src; int want_exit; };
static const struct row rows[] = {
{ "deflen_local",
"package main;\n"
"def MAX: i32 = 4;\n"
"export fn main() i32 = {\n"
" let buf: [MAX]u8 = [10, 20, 30, 40];\n"
" let s: []u8 = buf[1:];\n"
" return s.len: i32;\n"
"};\n",
3 },
{ "deflen_global",
"package main;\n"
"def MAX: i32 = 4;\n"
"let g: [MAX]u8 = [10, 20, 30, 40];\n"
"export fn main() i32 = {\n"
" let s: []u8 = g[1:];\n"
" return s.len: i32;\n"
"};\n",
3 },
{ "defcap",
"package main;\n"
"def MAX: i32 = 6;\n"
"export fn main() i32 = {\n"
" let buf: [MAX]u8 = [1, 2, 3, 4, 5, 6];\n"
" let s: []u8 = buf[2:4];\n"
" return (s.len * 100 + s.cap): i32;\n"
"};\n",
204 },
{ "defcap_global",
"package main;\n"
"def MAX: i32 = 6;\n"
"let g: [MAX]u8 = [1, 2, 3, 4, 5, 6];\n"
"export fn main() i32 = {\n"
" let s: []u8 = g[2:4];\n"
" return (s.len * 100 + s.cap): i32;\n"
"};\n",
204 },
};
static int
run_build(const char *driver, const struct row *r, int i)
{
char src[64], tmpdir[64], cmd[1024];
snprintf(src, sizeof src, "/tmp/dds_%d_%d.ww", getpid(), i);
snprintf(tmpdir, sizeof tmpdir, "/tmp/dds_%d_d_%d", getpid(), i);
FILE *f = fopen(src, "wb");
if (!f) return -2;
fputs(r->src, f);
fclose(f);
mkdir(tmpdir, 0755);
snprintf(cmd, sizeof cmd, "cd %s && %s build %s 2>/dev/null",
tmpdir, driver, src);
int brc = runwait(cmd);
const char *base = strrchr(src, '/');
base = base ? base + 1 : src;
char outbin[128];
snprintf(outbin, sizeof outbin, "%s/%s", tmpdir, base);
char *dot = strrchr(outbin, '.');
if (dot && strcmp(dot, ".ww") == 0) *dot = '\0';
int got = -1;
if (brc == 0) got = runwait(outbin);
unlink(src); unlink(outbin); rmdir(tmpdir);
return brc == 0 ? got : -1;
}
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 cdrv[1024], wdrv[1024];
snprintf(cdrv, sizeof cdrv, "%s/ww", bin);
snprintf(wdrv, sizeof wdrv, "%s/ww_ww", bin);
int have_ww = (access(wdrv, X_OK) == 0);
int n = (int)(sizeof rows / sizeof rows[0]);
int total = 0, fail = 0;
for (int i = 0; i < n; i++) {
total++;
int gc = run_build(cdrv, &rows[i], i);
if (gc < 0) {
fprintf(stderr, "defdim_slice[cstage][%s]: build/run failed "
"(got %d)\n", rows[i].label, gc);
fail++;
continue;
}
if (gc != rows[i].want_exit) {
fprintf(stderr, "defdim_slice[cstage][%s]: exit=%d want=%d\n",
rows[i].label, gc, rows[i].want_exit);
fail++;
}
if (!have_ww) {
fprintf(stderr, "defdim_slice: skip wwstage (no %s)\n", wdrv);
continue;
}
int gw = run_build(wdrv, &rows[i], i);
if (gw != gc) {
fprintf(stderr, "defdim_slice[%s]: cs=%d != ww=%d "
"(def-dim length/cap divergence — #21)\n",
rows[i].label, gc, gw);
fail++;
}
if (gw != rows[i].want_exit) {
fprintf(stderr, "defdim_slice[wwstage][%s]: exit=%d want=%d\n",
rows[i].label, gw, rows[i].want_exit);
fail++;
}
}
if (fail) {
fprintf(stderr, "defdim_slice_run: %d/%d checks failed\n",
fail, total);
return 1;
}
printf("defdim_slice_run: %d/%d ok\n", total, total);
return 0;
}