Finish the language: every remaining verb group, and the defects that blocked them
Closes groups A, C, D, E, F, H and J of TODO.md section 4, plus RESTORE and RENUMBER, and closes section 6 -- all seventeen reference defects. Seven of those turned out to have been fixed or never ported and nobody had written it down; the audit records the evidence for each. Two of the seventeen were real. math_plus mutated its left operand when the operand was mutable, so A# + 1 could modify A#; it was gated on FOR/NEXT coverage because NEXT relied on the mutation, so tests/for_next.c came first and NEXT now writes the counter back itself. And the binary operators summed both numeric fields of their right operand, which no BASIC program can reach -- that one needed a test written against the value API. Writing the tests turned up eight defects nobody had listed. Seven are fixed: IF A = 2 THEN was a parse error; only == worked IF ... AND ... was a parse error, because a condition parsed as one relation IF A = 1 OR B = 2 THEN was silently always false, and so was IF A THEN EXIT before any NEXT restarted the program and exhausted the variable pool READ never found a DATA line above it, and swallowed the lines between PRINT 2 + 2 at the prompt was filed as program text instead of answering a short read discarded its bytes, so COPY produced empty files every verb taking an argument list said "peek() returned nil token!" on none The eighth is not fixed and cannot be quietly: a FOR whose step overshoots runs its body one extra time, and FOR I = 1 TO 1 runs it zero times. The two errors cancel for a step of 1, which is why neither was noticed. Correcting them changes the expected output of a checked-in acceptance file, and tests/reference/README.md forbids editing one to suit this interpreter. It is tests/for_semantics.c in AKBASIC_KNOWN_FAILING_TESTS, asserting the correct contract, and TODO.md items 19 and 20. Sprites are real libakgl actors with a renderfunc of their own, because akgl_actor_render draws every sprite square and an actor has no per-axis scale. Both are filed upstream. SPRSAV takes an image file, an SSHAPE handle or a 63-element integer array -- a string here cannot hold a zero byte. Verbs that need hardware that does not exist are refused by name with the reason rather than faked: SYS, HEADER, COLLECT, BACKUP, BOOT, FILTER, and DIRECTORY, which is refused for a missing libakstdlib wrapper filed upstream. 94 tests in the default build, 93 with SDL, 94 under ASan and UBSan, doxygen clean. The Go acceptance corpus stayed green throughout. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Co-Authored-By: Andrew Kesterson <andrew@aklabs.net>
This commit is contained in:
20
src/main.c
20
src/main.c
@@ -100,8 +100,10 @@ static akerr_ErrorContext AKERR_NOIGNORE *drive(akbasic_Runtime *obj)
|
||||
* @brief The terminal driver: no window, no SDL, output on stdout.
|
||||
*
|
||||
* @param program The already-opened program file, or NULL for an interactive REPL.
|
||||
* @param path That file's path, so a relative asset path a program writes can be resolved
|
||||
* against the program's own directory. NULL for an interactive REPL.
|
||||
*/
|
||||
static akerr_ErrorContext AKERR_NOIGNORE *run_stdio(FILE *program)
|
||||
static akerr_ErrorContext AKERR_NOIGNORE *run_stdio(FILE *program, const char *path)
|
||||
{
|
||||
PREPARE_ERROR(errctx);
|
||||
|
||||
@@ -112,6 +114,13 @@ static akerr_ErrorContext AKERR_NOIGNORE *run_stdio(FILE *program)
|
||||
*/
|
||||
PASS(errctx, akbasic_sink_init_stdio(&SINK, &SINKSTATE, stdout, program));
|
||||
PASS(errctx, akbasic_runtime_init(&RUNTIME, &SINK));
|
||||
/*
|
||||
* So an asset path a program writes -- `SPRSAV "ship.png", 1` -- can be
|
||||
* tried against the program's own directory as well as against the
|
||||
* working one. Without it a `.bas` stored beside its art only works when
|
||||
* it is launched from its own directory.
|
||||
*/
|
||||
PASS(errctx, akbasic_runtime_set_source_path(&RUNTIME, path));
|
||||
PASS(errctx, akbasic_runtime_start(&RUNTIME, AKBASIC_MODE_RUNSTREAM));
|
||||
} else {
|
||||
PASS(errctx, akbasic_sink_init_stdio(&SINK, &SINKSTATE, stdout, stdin));
|
||||
@@ -140,8 +149,9 @@ static akerr_ErrorContext AKERR_NOIGNORE *run_stdio(FILE *program)
|
||||
* @brief The SDL driver: an 800x600 window, and stdout still gets everything.
|
||||
*
|
||||
* @param program The already-opened program file, or NULL to type at the window.
|
||||
* @param path That file's path; see run_stdio(). NULL when there is no program file.
|
||||
*/
|
||||
static akerr_ErrorContext AKERR_NOIGNORE *run_akgl(FILE *program)
|
||||
static akerr_ErrorContext AKERR_NOIGNORE *run_akgl(FILE *program, const char *path)
|
||||
{
|
||||
PREPARE_ERROR(errctx);
|
||||
const char *fontpath = getenv("AKBASIC_FONT");
|
||||
@@ -169,6 +179,8 @@ static akerr_ErrorContext AKERR_NOIGNORE *run_akgl(FILE *program)
|
||||
fontpath, AKBASIC_FRONTEND_FONT_SIZE,
|
||||
stdout, input));
|
||||
PASS(errctx, akbasic_frontend_akgl_attach(&FRONTEND, &RUNTIME));
|
||||
/* See the note in run_stdio(): this is what makes a relative asset path work. */
|
||||
PASS(errctx, akbasic_runtime_set_source_path(&RUNTIME, path));
|
||||
PASS(errctx, akbasic_runtime_start(&RUNTIME, mode));
|
||||
PASS(errctx, akbasic_frontend_akgl_drive(&FRONTEND, &RUNTIME));
|
||||
SUCCEED_RETURN(errctx);
|
||||
@@ -186,9 +198,9 @@ int main(int argc, char **argv)
|
||||
CATCH(errctx, aksl_fopen(argv[1], "r", &program));
|
||||
}
|
||||
#ifdef AKBASIC_HAVE_AKGL
|
||||
CATCH(errctx, run_akgl(program));
|
||||
CATCH(errctx, run_akgl(program, (argc > 1 ? argv[1] : NULL)));
|
||||
#else
|
||||
CATCH(errctx, run_stdio(program));
|
||||
CATCH(errctx, run_stdio(program, (argc > 1 ? argv[1] : NULL)));
|
||||
#endif
|
||||
} CLEANUP {
|
||||
if ( program != NULL ) {
|
||||
|
||||
Reference in New Issue
Block a user