* io.c (argf_eof): should not have reached EOF before trying to

read.  based on a patch by Heesob Park <phasis AT gmail.com> at
  [ruby-core:24559].  [ruby-core:24557]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24271 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

ChangeLog

@@ -1,3 +1,9 @@
+Sat Jul 25 17:49:03 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (argf_eof): should not have reached EOF before trying to
+	  read.  based on a patch by Heesob Park <phasis AT gmail.com> a
+	  [ruby-core:24559].  [ruby-core:24557]
+
 Sat Jul 25 13:44:28 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* complex.c (nucomp_hash), rational.c (nurat_hash): not to use

io.c

@@ -8500,7 +8500,7 @@ argf_to_io(VALUE argf)
 static VALUE
 argf_eof(VALUE argf)
 {
-    if (ARGF.current_file) {
+    if (RTEST(ARGF.current_file)) {
 	if (ARGF.init_p == 0) return Qtrue;
 	ARGF_FORWARD(0, 0);
 	if (rb_io_eof(ARGF.current_file)) {

test/ruby/test_argf.rb

@@ -72,7 +72,7 @@ class TestArgf < Test::Unit::TestCase
       p [a.gets.chomp, a.lineno, b.gets.chomp, b.lineno] #=> ["5", 5, "5", 8]
       p [a.gets.chomp, a.lineno, b.gets.chomp, b.lineno] #=> ["6", 6, "6", 9]
     SRC
-    expected = src.scan(/\#=> *(.*+)/).flatten
+    expected = src.scan(/\#=> *(.+)/).flatten
     ruby('-e', src, @t1.path, @t2.path, @t3.path) do |f|
       f.each_with_index do |a, i|
         assert_equal(expected.shift, a.chomp, "[ruby-dev:34445]: line #{i}")
@@ -102,7 +102,7 @@ class TestArgf < Test::Unit::TestCase
       a.gets; p $.  #=> 2001
       a.gets; p $.  #=> 2001
     SRC
-    expected = src.scan(/\#=> *(.*+)/).join(",")
+    expected = src.scan(/\#=> *(.+)/).join(",")
     ruby('-e', src, @t1.path, @t2.path, @t3.path) do |f|
       assert_equal(expected, f.read.chomp.gsub("\n", ","))
     end
@@ -125,7 +125,7 @@ class TestArgf < Test::Unit::TestCase
       a.gets; p $.  #=> 2000
       a.gets; p $.  #=> 2000
     SRC
-    expected = src.scan(/\#=> *(.*+)/).join(",")
+    expected = src.scan(/\#=> *(.+)/).join(",")
     ruby('-e', src, @t1.path, @t2.path, @t3.path) do |f|
       assert_equal(expected, f.read.chomp.gsub("\n", ","))
     end
@@ -433,7 +433,7 @@ class TestArgf < Test::Unit::TestCase
       end
     SRC
       a = f.read.split("\n")
-      ((%w(true false) * 4).take(7) + %w(end)).each do |x|
+      (%w(false) + (%w(false true) * 3) + %w(end)).each do |x|
         assert_equal(x, a.shift)
       end
     end