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

[bugfix] taking a wrong symbol for exporting

This commit is contained in:
Yuichi Nishiwaki 2013-12-07 19:03:18 -08:00
parent 0f491adc73
commit 791ab95219
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/macro.c
View File

@ -262,6 +262,9 @@ macroexpand(pic_state *pic, pic_value expr, struct pic_senv *senv)
} }
it = xh_begin(lib->exports); it = xh_begin(lib->exports);
while (! xh_isend(&it)) { while (! xh_isend(&it)) {
#if DEBUG
printf("* importing %s as %s\n", it.e->key, pic_symbol_name(pic, (pic_sym)it.e->val));
#endif
xh_put(pic->lib->senv->tbl, it.e->key, it.e->val); xh_put(pic->lib->senv->tbl, it.e->key, it.e->val);
xh_next(lib->exports, &it); xh_next(lib->exports, &it);
} }
@ -271,8 +274,8 @@ macroexpand(pic_state *pic, pic_value expr, struct pic_senv *senv)
pic_sym orig, ren; pic_sym orig, ren;
pic_value v; pic_value v;
orig = ren = pic_sym(pic_car(pic, expr)); orig = ren = pic_sym(pic_cadr(pic, expr));
v = macroexpand(pic, pic_car(pic, expr), senv); v = macroexpand(pic, pic_cadr(pic, expr), senv);
if (pic_symbol_p(v)) { if (pic_symbol_p(v)) {
ren = pic_sym(v); ren = pic_sym(v);
} }