* 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@17352 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 11 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 8136e1947e..4790cc1492 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jun 16 07:14:48 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/stringio/stringio.c (strio_readline, strio_each)
+	  (strio_readlines): set lastline.  [ruby-core:17257]
+
 Sat Jun 14 22:52:35 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/stringio/stringio.c (strio_sysread): should not raise at empty
diff --git a/ext/stringio/stringio.c b/ext/stringio/stringio.c
index 584bea8f64..484b299e53 100644
--- a/ext/stringio/stringio.c
+++ b/ext/stringio/stringio.c
@@ -992,7 +992,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;
 }
@@ -1016,6 +1016,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;
@@ -1038,6 +1039,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 b4d5b3596f..8bea0e110c 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2008-06-14"
+#define RUBY_RELEASE_DATE "2008-06-16"
 #define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20080614
+#define RUBY_RELEASE_CODE 20080616
 #define RUBY_PATCHLEVEL 5000
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 7
 #define RUBY_RELEASE_YEAR 2008
 #define RUBY_RELEASE_MONTH 6
-#define RUBY_RELEASE_DAY 14
+#define RUBY_RELEASE_DAY 16
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];