diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/kernel.c | 7 | ||||
| -rw-r--r-- | src/variable.c | 15 | ||||
| -rw-r--r-- | src/vm.c | 1 |
3 files changed, 21 insertions, 2 deletions
diff --git a/src/kernel.c b/src/kernel.c index 85eedc7ba..5e8a2f5aa 100644 --- a/src/kernel.c +++ b/src/kernel.c @@ -920,8 +920,9 @@ mrb_obj_public_methods(mrb_state *mrb, mrb_value self) mrb_value mrb_f_raise(mrb_state *mrb, mrb_value self) { - mrb_value a[2]; + mrb_value a[2], exc; int argc; + argc = mrb_get_args(mrb, "|oo", &a[0], &a[1]); switch (argc) { @@ -936,7 +937,9 @@ mrb_f_raise(mrb_state *mrb, mrb_value self) } /* fall through */ default: - mrb_exc_raise(mrb, mrb_make_exception(mrb, argc, a)); + exc = mrb_make_exception(mrb, argc, a); + mrb_obj_iv_set(mrb, mrb_obj_ptr(exc), mrb_intern(mrb, "lastpc"), mrb_voidp_value(mrb->ci->pc)); + mrb_exc_raise(mrb, exc); } return mrb_nil_value(); /* not reached */ } diff --git a/src/variable.c b/src/variable.c index 6907a8e2a..992663408 100644 --- a/src/variable.c +++ b/src/variable.c @@ -461,6 +461,21 @@ mrb_obj_iv_set(mrb_state *mrb, struct RObject *obj, mrb_sym sym, mrb_value v) } void +mrb_obj_iv_ifnone(mrb_state *mrb, struct RObject *obj, mrb_sym sym, mrb_value v) +{ + iv_tbl *t = obj->iv; + + if (!t) { + t = obj->iv = iv_new(mrb); + } + else if (iv_get(mrb, t, sym, &v)) { + return; + } + mrb_write_barrier(mrb, (struct RBasic*)obj); + iv_put(mrb, t, sym, v); +} + +void mrb_iv_set(mrb_state *mrb, mrb_value obj, mrb_sym sym, mrb_value v) { if (obj_iv_p(obj)) { @@ -1151,6 +1151,7 @@ mrb_run(mrb_state *mrb, struct RProc *proc, mrb_value self) int eidx; L_RAISE: + mrb_obj_iv_ifnone(mrb, mrb->exc, mrb_intern(mrb, "lastpc"), mrb_voidp_value(pc)); ci = mrb->ci; eidx = mrb->ci->eidx; if (ci == mrb->cibase) goto L_STOP; |