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

Need to raise "break from proc-closure" error; fix #3359 fix #3495

Browse Source 
Some examples in #3359 still behave differently from CRuby.
This commit is contained in:
Yukihiro "Matz" Matsumoto
2017-04-19 19:38:57 +09:00
parent 283d145d3e
commit 77c2aa7b8a
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vm.c
+8 -3
View File
@@ -1803,8 +1803,13 @@ RETRY_TRY_BLOCK:
ci = mrb->c->ci;
break;
case OP_R_BREAK:
if (!proc->env || !MRB_ENV_STACK_SHARED_P(proc->env)) {
localjump_error(mrb, LOCALJUMP_ERROR_BREAK);
if (ci->acc < 0 || !proc->env || !MRB_ENV_STACK_SHARED_P(proc->env)) {
mrb_value exc;
L_BREAK_ERROR:
exc = mrb_exc_new_str_lit(mrb, E_LOCALJUMP_ERROR,
"break from proc-closure");
mrb_exc_set(mrb, exc);
goto L_RAISE;
}
/* break from fiber block */
@@ -1820,7 +1825,7 @@ RETRY_TRY_BLOCK:
while (ci > mrb->c->ci) {
if (ci[-1].acc == CI_ACC_SKIP) {
mrb->c->ci = ci;
break;
goto L_BREAK_ERROR;
}
if (ci->env) {
mrb_env_unshare(mrb, ci->env);