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

add pic_raise_continuable

This commit is contained in:
Yuichi Nishiwaki 2014-02-18 16:58:51 +09:00
parent c42090f0b7
commit a078266c2d
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/picrin/error.h
View File

@ -24,6 +24,8 @@ struct pic_error {
#define pic_error_p(v) (pic_type(v) == PIC_TT_ERROR) #define pic_error_p(v) (pic_type(v) == PIC_TT_ERROR)
#define pic_error_ptr(v) ((struct pic_error *)pic_ptr(v)) #define pic_error_ptr(v) ((struct pic_error *)pic_ptr(v))
pic_value pic_raise_continuable(pic_state *, pic_value);
#if defined(__cplusplus) #if defined(__cplusplus)
} }
#endif #endif

31
src/error.c
View File

@ -91,6 +91,22 @@ pic_raise(pic_state *pic, pic_value obj)
pic_errorf(pic, "handler returned", 2, pic_obj_value(handler), a); pic_errorf(pic, "handler returned", 2, pic_obj_value(handler), a);
} }
pic_value
pic_raise_continuable(pic_state *pic, pic_value obj)
{
struct pic_proc *handler;
if (pic->ridx == 0) {
pic_abort(pic, "logic flaw: no exception handler remains");
}
handler = pic->rescue[--pic->ridx];
obj = pic_apply_argv(pic, handler, 1, obj);
pic->rescue[pic->ridx++] = handler;
return obj;
}
static pic_value static pic_value
pic_error_with_exception_handler(pic_state *pic) pic_error_with_exception_handler(pic_state *pic)
{ {
@ -128,20 +144,11 @@ pic_error_raise(pic_state *pic)
static pic_value static pic_value
pic_error_raise_continuable(pic_state *pic) pic_error_raise_continuable(pic_state *pic)
{ {
pic_value v, a; pic_value obj;
struct pic_proc *handler;
pic_get_args(pic, "o", &v); pic_get_args(pic, "o", &obj);
if (pic->ridx == 0) { return pic_raise_continuable(pic, obj);
pic_abort(pic, "logic flaw: no exception handler remains");
}
handler = pic->rescue[--pic->ridx];
a = pic_apply_argv(pic, handler, 1, v);
pic->rescue[pic->ridx++] = handler;
return a;
} }
NORETURN static pic_value NORETURN static pic_value