shyouhei	2009-12-24 17:54:26 +0900 (Thu, 24 Dec 2009)

  New Revision: 26171

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=26171

  Log:
    merge revision(s) 17103:
    * ext/stringio/stringio.c (strio_init): rewind when reopened.

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/ext/stringio/stringio.c
    branches/ruby_1_8_7/test/stringio/test_stringio.rb
    branches/ruby_1_8_7/version.h

Index: ruby_1_8_7/ext/stringio/stringio.c
===================================================================
--- ruby_1_8_7/ext/stringio/stringio.c	(revision 26170)
+++ ruby_1_8_7/ext/stringio/stringio.c	(revision 26171)
@@ -269,6 +269,8 @@
 	break;
     }
     ptr->string = string;
+    ptr->pos = 0;
+    ptr->lineno = 0;
 }
 
 static VALUE
Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 26170)
+++ ruby_1_8_7/ChangeLog	(revision 26171)
@@ -1,3 +1,7 @@
+Thu Dec 24 17:50:35 2009  Yusuke Endoh  <mame@t...>
+
+	* ext/stringio/stringio.c (strio_init): rewind when reopened.
+
 Thu Dec 24 17:06:13 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* gc.c (run_final): runs finalizers with the object terminated.
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 26170)
+++ ruby_1_8_7/version.h	(revision 26171)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2009-12-24"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20091224
-#define RUBY_PATCHLEVEL 245
+#define RUBY_PATCHLEVEL 246
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_7/test/stringio/test_stringio.rb
===================================================================
--- ruby_1_8_7/test/stringio/test_stringio.rb	(revision 26170)
+++ ruby_1_8_7/test/stringio/test_stringio.rb	(revision 26171)
@@ -40,4 +40,17 @@
     end
     assert_equal("hacker\nother ruby\n", stringio.string)
   end
+  
+  def test_reopen
+    f = StringIO.new("foo\nbar\nbaz\n")
+    assert_equal("foo\n", f.gets)
+    f.reopen("qux\nquux\nquuux\n")
+    assert_equal("qux\n", f.gets)
+
+    f2 = StringIO.new("")
+    f2.reopen(f)
+    assert_equal("quux\n", f2.gets)
+  ensure
+    f.close unless f.closed?
+  end
 end

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