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

Merge pull request #74 from koba-e964/master 

[bugfix] macroexpand (Issue #68)
This commit is contained in:
Yuichi Nishiwaki 2014-03-24 10:38:29 +09:00
parent e7a2a8f0a4 30cc6998de
commit 48e58293dc
1 changed files with 37 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/macro.c
View File

@ -213,32 +213,47 @@ macroexpand(pic_state *pic, pic_value expr, struct pic_senv *senv)
if (tag == pic->sDEFINE_LIBRARY) { if (tag == pic->sDEFINE_LIBRARY) {
struct pic_lib *prev = pic->lib; struct pic_lib *prev = pic->lib;
jmp_buf jmp, *prevjmp = pic->jmp;
bool name_restored = false;
if (pic_length(pic, expr) < 2) { /* restores pic->lib even if an error occurs */
pic_error(pic, "syntax error"); if (setjmp(jmp) == 0) {
pic->jmp = &jmp;
if (pic_length(pic, expr) < 2) {
pic_error(pic, "syntax error");
}
pic_make_library(pic, pic_cadr(pic, expr));
/* proceed expressions in new library */
pic_in_library(pic, pic_cadr(pic, expr));
{
int ai = pic_gc_arena_preserve(pic);
struct pic_proc *proc;
pic_for_each (v, pic_cddr(pic, expr)) {
proc = pic_compile(pic, v);
if (proc == NULL) {
abort();
}
pic_apply_argv(pic, proc, 0);
if (pic_undef_p(v)) {
abort();
}
pic_gc_arena_restore(pic, ai);
}
}
pic_in_library(pic, prev->name);
name_restored = true;
} }
pic_make_library(pic, pic_cadr(pic, expr)); else {
if (! name_restored) {
/* proceed expressions in new library */ pic_in_library(pic, prev->name);
pic_in_library(pic, pic_cadr(pic, expr));
{
int ai = pic_gc_arena_preserve(pic);
struct pic_proc *proc;
pic_for_each (v, pic_cddr(pic, expr)) {
proc = pic_compile(pic, v);
if (proc == NULL) {
abort();
}
pic_apply_argv(pic, proc, 0);
if (pic_undef_p(v)) {
abort();
}
pic_gc_arena_restore(pic, ai);
} }
} }
pic_in_library(pic, prev->name); pic->jmp = prevjmp;
if (pic->err) {
longjmp(*pic->jmp, 1);
}
return pic_none_value(); return pic_none_value();
} }