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

ww driver: align cstage flag-parse to ww twin; 949 pins parity

Browse Source 
Lone -I/-L/-l/-o now error "ww <cmd>: -X needs an argument" (rc2),
matching selfhost main.ww. do_test rewritten to an -I-only loop that
loud-rejects -l/-L/-o/unknown instead of silently swallowing them.
949_driver_flagargs: table-driven, 10 rows, each run against both
twins asserting identical rc+stderr. (#15-team)
This commit is contained in:
Hojun-Cho
2026-06-10 21:38:51 +09:00
parent 2661b4f2ea
commit 7470b1a5c3
3 changed files with 183 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
cmd/ww/main.c
View File

@@ -629,11 +629,14 @@ collect_tests(const char *dir, char ***files, int *n)
return 0;
}
/* Parse the standard -I/-L/-l flags into incs/libdirs/libs. The first
* non-flag positional becomes *src_out. Returns the index past the last
* arg consumed for positionals (so callers can pick up trailing args). */
/* Parse the standard -I/-L/-l/-o flags into incs/libdirs/libs/outpath. The
* first non-flag positional becomes *src_out. Returns the index past the last
* arg consumed for positionals (so callers can pick up trailing args), or -1
* if a flag is missing its argument (diagnostic already emitted). `cmd` names
* the subcommand for the diagnostic, byte-identical to the wwstage twin's
* per-subcommand wording (selfhost/cmd/ww/main.ww dobuild/dorun). */
static int
parse_build_flags(int argc, char **argv,
parse_build_flags(const char *cmd, int argc, char **argv,
char *incs, size_t incsz,
char *libdirs, size_t libdirsz,
char *libs, size_t libsz,
@@ -647,11 +650,21 @@ parse_build_flags(int argc, char **argv,
size_t n = strlen(libs);
snprintf(libs + n, libsz - n,
"%s%s", n ? " " : "", argv[i]);
} else if (strcmp(argv[i], "-l") == 0 && i + 1 < argc) {
} else if (strcmp(argv[i], "-l") == 0) {
if (i + 1 >= argc) {
fprintf(stderr,
"ww %s: -l needs an argument\n", cmd);
return -1;
}
size_t n = strlen(libs);
snprintf(libs + n, libsz - n,
"%s-l%s", n ? " " : "", argv[++i]);
} else if (strcmp(argv[i], "-L") == 0 && i + 1 < argc) {
} else if (strcmp(argv[i], "-L") == 0) {
if (i + 1 >= argc) {
fprintf(stderr,
"ww %s: -L needs an argument\n", cmd);
return -1;
}
size_t n = strlen(libdirs);
snprintf(libdirs + n, libdirsz - n,
"%s-L%s", n ? " " : "", argv[++i]);
@@ -659,7 +672,12 @@ parse_build_flags(int argc, char **argv,
size_t n = strlen(libdirs);
snprintf(libdirs + n, libdirsz - n,
"%s%s", n ? " " : "", argv[i]);
} else if (strcmp(argv[i], "-I") == 0 && i + 1 < argc) {
} else if (strcmp(argv[i], "-I") == 0) {
if (i + 1 >= argc) {
fprintf(stderr,
"ww %s: -I needs an argument\n", cmd);
return -1;
}
size_t n = strlen(incs);
snprintf(incs + n, incsz - n,
"%s%s", n ? ":" : "", argv[++i]);
@@ -667,7 +685,12 @@ parse_build_flags(int argc, char **argv,
size_t n = strlen(incs);
snprintf(incs + n, incsz - n,
"%s%s", n ? ":" : "", argv[i] + 2);
} else if (strcmp(argv[i], "-o") == 0 && i + 1 < argc) {
} else if (strcmp(argv[i], "-o") == 0) {
if (i + 1 >= argc) {
fprintf(stderr,
"ww %s: -o needs an argument\n", cmd);
return -1;
}
snprintf(outpath, outsz, "%s", argv[++i]);
} else if (strncmp(argv[i], "-o", 2) == 0 && argv[i][2]) {
snprintf(outpath, outsz, "%s", argv[i] + 2);
@@ -688,9 +711,10 @@ do_build(int argc, char **argv)
char libdirs[2048] = {0};
char incs[2048] = {0};
char outflag[1024] = {0};
parse_build_flags(argc, argv, incs, sizeof incs,
if (parse_build_flags("build", argc, argv, incs, sizeof incs,
libdirs, sizeof libdirs, libs, sizeof libs,
outflag, sizeof outflag, &src);
outflag, sizeof outflag, &src) < 0)
return 2;
if (src == NULL) src = "."; /* default: build cwd */
char resolved[1024];
int is_dir = 0;
@@ -726,9 +750,10 @@ do_run(int argc, char **argv)
char libdirs[2048] = {0};
char incs[2048] = {0};
char outflag[1024] = {0}; /* -o accepted+ignored: run always uses the temp */
int next = parse_build_flags(argc, argv, incs, sizeof incs,
int next = parse_build_flags("run", argc, argv, incs, sizeof incs,
libdirs, sizeof libdirs, libs, sizeof libs,
outflag, sizeof outflag, &src);
if (next < 0) return 2;
if (src == NULL) src = ".";
char resolved[1024];
int is_dir = 0;
@@ -766,13 +791,35 @@ static int
do_test(int argc, char **argv)
{
const char *src = NULL;
char libs[2048] = {0};
char libdirs[2048] = {0};
char incs[2048] = {0};
char outflag[1024] = {0}; /* -o accepted+ignored: test uses the temp */
parse_build_flags(argc, argv, incs, sizeof incs,
libdirs, sizeof libdirs, libs, sizeof libs,
outflag, sizeof outflag, &src);
/* test builds to a temp and runs it: -l/-L/-o carry no meaning here, so
* reject them (and any unknown flag) rather than silently swallow —
* byte-identical to the wwstage twin (selfhost/cmd/ww/main.ww dotest). */
for (int i = 0; i < argc; i++) {
if (argv[i][0] == '-') {
if (argv[i][1] == 'I') {
const char *dir;
if (argv[i][2]) {
dir = argv[i] + 2;
} else {
if (i + 1 >= argc) {
fprintf(stderr,
"ww test: -I needs an argument\n");
return 2;
}
dir = argv[++i];
}
size_t n = strlen(incs);
snprintf(incs + n, sizeof incs - n,
"%s%s", n ? ":" : "", dir);
} else {
fprintf(stderr, "ww test: unknown flag\n");
return 2;
}
} else if (src == NULL) {
src = argv[i];
}
}
const char *target = src ? src : ".";
struct stat st;
if (stat(target, &st) != 0) {