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: get rid of IOError when skipped while iteration

Browse source 
* io.c (argf_next_argv): set init flag if succeeded to forward, after
  skipping.
* io.c (argf_block_call_i, argf_block_call): no more forwarding if
  forwarded after skipping.  [ruby-list:49185]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39997 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-03-29 07:51:43 +00:00
parent 8d7c52dbe2
commit 824cb69058
3 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,4 +1,10 @@
Fri Mar 29 16:51:04 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
Fri Mar 29 16:51:39 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c (argf_next_argv): set init flag if succeeded to forward, after
skipping.
* io.c (argf_block_call_i, argf_block_call): no more forwarding if
forwarded after skipping. [ruby-list:49185]
* io.c (argf_close): deal with init flag.

9
io.c
View file

@ -7614,7 +7614,6 @@ argf_next_argv(VALUE argf)
else if (ARGF.next_p == -1 && RARRAY_LEN(ARGF.argv) > 0) {
ARGF.next_p = 1;
}
ARGF.init_p = 1;
}
if (ARGF.next_p == 1) {
@ -7747,6 +7746,7 @@ argf_next_argv(VALUE argf)
rb_stdout = orig_stdout;
}
}
if (ARGF.init_p == -1) ARGF.init_p = 1;
return TRUE;
}
@ -10927,7 +10927,7 @@ argf_readbyte(VALUE argf)
return c;
}
#define FOREACH_ARGF() for (; next_argv(); ARGF.next_p = 1)
#define FOREACH_ARGF() while (next_argv())
static VALUE
argf_block_call_i(VALUE i, VALUE argf, int argc, VALUE *argv)
@ -10935,7 +10935,7 @@ argf_block_call_i(VALUE i, VALUE argf, int argc, VALUE *argv)
const VALUE current = ARGF.current_file;
rb_yield_values2(argc, argv);
if (ARGF.init_p == -1 || current != ARGF.current_file) {
rb_iter_break();
rb_iter_break_value(Qundef);
}
return Qnil;
}
@ -10943,7 +10943,8 @@ argf_block_call_i(VALUE i, VALUE argf, int argc, VALUE *argv)
static void
argf_block_call(ID mid, int argc, VALUE *argv, VALUE argf)
{
rb_block_call(ARGF.current_file, mid, argc, argv, argf_block_call_i, argf);
VALUE ret = rb_block_call(ARGF.current_file, mid, argc, argv, argf_block_call_i, argf);
if (ret != Qundef) ARGF.next_p = 1;
}
/*

5
test/ruby/test_argf.rb
View file

@ -689,6 +689,11 @@ class TestArgf < Test::Unit::TestCase
SRC
assert_equal("1\n3\n5\n", f.read, '[ruby-list:49185]')
end
ruby('-e', <<-SRC, @t1.path, @t2.path, @t3.path) do |f|
ARGF.each_line {|l| ARGF.skip; puts [l, ARGF.gets].map {|s| s ? s.chomp : s.inspect}.join("+")}
SRC
assert_equal("1+3\n4+5\n6+nil\n", f.read, '[ruby-list:49185]')
end
end
def test_skip_in_each_byte