matz	2007-10-01 22:44:21 +0900 (Mon, 01 Oct 2007)

  New Revision: 13586

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

  Log:
    * 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/ChangeLog?r1=13586&r2=13585
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/version.h?r1=13586&r2=13585
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/eval.c?r1=13586&r2=13585

Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 13585)
+++ ruby_1_8/ChangeLog	(revision 13586)
@@ -14,6 +14,11 @@
 
 	* regex.c (re_mbc_startpos): separated from re_adjust_startpos.
 
+Tue Sep 25 13:47:38 2007  Yukihiro Matsumoto  <matz@r...>
+
+	* eval.c (remove_method): should not remove undef place holder.
+	  [ruby-dev:31817]
+
 Mon Sep 24 16:52:11 2007  Urabe Shyouhei  <shyouhei@r...>
 
 	* lib/net/http.rb: fix typo.
Index: ruby_1_8/version.h
===================================================================
--- ruby_1_8/version.h	(revision 13585)
+++ ruby_1_8/version.h	(revision 13586)
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2007-09-26"
+#define RUBY_RELEASE_DATE "2007-10-01"
 #define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20070926
+#define RUBY_RELEASE_CODE 20071001
 #define RUBY_PATCHLEVEL 5000
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 6
 #define RUBY_RELEASE_YEAR 2007
-#define RUBY_RELEASE_MONTH 9
-#define RUBY_RELEASE_DAY 26
+#define RUBY_RELEASE_MONTH 10
+#define RUBY_RELEASE_DAY 1
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
Index: ruby_1_8/eval.c
===================================================================
--- ruby_1_8/eval.c	(revision 13585)
+++ ruby_1_8/eval.c	(revision 13586)
@@ -569,8 +569,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