summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-06-16 07:04:48 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-06-16 07:04:48 +0000
commit34c9f5779ab00fc46f8b458101f928dccf9fd4f7 (patch)
tree8918a7eb81fba2a25f009837d5f765b3cdae6397
parent3259145c33c7e44e207f57c5101460ddaf79b47a (diff)
downloadruby-34c9f5779ab00fc46f8b458101f928dccf9fd4f7.tar.gz
ruby-34c9f5779ab00fc46f8b458101f928dccf9fd4f7.tar.xz
ruby-34c9f5779ab00fc46f8b458101f928dccf9fd4f7.zip
* object.c (rb_mod_le): singleton class inherits Class rather than its
object's class. [ruby-dev:23690] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@6463 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--object.c5
2 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 5544bd83a..fe17e603e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jun 16 16:04:40 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * object.c (rb_mod_le): singleton class inherits Class rather than its
+ object's class. [ruby-dev:23690]
+
Wed Jun 16 16:01:17 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* gc.c (stack_grow_direction): memoize the direction.
diff --git a/object.c b/object.c
index b44534fc0..dd6b1f3ae 100644
--- a/object.c
+++ b/object.c
@@ -1283,6 +1283,11 @@ rb_mod_le(mod, arg)
rb_raise(rb_eTypeError, "compared with non class/module");
}
+ if (FL_TEST(mod, FL_SINGLETON)) {
+ if (RCLASS(mod)->m_tbl == RCLASS(arg)->m_tbl)
+ return Qtrue;
+ mod = RBASIC(mod)->klass;
+ }
while (mod) {
if (RCLASS(mod)->m_tbl == RCLASS(arg)->m_tbl)
return Qtrue;