1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* eval.c (proc_invoke): save and restore block in the current frame.

Browse Source 
fixed: [ruby-core:07833], [ruby-talk:191639]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10198 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2006-05-27 13:45:47 +00:00
parent 5a7d4b7a98
commit e0337774ed
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ChangeLog
View File

@ -1,9 +1,14 @@
Sat May 27 11:29:46 2006 nobuyoshi nakada <nobu@ruby-lang.org> Sat May 27 22:46:38 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (proc_invoke): save and restore block in the current frame.
fixed: [ruby-core:07833], [ruby-talk:191639]
Sat May 27 11:29:46 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/extmk.rb (extmake): remove extinit files if no statically linked * ext/extmk.rb (extmake): remove extinit files if no statically linked
extensions. extensions.
Fri May 26 09:05:11 2006 nobuyoshi nakada <nobu@ruby-lang.org> Fri May 26 09:05:11 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ruby.h, lib/mkmf.rb (create_header): clear command line options for * ruby.h, lib/mkmf.rb (create_header): clear command line options for
macros moved to extconf.h. macros moved to extconf.h.
@ -18,7 +23,7 @@ Fri May 26 09:05:11 2006 nobuyoshi nakada <nobu@ruby-lang.org>
* lib/mkmf.rb (configuration): add $defs unless extconf.h was created. * lib/mkmf.rb (configuration): add $defs unless extconf.h was created.
Thu May 25 01:52:07 2006 nobuyoshi nakada <nobu@ruby-lang.org> Thu May 25 01:52:07 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb (pkg_config): particular config commands support. * lib/mkmf.rb (pkg_config): particular config commands support.
@ -32,7 +37,7 @@ Thu May 25 01:52:07 2006 nobuyoshi nakada <nobu@ruby-lang.org>
* win32/setup.mak: suffix OS name by runtime version. * win32/setup.mak: suffix OS name by runtime version.
Wed May 24 23:52:11 2006 nobuyoshi nakada <nobu@ruby-lang.org> Wed May 24 23:52:11 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (ac_install_sh): ignore dummy install-sh. * configure.in (ac_install_sh): ignore dummy install-sh.
[ruby-talk:193876] [ruby-talk:193876]
@ -86,7 +91,7 @@ Thu May 18 22:37:20 2006 GOTOU Yuuzou <gotoyuzo@notwork.org>
* test/webrick/test_utils.rb: test for WEBrick::Utils.timeout. * test/webrick/test_utils.rb: test for WEBrick::Utils.timeout.
Thu May 18 00:42:12 2006 nobuyoshi nakada <nobu@ruby-lang.org> Thu May 18 00:42:12 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/extmk.rb, lib/mkmf.rb: use BUILD_FILE_SEPARATOR in Makefiles. * ext/extmk.rb, lib/mkmf.rb: use BUILD_FILE_SEPARATOR in Makefiles.
@ -233,7 +238,7 @@ Sat Apr 1 15:11:27 2006 Masaki Suketa <masaki.suketa@nifty.ne.jp>
* add test/win32ole * add test/win32ole
Fri Mar 31 14:24:55 2006 nobuyoshi nakada <nobu@ruby-lang.org> Fri Mar 31 14:24:55 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* enumerator.c (enumerator_with_index): removed suspicious return * enumerator.c (enumerator_with_index): removed suspicious return
statement. statement.

4
eval.c
View File

@ -8264,7 +8264,7 @@ static VALUE
proc_invoke(VALUE proc, VALUE args /* OK */, VALUE self, VALUE klass) proc_invoke(VALUE proc, VALUE args /* OK */, VALUE self, VALUE klass)
{ {
struct BLOCK _block; struct BLOCK _block;
struct BLOCK *data; struct BLOCK *data, *volatile old_block;
volatile VALUE result = Qundef; volatile VALUE result = Qundef;
int state; int state;
volatile int safe = ruby_safe_level; volatile int safe = ruby_safe_level;
@ -8302,6 +8302,7 @@ proc_invoke(VALUE proc, VALUE args /* OK */, VALUE self, VALUE klass)
_block.scope = scope; _block.scope = scope;
} }
/* modify current frame */ /* modify current frame */
old_block = ruby_frame->block;
ruby_frame->block = &_block; ruby_frame->block = &_block;
PUSH_TAG((pcall&YIELD_LAMBDA_CALL) ? PROT_LAMBDA : PROT_NONE); PUSH_TAG((pcall&YIELD_LAMBDA_CALL) ? PROT_LAMBDA : PROT_NONE);
state = EXEC_TAG(); state = EXEC_TAG();
@ -8314,6 +8315,7 @@ proc_invoke(VALUE proc, VALUE args /* OK */, VALUE self, VALUE klass)
result = prot_tag->retval; result = prot_tag->retval;
} }
POP_TAG(); POP_TAG();
ruby_frame->block = old_block;
ruby_wrapper = old_wrapper; ruby_wrapper = old_wrapper;
POP_VARS(); POP_VARS();
if (proc_safe_level_p(proc)) if (proc_safe_level_p(proc))