diff options
| author | Yukihiro Matz Matsumoto <[email protected]> | 2012-12-12 18:23:20 +0900 |
|---|---|---|
| committer | Yukihiro Matz Matsumoto <[email protected]> | 2012-12-12 18:23:20 +0900 |
| commit | fd12f87712ee22b0a727f33f0c46c22ae968ec83 (patch) | |
| tree | 3c69cbafe260611f10a79b997d2bc76404cbd338 /src/kernel.c | |
| parent | f63d5c290510965e1256e4fac77709da83a6719a (diff) | |
| download | mruby-fd12f87712ee22b0a727f33f0c46c22ae968ec83.tar.gz mruby-fd12f87712ee22b0a727f33f0c46c22ae968ec83.zip | |
save lastpc on exception and use it in mruby stack trace
Diffstat (limited to 'src/kernel.c')
| -rw-r--r-- | src/kernel.c | 7 |
1 files changed, 5 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 */ } |