diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-10-01 13:44:21 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-10-01 13:44:21 +0000 |
commit | ac7497416dd6cac1a8c8a5ab35010da5a09ccc25 (patch) | |
tree | 1cf19cc7937039fa681429d160f16927e546a2fe | |
parent | 3d132526012e4c9bad0389bf97b978cf6159abde (diff) |
* eval.c (remove_method): should not remove undef place holder.
[ruby-dev:31817]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@13586 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | eval.c | 9 | ||||
-rw-r--r-- | version.h | 8 |
3 files changed, 16 insertions, 6 deletions
@@ -14,6 +14,11 @@ Wed Sep 26 05:12:17 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> * regex.c (re_mbc_startpos): separated from re_adjust_startpos. +Tue Sep 25 13:47:38 2007 Yukihiro Matsumoto <matz@ruby-lang.org> + + * eval.c (remove_method): should not remove undef place holder. + [ruby-dev:31817] + Mon Sep 24 16:52:11 2007 Urabe Shyouhei <shyouhei@ruby-lang.org> * lib/net/http.rb: fix typo. @@ -569,8 +569,13 @@ remove_method(klass, mid) 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)); } @@ -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[]; |