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 (rb_io_s_foreach): return enumerator including kerword

Browse source 
arguments.  [ruby-dev:45267][Bug #6054]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34735 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2012-02-22 08:07:38 +00:00
parent e093cfae7a
commit 873b56fd50
3 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Wed Feb 22 17:07:35 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c (rb_io_s_foreach): return enumerator including kerword
arguments. [ruby-dev:45267][Bug #6054]
Wed Feb 22 15:47:04 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> Wed Feb 22 15:47:04 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* common.mk (test-all): shut up nonsense skipping messages. * common.mk (test-all): shut up nonsense skipping messages.

2
io.c
View file

@ -8971,8 +8971,8 @@ rb_io_s_foreach(int argc, VALUE *argv, VALUE self)
VALUE opt; VALUE opt;
struct foreach_arg arg; struct foreach_arg arg;
argc = rb_scan_args(argc, argv, "13:", NULL, NULL, NULL, NULL, &opt);
RETURN_ENUMERATOR(self, argc, argv); RETURN_ENUMERATOR(self, argc, argv);
argc = rb_scan_args(argc, argv, "13:", NULL, NULL, NULL, NULL, &opt);
open_key_args(argc, argv, opt, &arg); open_key_args(argc, argv, opt, &arg);
if (NIL_P(arg.io)) return Qnil; if (NIL_P(arg.io)) return Qnil;
return rb_ensure(io_s_foreach, (VALUE)&arg, rb_io_close, arg.io); return rb_ensure(io_s_foreach, (VALUE)&arg, rb_io_close, arg.io);

3
test/ruby/test_io.rb
View file

@ -1605,6 +1605,9 @@ End
IO.foreach(t.path, "b", 3) {|x| a << x } IO.foreach(t.path, "b", 3) {|x| a << x }
assert_equal(["foo", "\nb", "ar\n", "b", "az\n"], a) assert_equal(["foo", "\nb", "ar\n", "b", "az\n"], a)
bug6054 = '[ruby-dev:45267]'
e = assert_raise(IOError, bug6054) {IO.foreach(t.path, mode:"w").next}
assert_match(/not opened for reading/, e.message, bug6054)
end end
def test_s_readlines def test_s_readlines