ruby-changes:6812
From: shyouhei <ko1@a...>
Date: Mon, 4 Aug 2008 12:24:40 +0900 (JST)
Subject: [ruby-changes:6812] Ruby:r18327 (ruby_1_8_7): merge revision(s) 17833:17837:
shyouhei 2008-08-04 12:24:26 +0900 (Mon, 04 Aug 2008) New Revision: 18327 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=18327 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_7/error.c branches/ruby_1_8_7/eval.c branches/ruby_1_8_7/gc.c branches/ruby_1_8_7/version.h Index: ruby_1_8_7/error.c =================================================================== --- ruby_1_8_7/error.c (revision 18326) +++ ruby_1_8_7/error.c (revision 18327) @@ -333,7 +333,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_7/version.h =================================================================== --- ruby_1_8_7/version.h (revision 18326) +++ ruby_1_8_7/version.h (revision 18327) @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.7" -#define RUBY_RELEASE_DATE "2008-07-17" +#define RUBY_RELEASE_DATE "2008-08-04" #define RUBY_VERSION_CODE 187 -#define RUBY_RELEASE_CODE 20080717 -#define RUBY_PATCHLEVEL 63 +#define RUBY_RELEASE_CODE 20080804 +#define RUBY_PATCHLEVEL 64 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 7 #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[]; @@ -28,3 +28,4 @@ #define RUBY_RELEASE_STR "patchlevel" #define RUBY_RELEASE_NUM RUBY_PATCHLEVEL + Index: ruby_1_8_7/eval.c =================================================================== --- ruby_1_8_7/eval.c (revision 18326) +++ ruby_1_8_7/eval.c (revision 18327) @@ -9992,13 +9992,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_7/gc.c =================================================================== --- ruby_1_8_7/gc.c (revision 18326) +++ ruby_1_8_7/gc.c (revision 18327) @@ -2115,7 +2115,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/