From 15d074cd90526b98e2dae3f6f280a9641c06b810 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Sun, 29 Jun 2008 08:19:27 +0000 Subject: merge revision(s) 17352: * ext/stringio/stringio.c (strio_readline, strio_each) (strio_readlines): set lastline. [ruby-core:17257] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_6@17658 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ ext/stringio/stringio.c | 4 +++- version.h | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2376cc206..97893aae8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Jun 29 17:18:45 2008 Nobuyoshi Nakada + + * ext/stringio/stringio.c (strio_readline, strio_each) + (strio_readlines): set lastline. [ruby-core:17257] + Sun Jun 29 17:10:30 2008 NAKAMURA Usaku * ext/openssl/ossl.h: include winsock.h if USE_WINSOCK2 is not defined. diff --git a/ext/stringio/stringio.c b/ext/stringio/stringio.c index 7355afd77..011ccb73f 100644 --- a/ext/stringio/stringio.c +++ b/ext/stringio/stringio.c @@ -947,7 +947,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; } @@ -969,6 +969,7 @@ strio_each(argc, argv, self) VALUE line; while (!NIL_P(line = strio_getline(argc, argv, readable(ptr)))) { + rb_lastline_set(line); rb_yield(line); } return self; @@ -991,6 +992,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; } diff --git a/version.h b/version.h index 0e06ba657..9a12c0ca4 100644 --- a/version.h +++ b/version.h @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-06-29" #define RUBY_VERSION_CODE 186 #define RUBY_RELEASE_CODE 20080629 -#define RUBY_PATCHLEVEL 242 +#define RUBY_PATCHLEVEL 243 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 -- cgit