oreodave/alisp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reader: read_str restores stream position for no closing speechmarks

Browse Source 
Say you have the following Lisp code: `"hello world` (no closing
speechmark).  This read_str implementation will now place
stream->position at the first speechmark rather than at the
EOF (what happened previously) which is a bit nicer.
This commit is contained in:
Aryadev Chavali
2026-03-05 20:25:03 +00:00
parent fee6614670
commit e594b6ce70
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/alisp/reader.h
View File

@@ -17,7 +17,7 @@ typedef enum
READ_ERR_EOF, READ_ERR_EOF,
READ_ERR_EXPECTED_CLOSED_BRACE, READ_ERR_EXPECTED_CLOSED_BRACE,
READ_ERR_EXPECTED_CLOSED_SQUARE_BRACKET, READ_ERR_EXPECTED_CLOSED_SQUARE_BRACKET,
READ_ERR_EXPECTED_SPEECHMARKS, READ_ERR_EXPECTED_CLOSING_SPEECHMARKS,
READ_ERR_UNEXPECTED_CLOSED_BRACE, READ_ERR_UNEXPECTED_CLOSED_BRACE,
READ_ERR_UNEXPECTED_CLOSED_SQUARE_BRACKET, READ_ERR_UNEXPECTED_CLOSED_SQUARE_BRACKET,
READ_ERR_UNKNOWN_CHAR, READ_ERR_UNKNOWN_CHAR,

11
src/reader.c
View File

@@ -24,8 +24,8 @@ const char *read_err_to_cstr(read_err_t err)
return "EXPECTED_CLOSED_BRACE"; return "EXPECTED_CLOSED_BRACE";
case READ_ERR_EXPECTED_CLOSED_SQUARE_BRACKET: case READ_ERR_EXPECTED_CLOSED_SQUARE_BRACKET:
return "EXPECTED_CLOSED_SQUARE_BRACKET"; return "EXPECTED_CLOSED_SQUARE_BRACKET";
case READ_ERR_EXPECTED_SPEECHMARKS: case READ_ERR_EXPECTED_CLOSING_SPEECHMARKS:
return "EXPECTED_SPEECHMARKS"; return "EXPECTED_CLOSING_SPEECHMARKS";
case READ_ERR_UNEXPECTED_CLOSED_BRACE: case READ_ERR_UNEXPECTED_CLOSED_BRACE:
return "UNEXPECTED_CLOSED_BRACE"; return "UNEXPECTED_CLOSED_BRACE";
case READ_ERR_UNEXPECTED_CLOSED_SQUARE_BRACKET: case READ_ERR_UNEXPECTED_CLOSED_SQUARE_BRACKET:
@@ -196,11 +196,14 @@ read_err_t read_vec(sys_t *sys, stream_t *stream, lisp_t **ret)
read_err_t read_str(sys_t *sys, stream_t *stream, lisp_t **ret) read_err_t read_str(sys_t *sys, stream_t *stream, lisp_t **ret)
{ {
u64 old_pos = stream->position;
(void)stream_next(stream); (void)stream_next(stream);
sv_t contents = stream_till(stream, "\""); sv_t contents = stream_till(stream, "\"");
if (stream_peek(stream) != '\"') if (stream_eoc(stream) || stream_peek(stream) != '\"')
{ {
return READ_ERR_EXPECTED_SPEECHMARKS; stream->position = old_pos;
return READ_ERR_EXPECTED_CLOSING_SPEECHMARKS;
} }
stream_next(stream); stream_next(stream);