mirror of
https://github.com/ruby/ruby.git
synced 2025-09-15 16:44:01 +02:00
* 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
This commit is contained in:
parent
3d13252601
commit
ac7497416d
3 changed files with 16 additions and 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.
|
* 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>
|
Mon Sep 24 16:52:11 2007 Urabe Shyouhei <shyouhei@ruby-lang.org>
|
||||||
|
|
||||||
* lib/net/http.rb: fix typo.
|
* lib/net/http.rb: fix typo.
|
||||||
|
|
9
eval.c
9
eval.c
|
@ -569,8 +569,13 @@ remove_method(klass, mid)
|
||||||
if (mid == __id__ || mid == __send__ || mid == init) {
|
if (mid == __id__ || mid == __send__ || mid == init) {
|
||||||
rb_warn("removing `%s' may cause serious problem", rb_id2name(mid));
|
rb_warn("removing `%s' may cause serious problem", rb_id2name(mid));
|
||||||
}
|
}
|
||||||
if (!st_delete(RCLASS(klass)->m_tbl, &mid, (st_data_t *)&body) ||
|
if (st_lookup(RCLASS(klass)->m_tbl, mid, (st_data_t *)&body)) {
|
||||||
!body->nd_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_name_error(mid, "method `%s' not defined in %s",
|
||||||
rb_id2name(mid), rb_class2name(klass));
|
rb_id2name(mid), rb_class2name(klass));
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,15 +1,15 @@
|
||||||
#define RUBY_VERSION "1.8.6"
|
#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_VERSION_CODE 186
|
||||||
#define RUBY_RELEASE_CODE 20070926
|
#define RUBY_RELEASE_CODE 20071001
|
||||||
#define RUBY_PATCHLEVEL 5000
|
#define RUBY_PATCHLEVEL 5000
|
||||||
|
|
||||||
#define RUBY_VERSION_MAJOR 1
|
#define RUBY_VERSION_MAJOR 1
|
||||||
#define RUBY_VERSION_MINOR 8
|
#define RUBY_VERSION_MINOR 8
|
||||||
#define RUBY_VERSION_TEENY 6
|
#define RUBY_VERSION_TEENY 6
|
||||||
#define RUBY_RELEASE_YEAR 2007
|
#define RUBY_RELEASE_YEAR 2007
|
||||||
#define RUBY_RELEASE_MONTH 9
|
#define RUBY_RELEASE_MONTH 10
|
||||||
#define RUBY_RELEASE_DAY 26
|
#define RUBY_RELEASE_DAY 1
|
||||||
|
|
||||||
#ifdef RUBY_EXTERN
|
#ifdef RUBY_EXTERN
|
||||||
RUBY_EXTERN const char ruby_version[];
|
RUBY_EXTERN const char ruby_version[];
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue