diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-05-27 13:45:47 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-05-27 13:45:47 +0000 |
commit | e0337774ed9bef3a491863290bc01476aa5b9743 (patch) | |
tree | 54eede26ad6aea945aa70645bb1c7ea77ea0264f /eval.c | |
parent | 5a7d4b7a981de8c0d1f7a190c85c402f1b0829ac (diff) | |
download | ruby-e0337774ed9bef3a491863290bc01476aa5b9743.tar.gz |
* eval.c (proc_invoke): save and restore block in the current frame.
fixed: [ruby-core:07833], [ruby-talk:191639]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10198 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'eval.c')
-rw-r--r-- | eval.c | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -8264,7 +8264,7 @@ static VALUE proc_invoke(VALUE proc, VALUE args /* OK */, VALUE self, VALUE klass) { struct BLOCK _block; - struct BLOCK *data; + struct BLOCK *data, *volatile old_block; volatile VALUE result = Qundef; int state; volatile int safe = ruby_safe_level; @@ -8302,6 +8302,7 @@ proc_invoke(VALUE proc, VALUE args /* OK */, VALUE self, VALUE klass) _block.scope = scope; } /* modify current frame */ + old_block = ruby_frame->block; ruby_frame->block = &_block; PUSH_TAG((pcall&YIELD_LAMBDA_CALL) ? PROT_LAMBDA : PROT_NONE); state = EXEC_TAG(); @@ -8314,6 +8315,7 @@ proc_invoke(VALUE proc, VALUE args /* OK */, VALUE self, VALUE klass) result = prot_tag->retval; } POP_TAG(); + ruby_frame->block = old_block; ruby_wrapper = old_wrapper; POP_VARS(); if (proc_safe_level_p(proc)) |