From 40303dfb0557c210a7a21940fee86de9cf7424a5 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Sun, 29 Jun 2008 08:20:39 +0000 Subject: merge revision(s) 17352: * ext/stringio/stringio.c (strio_readline, strio_each) (strio_readlines): set lastline. [ruby-core:17257] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@17660 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/stringio/stringio.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'ext/stringio') diff --git a/ext/stringio/stringio.c b/ext/stringio/stringio.c index f912c4193e..1a6502ed4d 100644 --- a/ext/stringio/stringio.c +++ b/ext/stringio/stringio.c @@ -990,7 +990,7 @@ strio_readline(argc, argv, self) VALUE *argv; VALUE self; { - VALUE line = strio_getline(argc, argv, readable(StringIO(self))); + VALUE line = strio_gets(argc, argv, self); if (NIL_P(line)) rb_eof_error(); return line; } @@ -1014,6 +1014,7 @@ strio_each(argc, argv, self) RETURN_ENUMERATOR(self, argc, argv); while (!NIL_P(line = strio_getline(argc, argv, readable(ptr)))) { + rb_lastline_set(line); rb_yield(line); } return self; @@ -1036,6 +1037,7 @@ strio_readlines(argc, argv, self) while (!NIL_P(line = strio_getline(argc, argv, readable(ptr)))) { rb_ary_push(ary, line); } + rb_lastline_set(Qnil); return ary; } -- cgit v1.2.3