1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* string.c (rb_str_each_line): fix newline size.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15539 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2008-02-18 06:18:31 +00:00
parent e61e1f6234
commit 8efc7ea9ad
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Mon Feb 18 15:16:30 2008 Tanaka Akira <akr@fsij.org>
* string.c (rb_str_each_line): fix newline size.
Mon Feb 18 13:06:37 2008 Tanaka Akira <akr@fsij.org> Mon Feb 18 13:06:37 2008 Tanaka Akira <akr@fsij.org>
* lib/irb/locale.rb (IRB::Locale#lc2kconv): check ja_JP.EUC-JP as well. * lib/irb/locale.rb (IRB::Locale#lc2kconv): check ja_JP.EUC-JP as well.

2
string.c
View File

@ -4896,7 +4896,7 @@ rb_str_each_line(int argc, VALUE *argv, VALUE str)
p++; p++;
continue; continue;
} }
p = p0 + rb_enc_mbclen(s, p0, enc); p = p0 + rb_enc_mbclen(p0, pend, enc);
line = rb_str_new5(str, s, p - s); line = rb_str_new5(str, s, p - s);
OBJ_INFECT(line, str); OBJ_INFECT(line, str);
rb_enc_copy(line, str); rb_enc_copy(line, str);

6
test/ruby/test_m17n.rb
View File

@ -980,6 +980,12 @@ class TestM17N < Test::Unit::TestCase
def test_each_line def test_each_line
s = e("\xa3\xb0\xa3\xb1\xa3\xb2\xa3\xb3\xa3\xb4") s = e("\xa3\xb0\xa3\xb1\xa3\xb2\xa3\xb3\xa3\xb4")
assert_raise(ArgumentError){s.each_line(a("\xa3\xb1")) {|l| }} assert_raise(ArgumentError){s.each_line(a("\xa3\xb1")) {|l| }}
s = e("\xa4\xa2\nfoo")
actual = []
s.each_line {|line| actual << line }
expected = [e("\xa4\xa2\n"), e("foo")]
assert_equal(expected, actual)
end end
def test_each_char def test_each_char