diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/stringio/stringio.c | 4 | ||||
| -rw-r--r-- | version.h | 2 |
3 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Sun Jun 29 17:19:59 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ext/stringio/stringio.c (strio_readline, strio_each) + (strio_readlines): set lastline. [ruby-core:17257] + Sun Jun 29 17:15:49 2008 NAKAMURA Usaku <usa@ruby-lang.org> * 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 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; } @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-06-29" #define RUBY_VERSION_CODE 187 #define RUBY_RELEASE_CODE 20080629 -#define RUBY_PATCHLEVEL 25 +#define RUBY_PATCHLEVEL 26 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 |