diff options
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | object.c | 2 | ||||
-rw-r--r-- | test/ruby/test_module.rb | 11 |
3 files changed, 19 insertions, 2 deletions
@@ -1,3 +1,11 @@ +Thu May 2 23:23:49 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * object.c (rb_obj_is_kind_of): skip prepending modules. + [ruby-core:54742] [Bug #8357] + + * object.c (rb_class_inherited_p): ditto. + [ruby-core:54736] [Bug #8357] + Thu May 2 22:11:47 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> * bin/irb: remove dead code from sample/irb.rb. @@ -599,6 +599,7 @@ rb_obj_is_kind_of(VALUE obj, VALUE c) VALUE cl = CLASS_OF(obj); c = class_or_module_required(c); + c = RCLASS_ORIGIN(c); while (cl) { if (cl == c || RCLASS_M_TBL(cl) == RCLASS_M_TBL(c)) return Qtrue; @@ -1511,6 +1512,7 @@ rb_class_inherited_p(VALUE mod, VALUE arg) if (!CLASS_OR_MODULE_P(arg)) { rb_raise(rb_eTypeError, "compared with non class/module"); } + arg = RCLASS_ORIGIN(arg); while (mod) { if (RCLASS_M_TBL(mod) == RCLASS_M_TBL(arg)) return Qtrue; diff --git a/test/ruby/test_module.rb b/test/ruby/test_module.rb index 0bb27be968..f27c11072a 100644 --- a/test/ruby/test_module.rb +++ b/test/ruby/test_module.rb @@ -1408,6 +1408,13 @@ class TestModule < Test::Unit::TestCase c = labeled_class("c") {prepend b} assert_operator(c, :<, b, bug6654) assert_operator(c, :<, a, bug6654) + bug8357 = '[ruby-core:54736] [Bug #8357]' + b = labeled_module("b") {prepend a} + c = labeled_class("c") {include b} + assert_operator(c, :<, b, bug8357) + assert_operator(c, :<, a, bug8357) + bug8357 = '[ruby-core:54742] [Bug #8357]' + assert_kind_of(b, c.new, bug8357) end def test_prepend_instance_methods @@ -1487,14 +1494,14 @@ class TestModule < Test::Unit::TestCase def labeled_module(name, &block) Module.new do - singleton_class.class_eval {define_method(:to_s) {name}} + singleton_class.class_eval {define_method(:to_s) {name}; alias inspect to_s} class_eval(&block) if block end end def labeled_class(name, superclass = Object, &block) Class.new(superclass) do - singleton_class.class_eval {define_method(:to_s) {name}} + singleton_class.class_eval {define_method(:to_s) {name}; alias inspect to_s} class_eval(&block) if block end end |