[ruby-dev:11753] [PATCH] extend/include for frozen

なかだです。

  freeze されたオブジェクトやクラスが、メソッドの追加や削除はできないの
に include や extend できるのはヘンじゃないでしょうか。

  それと rb_undef_method() のプロトタイプが ruby.h と intern.h の両方に
あるけど、rb_undef() がありません。

  一応 ChangeLog(っぽいの)。

Thu Dec 14 13:06:18 2000  Nobuyoshi Nakada  <[e-mail]>

	* class.c (rb_include_module): prohibit fronzen class/module.

	* eval.c (rb_frozen_class_p): make external.

	* intern.h (rb_frozen_class_p): prototyped.

	* intern.h (rb_undef): prototyped not but rb_undef_method()
	  which is also in ruby.h.


diff -pruPX ./.excludes current/class.c devel/class.c
--- current/class.c	Tue Dec  5 18:36:24 2000
+++ devel/class.c	Thu Dec 14 12:25:53 2000
@@ -241,6 +241,7 @@ rb_include_module(klass, module)
 		return;
 	    }
 	}
+	rb_frozen_class_p(klass);
 	RCLASS(klass)->super =
 	    include_class_new(module, RCLASS(klass)->super);
 	klass = RCLASS(klass)->super;
diff -pruPX ./.excludes current/eval.c devel/eval.c
--- current/eval.c	Tue Dec 12 16:42:21 2000
+++ devel/eval.c	Thu Dec 14 12:20:21 2000
@@ -1459,8 +1459,8 @@ rb_mod_s_constants()
     return ary;
 }
 
-static void
-frozen_class_p(klass)
+void
+rb_frozen_class_p(klass)
     VALUE klass;
 {
     char *desc = "something(?!)";
@@ -1495,7 +1495,7 @@ rb_undef(klass, id)
     if (rb_safe_level() >= 4 && !OBJ_TAINTED(klass)) {
 	rb_raise(rb_eSecurityError, "Insecure: can't undef");
     }
-    frozen_class_p(klass);
+    rb_frozen_class_p(klass);
     if (id == __id__ || id == __send__) {
 	rb_warn("undefining `%s' may cause serious problem",
 		rb_id2name(id));
@@ -1541,7 +1541,7 @@ rb_alias(klass, name, def)
     VALUE origin;
     NODE *orig, *body;
 
-    frozen_class_p(klass);
+    rb_frozen_class_p(klass);
     if (name == def) return;
     if (klass == rb_cObject) {
 	rb_secure(4);
@@ -2858,7 +2858,7 @@ rb_eval(self, n)
 		rb_warn("redefining `%s' may cause serious problem",
 			rb_id2name(node->nd_mid));
 	    }
-	    frozen_class_p(ruby_class);
+	    rb_frozen_class_p(ruby_class);
 	    body = search_method(ruby_class, node->nd_mid, &origin);
 	    if (body){
 		if (RTEST(ruby_verbose) && ruby_class == origin && body->nd_cnt == 0) {
diff -pruPX ./.excludes current/intern.h devel/intern.h
--- current/intern.h	Fri Dec  8 16:10:23 2000
+++ devel/intern.h	Thu Dec 14 12:24:48 2000
@@ -90,7 +90,8 @@ VALUE rb_class_protected_instance_method
 VALUE rb_class_private_instance_methods _((int, VALUE*, VALUE));
 VALUE rb_obj_singleton_methods _((VALUE));
 void rb_define_method_id _((VALUE, ID, VALUE (*)(), int));
-void rb_undef_method _((VALUE, const char*));
+void rb_frozen_class_p _((VALUE));
+void rb_undef _((VALUE, ID));
 void rb_define_protected_method _((VALUE, const char*, VALUE (*)(), int));
 void rb_define_private_method _((VALUE, const char*, VALUE (*)(), int));
 void rb_define_singleton_method _((VALUE,const char*,VALUE(*)(),int));


-- 
--- 僕の前にBugはない。
--- 僕の後ろにBugはできる。
    中田 伸悦