From 77c2aa7b8aaf2c3611189e84c48ac3ee74d2f47d Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Wed, 19 Apr 2017 19:38:57 +0900 Subject: Need to raise "break from proc-closure" error; fix #3359 fix #3495 Some examples in #3359 still behave differently from CRuby. --- src/vm.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/vm.c b/src/vm.c index 80a09b259..91aca3eb0 100644 --- a/src/vm.c +++ b/src/vm.c @@ -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); -- cgit v1.2.3