diff options
| author | shugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-04-07 08:47:09 +0000 |
|---|---|---|
| committer | shugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-04-07 08:47:09 +0000 |
| commit | ebe2a8731f0673958040d4d4f37f2290bedf7cc1 (patch) | |
| tree | d1319db925cc75b7e9d11ee7b4b852f10c52a92d /eval.c | |
| parent | ba9543cf7d2e200f12e242aeace8344fce07e10c (diff) | |
| download | ruby-ebe2a8731f0673958040d4d4f37f2290bedf7cc1.tar.gz ruby-ebe2a8731f0673958040d4d4f37f2290bedf7cc1.tar.xz ruby-ebe2a8731f0673958040d4d4f37f2290bedf7cc1.zip | |
* eval.c (rb_call0): "return" event hook should be always executed
if event_hooks is set. fixed: [ruby-core:04662]
(backported from HEAD)
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@8263 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'eval.c')
| -rw-r--r-- | eval.c | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -5637,7 +5637,6 @@ rb_call0(klass, recv, id, oid, argc, argv, body, nosuper) int state; VALUE *local_vars; /* OK */ NODE *saved_cref = 0; - int hook_return = 0; PUSH_SCOPE(); @@ -5733,7 +5732,6 @@ rb_call0(klass, recv, id, oid, argc, argv, body, nosuper) if (event_hooks) { EXEC_EVENT_HOOK(RUBY_EVENT_CALL, b2, recv, id, klass); - hook_return = 1; } result = rb_eval(recv, body); } @@ -5746,7 +5744,7 @@ rb_call0(klass, recv, id, oid, argc, argv, body, nosuper) POP_CLASS(); POP_SCOPE(); ruby_cref = saved_cref; - if (hook_return) { + if (event_hooks) { EXEC_EVENT_HOOK(RUBY_EVENT_RETURN, body, recv, id, klass); } switch (state) { |