From 8cb3d2e996d9db43bb5854b008df65f3a377b815 Mon Sep 17 00:00:00 2001 From: shugo Date: Thu, 7 Apr 2005 08:38:05 +0000 Subject: * 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 --- eval.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'eval.c') 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) { -- cgit