1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Extract compile_errinfo from iseq_compile_each0

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2017-03-13 00:03:09 +09:00
parent d7bba95eba
commit cbf841e3ed
No known key found for this signature in database
GPG Key ID: 7CD2805BFA3770C6
Notes: git 2021-09-01 16:17:28 +09:00 
Merged: https://github.com/ruby/ruby/pull/4795
1 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
compile.c
View File

@ -8802,6 +8802,34 @@ compile_dots(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, in
return COMPILE_OK; return COMPILE_OK;
} }
static int
compile_errinfo(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int popped)
{
if (!popped) {
if (iseq->body->type == ISEQ_TYPE_RESCUE) {
ADD_GETLOCAL(ret, node, LVAR_ERRINFO, 0);
}
else {
const rb_iseq_t *ip = iseq;
int level = 0;
while (ip) {
if (ip->body->type == ISEQ_TYPE_RESCUE) {
break;
}
ip = ip->body->parent_iseq;
level++;
}
if (ip) {
ADD_GETLOCAL(ret, node, LVAR_ERRINFO, level);
}
else {
ADD_INSN(ret, node, putnil);
}
}
}
return COMPILE_OK;
}
static int iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int popped); static int iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int popped);
/** /**
compile each node compile each node
@ -9458,31 +9486,9 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const no
} }
break; break;
} }
case NODE_ERRINFO:{ case NODE_ERRINFO:
if (!popped) { CHECK(compile_errinfo(iseq, ret, node, popped));
if (body->type == ISEQ_TYPE_RESCUE) {
ADD_GETLOCAL(ret, node, LVAR_ERRINFO, 0);
}
else {
const rb_iseq_t *ip = iseq;
int level = 0;
while (ip) {
if (ip->body->type == ISEQ_TYPE_RESCUE) {
break;
}
ip = ip->body->parent_iseq;
level++;
}
if (ip) {
ADD_GETLOCAL(ret, node, LVAR_ERRINFO, level);
}
else {
ADD_INSN(ret, node, putnil);
}
}
}
break; break;
}
case NODE_DEFINED: case NODE_DEFINED:
if (!popped) { if (!popped) {
CHECK(compile_defined_expr(iseq, ret, node, Qtrue)); CHECK(compile_defined_expr(iseq, ret, node, Qtrue));