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

[bugfix] binding leak

This commit is contained in:
Yuichi Nishiwaki 2013-11-26 16:51:48 -08:00
parent 3710d5feea
commit 38ab43d7fc
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/macro.c
View File

@ -136,9 +136,10 @@ macroexpand(pic_state *pic, pic_value expr, struct pic_senv *senv)
orig = pic_sym(pic_car(pic, a)); orig = pic_sym(pic_car(pic, a));
gen = new_uniq_sym(pic, orig); gen = new_uniq_sym(pic, orig);
xh_put(senv->tbl, pic_symbol_name(pic, orig), (int)gen); xh_put(in->tbl, pic_symbol_name(pic, orig), (int)gen);
}
if (pic_symbol_p(a)) { if (pic_symbol_p(a)) {
xh_put(senv->tbl, pic_symbol_name(pic, pic_sym(a)), (int)new_uniq_sym(pic, pic_sym(a))); xh_put(in->tbl, pic_symbol_name(pic, pic_sym(a)), (int)new_uniq_sym(pic, pic_sym(a)));
} }
v = pic_cons(pic, pic_symbol_value(pic_syntax(car)->sym), v = pic_cons(pic, pic_symbol_value(pic_syntax(car)->sym),
@ -170,15 +171,20 @@ macroexpand(pic_state *pic, pic_value expr, struct pic_senv *senv)
in->xlen = 0; in->xlen = 0;
in->xcapa = 0; in->xcapa = 0;
/* defined symbol */
a = pic_car(pic, var);
xh_put(senv->tbl, pic_symbol_name(pic, pic_sym(a)), (int)new_uniq_sym(pic, pic_sym(a)));
var = pic_cdr(pic, var);
for (a = var; pic_pair_p(a); a = pic_cdr(pic, a)) { for (a = var; pic_pair_p(a); a = pic_cdr(pic, a)) {
pic_sym gen, orig; pic_sym gen, orig;
orig = pic_sym(pic_car(pic, a)); orig = pic_sym(pic_car(pic, a));
gen = new_uniq_sym(pic, orig); gen = new_uniq_sym(pic, orig);
xh_put(senv->tbl, pic_symbol_name(pic, orig), (int)gen); xh_put(in->tbl, pic_symbol_name(pic, orig), (int)gen);
} }
if (pic_symbol_p(a)) { if (pic_symbol_p(a)) {
xh_put(senv->tbl, pic_symbol_name(pic, pic_sym(a)), (int)new_uniq_sym(pic, pic_sym(a))); xh_put(in->tbl, pic_symbol_name(pic, pic_sym(a)), (int)new_uniq_sym(pic, pic_sym(a)));
} }
v = pic_cons(pic, pic_symbol_value(pic_syntax(car)->sym), v = pic_cons(pic, pic_symbol_value(pic_syntax(car)->sym),