ruby-changes:12418
From: yugui <ko1@a...>
Date: Wed, 15 Jul 2009 20:57:47 +0900 (JST)
Subject: [ruby-changes:12418] Ruby:r24118 (ruby_1_9_1): merges r24086,r24087 and r24095 from trunk into ruby_1_9_1.
yugui 2009-07-15 20:57:24 +0900 (Wed, 15 Jul 2009) New Revision: 24118 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=24118 Log: merges r24086,r24087 and r24095 from trunk into ruby_1_9_1. -- * marshal.c (r_object0): copy instance variables to new regexp. -- * marshal.c (r_object0): should not shadow outer variable not to return Qnil always. -- * marshal.c (r_object0): should return real object. Modified files: branches/ruby_1_9_1/ChangeLog branches/ruby_1_9_1/marshal.c branches/ruby_1_9_1/version.h Index: ruby_1_9_1/ChangeLog =================================================================== --- ruby_1_9_1/ChangeLog (revision 24117) +++ ruby_1_9_1/ChangeLog (revision 24118) @@ -1,3 +1,16 @@ +Tue Jul 14 01:24:56 2009 NARUSE, Yui <naruse@r...> + + * marshal.c (r_object0): should return real object. + +Mon Jul 13 20:21:51 2009 Nobuyoshi Nakada <nobu@r...> + + * marshal.c (r_object0): should not shadow outer variable not to + return Qnil always. + +Mon Jul 13 19:41:05 2009 NARUSE, Yui <naruse@r...> + + * marshal.c (r_object0): copy instance variables to new regexp. + Fri Jul 10 14:41:34 2009 NARUSE, Yui <naruse@r...> * marshal.c (r_object0): set encoding only if the encoding @@ -1878,7 +1891,7 @@ Tue Jan 13 18:19:49 2009 NAKAMURA Usaku <usa@r...> * io.c (rb_io_initialize): workaround for Windows. [ruby-dev:37686] - (also see [ruby-dev:37721]) + (also see [ruby-dev:37721]) Tue Jan 13 17:29:02 2009 Nobuyoshi Nakada <nobu@r...> Index: ruby_1_9_1/version.h =================================================================== --- ruby_1_9_1/version.h (revision 24117) +++ ruby_1_9_1/version.h (revision 24118) @@ -4,7 +4,7 @@ #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 -#define RUBY_PATCHLEVEL 231 +#define RUBY_PATCHLEVEL 232 #define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_MONTH 7 #define RUBY_RELEASE_DAY 12 Index: ruby_1_9_1/marshal.c =================================================================== --- ruby_1_9_1/marshal.c (revision 24117) +++ ruby_1_9_1/marshal.c (revision 24118) @@ -1371,7 +1371,7 @@ { volatile VALUE str = r_bytes(arg); int options = r_byte(arg); - v = r_entry(rb_reg_new("", 0, options), arg); + v = rb_reg_new("", 0, options); if (ivp) { r_ivar(v, arg); *ivp = Qfalse; @@ -1382,8 +1382,9 @@ #define f_gsub_bang(x,y,z) rb_funcall(x, rb_intern("gsub!"), 2, y, z) f_gsub_bang(str, rb_reg_new("\\\\u", 3, 0), rb_usascii_str_new_cstr("u")); } - v = r_entry(rb_reg_new_str(str, options), arg); - v = r_leave(v, arg); + str = r_entry(rb_reg_new_str(str, options), arg); + rb_copy_generic_ivar(str, v); + v = r_leave(str, arg); } break; -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/