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

[bugfix] unwrap raised error object

This commit is contained in:
Yuichi Nishiwaki 2014-06-29 17:27:18 +09:00
parent be2fbc394e
commit f52ef27a81
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/error.c
View File

@ -147,7 +147,13 @@ pic_error_with_exception_handler(pic_state *pic)
struct pic_error *e = pic->err; struct pic_error *e = pic->err;
pic->err = NULL; pic->err = NULL;
v = pic_apply1(pic, handler, pic_obj_value(e));
if (e->type == PIC_ERROR_RAISED) {
v = pic_list_ref(pic, e->irrs, 0);
} else {
v = pic_obj_value(e);
}
v = pic_apply1(pic, handler, v);
pic_errorf(pic, "error handler returned ~s, by error ~s", v, pic_obj_value(e)); pic_errorf(pic, "error handler returned ~s, by error ~s", v, pic_obj_value(e));
} }
return v; return v;