[ruby-dev:12684] rb_include_module

共通のモジュールをインクルードしている
二つのモジュールの間で、インクルードを行うときに、
method cacheのクリアミスが起きます。

module MP
  def foo; puts "MP#foo"; end
end

module M
  include MP
  def foo; puts "M#foo"; end
end

class A
  include MP
end

class A
  self.new.foo      # => MP#foo
  include M
  self.new.foo      # => MP#foo   ???
end


--- ruby.h.orig	Tue Mar 27 16:09:23 2001
+++ ruby.h	Tue Mar 27 19:03:11 2001
@@ -403,7 +403,7 @@
 VALUE rb_define_class_under _((VALUE, const char*, VALUE));
 VALUE rb_define_module_under _((VALUE, const char*));
 
-void rb_include_module _((VALUE,VALUE));
+int  rb_include_module _((VALUE,VALUE));
 void rb_extend_object _((VALUE,VALUE));
 
 void rb_define_variable _((const char*,VALUE*));


--- class.c.orig	Wed Feb 14 14:51:57 2001
+++ class.c	Tue Mar 27 19:05:25 2001
@@ -212,14 +212,15 @@
     return (VALUE)klass;
 }
 
-void
+int
 rb_include_module(klass, module)
     VALUE klass, module;
 {
     VALUE p;
+    int changed;
 
-    if (NIL_P(module)) return;
-    if (klass == module) return;
+    if (NIL_P(module)) return 0;
+    if (klass == module) return 0;
 
     switch (TYPE(module)) {
       case T_MODULE:
@@ -230,15 +231,18 @@
 	Check_Type(module, T_MODULE);
     }
 
+    changed = 0;
     while (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 &&
 		RCLASS(p)->m_tbl == RCLASS(module)->m_tbl) {
 		if (RCLASS(module)->super) {
-		    rb_include_module(p, RCLASS(module)->super);
+		  if (rb_include_module(p, RCLASS(module)->super))
+		    return 1;
 		}
-		return;
+		if (changed) rb_clear_cache();
+		return changed;
 	    }
 	}
 	rb_frozen_class_p(klass);
@@ -246,8 +250,10 @@
 	    include_class_new(module, RCLASS(klass)->super);
 	klass = RCLASS(klass)->super;
 	module = RCLASS(module)->super;
+	changed = 1;
     }
     rb_clear_cache();
+    return changed;
 }
 
 VALUE

----
小迫＠ソフネック   渋谷区恵比寿1-15-1