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

stringio.c: chomp CR

Browse source 
* ext/stringio/stringio.c (strio_getline): chomp CR not only LF,
  as well as String#chomp.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57043 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2016-12-10 08:54:40 +00:00
parent f46a137746
commit 30540c5675
2 changed files with 29 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ext/stringio/stringio.c
View file

@ -1041,6 +1041,7 @@ static inline int
chomp_newline_width(const char *s, const char *e) chomp_newline_width(const char *s, const char *e)
{ {
if (e > s && *--e == '\n') { if (e > s && *--e == '\n') {
if (e > s && *--e == '\r') return 2;
return 1; return 1;
} }
return 0; return 0;
@ -1071,7 +1072,8 @@ strio_getline(struct getline_arg *arg, struct StringIO *ptr)
} }
else if ((n = RSTRING_LEN(str)) == 0) { else if ((n = RSTRING_LEN(str)) == 0) {
p = s; p = s;
while (*p == '\n') { while (p[(p + 1 < e) && (*p == '\r') && 0] == '\n') {
p += *p == '\r';
if (++p == e) { if (++p == e) {
return Qnil; return Qnil;
} }
@ -1083,6 +1085,11 @@ strio_getline(struct getline_arg *arg, struct StringIO *ptr)
w = (arg->chomp ? 1 : 0); w = (arg->chomp ? 1 : 0);
break; break;
} }
else if (*p == '\r' && p < e && p[1] == '\n') {
e = p + 2;
w = (arg->chomp ? 2 : 0);
break;
}
} }
if (!w && arg->chomp) { if (!w && arg->chomp) {
w = chomp_newline_width(s, e); w = chomp_newline_width(s, e);
@ -1092,7 +1099,7 @@ strio_getline(struct getline_arg *arg, struct StringIO *ptr)
else if (n == 1) { else if (n == 1) {
if ((p = memchr(s, RSTRING_PTR(str)[0], e - s)) != 0) { if ((p = memchr(s, RSTRING_PTR(str)[0], e - s)) != 0) {
e = p + 1; e = p + 1;
w = (arg->chomp ? 1 : 0); w = (arg->chomp ? (p > s && *(p-1) == '\r') + 1 : 0);
} }
str = strio_substr(ptr, ptr->pos, e - s - w); str = strio_substr(ptr, ptr->pos, e - s - w);
} }

20
test/stringio/test_stringio.rb
View file

@ -96,6 +96,21 @@ class TestStringIO < Test::Unit::TestCase
assert_equal("def", stringio.gets("", chomp: true)) assert_equal("def", stringio.gets("", chomp: true))
end end
def test_gets_chomp_eol
assert_equal(nil, StringIO.new("").gets(chomp: true))
assert_equal("", StringIO.new("\r\n").gets(chomp: true))
assert_equal("a", StringIO.new("a\r\n").gets(chomp: true))
assert_equal("a", StringIO.new("a\r\nb\r\n").gets(chomp: true))
assert_equal("a", StringIO.new("a").gets(chomp: true))
assert_equal("a", StringIO.new("a\r\nb").gets(chomp: true))
assert_equal("abc", StringIO.new("abc\r\n\r\ndef\r\n").gets(chomp: true))
assert_equal("abc\r\n\r\ndef", StringIO.new("abc\r\n\r\ndef\r\n").gets(nil, chomp: true))
assert_equal("abc\r\n", StringIO.new("abc\r\n\r\ndef\r\n").gets("", chomp: true))
stringio = StringIO.new("abc\r\n\r\ndef\r\n")
assert_equal("abc\r\n", stringio.gets("", chomp: true))
assert_equal("def", stringio.gets("", chomp: true))
end
def test_readlines def test_readlines
assert_equal([], StringIO.new("").readlines) assert_equal([], StringIO.new("").readlines)
assert_equal(["\n"], StringIO.new("\n").readlines) assert_equal(["\n"], StringIO.new("\n").readlines)
@ -497,6 +512,11 @@ class TestStringIO < Test::Unit::TestCase
assert_equal(["foo\nbar\n\n", "baz\n"], f.each("").to_a) assert_equal(["foo\nbar\n\n", "baz\n"], f.each("").to_a)
f.rewind f.rewind
assert_equal(["foo\nbar\n", "baz"], f.each("", chomp: true).to_a) assert_equal(["foo\nbar\n", "baz"], f.each("", chomp: true).to_a)
f = StringIO.new("foo\r\nbar\r\n\r\nbaz\r\n")
assert_equal(["foo\r\nbar\r\n\r\n", "baz\r\n"], f.each("").to_a)
f.rewind
assert_equal(["foo\r\nbar\r\n", "baz"], f.each("", chomp: true).to_a)
end end
def test_putc def test_putc