diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-12-21 08:11:42 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-12-21 08:11:42 +0000 |
commit | d51f2ecb5b815ee9410b733fac04d3b22612c9e7 (patch) | |
tree | 0dca5dc53d84f673287273c82ca77945f388a415 | |
parent | 0ef92798abfb49a433db0e73ac2b9a7b9a62c82c (diff) |
revert revision r26082. cf: [ruby-dev:39889]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@26142 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | eval.c | 6 | ||||
-rw-r--r-- | test/ruby/test_settracefunc.rb | 5 | ||||
-rw-r--r-- | version.h | 2 |
4 files changed, 2 insertions, 17 deletions
@@ -51,7 +51,6 @@ Mon Dec 14 11:47:31 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * eval.c (rb_call): fixed for super in cached method. [ruby-dev:39757] -n Mon Dec 14 11:40:35 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> @@ -69,11 +68,6 @@ Mon Dec 14 03:36:20 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca> method created from an alias. Based on a patch by Peter Vanbroekhoven [ruby-core:22040] -Mon Dec 14 03:21:59 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * eval.c (call_trace_func): remove the trace hook if any exception - raised. [ruby-list:46515] - Mon Dec 14 02:27:32 2009 Yusuke Endoh <mame@tsg.ne.jp> * hash.c (rb_hash): always return a fixnum value because a return @@ -2772,11 +2772,7 @@ call_trace_func(event, node, self, id, klass) tracing = 0; ruby_current_node = node_save; SET_CURRENT_SOURCE(); - if (state) { - trace_func = 0; - rb_remove_event_hook(call_trace_func); - JUMP_TAG(state); - } + if (state) JUMP_TAG(state); } static VALUE diff --git a/test/ruby/test_settracefunc.rb b/test/ruby/test_settracefunc.rb index 765600f34d..14d6679407 100644 --- a/test/ruby/test_settracefunc.rb +++ b/test/ruby/test_settracefunc.rb @@ -135,9 +135,4 @@ class TestSetTraceFunc < Test::Unit::TestCase assert_equal(["c-call", 131, :set_trace_func, Kernel], events.shift) assert_equal([], events) end - - def test_bad_trace - e = Class.new(RuntimeError) - assert_raise(e) {set_trace_func proc{raise e}} - end end @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2009-12-21" #define RUBY_VERSION_CODE 187 #define RUBY_RELEASE_CODE 20091221 -#define RUBY_PATCHLEVEL 243 +#define RUBY_PATCHLEVEL 244 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 |