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: CRLF in paragraph mode

Browse source 
* string.c (rb_str_enumerate_lines): allow CRLF to separate
  paragraphs.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57185 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2016-12-25 23:56:55 +00:00
parent 091f99b4b9
commit 10bd48e402
2 changed files with 47 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

54
string.c
View file

@ -7424,7 +7424,6 @@ rb_str_enumerate_lines(int argc, VALUE *argv, VALUE str, int wantarray)
VALUE line, rs, orig = str, opts = Qnil, chomp = Qfalse;
const char *ptr, *pend, *subptr, *subend, *rsptr, *hit, *adjusted;
long pos, len, rslen;
int paragraph_mode = 0;
int rsnewline = 0;
VALUE MAYBE_UNUSED(ary);
@ -7469,6 +7468,7 @@ rb_str_enumerate_lines(int argc, VALUE *argv, VALUE str, int wantarray)
}
}
if (!RSTRING_LEN(str)) goto end;
str = rb_str_new_frozen(str);
ptr = subptr = RSTRING_PTR(str);
pend = RSTRING_END(str);
@ -7482,10 +7482,39 @@ rb_str_enumerate_lines(int argc, VALUE *argv, VALUE str, int wantarray)
enc = rb_enc_check(str, rs);
if (rslen == 0) {
rsptr = "\n\n";
rslen = 2;
paragraph_mode = 1;
rsnewline = 1;
/* paragraph mode */
int n;
const char *eol = NULL;
subend = subptr;
while (subend < pend) {
do {
if (rb_enc_ascget(subend, pend, &n, enc) != '\r')
n = 0;
rslen = n + rb_enc_mbclen(subend + n, pend, enc);
if (rb_enc_is_newline(subend + n, pend, enc)) {
if (eol == subend) break;
subend += rslen;
if (subptr) eol = subend;
}
else {
if (!subptr) subptr = subend;
subend += rslen;
}
rslen = 0;
} while (subend < pend);
if (!subptr) break;
line = rb_str_subseq(str, subptr - ptr,
subend - subptr + (chomp ? 0 : rslen));
if (wantarray) {
rb_ary_push(ary, line);
}
else {
rb_yield(line);
str_mod_check(str, ptr, len);
}
subptr = eol = NULL;
}
goto end;
}
else {
rsptr = RSTRING_PTR(rs);
@ -7495,7 +7524,7 @@ rb_str_enumerate_lines(int argc, VALUE *argv, VALUE str, int wantarray)
}
}
if ((rs == rb_default_rs || paragraph_mode) && !rb_enc_asciicompat(enc)) {
if ((rs == rb_default_rs) && !rb_enc_asciicompat(enc)) {
rs = rb_str_new(rsptr, rslen);
rs = rb_str_encode(rs, rb_enc_from_encoding(enc), 0, Qnil);
rsptr = RSTRING_PTR(rs);
@ -7512,16 +7541,6 @@ rb_str_enumerate_lines(int argc, VALUE *argv, VALUE str, int wantarray)
continue;
}
subend = hit += rslen;
if (paragraph_mode) {
while (hit < pend) {
int n;
if (rb_enc_ascget(hit, pend, &n, enc) != '\r')
n = 0;
if (!rb_enc_is_newline(hit + n, pend, enc)) break;
hit += n;
hit += rb_enc_mbclen(hit, pend, enc);
}
}
if (chomp) {
if (rsnewline) {
subend = chomp_newline(subptr, subend, enc);
@ -7542,7 +7561,7 @@ rb_str_enumerate_lines(int argc, VALUE *argv, VALUE str, int wantarray)
}
if (subptr != pend) {
if (chomp && paragraph_mode) {
if (chomp) {
pend = chomp_newline(subptr, pend, enc);
}
line = rb_str_subseq(str, subptr - ptr, pend - subptr);
@ -7553,6 +7572,7 @@ rb_str_enumerate_lines(int argc, VALUE *argv, VALUE str, int wantarray)
RB_GC_GUARD(str);
}
end:
if (wantarray)
return ary;
else

10
test/ruby/test_string.rb
View file

@ -785,6 +785,11 @@ CODE
assert_equal(S("hello\n\n"), res[0])
assert_equal(S("world"), res[1])
res=[]
S("hello\r\n\r\nworld").each_line(S('')) {|x| res << x}
assert_equal(S("hello\r\n\r\n"), res[0])
assert_equal(S("world"), res[1])
$/ = "!"
res=[]
@ -827,6 +832,11 @@ CODE
assert_equal(S("hello\n"), res[0])
assert_equal(S("world"), res[1])
res = []
S("hello\r\n\r\nworld").each_line(S(''), chomp: true) {|x| res << x}
assert_equal(S("hello\r\n"), res[0])
assert_equal(S("world"), res[1])
res = []
S("hello!world").each_line(S('!'), chomp: true) {|x| res << x}
assert_equal(S("hello"), res[0])