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

[bugfix] identifier=? dies when take auxiliary syntax (because they emit 

errors during expansion)
This commit is contained in:
Yuichi Nishiwaki 2013-12-10 01:50:53 -08:00
parent 41ffd0d7e5
commit fb34b71de1
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/macro.c
View File

@ -231,6 +231,12 @@ macroexpand(pic_state *pic, pic_value expr, struct pic_senv *senv)
{ {
int ai = pic_gc_arena_preserve(pic); int ai = pic_gc_arena_preserve(pic);
#if DEBUG
printf("[macroexpand] expanding... ");
pic_debug(pic, expr);
puts("");
#endif
switch (pic_type(expr)) { switch (pic_type(expr)) {
case PIC_TT_SC: { case PIC_TT_SC: {
struct pic_sc *sc; struct pic_sc *sc;
@ -630,6 +636,10 @@ pic_macro_identifier_eq_p(pic_state *pic)
} }
e2 = pic_senv(f); e2 = pic_senv(f);
if (! (pic_identifier_p(x) && pic_identifier_p(y))) {
return pic_false_value();
}
x = macroexpand(pic, x, e1); x = macroexpand(pic, x, e1);
y = macroexpand(pic, y, e2); y = macroexpand(pic, y, e2);