kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* eval.c (rb_call0): "return" event hook should be always executed

Browse source 
if event_hooks is set.  fixed: [ruby-core:04662]
  (backported from HEAD)


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8263 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shugo 2005-04-07 08:47:09 +00:00
parent 3c887f64a4
commit 6f8fe02f96
3 changed files with 86 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Thu Apr 7 17:43:25 2005 Shugo Maeda <shugo@ruby-lang.org>
* eval.c (rb_call0): "return" event hook should be always executed
if event_hooks is set. fixed: [ruby-core:04662]
(backported from HEAD)
Mon Apr 4 23:17:52 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> Mon Apr 4 23:17:52 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tk.rb (TkComm#array2tk_list): accept enc-mode argument to * ext/tk/lib/tk.rb (TkComm#array2tk_list): accept enc-mode argument to

4
eval.c
View file

@ -5637,7 +5637,6 @@ rb_call0(klass, recv, id, oid, argc, argv, body, nosuper)
int state; int state;
VALUE *local_vars; /* OK */ VALUE *local_vars; /* OK */
NODE *saved_cref = 0; NODE *saved_cref = 0;
int hook_return = 0;
PUSH_SCOPE(); PUSH_SCOPE();
@ -5733,7 +5732,6 @@ rb_call0(klass, recv, id, oid, argc, argv, body, nosuper)
if (event_hooks) { if (event_hooks) {
EXEC_EVENT_HOOK(RUBY_EVENT_CALL, b2, recv, id, klass); EXEC_EVENT_HOOK(RUBY_EVENT_CALL, b2, recv, id, klass);
hook_return = 1;
} }
result = rb_eval(recv, body); result = rb_eval(recv, body);
} }
@ -5746,7 +5744,7 @@ rb_call0(klass, recv, id, oid, argc, argv, body, nosuper)
POP_CLASS(); POP_CLASS();
POP_SCOPE(); POP_SCOPE();
ruby_cref = saved_cref; ruby_cref = saved_cref;
if (hook_return) { if (event_hooks) {
EXEC_EVENT_HOOK(RUBY_EVENT_RETURN, body, recv, id, klass); EXEC_EVENT_HOOK(RUBY_EVENT_RETURN, body, recv, id, klass);
} }
switch (state) { switch (state) {

142
test/ruby/test_settracefunc.rb
View file

@ -1,7 +1,15 @@
require 'test/unit' require 'test/unit'
class TestSetTraceFunc < Test::Unit::TestCase class TestSetTraceFunc < Test::Unit::TestCase
def foo; end def foo; end;
def bar
events = []
set_trace_func(Proc.new { |event, file, lineno, mid, bidning, klass|
events << [event, lineno, mid, klass]
})
return events
end
def test_event def test_event
events = [] events = []
@ -27,79 +35,79 @@ class TestSetTraceFunc < Test::Unit::TestCase
eval("class Foo; end") eval("class Foo; end")
set_trace_func nil set_trace_func nil
assert_equal(["line", 11, :test_event, TestSetTraceFunc], assert_equal(["line", 19, :test_event, TestSetTraceFunc],
events.shift) # a = 1 events.shift) # a = 1
assert_equal(["line", 12, :test_event, TestSetTraceFunc], assert_equal(["line", 20, :test_event, TestSetTraceFunc],
events.shift) # foo events.shift) # foo
assert_equal(["call", 4, :foo, TestSetTraceFunc], assert_equal(["call", 4, :foo, TestSetTraceFunc],
events.shift) # foo events.shift) # foo
assert_equal(["return", 4, :foo, TestSetTraceFunc], assert_equal(["return", 4, :foo, TestSetTraceFunc],
events.shift) # foo events.shift) # foo
assert_equal(["line", 13, :test_event, TestSetTraceFunc], assert_equal(["line", 21, :test_event, TestSetTraceFunc],
events.shift) # a events.shift) # a
assert_equal(["line", 14, :test_event, TestSetTraceFunc], assert_equal(["line", 22, :test_event, TestSetTraceFunc],
events.shift) # b = 1 + 2 events.shift) # b = 1 + 2
assert_equal(["c-call", 14, :+, Fixnum], assert_equal(["c-call", 22, :+, Fixnum],
events.shift) # 1 + 2 events.shift) # 1 + 2
assert_equal(["c-return", 14, :+, Fixnum], assert_equal(["c-return", 22, :+, Fixnum],
events.shift) # 1 + 2 events.shift) # 1 + 2
assert_equal(["line", 15, :test_event, TestSetTraceFunc],
events.shift) # if b == 3
assert_equal(["line", 15, :test_event, TestSetTraceFunc],
events.shift) # if b == 3
assert_equal(["c-call", 15, :==, Fixnum],
events.shift) # b == 3
assert_equal(["c-return", 15, :==, Fixnum],
events.shift) # b == 3
assert_equal(["line", 16, :test_event, TestSetTraceFunc],
events.shift) # case b
assert_equal(["line", 17, :test_event, TestSetTraceFunc],
events.shift) # when 2
assert_equal(["c-call", 17, :===, Kernel],
events.shift) # when 2
assert_equal(["c-call", 17, :==, Fixnum],
events.shift) # when 2
assert_equal(["c-return", 17, :==, Fixnum],
events.shift) # when 2
assert_equal(["c-return", 17, :===, Kernel],
events.shift) # when 2
assert_equal(["line", 19, :test_event, TestSetTraceFunc],
events.shift) # when 3
assert_equal(["c-call", 19, :===, Kernel],
events.shift) # when 3
assert_equal(["c-return", 19, :===, Kernel],
events.shift) # when 3
assert_equal(["line", 20, :test_event, TestSetTraceFunc],
events.shift) # c = "b == 3"
assert_equal(["line", 23, :test_event, TestSetTraceFunc], assert_equal(["line", 23, :test_event, TestSetTraceFunc],
events.shift) # begin events.shift) # if b == 3
assert_equal(["line", 23, :test_event, TestSetTraceFunc],
events.shift) # if b == 3
assert_equal(["c-call", 23, :==, Fixnum],
events.shift) # b == 3
assert_equal(["c-return", 23, :==, Fixnum],
events.shift) # b == 3
assert_equal(["line", 24, :test_event, TestSetTraceFunc], assert_equal(["line", 24, :test_event, TestSetTraceFunc],
events.shift) # raise "error" events.shift) # case b
assert_equal(["c-call", 24, :raise, Kernel], assert_equal(["line", 25, :test_event, TestSetTraceFunc],
events.shift) # raise "error" events.shift) # when 2
assert_equal(["c-call", 24, :new, Class], assert_equal(["c-call", 25, :===, Kernel],
events.shift) # raise "error" events.shift) # when 2
assert_equal(["c-call", 24, :initialize, Exception], assert_equal(["c-call", 25, :==, Fixnum],
events.shift) # raise "error" events.shift) # when 2
assert_equal(["c-return", 24, :initialize, Exception], assert_equal(["c-return", 25, :==, Fixnum],
events.shift) # raise "error" events.shift) # when 2
assert_equal(["c-return", 24, :new, Class], assert_equal(["c-return", 25, :===, Kernel],
events.shift) # raise "error" events.shift) # when 2
assert_equal(["c-call", 24, :backtrace, Exception],
events.shift) # raise "error"
assert_equal(["c-return", 24, :backtrace, Exception],
events.shift) # raise "error"
assert_equal(["c-call", 24, :set_backtrace, Exception],
events.shift) # raise "error"
assert_equal(["c-return", 24, :set_backtrace, Exception],
events.shift) # raise "error"
assert_equal(["raise", 24, :test_event, TestSetTraceFunc],
events.shift) # raise "error"
assert_equal(["c-return", 24, :raise, Kernel],
events.shift) # raise "error"
assert_equal(["line", 27, :test_event, TestSetTraceFunc], assert_equal(["line", 27, :test_event, TestSetTraceFunc],
events.shift) # when 3
assert_equal(["c-call", 27, :===, Kernel],
events.shift) # when 3
assert_equal(["c-return", 27, :===, Kernel],
events.shift) # when 3
assert_equal(["line", 28, :test_event, TestSetTraceFunc],
events.shift) # c = "b == 3"
assert_equal(["line", 31, :test_event, TestSetTraceFunc],
events.shift) # begin
assert_equal(["line", 32, :test_event, TestSetTraceFunc],
events.shift) # raise "error"
assert_equal(["c-call", 32, :raise, Kernel],
events.shift) # raise "error"
assert_equal(["c-call", 32, :new, Class],
events.shift) # raise "error"
assert_equal(["c-call", 32, :initialize, Exception],
events.shift) # raise "error"
assert_equal(["c-return", 32, :initialize, Exception],
events.shift) # raise "error"
assert_equal(["c-return", 32, :new, Class],
events.shift) # raise "error"
assert_equal(["c-call", 32, :backtrace, Exception],
events.shift) # raise "error"
assert_equal(["c-return", 32, :backtrace, Exception],
events.shift) # raise "error"
assert_equal(["c-call", 32, :set_backtrace, Exception],
events.shift) # raise "error"
assert_equal(["c-return", 32, :set_backtrace, Exception],
events.shift) # raise "error"
assert_equal(["raise", 32, :test_event, TestSetTraceFunc],
events.shift) # raise "error"
assert_equal(["c-return", 32, :raise, Kernel],
events.shift) # raise "error"
assert_equal(["line", 35, :test_event, TestSetTraceFunc],
events.shift) # eval(<<EOF) events.shift) # eval(<<EOF)
assert_equal(["c-call", 27, :eval, Kernel], assert_equal(["c-call", 35, :eval, Kernel],
events.shift) # eval(<<EOF) events.shift) # eval(<<EOF)
assert_equal(["line", 1, :test_event, TestSetTraceFunc], assert_equal(["line", 1, :test_event, TestSetTraceFunc],
events.shift) # class Foo events.shift) # class Foo
@ -111,12 +119,20 @@ class TestSetTraceFunc < Test::Unit::TestCase
events.shift) # class Foo events.shift) # class Foo
assert_equal(["end", 1, :test_event, TestSetTraceFunc], assert_equal(["end", 1, :test_event, TestSetTraceFunc],
events.shift) # class Foo events.shift) # class Foo
assert_equal(["c-return", 27, :eval, Kernel], assert_equal(["c-return", 35, :eval, Kernel],
events.shift) # eval(<<EOF) events.shift) # eval(<<EOF)
assert_equal(["line", 28, :test_event, TestSetTraceFunc], assert_equal(["line", 36, :test_event, TestSetTraceFunc],
events.shift) # set_trace_func nil events.shift) # set_trace_func nil
assert_equal(["c-call", 28, :set_trace_func, Kernel], assert_equal(["c-call", 36, :set_trace_func, Kernel],
events.shift) # set_trace_func nil events.shift) # set_trace_func nil
assert_equal([], events) assert_equal([], events)
events = bar
set_trace_func(nil)
assert_equal(["line", 11, :bar, TestSetTraceFunc], events.shift)
assert_equal(["return", 7, :bar, TestSetTraceFunc], events.shift)
assert_equal(["line", 131, :test_event, TestSetTraceFunc], events.shift)
assert_equal(["c-call", 131, :set_trace_func, Kernel], events.shift)
assert_equal([], events)
end end
end end