1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

string.c: block for scrub with ASCII-incompatible

Browse Source 
* 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
This commit is contained in:
nobu 2017-01-11 01:03:37 +00:00
parent e4a2dd5f52
commit c763f0fb9b
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
string.c
View File

@ -9345,7 +9345,11 @@ rb_enc_str_scrub(rb_encoding *enc, VALUE str, VALUE repl)
const char *e = RSTRING_END(str); const char *e = RSTRING_END(str);
const char *p1 = p; const char *p1 = p;
long mbminlen = rb_enc_mbminlen(enc); 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); rep = RSTRING_PTR(repl);
replen = RSTRING_LEN(repl); replen = RSTRING_LEN(repl);
} }

5
test/ruby/test_m17n.rb
View File

@ -1640,6 +1640,11 @@ class TestM17N < Test::Unit::TestCase
assert_equal("\uFFFD".encode("UTF-32LE"), assert_equal("\uFFFD".encode("UTF-32LE"),
"\xff".force_encoding(Encoding::UTF_32LE). "\xff".force_encoding(Encoding::UTF_32LE).
scrub) 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 end
def test_scrub_dummy_encoding def test_scrub_dummy_encoding