diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | io.c | 1 | ||||
| -rw-r--r-- | test/ruby/test_argf.rb | 12 |
3 files changed, 18 insertions, 0 deletions
@@ -1,3 +1,8 @@ +Sun Jul 26 19:17:33 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * io.c (argf_eof): go to the next file if called after ARGF.close + or ARGF.skip. [ruby-core:24561] + Sun Jul 26 18:30:02 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * vm_insnhelper.c (vm_call_method): __send__ can call protected @@ -8502,6 +8502,7 @@ argf_eof(VALUE argf) { if (RTEST(ARGF.current_file)) { if (ARGF.init_p == 0) return Qtrue; + next_argv(); ARGF_FORWARD(0, 0); if (rb_io_eof(ARGF.current_file)) { return Qtrue; diff --git a/test/ruby/test_argf.rb b/test/ruby/test_argf.rb index c00db99bf..ed92a516a 100644 --- a/test/ruby/test_argf.rb +++ b/test/ruby/test_argf.rb @@ -437,6 +437,18 @@ class TestArgf < Test::Unit::TestCase assert_equal(x, a.shift) end end + + t1 = Tempfile.new("foo") + t1.binmode + t1.puts "foo" + t1.close + t2 = Tempfile.new("bar") + t2.binmode + t2.puts "bar" + t2.close + ruby('-e', 'STDERR.reopen(STDOUT); ARGF.gets; ARGF.skip; p ARGF.eof?', t1.path, t2.path) do |f| + assert_equal(%w(false), f.read.split(/\n/)) + end end def test_read |