diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-07-13 06:13:51 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-07-13 06:13:51 +0000 |
commit | 4a3df5dc5179103958ad8a96368b64b4c0f3c349 (patch) | |
tree | 5b46fecb44e51e5401d1e0acc0b80df0e3d65557 | |
parent | cb3df565d754031841109cfc806610a13bc13f02 (diff) |
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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@24074 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | marshal.c | 13 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 19 insertions, 3 deletions
@@ -1,9 +1,14 @@ +Thu Jul 9 21:56:59 2009 NARUSE, Yui <naruse@ruby-lang.org> + + * 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 <nobu@ruby-lang.org> * file.c (rb_file_s_basename): returns new string instead of shared string from FilePathStringValue(). [ruby-core:24199] -2009-07-07 Eric Hodel <drbrain@segment7.net> +Wed Jul 8 04:28:16 2009 Eric Hodel <drbrain@segment7.net> * ext/.document: Update with extensions that appear to have documentation. [ruby-core:24181] @@ -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; @@ -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 |