shyouhei	2008-06-29 17:19:27 +0900 (Sun, 29 Jun 2008)

  New Revision: 17658

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

  Log:
    merge revision(s) 17352:
    * 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_6/ChangeLog?r1=17658&r2=17657&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/version.h?r1=17658&r2=17657&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/ext/stringio/stringio.c?r1=17658&r2=17657&diff_format=u

Index: ruby_1_8_6/ext/stringio/stringio.c
===================================================================
--- ruby_1_8_6/ext/stringio/stringio.c	(revision 17657)
+++ ruby_1_8_6/ext/stringio/stringio.c	(revision 17658)
@@ -947,7 +947,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;
 }
@@ -969,6 +969,7 @@
     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 @@
     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_6/ChangeLog
===================================================================
--- ruby_1_8_6/ChangeLog	(revision 17657)
+++ ruby_1_8_6/ChangeLog	(revision 17658)
@@ -1,3 +1,8 @@
+Sun Jun 29 17:18:45 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/stringio/stringio.c (strio_readline, strio_each)
+	  (strio_readlines): set lastline.  [ruby-core:17257]
+
 Sun Jun 29 17:10:30 2008  NAKAMURA Usaku  <usa@r...>
 
 	* ext/openssl/ossl.h: include winsock.h if USE_WINSOCK2 is not defined.
Index: ruby_1_8_6/version.h
===================================================================
--- ruby_1_8_6/version.h	(revision 17657)
+++ ruby_1_8_6/version.h	(revision 17658)
@@ -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

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