Permalink
Browse files

should not ignore exception on top-level; close #635

  • Loading branch information...
1 parent 04b341b commit 9de76a71e180afb9803f6c62f86cf452b863157b @matz matz committed Dec 17, 2012
Showing with 6 additions and 2 deletions.
  1. +6 −2 src/vm.c
View
@@ -1153,8 +1153,11 @@ mrb_run(mrb_state *mrb, struct RProc *proc, mrb_value self)
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;
+ eidx = ci->eidx;
+ if (ci == mrb->cibase) {
+ if (ci->ridx == 0) goto L_STOP;
+ goto L_RESCUE;
+ }
while (ci[0].ridx == ci[-1].ridx) {
cipop(mrb);
ci = mrb->ci;
@@ -1173,6 +1176,7 @@ mrb_run(mrb_state *mrb, struct RProc *proc, mrb_value self)
break;
}
}
+ L_RESCUE:
irep = ci->proc->body.irep;
pool = irep->pool;
syms = irep->syms;

0 comments on commit 9de76a7

Please sign in to comment.