mirrors/janet
1
0
Fork 0
mirror of https://github.com/janet-lang/janet synced 2025-10-31 15:43:01 +00:00
Code Issues 1 Releases Wiki Activity

Fix parse.c parser/state :args

Browse Source
This commit is contained in:
Calvin Rose
2021-10-30 09:30:56 -05:00
parent fd37567c18
commit deb4315383
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/parse.c
View File

@@ -1093,8 +1093,9 @@ static Janet janet_wrap_parse_state(JanetParseState *s, Janet *args,
if (s->flags & PFLAG_CONTAINER) { if (s->flags & PFLAG_CONTAINER) {
JanetArray *container_args = janet_array(s->argn); JanetArray *container_args = janet_array(s->argn);
container_args->count = s->argn; for (int32_t i = 0; i < s->argn; i++) {
safe_memcpy(container_args->data, args, sizeof(args[0])*s->argn); janet_array_push(container_args, args[i]);
}
janet_table_put(state, janet_ckeywordv("args"), janet_table_put(state, janet_ckeywordv("args"),
janet_wrap_array(container_args)); janet_wrap_array(container_args));
} }
@@ -1189,11 +1190,12 @@ static Janet parser_state_frames(const JanetParser *p) {
JanetArray *states = janet_array(count); JanetArray *states = janet_array(count);
states->count = count; states->count = count;
uint8_t *buf = p->buf; uint8_t *buf = p->buf;
Janet *args = p->args; /* Iterate arg stack backwards */
Janet *args = p->args + p->argcount;
for (int32_t i = count - 1; i >= 0; --i) { for (int32_t i = count - 1; i >= 0; --i) {
JanetParseState *s = p->states + i; JanetParseState *s = p->states + i;
states->data[i] = janet_wrap_parse_state(s, args, buf, (uint32_t) p->bufcount);
args -= s->argn; args -= s->argn;
states->data[i] = janet_wrap_parse_state(s, args, buf, (uint32_t) p->bufcount);
} }
return janet_wrap_array(states); return janet_wrap_array(states);
} }