kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* string.c (str_gsub): should copy encoding to the result.

Browse source 
* sprintf.c (rb_str_format): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14212 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2007-12-13 09:05:49 +00:00
parent fb14b7eb05
commit 66bae8ad6d
4 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,4 +1,4 @@
Thu Dec 13 17:26:17 2007 Yukihiro Matsumoto <matz@ruby-lang.org> Thu Dec 13 17:51:54 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* string.c (rb_str_split_m): need not to check encoding if regexp * string.c (rb_str_split_m): need not to check encoding if regexp
is empty. is empty.
@ -9,6 +9,10 @@ Thu Dec 13 17:26:17 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* string.c (rb_str_chomp_bang): need to check encoding of record * string.c (rb_str_chomp_bang): need to check encoding of record
separator. separator.
* string.c (str_gsub): should copy encoding to the result.
* sprintf.c (rb_str_format): ditto.
Thu Dec 13 17:03:29 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> Thu Dec 13 17:03:29 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* encoding.c (rb_enc_compatible): should swap encoding indexes too. * encoding.c (rb_enc_compatible): should swap encoding indexes too.

2
bootstraptest/test_knownbug.rb
View file

@ -70,7 +70,7 @@ assert_equal 'ok', %q{
begin begin
s["\xb0\xa3"] = "foo" s["\xb0\xa3"] = "foo"
:ng :ng
rescue IndexError rescue ArgumentError
:ok :ok
end end
} }

1
sprintf.c
View file

@ -848,6 +848,7 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
rb_str_resize(result, blen); rb_str_resize(result, blen);
if (tainted) OBJ_TAINT(result); if (tainted) OBJ_TAINT(result);
rb_enc_associate(result, enc);
return result; return result;
} }

8
string.c
View file

@ -2490,11 +2490,12 @@ str_gsub(int argc, VALUE *argv, VALUE str, int bang)
rb_str_locktmp(dest); rb_str_locktmp(dest);
do { do {
rb_encoding *enc;
n++; n++;
match = rb_backref_get(); match = rb_backref_get();
regs = RMATCH(match)->regs; regs = RMATCH(match)->regs;
if (iter) { if (iter) {
rb_encoding *enc;
rb_match_busy(match); rb_match_busy(match);
val = rb_obj_as_string(rb_yield(rb_reg_nth_match(0, match))); val = rb_obj_as_string(rb_yield(rb_reg_nth_match(0, match)));
@ -2505,12 +2506,12 @@ str_gsub(int argc, VALUE *argv, VALUE str, int bang)
rb_raise(rb_eRuntimeError, "block should not cheat"); rb_raise(rb_eRuntimeError, "block should not cheat");
} }
rb_backref_set(match); rb_backref_set(match);
rb_enc_associate(str, enc);
} }
else { else {
val = rb_reg_regsub(repl, str, regs, pat); val = rb_reg_regsub(repl, str, regs, pat);
rb_enc_copy(str, val); enc = rb_enc_check(str, val);
} }
rb_enc_associate(str, enc);
if (OBJ_TAINTED(val)) tainted = 1; if (OBJ_TAINTED(val)) tainted = 1;
len = (bp - buf) + (beg - offset) + RSTRING_LEN(val) + 3; len = (bp - buf) + (beg - offset) + RSTRING_LEN(val) + 3;
if (blen < len) { if (blen < len) {
@ -2570,6 +2571,7 @@ str_gsub(int argc, VALUE *argv, VALUE str, int bang)
else { else {
RBASIC(dest)->klass = rb_obj_class(str); RBASIC(dest)->klass = rb_obj_class(str);
OBJ_INFECT(dest, str); OBJ_INFECT(dest, str);
rb_enc_copy(dest, str);
str = dest; str = dest;
} }
STR_SET_LEN(str, bp - buf); STR_SET_LEN(str, bp - buf);