ruby-changes:6809
From: shyouhei <ko1@a...>
Date: Mon, 4 Aug 2008 12:17:08 +0900 (JST)
Subject: [ruby-changes:6809] Ruby:r18325 (ruby_1_8_6): merge revision(s) 17833:17837:
shyouhei 2008-08-04 12:16:55 +0900 (Mon, 04 Aug 2008) New Revision: 18325 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=18325 Log: merge revision(s) 17833:17837: * gc.c (Init_GC): fix syntax error. * error.c (rb_exc_new3): keeps the given string itself. * eval.c (Init_Proc), gc.c (Init_GC): freeze messages of preallocated special exceptions also. Modified files: branches/ruby_1_8_6/ChangeLog branches/ruby_1_8_6/error.c branches/ruby_1_8_6/eval.c branches/ruby_1_8_6/gc.c branches/ruby_1_8_6/version.h Index: ruby_1_8_6/error.c =================================================================== --- ruby_1_8_6/error.c (revision 18324) +++ ruby_1_8_6/error.c (revision 18325) @@ -334,7 +334,7 @@ VALUE etype, str; { StringValue(str); - return rb_exc_new(etype, RSTRING(str)->ptr, RSTRING(str)->len); + return rb_funcall(etype, rb_intern("new"), 1, str); } /* Index: ruby_1_8_6/ChangeLog =================================================================== --- ruby_1_8_6/ChangeLog (revision 18324) +++ ruby_1_8_6/ChangeLog (revision 18325) @@ -1,3 +1,14 @@ +Mon Aug 4 12:11:29 2008 Tanaka Akira <akr@f...> + + * gc.c (Init_GC): fix syntax error. + +Mon Aug 4 12:11:29 2008 Nobuyoshi Nakada <nobu@r...> + + * error.c (rb_exc_new3): keeps the given string itself. + + * eval.c (Init_Proc), gc.c (Init_GC): freeze messages of preallocated + special exceptions also. + Thu Jul 17 21:37:39 2008 URABE Shyouhei <shyouhei@r...> * lib/net/smtp.rb (Net::SMTP::start): revert to avoid RFC2821 Index: ruby_1_8_6/version.h =================================================================== --- ruby_1_8_6/version.h (revision 18324) +++ ruby_1_8_6/version.h (revision 18325) @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.6" -#define RUBY_RELEASE_DATE "2008-07-17" +#define RUBY_RELEASE_DATE "2008-08-04" #define RUBY_VERSION_CODE 186 -#define RUBY_RELEASE_CODE 20080717 -#define RUBY_PATCHLEVEL 279 +#define RUBY_RELEASE_CODE 20080804 +#define RUBY_PATCHLEVEL 280 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 6 #define RUBY_RELEASE_YEAR 2008 -#define RUBY_RELEASE_MONTH 7 -#define RUBY_RELEASE_DAY 17 +#define RUBY_RELEASE_MONTH 8 +#define RUBY_RELEASE_DAY 4 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; @@ -18,3 +18,4 @@ RUBY_EXTERN const int ruby_patchlevel; #endif + Index: ruby_1_8_6/eval.c =================================================================== --- ruby_1_8_6/eval.c (revision 18324) +++ ruby_1_8_6/eval.c (revision 18325) @@ -9715,13 +9715,15 @@ rb_define_method(rb_eLocalJumpError, "reason", localjump_reason, 0); rb_global_variable(&exception_error); - exception_error = rb_exc_new2(rb_eFatal, "exception reentered"); + exception_error = rb_exc_new3(rb_eFatal, + rb_obj_freeze(rb_str_new2("exception reentered"))); OBJ_TAINT(exception_error); OBJ_FREEZE(exception_error); rb_eSysStackError = rb_define_class("SystemStackError", rb_eStandardError); rb_global_variable(&sysstack_error); - sysstack_error = rb_exc_new2(rb_eSysStackError, "stack level too deep"); + sysstack_error = rb_exc_new3(rb_eSysStackError, + rb_obj_freeze(rb_str_new2("stack level too deep"))); OBJ_TAINT(sysstack_error); OBJ_FREEZE(sysstack_error); Index: ruby_1_8_6/gc.c =================================================================== --- ruby_1_8_6/gc.c (revision 18324) +++ ruby_1_8_6/gc.c (revision 18325) @@ -2069,7 +2069,8 @@ source_filenames = st_init_strtable(); rb_global_variable(&nomem_error); - nomem_error = rb_exc_new2(rb_eNoMemError, "failed to allocate memory"); + nomem_error = rb_exc_new3(rb_eNoMemError, + rb_obj_freeze(rb_str_new2("failed to allocate memory"))); OBJ_TAINT(nomem_error); OBJ_FREEZE(nomem_error); -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/