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

Merge branch 'refactor-macroexpand'

This commit is contained in:
Yuichi Nishiwaki 2014-03-29 09:10:44 +09:00
parent dec4ddc125 7b73b37bec
commit 8b68e98709
1 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/macro.c
View File

@ -445,10 +445,6 @@ macroexpand_node(pic_state *pic, pic_value expr, struct pic_senv *senv)
return pic_cons(pic, pic_symbol_value(tag), macroexpand_list(pic, pic_cdr(pic, expr), senv)); return pic_cons(pic, pic_symbol_value(tag), macroexpand_list(pic, pic_cdr(pic, expr), senv));
} }
else if (tag == pic->sSETBANG || tag == pic->sIF || tag == pic->sBEGIN) {
return pic_cons(pic, car, macroexpand_list(pic, pic_cdr(pic, expr), senv));
}
else if (tag == pic->sQUOTE) { else if (tag == pic->sQUOTE) {
return pic_cons(pic, car, pic_cdr(pic, expr)); return pic_cons(pic, car, pic_cdr(pic, expr));
} }
@ -830,10 +826,10 @@ static pic_value
ir_macro_wrap(pic_state *pic, pic_value expr, struct pic_senv *use_env, pic_value *assoc) ir_macro_wrap(pic_state *pic, pic_value expr, struct pic_senv *use_env, pic_value *assoc)
{ {
if (pic_sym_p(expr)) { if (pic_sym_p(expr)) {
pic_value ren; pic_value r;
ren = macroexpand(pic, expr, use_env); r = pic_sym_value(symbol_rename(pic, pic_sym(expr), use_env));
*assoc = pic_acons(pic, ren, expr, *assoc); *assoc = pic_acons(pic, r, expr, *assoc);
return ren; return r;
} }
else if (pic_pair_p(expr)) { else if (pic_pair_p(expr)) {
return pic_cons(pic, return pic_cons(pic,
@ -848,18 +844,12 @@ ir_macro_wrap(pic_state *pic, pic_value expr, struct pic_senv *use_env, pic_valu
static pic_value static pic_value
ir_macro_unwrap(pic_state *pic, pic_value expr, struct pic_senv *mac_env, pic_value *assoc) ir_macro_unwrap(pic_state *pic, pic_value expr, struct pic_senv *mac_env, pic_value *assoc)
{ {
if (pic_sym_p(expr) || pic_macro_p(expr)) { if (pic_sym_p(expr)) {
pic_value r; pic_value r;
if (pic_test(r = pic_assq(pic, expr, *assoc))) { if (pic_test(r = pic_assq(pic, expr, *assoc))) {
return pic_cdr(pic, r); return pic_cdr(pic, r);
} }
r = macroexpand(pic, expr, mac_env); return pic_sym_value(symbol_rename(pic, pic_sym(expr), mac_env));
if (pic_macro_p(r)) {
return expr;
}
else {
return r;
}
} }
else if (pic_pair_p(expr)) { else if (pic_pair_p(expr)) {
return pic_cons(pic, return pic_cons(pic,