diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-05-04 14:48:20 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-05-04 14:48:20 +0000 |
commit | f824c6f15f3bfb0b2d7188fc2b8496ee8d69285f (patch) | |
tree | f18057866439f0a8663912790b31a264168f5296 /object.c | |
parent | 453bb57d5539e36e4672d9a1883a296a98a0126a (diff) |
merge revision(s) 40561: [Backport #8357]
* 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]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40575 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'object.c')
-rw-r--r-- | object.c | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -584,6 +584,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; @@ -1465,6 +1466,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; |