nobu	2008-06-16 07:14:51 +0900 (Mon, 16 Jun 2008)

  New Revision: 17352

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/ext/stringio/stringio.c
    branches/ruby_1_8/version.h
    trunk/ChangeLog
    trunk/ext/stringio/stringio.c

  Log:
    * ext/stringio/stringio.c (strio_readline, strio_each)
      (strio_readlines): set lastline.  [ruby-core:17257]


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=17352&r2=17351&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=17352&r2=17351&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ext/stringio/stringio.c?r1=17352&r2=17351&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ext/stringio/stringio.c?r1=17352&r2=17351&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/version.h?r1=17352&r2=17351&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 17351)
+++ ChangeLog	(revision 17352)
@@ -1,3 +1,8 @@
+Mon Jun 16 07:14:48 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/stringio/stringio.c (strio_readline, strio_each)
+	  (strio_readlines): set lastline.  [ruby-core:17257]
+
 Mon Jun 16 01:49:39 2008  Koichi Sasada  <ko1@a...>
 
 	* eval.c (rb_f_block_given_p): fix to skip class frame.
Index: ext/stringio/stringio.c
===================================================================
--- ext/stringio/stringio.c	(revision 17351)
+++ ext/stringio/stringio.c	(revision 17352)
@@ -928,7 +928,7 @@
 static VALUE
 strio_readline(int argc, 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;
 }
@@ -953,6 +953,7 @@
     RETURN_ENUMERATOR(self, argc, argv);
 
     while (!NIL_P(line = strio_getline(argc, argv, readable(ptr)))) {
+	rb_lastline_set(line);
 	rb_yield(line);
     }
     return self;
@@ -974,6 +975,7 @@
     while (!NIL_P(line = strio_getline(argc, argv, readable(ptr)))) {
 	rb_ary_push(ary, line);
     }
+    rb_lastline_set(Qnil);
     return ary;
 }
 
Index: ruby_1_8/ext/stringio/stringio.c
===================================================================
--- ruby_1_8/ext/stringio/stringio.c	(revision 17351)
+++ ruby_1_8/ext/stringio/stringio.c	(revision 17352)
@@ -992,7 +992,7 @@
     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 @@
     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 @@
     while (!NIL_P(line = strio_getline(argc, argv, readable(ptr)))) {
 	rb_ary_push(ary, line);
     }
+    rb_lastline_set(Qnil);
     return ary;
 }
 
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 17351)
+++ ruby_1_8/ChangeLog	(revision 17352)
@@ -1,3 +1,8 @@
+Mon Jun 16 07:14:48 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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@r...>
 
 	* ext/stringio/stringio.c (strio_sysread): should not raise at empty
Index: ruby_1_8/version.h
===================================================================
--- ruby_1_8/version.h	(revision 17351)
+++ ruby_1_8/version.h	(revision 17352)
@@ -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[];

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/