diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-01-11 01:03:37 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-01-11 01:03:37 +0000 |
commit | c1a8666faf5a95e9bb9b1acb8f2fa3f1b9e46152 (patch) | |
tree | 3089e30811f9bf6cdcd548072002f7405a3f43e5 | |
parent | dbb3cc4d7fb56f7e6a6bc17a4548279bd4d7abf2 (diff) | |
download | ruby-c1a8666faf5a95e9bb9b1acb8f2fa3f1b9e46152.tar.gz |
string.c: block for scrub with ASCII-incompatible
* string.c (rb_enc_str_scrub): honor the given block with
ASCII-incompatible encoding. [ruby-core:79039] [Bug #13120]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57302 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | string.c | 6 | ||||
-rw-r--r-- | test/ruby/test_m17n.rb | 5 |
2 files changed, 10 insertions, 1 deletions
@@ -9345,7 +9345,11 @@ rb_enc_str_scrub(rb_encoding *enc, VALUE str, VALUE repl) const char *e = RSTRING_END(str); const char *p1 = p; long mbminlen = rb_enc_mbminlen(enc); - if (!NIL_P(repl)) { + if (rb_block_given_p()) { + rep = NULL; + replen = 0; + } + else if (!NIL_P(repl)) { rep = RSTRING_PTR(repl); replen = RSTRING_LEN(repl); } diff --git a/test/ruby/test_m17n.rb b/test/ruby/test_m17n.rb index 8b7e7e6b4a..c610f71216 100644 --- a/test/ruby/test_m17n.rb +++ b/test/ruby/test_m17n.rb @@ -1640,6 +1640,11 @@ class TestM17N < Test::Unit::TestCase assert_equal("\uFFFD".encode("UTF-32LE"), "\xff".force_encoding(Encoding::UTF_32LE). scrub) + c = nil + assert_equal("?".encode(Encoding::UTF_16LE), + "\x00\xD8".force_encoding(Encoding::UTF_16LE). + scrub {|e| c = e; "?".encode(Encoding::UTF_16LE)}) + assert_equal("\x00\xD8".force_encoding(Encoding::UTF_16LE), c) end def test_scrub_dummy_encoding |