diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-22 13:42:22 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-22 13:42:22 +0000 |
commit | 624d07b0e4257a5261558a154eddd464d85e6174 (patch) | |
tree | 8f78626556c9b38f407dbcdb899ae5a19c652264 | |
parent | 7b1bbd59e12f8c3f262c7157ea6b73f8e3e7dad6 (diff) | |
download | ruby-624d07b0e4257a5261558a154eddd464d85e6174.tar.gz |
* string.c (tr_trans): should recalculate coderange.
[ruby-core:22326] (reopened at [ruby-core:22328])
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22547 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | string.c | 15 | ||||
-rw-r--r-- | test/ruby/test_string.rb | 2 |
3 files changed, 20 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Sun Feb 22 22:42:20 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * string.c (tr_trans): should recalculate coderange. + [ruby-core:22326] (reopened at [ruby-core:22328]) + Sun Feb 22 20:09:29 2009 Tanaka Akira <akr@fsij.org> * ext/socket/option.c (inspect_linger): message refined. @@ -4712,6 +4712,10 @@ tr_trans(VALUE str, VALUE src, VALUE repl, int sflag) int singlebyte = single_byte_optimizable(str); int cr; +#define CHECK_IF_ASCII(c) \ + (void)((cr == ENC_CODERANGE_7BIT && !rb_isascii(c)) ? \ + (cr = ENC_CODERANGE_VALID) : 0) + StringValue(src); StringValue(repl); if (RSTRING_LEN(str) == 0 || !RSTRING_PTR(str)) return Qnil; @@ -4783,6 +4787,8 @@ tr_trans(VALUE str, VALUE src, VALUE repl, int sflag) } } + if (cr == ENC_CODERANGE_VALID) + cr = ENC_CODERANGE_7BIT; str_modify_keep_cr(str); s = RSTRING_PTR(str); send = RSTRING_END(str); if (sflag) { @@ -4813,7 +4819,10 @@ tr_trans(VALUE str, VALUE src, VALUE repl, int sflag) c = errc; } if (c != -1) { - if (save == c) continue; + if (save == c) { + CHECK_IF_ASCII(c); + continue; + } save = c; tlen = rb_enc_codelen(c, enc); modify = 1; @@ -4833,6 +4842,7 @@ tr_trans(VALUE str, VALUE src, VALUE repl, int sflag) if (may_modify && memcmp(s, t, tlen) != 0) { modify = 1; } + CHECK_IF_ASCII(c); t += tlen; } *t = '\0'; @@ -4855,6 +4865,7 @@ tr_trans(VALUE str, VALUE src, VALUE repl, int sflag) modify = 1; } } + CHECK_IF_ASCII(c); s++; } } @@ -4904,6 +4915,7 @@ tr_trans(VALUE str, VALUE src, VALUE repl, int sflag) modify = 1; } } + CHECK_IF_ASCII(c); s += clen; t += tlen; } @@ -4918,7 +4930,6 @@ tr_trans(VALUE str, VALUE src, VALUE repl, int sflag) } if (modify) { - cr = ENC_CODERANGE_AND(cr, ENC_CODERANGE(repl)); if (cr != ENC_CODERANGE_BROKEN) ENC_CODERANGE_SET(str, cr); rb_enc_associate(str, enc); diff --git a/test/ruby/test_string.rb b/test/ruby/test_string.rb index c5375c735a..d4b6ff2081 100644 --- a/test/ruby/test_string.rb +++ b/test/ruby/test_string.rb @@ -1432,6 +1432,8 @@ class TestString < Test::Unit::TestCase def test_tr_s assert_equal(S("hypo"), S("hello").tr_s(S("el"), S("yp"))) assert_equal(S("h*o"), S("hello").tr_s(S("el"), S("*"))) + assert_equal("a".hash, "\u0101\u0101".tr_s("\u0101", "a").hash) + assert_equal(true, "\u3041\u3041".tr("\u3041", "a").ascii_only?) end def test_tr_s! |