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

rewrite define-library expander with pic_try/catch

This commit is contained in:
Yuichi Nishiwaki 2014-03-24 13:25:37 +09:00
parent 3d465f21dc
commit 136980ae2e
1 changed files with 23 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/macro.c
View File

@ -8,6 +8,7 @@
#include "picrin/proc.h" #include "picrin/proc.h"
#include "picrin/macro.h" #include "picrin/macro.h"
#include "picrin/lib.h" #include "picrin/lib.h"
#include "picrin/error.h"
static pic_value macroexpand(pic_state *, pic_value, struct pic_senv *); static pic_value macroexpand(pic_state *, pic_value, struct pic_senv *);
static pic_value macroexpand_list(pic_state *, pic_value, struct pic_senv *); static pic_value macroexpand_list(pic_state *, pic_value, struct pic_senv *);
@ -213,24 +214,19 @@ 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;
/* restores pic->lib even if an error occurs */
if (setjmp(jmp) == 0) {
pic->jmp = &jmp;
if (pic_length(pic, expr) < 2) { if (pic_length(pic, expr) < 2) {
pic_error(pic, "syntax error"); pic_error(pic, "syntax error");
} }
pic_make_library(pic, pic_cadr(pic, expr)); pic_make_library(pic, pic_cadr(pic, expr));
/* proceed expressions in new library */ pic_try {
pic_in_library(pic, pic_cadr(pic, expr)); 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)) { pic_for_each (v, pic_cddr(pic, expr)) {
struct pic_proc *proc;
int ai = pic_gc_arena_preserve(pic);
proc = pic_compile(pic, v); proc = pic_compile(pic, v);
if (proc == NULL) { if (proc == NULL) {
abort(); abort();
@ -241,19 +237,15 @@ macroexpand(pic_state *pic, pic_value expr, struct pic_senv *senv)
} }
pic_gc_arena_restore(pic, ai); pic_gc_arena_restore(pic, ai);
} }
}
pic_in_library(pic, prev->name);
name_restored = true;
}
else {
if (! name_restored) {
pic_in_library(pic, prev->name); pic_in_library(pic, prev->name);
} }
} pic_catch {
pic->jmp = prevjmp; /* restores pic->lib even if an error occurs */
if (pic->err) { pic_in_library(pic, prev->name);
longjmp(*pic->jmp, 1); longjmp(*pic->jmp, 1);
} }
return pic_none_value(); return pic_none_value();
} }