From 18d92ed1dca2ff7a1f4fd883c4731e0da6f90086 Mon Sep 17 00:00:00 2001 From: yugui Date: Mon, 13 Jul 2009 06:13:51 +0000 Subject: merges r23999 from trunk into ruby_1_9_1. -- * marshal.c (r_object0): replace \u by u when the regexp is made by Ruby 1.8. [ruby-dev:36750] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@24074 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 ++++++- marshal.c | 13 ++++++++++++- version.h | 2 +- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 515317315..19852dd60 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,14 @@ +Thu Jul 9 21:56:59 2009 NARUSE, Yui + + * marshal.c (r_object0): replace \u by u when the regexp is + made by Ruby 1.8. [ruby-dev:36750] + Wed Jul 8 16:47:03 2009 Nobuyoshi Nakada * file.c (rb_file_s_basename): returns new string instead of shared string from FilePathStringValue(). [ruby-core:24199] -2009-07-07 Eric Hodel +Wed Jul 8 04:28:16 2009 Eric Hodel * ext/.document: Update with extensions that appear to have documentation. [ruby-core:24181] diff --git a/marshal.c b/marshal.c index b76d012bc..0c49fd339 100644 --- a/marshal.c +++ b/marshal.c @@ -1371,8 +1371,19 @@ 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); + if (ivp) { + r_ivar(v, arg); + rb_p(v); + *ivp = Qfalse; + } + rb_enc_copy(str, v); + if (rb_enc_get_index(str) != rb_utf8_encindex()) { +#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); + v = r_leave(v, arg); } break; diff --git a/version.h b/version.h index cdcf83b57..c305bb043 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "1.9.1" #define RUBY_RELEASE_DATE "2009-07-12" -#define RUBY_PATCHLEVEL 224 +#define RUBY_PATCHLEVEL 225 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 -- cgit