ruby-changes:5447
From: shyouhei <ko1@a...>
Date: Sun, 8 Jun 2008 04:16:25 +0900 (JST)
Subject: [ruby-changes:5447] Ruby:r16949 (ruby_1_8_5): merge revision(s) 13957:
shyouhei 2008-06-08 04:16:10 +0900 (Sun, 08 Jun 2008) New Revision: 16949 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) 13957: * eval.c (rb_alias): do not call hook functions until initialization finishes. [ruby-talk:279538] http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/version.h?r1=16949&r2=16948&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ChangeLog?r1=16949&r2=16948&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/eval.c?r1=16949&r2=16948&diff_format=u Index: ruby_1_8_5/ChangeLog =================================================================== --- ruby_1_8_5/ChangeLog (revision 16948) +++ ruby_1_8_5/ChangeLog (revision 16949) @@ -1,3 +1,8 @@ +Sun Jun 8 04:15:40 2008 Nobuyoshi Nakada <nobu@r...> + + * eval.c (rb_alias): do not call hook functions until initialization + finishes. [ruby-talk:279538] + Sun Jun 8 04:12:50 2008 Masaki Suketa <masaki.suketa@n...> * ext/win32ole/win32ole.c (ole_invoke): bug fix. [ruby-talk:279100] Index: ruby_1_8_5/version.h =================================================================== --- ruby_1_8_5/version.h (revision 16948) +++ ruby_1_8_5/version.h (revision 16949) @@ -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 Index: ruby_1_8_5/eval.c =================================================================== --- ruby_1_8_5/eval.c (revision 16948) +++ ruby_1_8_5/eval.c (revision 16949) @@ -2168,6 +2168,9 @@ 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)); } -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/