diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | eval.c | 18 |
2 files changed, 16 insertions, 7 deletions
@@ -1,3 +1,8 @@ +Tue Jul 4 15:12:49 2006 Yukihiro Matsumoto <matz@ruby-lang.org> + + * eval.c (rb_call): should not set prot_tag->blkid since it would + never catch breaks at this level. [ruby-dev:28922] + Tue Jul 4 04:48:36 2006 Yukihiro Matsumoto <matz@ruby-lang.org> * bignum.c: ruby 1.9 HEAD 64 bit warnings clean up from @@ -785,10 +785,14 @@ static unsigned long block_unique = 1; _block.dyna_vars = ruby_dyna_vars; \ _block.wrapper = ruby_wrapper; \ _block.block_obj = 0; \ - _block.uniq = (b)?block_unique++:0; \ if (b) { \ + _block.uniq = block_unique++; \ prot_tag->blkid = _block.uniq; \ } \ + else { \ + _block.uniq = 0; \ + prot_tag->blkid = 0; \ + } \ (v) = &_block #define POP_BLOCK() } while (0) @@ -5915,15 +5919,15 @@ rb_call(VALUE klass, VALUE recv, ID mid, int state; PUSH_TAG(PROT_LOOP); - prot_tag->blkid = block->uniq; +// prot_tag->blkid = block->uniq; state = EXEC_TAG(); if (state == 0) { result = rb_call0(klass, recv, mid, id, argc, argv, block, body, noex); } - else if (state == TAG_BREAK && TAG_DST()) { - result = prot_tag->retval; - state = 0; - } +// else if (state == TAG_BREAK && TAG_DST()) { +// result = prot_tag->retval; +// state = 0; +// } POP_TAG(); if (state) JUMP_TAG(state); return result; @@ -8750,7 +8754,7 @@ passing_block(VALUE proc, struct BLOCK *blockp) if (!orphan) return data; *blockp = *data; - if (orphan) blockp->uniq = block_unique++; + blockp->uniq = block_unique++; return blockp; } |