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_method.c: fix method_removed

Browse source 
* vm_method.c: call method_removed hook on called class, not on
  prepending iclass.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39234 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-02-14 01:30:47 +00:00
parent 8c5a6fb684
commit 01e43fb0e2
3 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Thu Feb 14 10:30:41 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* vm_method.c: call method_removed hook on called class, not on
prepending iclass.
Thu Feb 14 10:05:57 2013 Eric Hodel <drbrain@segment7.net>
* lib/net/http: Do not handle Content-Encoding when the user sets

19
test/ruby/test_module.rb
View file

@ -1382,12 +1382,27 @@ class TestModule < Test::Unit::TestCase
end
def test_prepend_remove_method
c = Class.new do
prepend Module.new {def foo; end}
end
assert_raise(NameError) do
Class.new do
prepend Module.new {def foo; end}
c.class_eval do
remove_method(:foo)
end
end
c.class_eval do
def foo; end
end
removed = nil
c.singleton_class.class_eval do
define_method(:method_removed) {|id| removed = id}
end
assert_nothing_raised(NoMethodError, NameError) do
c.class_eval do
remove_method(:foo)
end
end
assert_equal(:foo, removed)
end
def test_prepend_class_ancestors

3
vm_method.c
View file

@ -648,6 +648,7 @@ remove_method(VALUE klass, ID mid)
{
st_data_t key, data;
rb_method_entry_t *me = 0;
VALUE self = klass;
klass = RCLASS_ORIGIN(klass);
if (klass == rb_cObject) {
@ -674,7 +675,7 @@ remove_method(VALUE klass, ID mid)
rb_clear_cache_for_undef(klass, mid);
rb_unlink_method_entry(me);
CALL_METHOD_HOOK(klass, removed, mid);
CALL_METHOD_HOOK(self, removed, mid);
}
void