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

throw wrong number of arguments error for user defined lambda call

This commit is contained in:
Yuichi Nishiwaki 2013-10-24 00:09:40 +09:00
parent 05f1b4551d
commit 0fd1bbeae9
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/picrin/irep.h
View File

@ -38,6 +38,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;
}; };
#endif #endif

12
src/codegen.c
View File

@ -11,7 +11,7 @@ typedef struct codegen_scope {
/* local variables are 1-indexed */ /* local variables are 1-indexed */
struct xhash *local_tbl; struct xhash *local_tbl;
size_t localc; size_t argc;
} codegen_scope; } codegen_scope;
static codegen_scope * static codegen_scope *
@ -22,7 +22,7 @@ new_global_scope(pic_state *pic)
scope = (codegen_scope *)pic_alloc(pic, sizeof(codegen_scope)); scope = (codegen_scope *)pic_alloc(pic, sizeof(codegen_scope));
scope->up = NULL; scope->up = NULL;
scope->local_tbl = pic->global_tbl; scope->local_tbl = pic->global_tbl;
scope->localc = -1; scope->argc = -1;
return scope; return scope;
} }
@ -45,7 +45,7 @@ new_local_scope(pic_state *pic, pic_value args, codegen_scope *scope)
sym = pic_car(pic, v); sym = pic_car(pic, v);
xh_put(x, pic_symbol_ptr(sym)->name, i++); xh_put(x, pic_symbol_ptr(sym)->name, i++);
} }
new_scope->localc = i-1; new_scope->argc = i;
return new_scope; return new_scope;
} }
@ -68,6 +68,7 @@ new_irep(pic_state *pic)
irep->code = (struct pic_code *)pic_alloc(pic, sizeof(struct pic_code) * 1024); irep->code = (struct pic_code *)pic_alloc(pic, sizeof(struct pic_code) * 1024);
irep->clen = 0; irep->clen = 0;
irep->ccapa = 1024; irep->ccapa = 1024;
irep->argc = -1;
return irep; return irep;
} }
@ -87,7 +88,6 @@ new_codegen_state(pic_state *pic)
state = (codegen_state *)pic_alloc(pic, sizeof(codegen_state)); state = (codegen_state *)pic_alloc(pic, sizeof(codegen_state));
state->pic = pic; state->pic = pic;
state->scope = new_global_scope(pic); state->scope = new_global_scope(pic);
state->irep = new_irep(pic);
return state; return state;
} }
@ -376,8 +376,9 @@ codegen_lambda(codegen_state *state, pic_value obj)
prev_irep = state->irep; prev_irep = state->irep;
prev_scope = state->scope; prev_scope = state->scope;
state->irep = irep = new_irep(pic);
state->scope = new_local_scope(pic, pic_car(pic, pic_cdr(pic, obj)), state->scope); state->scope = new_local_scope(pic, pic_car(pic, pic_cdr(pic, obj)), state->scope);
state->irep = irep = new_irep(pic);
irep->argc = state->scope->argc;
{ {
/* body */ /* body */
body = pic_cdr(pic, pic_cdr(pic, obj)); body = pic_cdr(pic, pic_cdr(pic, obj));
@ -424,6 +425,7 @@ pic_codegen(pic_state *pic, pic_value obj)
return NULL; return NULL;
} }
} }
state->irep = new_irep(pic);
codegen(state, obj); codegen(state, obj);
state->irep->code[state->irep->clen].insn = OP_STOP; state->irep->code[state->irep->clen].insn = OP_STOP;
state->irep->clen++; state->irep->clen++;

4
src/vm.c
View File

@ -212,6 +212,10 @@ pic_run(pic_state *pic, struct pic_proc *proc, pic_value args)
NEXT; NEXT;
} }
else { else {
if (ci->argc != proc->u.irep->argc) {
pic->errmsg = "wrong number of arguments";
goto L_RAISE;
}
pc = proc->u.irep->code; pc = proc->u.irep->code;
pic_gc_arena_restore(pic, ai); pic_gc_arena_restore(pic, ai);
JUMP; JUMP;