diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-03-11 16:38:53 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-03-11 16:38:53 +0000 |
commit | 9a663128185cee7671d945659b258730bcfbab77 (patch) | |
tree | db3550c44fd06c0d6f0d8e6f0696359ee6fd93ae /string.c | |
parent | 2ba797d3623bd7114ec708557a0ada1d80c7adaa (diff) |
merge revision(s) 57302,57303,57304: [Backport #13119]
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]
string.c: yield invalid part
* string.c (rb_enc_str_scrub): yield the invalid part only with
ASCII-incompatible. [ruby-core:79039] [Bug #13120]
string.c: replacement and block
* string.c (rb_enc_str_scrub): only one of replacement and block
is allowed. [ruby-core:79038] [Bug #13119]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@57855 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'string.c')
-rw-r--r-- | string.c | 18 |
1 files changed, 13 insertions, 5 deletions
@@ -9187,9 +9187,15 @@ rb_enc_str_scrub(rb_encoding *enc, VALUE str, VALUE repl) int encidx; VALUE buf = Qnil; const char *rep; - long replen; + long replen = -1; int tainted = 0; + if (rb_block_given_p()) { + if (!NIL_P(repl)) + rb_raise(rb_eArgError, "both of block and replacement given"); + replen = 0; + } + if (ENC_CODERANGE_CLEAN_P(cr)) return Qnil; @@ -9213,9 +9219,8 @@ rb_enc_str_scrub(rb_encoding *enc, VALUE str, VALUE repl) const char *e = RSTRING_END(str); const char *p1 = p; int rep7bit_p; - if (rb_block_given_p()) { + if (!replen) { rep = NULL; - replen = 0; rep7bit_p = FALSE; } else if (!NIL_P(repl)) { @@ -9326,7 +9331,10 @@ 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 (!replen) { + rep = NULL; + } + else if (!NIL_P(repl)) { rep = RSTRING_PTR(repl); replen = RSTRING_LEN(repl); } @@ -9377,7 +9385,7 @@ rb_enc_str_scrub(rb_encoding *enc, VALUE str, VALUE repl) rb_str_buf_cat(buf, rep, replen); } else { - repl = rb_yield(rb_enc_str_new(p, e-p, enc)); + repl = rb_yield(rb_enc_str_new(p, clen, enc)); repl = str_compat_and_valid(repl, enc); tainted |= OBJ_TAINTED_RAW(repl); rb_str_buf_cat(buf, RSTRING_PTR(repl), RSTRING_LEN(repl)); |