diff options
Diffstat (limited to 'string.c')
| -rw-r--r-- | string.c | 9 |
1 files changed, 7 insertions, 2 deletions
@@ -8967,6 +8967,7 @@ rb_str_enumerate_lines(int argc, VALUE *argv, VALUE str, VALUE ary) const char *eol = NULL; subend = subptr; while (subend < pend) { + long chomp_rslen = 0; do { if (rb_enc_ascget(subend, pend, &n, enc) != '\r') n = 0; @@ -8974,7 +8975,10 @@ rb_str_enumerate_lines(int argc, VALUE *argv, VALUE str, VALUE ary) if (rb_enc_is_newline(subend + n, pend, enc)) { if (eol == subend) break; subend += rslen; - if (subptr) eol = subend; + if (subptr) { + eol = subend; + chomp_rslen = -rslen; + } } else { if (!subptr) subptr = subend; @@ -8983,8 +8987,9 @@ rb_str_enumerate_lines(int argc, VALUE *argv, VALUE str, VALUE ary) rslen = 0; } while (subend < pend); if (!subptr) break; + if (rslen == 0) chomp_rslen = 0; line = rb_str_subseq(str, subptr - ptr, - subend - subptr + (chomp ? 0 : rslen)); + subend - subptr + (chomp ? chomp_rslen : rslen)); if (ENUM_ELEM(ary, line)) { str_mod_check(str, ptr, len); } |