diff options
| -rw-r--r-- | ChangeLog | 15 | ||||
| -rw-r--r-- | marshal.c | 7 | ||||
| -rw-r--r-- | version.h | 2 |
3 files changed, 19 insertions, 5 deletions
@@ -1,3 +1,16 @@ +Tue Jul 14 01:24:56 2009 NARUSE, Yui <naruse@ruby-lang.org> + + * marshal.c (r_object0): should return real object. + +Mon Jul 13 20:21:51 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * marshal.c (r_object0): should not shadow outer variable not to + return Qnil always. + +Mon Jul 13 19:41:05 2009 NARUSE, Yui <naruse@ruby-lang.org> + + * marshal.c (r_object0): copy instance variables to new regexp. + Fri Jul 10 14:41:34 2009 NARUSE, Yui <naruse@ruby-lang.org> * marshal.c (r_object0): set encoding only if the encoding @@ -1878,7 +1891,7 @@ Tue Jan 13 18:21:44 2009 NAKAMURA Usaku <usa@ruby-lang.org> Tue Jan 13 18:19:49 2009 NAKAMURA Usaku <usa@ruby-lang.org> * 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@ruby-lang.org> @@ -1371,7 +1371,7 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod) { 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 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod) #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; @@ -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 |