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

duplicate variable binding

This commit is contained in:
Yuichi Nishiwaki 2014-01-18 20:53:16 +09:00
parent 801d92e0a4
commit d3412deae1
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/codegen.c
View File

@ -271,7 +271,6 @@ codegen(codegen_state *state, pic_value obj, bool tailpos)
if (sym == pic->sDEFINE) { if (sym == pic->sDEFINE) {
int idx; int idx;
pic_value var, val; pic_value var, val;
codegen_scope *s;
if (pic_length(pic, obj) < 2) { if (pic_length(pic, obj) < 2) {
pic_error(pic, "syntax error"); pic_error(pic, "syntax error");
@ -294,8 +293,7 @@ codegen(codegen_state *state, pic_value obj, bool tailpos)
pic_error(pic, "syntax error"); pic_error(pic, "syntax error");
} }
s = state->scope; if (scope_is_global(scope)) {
if (scope_is_global(s)) {
idx = scope_global_define(pic, pic_symbol_name(pic, pic_sym(var))); idx = scope_global_define(pic, pic_symbol_name(pic, pic_sym(var)));
codegen(state, val, false); codegen(state, val, false);
scope->code[scope->clen].insn = OP_GSET; scope->code[scope->clen].insn = OP_GSET;
@ -306,7 +304,7 @@ codegen(codegen_state *state, pic_value obj, bool tailpos)
break; break;
} }
else { else {
idx = scope_local_define(pic, pic_symbol_name(pic, pic_sym(var)), s); idx = scope_local_define(pic, pic_symbol_name(pic, pic_sym(var)), scope);
codegen(state, val, false); codegen(state, val, false);
scope->code[scope->clen].insn = OP_CSET; scope->code[scope->clen].insn = OP_CSET;
scope->code[scope->clen].u.r.depth = 0; scope->code[scope->clen].u.r.depth = 0;