diff options
| -rw-r--r-- | ext/stringio/stringio.c | 11 | ||||
| -rw-r--r-- | test/stringio/test_stringio.rb | 20 |
2 files changed, 29 insertions, 2 deletions
diff --git a/ext/stringio/stringio.c b/ext/stringio/stringio.c index ff2a544af6..fb2eddaa7e 100644 --- a/ext/stringio/stringio.c +++ b/ext/stringio/stringio.c @@ -1041,6 +1041,7 @@ static inline int chomp_newline_width(const char *s, const char *e) { if (e > s && *--e == '\n') { + if (e > s && *--e == '\r') return 2; return 1; } return 0; @@ -1071,7 +1072,8 @@ strio_getline(struct getline_arg *arg, struct StringIO *ptr) } else if ((n = RSTRING_LEN(str)) == 0) { p = s; - while (*p == '\n') { + while (p[(p + 1 < e) && (*p == '\r') && 0] == '\n') { + p += *p == '\r'; if (++p == e) { return Qnil; } @@ -1083,6 +1085,11 @@ strio_getline(struct getline_arg *arg, struct StringIO *ptr) w = (arg->chomp ? 1 : 0); break; } + else if (*p == '\r' && p < e && p[1] == '\n') { + e = p + 2; + w = (arg->chomp ? 2 : 0); + break; + } } if (!w && arg->chomp) { w = chomp_newline_width(s, e); @@ -1092,7 +1099,7 @@ strio_getline(struct getline_arg *arg, struct StringIO *ptr) else if (n == 1) { if ((p = memchr(s, RSTRING_PTR(str)[0], e - s)) != 0) { 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); } diff --git a/test/stringio/test_stringio.rb b/test/stringio/test_stringio.rb index 07435008ad..d4df7b2617 100644 --- a/test/stringio/test_stringio.rb +++ b/test/stringio/test_stringio.rb @@ -96,6 +96,21 @@ class TestStringIO < Test::Unit::TestCase assert_equal("def", stringio.gets("", chomp: true)) 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 assert_equal([], StringIO.new("").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) f.rewind 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 def test_putc |