kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* io.c (argf_eof): go to the next file if called after ARGF.close

Browse source 
or ARGF.skip.  [ruby-core:24561]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24284 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-07-26 10:17:39 +00:00
parent f9f1581f6d
commit b7f26835da
3 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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> Sun Jul 26 18:30:02 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* vm_insnhelper.c (vm_call_method): __send__ can call protected * vm_insnhelper.c (vm_call_method): __send__ can call protected

1
io.c
View file

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

12
test/ruby/test_argf.rb
View file

@ -437,6 +437,18 @@ class TestArgf < Test::Unit::TestCase
assert_equal(x, a.shift) assert_equal(x, a.shift)
end end
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 end
def test_read def test_read