diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-02-20 04:28:52 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-02-20 04:28:52 +0000 |
| commit | 22768f9aefdb5e7a466bfd4e63dbfdf2bc5184b8 (patch) | |
| tree | 33117ceb2e479bc146c1f40711234ae780df5748 /class.c | |
| parent | 92886835719364eac3497eeb74f10dce1ff6275a (diff) | |
* hash.c (rb_any_cmp): should handle Qundef in keys.
* eval.c (remove_method): should not remove a empty method to
implement "undef".
* eval.c (rb_eval): should allow singleton class def for
true/false/nil.
* parse.y (str_extend): backslash escape was done wrong.
* class.c (rb_include_module): should preserve ancestor order in
the included class/module.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_6@2101 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'class.c')
| -rw-r--r-- | class.c | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -330,8 +330,10 @@ rb_include_module(klass, module) /* ignore if the module included already in superclasses */ for (p = RCLASS(klass)->super; p; p = RCLASS(p)->super) { if (BUILTIN_TYPE(p) == T_ICLASS) { - if (RCLASS(p)->m_tbl == RCLASS(module)->m_tbl) + if (RCLASS(p)->m_tbl == RCLASS(module)->m_tbl) { + c = p; goto skip; + } } } RCLASS(c)->super = include_class_new(module, RCLASS(c)->super); |