admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

execute ensure clause correctly without OP_EPOP

Browse Source
This commit is contained in:
h2so5
2014-01-05 16:22:58 +09:00
parent 0b92025c3d
commit 0e23038a60
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vm.c
+4 -3
View File
@@ -264,7 +264,7 @@ ecall(mrb_state *mrb, int i)
p = mrb->c->ensure[i];
if (!p) return;
if (mrb->c->ci->eidx < i)
if (mrb->c->ci->eidx > i)
mrb->c->ci->eidx = i;
ci = cipush(mrb);
ci->stackidx = mrb->c->stack - mrb->c->stbase;
@@ -857,9 +857,10 @@ mrb_context_run(mrb_state *mrb, struct RProc *proc, mrb_value self, unsigned int
/* A A.times{ensure_pop().call} */
int n;
int a = GETARG_A(i);
mrb_callinfo *ci = mrb->c->ci;
for (n=0; n<a; n++) {
ecall(mrb, --mrb->c->ci->eidx);
for (n=0; n<a && ci->eidx > ci[-1].eidx; n++) {
ecall(mrb, --ci->eidx);
ARENA_RESTORE(mrb, ai);
}
NEXT;