Fcalva/chibi-scheme
1
0
Fork 0
mirror of https://github.com/ashinn/chibi-scheme.git synced 2025-07-03 11:16:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

don't assume EOF < 0x80 (issue #731)

Browse source
This commit is contained in:
Alex Shinn 2021-04-19 10:22:00 +09:00
parent ade90906f9
commit d53bf51fc9
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
vm.c
View file

@ -2101,18 +2101,12 @@ sexp sexp_apply (sexp ctx, sexp proc, sexp args) {
errno = 0; errno = 0;
#endif #endif
i = sexp_read_char(ctx, _ARG1); i = sexp_read_char(ctx, _ARG1);
#if SEXP_USE_UTF8_STRINGS
if (i >= 0x80)
_ARG1 = sexp_read_utf8_char(ctx, _ARG1, i);
else
#endif
if (i == EOF) { if (i == EOF) {
if (!sexp_port_openp(_ARG1)) if (!sexp_port_openp(_ARG1)) {
sexp_raise("read-char: port is closed", _ARG1); sexp_raise("read-char: port is closed", _ARG1);
else
#if SEXP_USE_GREEN_THREADS #if SEXP_USE_GREEN_THREADS
if ((sexp_port_stream(_ARG1) ? ferror(sexp_port_stream(_ARG1)) : 1) } else if ((sexp_port_stream(_ARG1) ? ferror(sexp_port_stream(_ARG1)) : 1)
&& (errno == EAGAIN)) { && (errno == EAGAIN)) {
if (sexp_port_stream(_ARG1)) clearerr(sexp_port_stream(_ARG1)); if (sexp_port_stream(_ARG1)) clearerr(sexp_port_stream(_ARG1));
/* TODO: block and unblock */ /* TODO: block and unblock */
if (sexp_applicablep(sexp_global(ctx, SEXP_G_THREADS_BLOCKER))) if (sexp_applicablep(sexp_global(ctx, SEXP_G_THREADS_BLOCKER)))
@ -2121,9 +2115,14 @@ sexp sexp_apply (sexp ctx, sexp proc, sexp args) {
sexp_poll_input(ctx, _ARG1); sexp_poll_input(ctx, _ARG1);
fuel = 0; fuel = 0;
ip--; /* try again */ ip--; /* try again */
} else } else {
#endif #endif
_ARG1 = SEXP_EOF; _ARG1 = SEXP_EOF;
}
#if SEXP_USE_UTF8_STRINGS
} else if (i >= 0x80) {
_ARG1 = sexp_read_utf8_char(ctx, _ARG1, i);
#endif
} else { } else {
if (i == '\n') sexp_port_line(_ARG1)++; if (i == '\n') sexp_port_line(_ARG1)++;
_ARG1 = sexp_make_character(i); _ARG1 = sexp_make_character(i);