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

compile_next: do not goto into a branch

Browse Source 
I'm not necessarily against every goto in general, but jumping into a
branch is definitely a bad idea.  Better refactor.
This commit is contained in:
卜部昌平 2020-06-12 12:48:28 +09:00
parent cc1e9b8e11
commit cf29de7e6e
Notes: git 2020-06-29 11:07:11 +09:00 
Merged: https://github.com/ruby/ruby/pull/3247
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
compile.c
View File

@ -6651,11 +6651,6 @@ compile_next(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, in
ADD_INSN(ret, line, putnil); ADD_INSN(ret, line, putnil);
} }
} }
else if (iseq->body->type == ISEQ_TYPE_EVAL) {
next_in_eval:
COMPILE_ERROR(ERROR_ARGS "Can't escape from eval with next");
return COMPILE_NG;
}
else { else {
const rb_iseq_t *ip = iseq; const rb_iseq_t *ip = iseq;
@ -6674,7 +6669,8 @@ compile_next(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, in
break; break;
} }
else if (ip->body->type == ISEQ_TYPE_EVAL) { else if (ip->body->type == ISEQ_TYPE_EVAL) {
goto next_in_eval; COMPILE_ERROR(ERROR_ARGS "Can't escape from eval with next");
return COMPILE_NG;
} }
ip = ip->body->parent_iseq; ip = ip->body->parent_iseq;