ruby-changes:2706
From: ko1@a...
Date: 12 Dec 2007 12:15:27 +0900
Subject: [ruby-changes:2706] nobu - Ruby:r14197 (trunk): * re.c (rb_reg_regsub): should copy encoding.
nobu 2007-12-12 12:11:44 +0900 (Wed, 12 Dec 2007) New Revision: 14197 Modified files: trunk/ChangeLog trunk/re.c trunk/string.c trunk/version.h Log: * re.c (rb_reg_regsub): should copy encoding. * string.c (rb_str_sub_bang, str_gsub): should check and copy encoding to be replaced. http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/version.h?r1=14197&r2=14196 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/string.c?r1=14197&r2=14196 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=14197&r2=14196 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/re.c?r1=14197&r2=14196 Index: re.c =================================================================== --- re.c (revision 14196) +++ re.c (revision 14197) @@ -2796,6 +2796,7 @@ rb_str_buf_cat(val, p, e-p); } if (!val) return str; + rb_enc_copy(val, str); return val; } Index: ChangeLog =================================================================== --- ChangeLog (revision 14196) +++ ChangeLog (revision 14197) @@ -1,3 +1,10 @@ +Wed Dec 12 12:11:42 2007 Nobuyoshi Nakada <nobu@r...> + + * re.c (rb_reg_regsub): should copy encoding. + + * string.c (rb_str_sub_bang, str_gsub): should check and copy encoding + to be replaced. + Tue Dec 11 23:04:17 2007 Yukihiro Matsumoto <matz@r...> * pack.c (pack_pack): RDoc update. a patch from Gary Wright Index: string.c =================================================================== --- string.c (revision 14196) +++ string.c (revision 14197) @@ -2370,15 +2370,19 @@ if (iter) { char *p = RSTRING_PTR(str); long len = RSTRING_LEN(str); + rb_encoding *enc; rb_match_busy(match); repl = rb_obj_as_string(rb_yield(rb_reg_nth_match(0, match))); + enc = rb_enc_check(str, repl); str_mod_check(str, p, len); str_frozen_check(str); rb_backref_set(match); + rb_enc_associate(str, enc); } else { repl = rb_reg_regsub(repl, str, regs, pat); + rb_enc_copy(str, repl); } rb_str_modify(str); if (OBJ_TAINTED(repl)) tainted = 1; @@ -2490,17 +2494,22 @@ match = rb_backref_get(); regs = RMATCH(match)->regs; if (iter) { + rb_encoding *enc; + rb_match_busy(match); val = rb_obj_as_string(rb_yield(rb_reg_nth_match(0, match))); + enc = rb_enc_check(str, val); str_mod_check(str, sp, slen); if (bang) str_frozen_check(str); if (val == dest) { /* paranoid chack [ruby-dev:24827] */ rb_raise(rb_eRuntimeError, "block should not cheat"); } rb_backref_set(match); + rb_enc_associate(str, enc); } else { val = rb_reg_regsub(repl, str, regs, pat); + rb_enc_copy(str, val); } if (OBJ_TAINTED(val)) tainted = 1; len = (bp - buf) + (beg - offset) + RSTRING_LEN(val) + 3; Index: version.h =================================================================== --- version.h (revision 14196) +++ version.h (revision 14197) @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.9.0" -#define RUBY_RELEASE_DATE "2007-12-11" +#define RUBY_RELEASE_DATE "2007-12-12" #define RUBY_VERSION_CODE 190 -#define RUBY_RELEASE_CODE 20071211 +#define RUBY_RELEASE_CODE 20071212 #define RUBY_PATCHLEVEL 0 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 0 #define RUBY_RELEASE_YEAR 2007 #define RUBY_RELEASE_MONTH 12 -#define RUBY_RELEASE_DAY 11 +#define RUBY_RELEASE_DAY 12 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml