diff --git a/ChangeLog b/ChangeLog index 0b00ac5121..061e28b989 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Jan 29 14:25:39 2001 Yukihiro Matsumoto + + * eval.c (block_pass): return from block jumps directory to + block invoker. + Mon Jan 29 01:40:27 2001 Yukihiro Matsumoto * string.c (str_independent): should not clear str->orig here. diff --git a/eval.c b/eval.c index e833b74f19..3292cc411d 100644 --- a/eval.c +++ b/eval.c @@ -6333,7 +6333,23 @@ block_pass(self, node) POP_TAG(); POP_ITER(); if (_block.tag->dst == state) { - state &= TAG_MASK; + if (orphan) { + state &= TAG_MASK; + } + else { + struct BLOCK *ptr = old_block; + + while (ptr) { + if (ptr->scope == _block.scope) { + ptr->tag->dst = state; + break; + } + ptr = ptr->prev; + } + if (!ptr) { + state &= TAG_MASK; + } + } } ruby_block = old_block; ruby_safe_level = safe;