diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-11-27 02:54:20 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-11-27 02:54:20 +0000 |
commit | 10c992f436caa8110a2201d08f067273a6aa884a (patch) | |
tree | 33ceb171e04fc12775f7b4a944a7693fe7abebe0 /marshal.c | |
parent | c6a33f0841a8aec6503241b88aa15001b1ad9b67 (diff) | |
download | ruby-10c992f436caa8110a2201d08f067273a6aa884a.tar.gz ruby-10c992f436caa8110a2201d08f067273a6aa884a.tar.xz ruby-10c992f436caa8110a2201d08f067273a6aa884a.zip |
merges r25001 from trunk into ruby_1_9_1.
--
* marshal.c (r_object0): entry regexp object before its encoding
name. [ruby-core:25625]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@25942 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'marshal.c')
-rw-r--r-- | marshal.c | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -1429,7 +1429,10 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod) { volatile VALUE str = r_bytes(arg); int options = r_byte(arg); - v = rb_reg_new("", 0, options); + VALUE args[2]; + args[0] = str; + args[1] = INT2FIX(options); + v = r_entry(rb_obj_alloc(rb_cRegexp), arg); if (ivp) { r_ivar(v, arg); *ivp = Qfalse; @@ -1440,9 +1443,8 @@ 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")); } - str = r_entry(rb_reg_new_str(str, options), arg); - rb_copy_generic_ivar(str, v); - v = r_leave(str, arg); + rb_obj_call_init(v, 2, args); + v = r_leave(v, arg); } break; |