*** empty log message ***

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4065 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 20 insertions, 19 deletions

diff --git a/eval.c b/eval.c
index 964d30270d..ab8ddc8e67 100644
--- a/eval.c
+++ b/eval.c
@@ -267,25 +267,25 @@ rb_add_method(klass, mid, node, noex)
     if (!FL_TEST(klass, FL_SINGLETON) &&
 	node && nd_type(node) != NODE_ZSUPER &&
 	(mid == rb_intern("initialize" )|| mid == rb_intern("initialize_copy"))) {
-	 noex = NOEX_PRIVATE | (noex & NOEX_NOSUPER);
-     }
-     else if (FL_TEST(klass, FL_SINGLETON) && node && nd_type(node) == NODE_CFUNC &&
-	      mid == rb_intern("allocate")) {
-	 rb_warn("defining %s.allocate is deprecated; use rb_define_alloc_func()",
-		 rb_class2name(rb_iv_get(klass, "__attached__")));
-	 mid = ID_ALLOCATOR;
-     }
-     if (OBJ_FROZEN(klass)) rb_error_frozen("class/module");
-     rb_clear_cache_for_undef(klass, mid);
-     body = NEW_METHOD(node, noex);
-     st_insert(RCLASS(klass)->m_tbl, mid, (st_data_t)body);
-     if (node && mid != ID_ALLOCATOR && ruby_running) {
-	 if (FL_TEST(klass, FL_SINGLETON)) {
-	     rb_funcall(rb_iv_get(klass, "__attached__"), singleton_added, 1, ID2SYM(mid));
-	 }
-	 else {
-	     rb_funcall(klass, added, 1, ID2SYM(mid));
-	 }
+	noex = NOEX_PRIVATE | (noex & NOEX_NOSUPER);
+    }
+    else if (FL_TEST(klass, FL_SINGLETON) && node && nd_type(node) == NODE_CFUNC &&
+	     mid == rb_intern("allocate")) {
+	rb_warn("defining %s.allocate is deprecated; use rb_define_alloc_func()",
+		rb_class2name(rb_iv_get(klass, "__attached__")));
+	mid = ID_ALLOCATOR;
+    }
+    if (OBJ_FROZEN(klass)) rb_error_frozen("class/module");
+    rb_clear_cache_for_undef(klass, mid);
+    body = NEW_METHOD(node, noex);
+    st_insert(RCLASS(klass)->m_tbl, mid, (st_data_t)body);
+    if (node && mid != ID_ALLOCATOR && ruby_running) {
+	if (FL_TEST(klass, FL_SINGLETON)) {
+	    rb_funcall(rb_iv_get(klass, "__attached__"), singleton_added, 1, ID2SYM(mid));
+	}
+	else {
+	    rb_funcall(klass, added, 1, ID2SYM(mid));
+	}
     }
 }
 
@@ -1820,6 +1820,7 @@ rb_undef(klass, id)
 	rb_name_error(id, "undefined method `%s' for%s `%s'",
 		      rb_id2name(id),s0,rb_class2name(c));
     }
+    if (klass != origin) rb_clear_cache_for_undef(origin, id);
     rb_add_method(klass, id, 0, NOEX_PUBLIC);
     if (FL_TEST(klass, FL_SINGLETON)) {
 	rb_funcall(rb_iv_get(klass, "__attached__"),