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

* string.c (rb_str_each_line): return original string.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16284 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2008-05-04 03:59:01 +00:00
parent 47dcf6702a
commit 7ef9aba753
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Sun May 4 12:57:58 2008 Tanaka Akira <akr@fsij.org>
* string.c (rb_str_each_line): return original string.
Sat May 3 20:57:06 2008 Tanaka Akira <akr@fsij.org> Sat May 3 20:57:06 2008 Tanaka Akira <akr@fsij.org>
* test/ruby/envutil.rb (Test::Unit::Assertions#assert_normal_exit): * test/ruby/envutil.rb (Test::Unit::Assertions#assert_normal_exit):

5
string.c
View File

@ -5045,6 +5045,7 @@ rb_str_each_line(int argc, VALUE *argv, VALUE str)
long len, rslen; long len, rslen;
VALUE line; VALUE line;
int n; int n;
VALUE orig = str;
if (argc == 0) { if (argc == 0) {
rs = rb_rs; rs = rb_rs;
@ -5055,7 +5056,7 @@ rb_str_each_line(int argc, VALUE *argv, VALUE str)
RETURN_ENUMERATOR(str, argc, argv); RETURN_ENUMERATOR(str, argc, argv);
if (NIL_P(rs)) { if (NIL_P(rs)) {
rb_yield(str); rb_yield(str);
return str; return orig;
} }
str = rb_str_new4(str); str = rb_str_new4(str);
ptr = p = s = RSTRING_PTR(str); ptr = p = s = RSTRING_PTR(str);
@ -5124,7 +5125,7 @@ rb_str_each_line(int argc, VALUE *argv, VALUE str)
rb_yield(line); rb_yield(line);
} }
return str; return orig;
} }