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

delegate error handling to REPL when no exception handlers remain

This commit is contained in:
Yuichi Nishiwaki 2014-02-19 02:22:34 +09:00
parent 6e3a2b176a
commit b69b549fca
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/picrin.h
View File

@ -211,7 +211,7 @@ void pic_import(pic_state *, pic_value);
void pic_export(pic_state *, pic_sym); void pic_export(pic_state *, pic_sym);
NORETURN void pic_abort(pic_state *, const char *); NORETURN void pic_abort(pic_state *, const char *);
NORETURN void pic_raise(pic_state *, pic_value); NORETURN void pic_raise(pic_state *, struct pic_error *);
NORETURN void pic_error(pic_state *, const char *); NORETURN void pic_error(pic_state *, const char *);
NORETURN void pic_errorf(pic_state *, const char *, ...); NORETURN void pic_errorf(pic_state *, const char *, ...);
void pic_warn(pic_state *, const char *); void pic_warn(pic_state *, const char *);

16
src/error.c
View File

@ -80,19 +80,19 @@ pic_warn(pic_state *pic, const char *msg)
} }
void void
pic_raise(pic_state *pic, pic_value obj) pic_raise(pic_state *pic, struct pic_error *e)
{ {
pic_value a; pic_value a;
struct pic_proc *handler; struct pic_proc *handler;
if (pic->ridx == 0) { if (pic->ridx == 0) {
pic_abort(pic, "logic flaw: no exception handler remains"); raise(pic, e);
} }
handler = pic->rescue[--pic->ridx]; handler = pic->rescue[--pic->ridx];
pic_gc_protect(pic, pic_obj_value(handler)); pic_gc_protect(pic, pic_obj_value(handler));
a = pic_apply_argv(pic, handler, 1, obj); a = pic_apply_argv(pic, handler, 1, pic_obj_value(e));
/* when the handler returns */ /* when the handler returns */
pic_errorf(pic, "handler returned", 2, pic_obj_value(handler), a); pic_errorf(pic, "handler returned", 2, pic_obj_value(handler), a);
} }
@ -141,10 +141,16 @@ NORETURN static pic_value
pic_error_raise(pic_state *pic) pic_error_raise(pic_state *pic)
{ {
pic_value v; pic_value v;
struct pic_error *e;
pic_get_args(pic, "o", &v); pic_get_args(pic, "o", &v);
pic_raise(pic, v); e = (struct pic_error *)pic_obj_alloc(pic, sizeof(struct pic_error), PIC_TT_ERROR);
e->type = PIC_ERROR_RAISED;
e->msg = pic_str_new_cstr(pic, "raised");
e->irrs = pic_list(pic, 1, v);
pic_raise(pic, e);
} }
static pic_value static pic_value
@ -173,7 +179,7 @@ pic_error_error(pic_state *pic)
e->msg = pic_str_new_cstr(pic, str); e->msg = pic_str_new_cstr(pic, str);
e->irrs = pic_list_by_array(pic, argc, argv); e->irrs = pic_list_by_array(pic, argc, argv);
pic_raise(pic, pic_obj_value(e)); pic_raise(pic, e);
} }
static pic_value static pic_value