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

* vm_trace.c (rb_tracepoint_attr_raised_exception): should not check

Browse source 
value before event checking.
* vm_trace.c (rb_tracepoint_attr_return_value): ditto.
* test/ruby/test_settracefunc.rb: add tests for TracePoint#return_value
  and TracePoint#raised_exception.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37830 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2012-11-24 04:12:30 +00:00
parent 76cffcdbf2
commit 9d803dfd5f
3 changed files with 59 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
Sat Nov 24 13:10:14 2012 Koichi Sasada <ko1@atdot.net>
* vm_trace.c (rb_tracepoint_attr_raised_exception): should not check
value before event checking.
* vm_trace.c (rb_tracepoint_attr_return_value): ditto.
* test/ruby/test_settracefunc.rb: add tests for TracePoint#return_value
and TracePoint#raised_exception.
Sat Nov 24 12:47:27 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com>
* test/ruby/test_process.rb (TestProcess#test_setsid): "./ruby-trunk"

43
test/ruby/test_settracefunc.rb
View file

@ -639,4 +639,47 @@ class TestSetTraceFunc < Test::Unit::TestCase
trace.disable
assert_equal(false, trace.enabled?)
end
def method_test_tracepoint_return_value obj
obj
end
def test_tracepoint_return_value
trace = TracePoint.new(:call, :return){|tp|
case tp.event
when :call
assert_raise(RuntimeError) {tp.return_value}
when :return
assert_equal("xyzzy", tp.return_value)
end
}
trace.enable{
method_test_tracepoint_return_value "xyzzy"
}
end
class XYZZYException < Exception; end
def method_test_tracepoint_raised_exception err
raise err
end
def test_tracepoint_raised_exception
trace = TracePoint.new(:call, :return){|tp|
case tp.event
when :call, :return
assert_raise(RuntimeError) { tp.raised_exception }
when :raise
assert_equal(XYZZYError, tp.raised_exception)
end
}
trace.enable{
begin
method_test_tracepoint_raised_exception XYZZYException
rescue XYZZYException
# ok
else
raise
end
}
end
end

12
vm_trace.c
View file

@ -750,15 +750,15 @@ rb_tracepoint_attr_return_value(VALUE tpval)
rb_tp_t *tp = tpptr(tpval);
tp_attr_check_active(tp);
if (tp->trace_arg->data == Qundef) {
rb_bug("tp_attr_return_value_m: unreachable");
}
if (tp->trace_arg->event & (RUBY_EVENT_RETURN | RUBY_EVENT_C_RETURN)) {
/* ok */
}
else {
rb_raise(rb_eRuntimeError, "not supported by this event");
}
if (tp->trace_arg->data == Qundef) {
rb_bug("tp_attr_return_value_m: unreachable");
}
return tp->trace_arg->data;
}
@ -768,15 +768,15 @@ rb_tracepoint_attr_raised_exception(VALUE tpval)
rb_tp_t *tp = tpptr(tpval);
tp_attr_check_active(tp);
if (tp->trace_arg->data == Qundef) {
rb_bug("tp_attr_raised_exception_m: unreachable");
}
if (tp->trace_arg->event & (RUBY_EVENT_RAISE)) {
/* ok */
}
else {
rb_raise(rb_eRuntimeError, "not supported by this event");
}
if (tp->trace_arg->data == Qundef) {
rb_bug("tp_attr_raised_exception_m: unreachable");
}
return tp->trace_arg->data;
}