shyouhei	2008-06-04 19:16:19 +0900 (Wed, 04 Jun 2008)

  New Revision: 16814

  Modified files:
    branches/ruby_1_8_5/ChangeLog
    branches/ruby_1_8_5/eval.c
    branches/ruby_1_8_5/version.h

  Log:
    merge revision(s) 13586:
    * eval.c (remove_method): should not remove undef place holder.
      [ruby-dev:31817]


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/version.h?r1=16814&r2=16813&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ChangeLog?r1=16814&r2=16813&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/eval.c?r1=16814&r2=16813&diff_format=u

Index: ruby_1_8_5/ChangeLog
===================================================================
--- ruby_1_8_5/ChangeLog	(revision 16813)
+++ ruby_1_8_5/ChangeLog	(revision 16814)
@@ -14,6 +14,11 @@
 	* gc.c (os_obj_of, os_each_obj): hide objects to be finalized.
 	  [ruby-dev:31810]
 
+Wed Jun  4 19:15:57 2008  Yukihiro Matsumoto  <matz@r...>
+
+	* eval.c (remove_method): should not remove undef place holder.
+	  [ruby-dev:31817]
+
 Tue Jun  3 15:05:48 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* process.c (struct rb_exec_arg): proc should be a VALUE.
Index: ruby_1_8_5/version.h
===================================================================
--- ruby_1_8_5/version.h	(revision 16813)
+++ ruby_1_8_5/version.h	(revision 16814)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-06-04"
 #define RUBY_VERSION_CODE 185
 #define RUBY_RELEASE_CODE 20080604
-#define RUBY_PATCHLEVEL 125
+#define RUBY_PATCHLEVEL 126
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_5/eval.c
===================================================================
--- ruby_1_8_5/eval.c	(revision 16813)
+++ ruby_1_8_5/eval.c	(revision 16814)
@@ -574,8 +574,13 @@
     if (mid == __id__ || mid == __send__ || mid == init) {
 	rb_warn("removing `%s' may cause serious problem", rb_id2name(mid));
     }
-    if (!st_delete(RCLASS(klass)->m_tbl, &mid, (st_data_t *)&body) ||
-	!body->nd_body) {
+    if (st_lookup(RCLASS(klass)->m_tbl, mid, (st_data_t *)&body)) {
+	if (!body || !body->nd_body) body = 0;
+	else {
+	    st_delete(RCLASS(klass)->m_tbl, &mid, (st_data_t *)&body);
+	}
+    }
+    if (!body) {
 	rb_name_error(mid, "method `%s' not defined in %s",
 		      rb_id2name(mid), rb_class2name(klass));
     }

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/