conservatory
/
picrin
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[bugfix] allocate space to hold closed rest args variable in pic_env

This commit is contained in:
Yuichi Nishiwaki 2013-11-01 18:55:23 +09:00
parent 75667d7649
commit 8007baf011
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/picrin/irep.h
View File

@ -50,7 +50,7 @@ struct pic_code {
struct pic_irep { struct pic_irep {
struct pic_code *code; struct pic_code *code;
size_t clen, ccapa; size_t clen, ccapa;
int argc; int argc, localc;
bool varg; bool varg;
}; };

19
src/codegen.c
View File

@ -13,8 +13,8 @@ typedef struct codegen_scope {
/* local variables are 1-indexed, 0 is reserved for the callee */ /* local variables are 1-indexed, 0 is reserved for the callee */
struct xhash *local_tbl; struct xhash *local_tbl;
/* does not count rest argument variable */ /* rest args variable is counted at localc */
size_t argc; size_t argc, localc;
/* dirty flags: if local var i is captured, then cv_tbl[i] == 1 */ /* dirty flags: if local var i is captured, then cv_tbl[i] == 1 */
int *cv_tbl; int *cv_tbl;
bool varg; bool varg;
@ -29,6 +29,7 @@ new_global_scope(pic_state *pic)
scope->up = NULL; scope->up = NULL;
scope->local_tbl = pic->global_tbl; scope->local_tbl = pic->global_tbl;
scope->argc = -1; scope->argc = -1;
scope->localc = -1;
scope->cv_tbl = NULL; scope->cv_tbl = NULL;
scope->varg = false; scope->varg = false;
return scope; return scope;
@ -39,7 +40,7 @@ new_local_scope(pic_state *pic, pic_value args, codegen_scope *scope)
{ {
codegen_scope *new_scope; codegen_scope *new_scope;
pic_value v; pic_value v;
int i; int i, l;
struct xhash *x; struct xhash *x;
new_scope = (codegen_scope *)pic_alloc(pic, sizeof(codegen_scope)); new_scope = (codegen_scope *)pic_alloc(pic, sizeof(codegen_scope));
@ -47,7 +48,7 @@ new_local_scope(pic_state *pic, pic_value args, codegen_scope *scope)
new_scope->local_tbl = x = xh_new(); new_scope->local_tbl = x = xh_new();
new_scope->varg = false; new_scope->varg = false;
i = 1; i = 1; l = 0;
for (v = args; pic_pair_p(v); v = pic_cdr(pic, v)) { for (v = args; pic_pair_p(v); v = pic_cdr(pic, v)) {
pic_value sym; pic_value sym;
@ -59,12 +60,13 @@ new_local_scope(pic_state *pic, pic_value args, codegen_scope *scope)
} }
else if (pic_symbol_p(v)) { else if (pic_symbol_p(v)) {
new_scope->varg = true; new_scope->varg = true;
xh_put(x, pic_symbol_name(pic, pic_sym(v)), i); xh_put(x, pic_symbol_name(pic, pic_sym(v)), i + l++);
} }
else { else {
pic_error(pic, "logic flaw"); pic_error(pic, "logic flaw");
} }
new_scope->argc = i; new_scope->argc = i;
new_scope->localc = l;
new_scope->cv_tbl = (int *)pic_calloc(pic, i, sizeof(int)); new_scope->cv_tbl = (int *)pic_calloc(pic, i, sizeof(int));
return new_scope; return new_scope;
@ -90,6 +92,7 @@ new_irep(pic_state *pic)
irep->clen = 0; irep->clen = 0;
irep->ccapa = 1024; irep->ccapa = 1024;
irep->argc = -1; irep->argc = -1;
irep->localc = -1;
irep->varg = false; irep->varg = false;
return irep; return irep;
} }
@ -595,6 +598,7 @@ codegen_lambda(codegen_state *state, pic_value obj)
state->scope = new_local_scope(pic, args, state->scope); state->scope = new_local_scope(pic, args, state->scope);
state->irep = irep = new_irep(pic); state->irep = irep = new_irep(pic);
irep->argc = state->scope->argc; irep->argc = state->scope->argc;
irep->localc = state->scope->localc;
irep->varg = state->scope->varg; irep->varg = state->scope->varg;
{ {
/* body */ /* body */
@ -662,12 +666,13 @@ pic_codegen(pic_state *pic, pic_value obj)
} }
state->irep = new_irep(pic); state->irep = new_irep(pic);
state->irep->argc = 1; state->irep->argc = 1;
state->irep->localc = 0;
codegen(state, pic_expand(pic, obj), false); codegen(state, pic_expand(pic, obj), false);
state->irep->code[state->irep->clen].insn = OP_RET; state->irep->code[state->irep->clen].insn = OP_RET;
state->irep->clen++; state->irep->clen++;
env = (struct pic_env *)pic_obj_alloc(pic, sizeof(struct pic_env), PIC_TT_ENV); env = (struct pic_env *)pic_obj_alloc(pic, sizeof(struct pic_env), PIC_TT_ENV);
env->num_val = state->irep->argc; env->num_val = state->irep->argc + state->irep->localc;
env->values = (pic_value *)pic_alloc(pic, sizeof(pic_value) * env->num_val); env->values = (pic_value *)pic_alloc(pic, sizeof(pic_value) * env->num_val);
for (i = 0; i < env->num_val; ++i) { for (i = 0; i < env->num_val; ++i) {
env->values[i] = pic_undef_value(); env->values[i] = pic_undef_value();
@ -702,7 +707,7 @@ print_irep(pic_state *pic, struct pic_irep *irep)
int i; int i;
printf("## irep %p\n", irep); printf("## irep %p\n", irep);
printf("[clen = %zd, ccapa = %zd, argc = %d]\n", irep->clen, irep->ccapa, irep->argc); printf("[clen = %zd, ccapa = %zd, argc = %d, localc = %d]\n", irep->clen, irep->ccapa, irep->argc, irep->localc);
for (i = 0; i < irep->clen; ++i) { for (i = 0; i < irep->clen; ++i) {
switch (irep->code[i].insn) { switch (irep->code[i].insn) {
case OP_POP: case OP_POP:

4
src/vm.c
View File

@ -351,8 +351,8 @@ pic_apply(pic_state *pic, struct pic_proc *proc, pic_value argv)
/* prepare env */ /* prepare env */
ci->env = (struct pic_env *)pic_obj_alloc(pic, sizeof(struct pic_env), PIC_TT_ENV); ci->env = (struct pic_env *)pic_obj_alloc(pic, sizeof(struct pic_env), PIC_TT_ENV);
ci->env->up = proc->env; ci->env->up = proc->env;
ci->env->num_val = proc->u.irep->argc; ci->env->num_val = proc->u.irep->argc + proc->u.irep->localc;
ci->env->values = (pic_value *)pic_alloc(pic, sizeof(pic_value) * ci->env->num_val); ci->env->values = (pic_value *)pic_calloc(pic, ci->env->num_val, sizeof(pic_value));
for (i = 0; i < ci->env->num_val; ++i) { for (i = 0; i < ci->env->num_val; ++i) {
ci->env->values[i] = ci->fp[i]; ci->env->values[i] = ci->fp[i];
} }