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 | |
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
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | object.c | 2 | ||||
-rw-r--r-- | test/ruby/test_module.rb | 11 | ||||
-rw-r--r-- | version.h | 6 |
4 files changed, 22 insertions, 5 deletions
@@ -1,3 +1,11 @@ +Sat May 4 23:44:54 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 23:39:45 2013 Tanaka Akira <akr@fsij.org> * thread.c (double2timeval): convert the infinity to TIME_MAX to avoid @@ -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; diff --git a/test/ruby/test_module.rb b/test/ruby/test_module.rb index 1dd27561b0..e7523f6a1e 100644 --- a/test/ruby/test_module.rb +++ b/test/ruby/test_module.rb @@ -1368,6 +1368,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 @@ -1447,14 +1454,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 @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.0.0" -#define RUBY_RELEASE_DATE "2013-05-02" -#define RUBY_PATCHLEVEL 181 +#define RUBY_RELEASE_DATE "2013-05-04" +#define RUBY_PATCHLEVEL 182 #define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_MONTH 5 -#define RUBY_RELEASE_DAY 2 +#define RUBY_RELEASE_DAY 4 #include "ruby/version.h" |