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

OP_RETRUN to take B as matching exception; ref #3487

Browse Source
This commit is contained in:
Yukihiro "Matz" Matsumoto
2017-03-11 16:32:29 +09:00
parent 4ab70294ea
commit 000c68da97
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/mruby/opcode.h
+1 -1
View File
@@ -82,7 +82,7 @@ enum {
OP_JMPIF,/* A sBx if R(A) pc+=sBx */
OP_JMPNOT,/* A sBx if !R(A) pc+=sBx */
OP_ONERR,/* sBx rescue_push(pc+sBx) */
OP_RESCUE,/* A clear(exc); R(A) := exception (ignore when A=0) */
OP_RESCUE,/* A B R(A) := exc; R(B) := matched (ignore if A/B=0) */
OP_POPERR,/* A A.times{rescue_pop()} */
OP_RAISE,/* A raise(R(A)) */
OP_EPUSH,/* Bx ensure_push(SEQ[Bx]) */
mrbgems/mruby-compiler/core/codegen.c
+2 -2
View File
@@ -1294,7 +1294,7 @@ codegen(codegen_scope *s, node *tree, int val)
node *n2 = tree->car;
int exc = cursp();
genop(s, MKOP_A(OP_RESCUE, exc));
genop(s, MKOP_AB(OP_RESCUE, exc, 0));
push();
while (n2) {
node *n3 = n2->car;
@@ -1788,7 +1788,7 @@ codegen(codegen_scope *s, node *tree, int val)
genop(s, MKOP_A(OP_POPERR, 1));
noexc = genop(s, MKOP_Bx(OP_JMP, 0));
dispatch(s, onerr);
genop(s, MKOP_A(OP_RESCUE, exc));
genop(s, MKOP_AB(OP_RESCUE, exc, 0));
genop(s, MKOP_A(OP_LOADF, exc));
dispatch(s, noexc);
loop_pop(s, NOVAL);