Skip to content

Tiny improvement for read_() #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Tiny improvement for read_() #25

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e5b92dd
Some fixes for 'read_'
ooichu Feb 10, 2023
3e5410c
Removed unecessary check for `\` in `read_`
ooichu Feb 18, 2023
d825bb7
Made the characters `"` and `'` as delimiters
ooichu Mar 3, 2023
7625c18
Fixed incorrect GC stack restore after `fe_open()`
ooichu Apr 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/fe.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@ void fe_set(fe_Context *ctx, fe_Object *sym, fe_Object *v) {
static fe_Object rparen;

static fe_Object* read_(fe_Context *ctx, fe_ReadFn fn, void *udata) {
const char *delimiter = " \n\t\r();";
const char *delimiter = " \n\t\r\"'();";
fe_Object *v, *res, **tail;
fe_Number n;
int chr, gc;
Expand All @@ -474,7 +474,7 @@ static fe_Object* read_(fe_Context *ctx, fe_ReadFn fn, void *udata) {
return NULL;

case ';':
while (chr && chr != '\n') { chr = fn(ctx, udata); }
while (chr && chr != '\n' && chr != '\r') { chr = fn(ctx, udata); }
return read_(ctx, fn, udata);

case ')':
Expand Down Expand Up @@ -809,11 +809,11 @@ fe_Context* fe_open(void *ptr, int size) {
}

/* init objects */
save = fe_savegc(ctx);
ctx->t = fe_symbol(ctx, "t");
fe_set(ctx, ctx->t, ctx->t);

/* register built in primitives */
save = fe_savegc(ctx);
for (i = 0; i < P_MAX; i++) {
fe_Object *v = object(ctx);
settype(v, FE_TPRIM);
Expand Down