summaryrefslogtreecommitdiffstats
path: root/eval.c
diff options
context:
space:
mode:
authorshugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-04-07 08:38:05 +0000
committershugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-04-07 08:38:05 +0000
commit8cb3d2e996d9db43bb5854b008df65f3a377b815 (patch)
treea4a4da8439c18262d305c716d3aa9db9ba96e8bd /eval.c
parent65c3d30db79e602f3a0c6cfa51ab565e586670bc (diff)
downloadruby-8cb3d2e996d9db43bb5854b008df65f3a377b815.tar.gz
ruby-8cb3d2e996d9db43bb5854b008df65f3a377b815.tar.xz
ruby-8cb3d2e996d9db43bb5854b008df65f3a377b815.zip
* eval.c (rb_call0): "return" event hook should be always executed
if event_hooks is set. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@8262 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'eval.c')
-rw-r--r--eval.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/eval.c b/eval.c
index e47da642f..b0ea47f38 100644
--- a/eval.c
+++ b/eval.c
@@ -5718,7 +5718,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();
@@ -5814,7 +5813,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);
}
@@ -5827,7 +5825,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) {