From c223c92afdfeb8049b97e687533767c8177b4811 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Sat, 7 Jun 2008 19:16:10 +0000 Subject: merge revision(s) 13957: * eval.c (rb_alias): do not call hook functions until initialization finishes. [ruby-talk:279538] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@16949 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ eval.c | 3 +++ version.h | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 998805d2b3..1d038c3bf5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Jun 8 04:15:40 2008 Nobuyoshi Nakada + + * eval.c (rb_alias): do not call hook functions until initialization + finishes. [ruby-talk:279538] + Sun Jun 8 04:12:50 2008 Masaki Suketa * ext/win32ole/win32ole.c (ole_invoke): bug fix. [ruby-talk:279100] diff --git a/eval.c b/eval.c index 132d2809cb..080aaf40d6 100644 --- a/eval.c +++ b/eval.c @@ -2168,6 +2168,9 @@ rb_alias(klass, name, def) st_insert(RCLASS(klass)->m_tbl, name, (st_data_t)NEW_METHOD(NEW_FBODY(body, def, origin), NOEX_WITH_SAFE(orig->nd_noex))); + + if (!ruby_running) return; + if (singleton) { rb_funcall(singleton, singleton_added, 1, ID2SYM(name)); } diff --git a/version.h b/version.h index 76686e9990..912605ca27 100644 --- a/version.h +++ b/version.h @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-06-08" #define RUBY_VERSION_CODE 185 #define RUBY_RELEASE_CODE 20080608 -#define RUBY_PATCHLEVEL 149 +#define RUBY_PATCHLEVEL 150 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 -- cgit v1.2.3