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

use raise-continuable in raise procedure

This commit is contained in:
Yuichi Nishiwaki 2014-09-17 22:34:51 +09:00
parent de92aab194
commit 6a8a7d93e7
1 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
error.c
View File

@ -129,46 +129,46 @@ pic_raise_continuable(pic_state *pic, pic_value err)
if (pic->try_jmp_idx == 0) { if (pic->try_jmp_idx == 0) {
pic_errorf(pic, "no exception handler registered"); pic_errorf(pic, "no exception handler registered");
} }
if (pic->try_jmps[pic->try_jmp_idx - 1].handler == NULL) { if (pic->try_jmps[pic->try_jmp_idx - 1].handler == NULL) {
pic_errorf(pic, "uncontinuable exception handler is on top"); void pic_vm_tear_off(pic_state *);
}
else { pic_vm_tear_off(pic); /* tear off */
pic->try_jmp_idx--;
v = pic_apply1(pic, pic->try_jmps[pic->try_jmp_idx].handler, err); pic->err = err;
++pic->try_jmp_idx; if (! pic->jmp) {
puts(pic_errmsg(pic));
pic_panic(pic, "no handler found on stack");
}
longjmp(*pic->jmp, 1);
} }
struct pic_proc *handler;
handler = pic->try_jmps[pic->try_jmp_idx - 1].handler;
pic_gc_protect(pic, pic_obj_value(handler));
pic->try_jmp_idx--;
v = pic_apply1(pic, pic->try_jmps[pic->try_jmp_idx].handler, err);
pic->try_jmp_idx++;
return v; return v;
} }
noreturn void noreturn void
pic_raise(pic_state *pic, pic_value err) pic_raise(pic_state *pic, pic_value err)
{ {
if (pic->try_jmps[pic->try_jmp_idx - 1].handler != NULL) { pic_value val;
struct pic_proc *handler;
pic_value val;
handler = pic->try_jmps[pic->try_jmp_idx - 1].handler; val = pic_raise_continuable(pic, err);
pic_pop_try(pic); pic_pop_try(pic);
pic_gc_protect(pic, pic_obj_value(handler)); pic_errorf(pic, "error handler returned with ~s on error ~s", val, err);
val = pic_apply1(pic, handler, err);
pic_errorf(pic, "error handler returned with ~s on error ~s", val, err);
}
void pic_vm_tear_off(pic_state *);
pic_vm_tear_off(pic); /* tear off */
pic->err = err;
if (! pic->jmp) {
puts(pic_errmsg(pic));
pic_panic(pic, "no handler found on stack");
}
longjmp(*pic->jmp, 1);
} }
noreturn void noreturn void