Files
akbasic/src/sink_stdio.c
Tachikoma b434be1901 Port onto libakstdlib 2b79aca and convert the eight bool predicates
akbasic's src/ now calls libakstdlib 313 times and raw libc 7 -- 2.2%
bypassed, against 86.4% on the same tree before this. The submodule bump
669b2b3 -> 2b79aca needed no source change of its own: the release is
drop-in for what akbasic already used.

Seven of the eight sites the earlier port left on raw libc change their own
signature rather than swallowing an error, per andrew's ruling on
libakstdlib#38. word_is, the is_waiting_for pair, the scanner's is_at_end,
peek, peek_next and match_next_char, format.c's overflow, and sink_akgl's
scroll/newline/putchar_at/echo_line/edit_key chain all return an
akerr_ErrorContext * and hand the answer back through an out parameter.
is_waiting_for and is_waiting_for_any are a public header change; every
call site that used one as a term in a condition hoists it into a
statement first.

verb_compare is the eighth and stays on strcmp. bsearch(3) fixes the
comparator's signature, so there is no out parameter to report through --
which is what libakstdlib#38 concluded. It carries a comment saying so and
saying why the bypass is safe there.

Six snprintf sites stay raw because they want truncation as an answer
rather than an error, and aksl_snprintf cannot express that until
libakstdlib#34 hands the required length back. Each of the six says so at
the site. Two of them, in host.c, are a latent defect rather than a
decision: a host type name over 31 characters truncates silently and two
sharing a prefix then collide, where structtype.c refuses the same case.

DLOAD leaked a file descriptor. Its read loop sat inside an ATTEMPT and the
PASS in it returned past CLEANUP, so a scan error left the file open.
Hoisting the loop into its own helper to convert fgets fixes it.

Refs libakstdlib#26, libakstdlib#38

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
2026-08-03 21:23:32 -04:00

125 lines
4.1 KiB
C

/**
* @file sink_stdio.c
* @brief The stdio-backed text sink.
*
* This is what makes the golden corpus runnable with no SDL on the machine. It
* writes exactly what the reference's fmt.Printf/fmt.Println mirror wrote, byte
* for byte, including the newline writeln appends -- an error line therefore
* ends in two newlines, because the caller's message already carries one. That
* is the acceptance contract, not an accident. See TODO.md section 1.8.
*/
#include <stdio.h>
#include <akerror.h>
#include <akstdlib.h>
#include <akbasic/error.h>
#include <akbasic/sink.h>
static akerr_ErrorContext *stdio_write(akbasic_TextSink *self, const char *text)
{
PREPARE_ERROR(errctx);
akbasic_StdioSink *state = NULL;
int count = 0;
FAIL_ZERO_RETURN(errctx, (self != NULL && text != NULL), AKERR_NULLPOINTER,
"NULL argument in sink write");
state = (akbasic_StdioSink *)self->self;
PASS(errctx, aksl_fprintf(&count, state->out, "%s", text));
SUCCEED_RETURN(errctx);
}
static akerr_ErrorContext *stdio_writeln(akbasic_TextSink *self, const char *text)
{
PREPARE_ERROR(errctx);
akbasic_StdioSink *state = NULL;
int count = 0;
FAIL_ZERO_RETURN(errctx, (self != NULL && text != NULL), AKERR_NULLPOINTER,
"NULL argument in sink writeln");
state = (akbasic_StdioSink *)self->self;
PASS(errctx, aksl_fprintf(&count, state->out, "%s\n", text));
SUCCEED_RETURN(errctx);
}
static akerr_ErrorContext *stdio_readline(akbasic_TextSink *self, char *dest, size_t len, bool *eof)
{
PREPARE_ERROR(errctx);
akbasic_StdioSink *state = NULL;
size_t used = 0;
FAIL_ZERO_RETURN(errctx, (self != NULL && dest != NULL && eof != NULL), AKERR_NULLPOINTER,
"NULL argument in sink readline");
FAIL_ZERO_RETURN(errctx, (len > 1), AKBASIC_ERR_BOUNDS,
"Read buffer of %zu bytes is too small", len);
state = (akbasic_StdioSink *)self->self;
*eof = false;
dest[0] = '\0';
/*
* The end of the stream is AKERR_EOF rather than a NULL return, so it is
* handled here and turned back into the *eof flag this sink promises. A
* genuine read error is left to propagate, which is what a NULL from
* fgets(3) could never be told apart from.
*/
ATTEMPT {
CATCH(errctx, aksl_fgets(dest, len, state->in, &used));
} CLEANUP {
} PROCESS(errctx) {
} HANDLE(errctx, AKERR_EOF) {
*eof = true;
} FINISH(errctx, true);
if ( *eof ) {
SUCCEED_RETURN(errctx);
}
/*
* Strip the line terminator. The scanner treats \r and \n as end-of-line
* anyway, but leaving them on would make a stored source line differ from
* the same line typed at the REPL.
*/
while ( used > 0 && (dest[used - 1] == '\n' || dest[used - 1] == '\r') ) {
dest[used - 1] = '\0';
used -= 1;
}
SUCCEED_RETURN(errctx);
}
static akerr_ErrorContext *stdio_clear(akbasic_TextSink *self)
{
PREPARE_ERROR(errctx);
FAIL_ZERO_RETURN(errctx, (self != NULL), AKERR_NULLPOINTER, "NULL sink in clear");
/* A terminal has no screen to clear that the golden corpus would agree on. */
SUCCEED_RETURN(errctx);
}
akerr_ErrorContext *akbasic_sink_init_stdio(akbasic_TextSink *obj, akbasic_StdioSink *state, FILE *out, FILE *in)
{
PREPARE_ERROR(errctx);
FAIL_ZERO_RETURN(errctx, (obj != NULL), AKERR_NULLPOINTER, "NULL sink in init");
FAIL_ZERO_RETURN(errctx, (state != NULL), AKERR_NULLPOINTER, "NULL sink state in init");
state->out = (out != NULL ? out : stdout);
state->in = (in != NULL ? in : stdin);
obj->self = state;
obj->write = stdio_write;
obj->writeln = stdio_writeln;
obj->readline = stdio_readline;
obj->clear = stdio_clear;
/*
* The optional entry points, cleared rather than left alone. A stream has no
* character grid, so `CHAR` and `WINDOW` must refuse by name -- and they
* decide that by testing the pointer for NULL. A caller with a sink on the
* stack would otherwise hand them whatever was in that memory.
*/
obj->moveto = NULL;
obj->window = NULL;
obj->grid = NULL;
obj->graphic = NULL;
SUCCEED_RETURN(errctx);
}