kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

string.c: chomp rs at the end

Browse source 
* string.c (rb_str_enumerate_lines): should chomp record separator
  only, but not a newline, at the end of the receiver as well as
  middle, if the separator is given.
  [ruby-core:84552] [Bug #14257]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61513 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2017-12-29 12:19:03 +00:00
parent 18640bf9f0
commit 634a48c5c1
2 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
string.c
View file

@ -8012,7 +8012,12 @@ rb_str_enumerate_lines(int argc, VALUE *argv, VALUE str, VALUE ary)
if (subptr != pend) {
if (chomp) {
pend = chomp_newline(subptr, pend, enc);
if (rsnewline) {
pend = chomp_newline(subptr, pend, enc);
}
else if (memcmp(pend - rslen, rsptr, rslen) == 0) {
pend -= rslen;
}
}
line = rb_str_subseq(str, subptr - ptr, pend - subptr);
ENUM_ELEM(ary, line);

4
test/ruby/test_string.rb
View file

@ -1119,6 +1119,10 @@ CODE
res = []
S("\r\n").each_line(chomp: true) {|x| res << x}
assert_equal([S("")], res)
res = []
S("a\n b\n").each_line(" ", chomp: true) {|x| res << x}
assert_equal([S("a\n"), S("b\n")], res)
end
def test_lines