diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-22 13:04:38 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-22 13:04:38 +0000 |
commit | 35bf8099d4dc06437e816815ad38309e68628d26 (patch) | |
tree | 0d46521c5295ea054311e1b16670da8983ff9115 /io.c | |
parent | fa1a2ae15852ff5f3826a6173effe4d624ab8d72 (diff) |
merge revision(s) 34735,34736:
* io.c (rb_io_s_foreach): return enumerator including kerword
arguments. [ruby-dev:45267][Bug #6054]
* io.c (rb_io_s_foreach): argument check before making Enumerator.
[ruby-dev:31525]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34749 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'io.c')
-rw-r--r-- | io.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -8484,10 +8484,11 @@ static VALUE rb_io_s_foreach(int argc, VALUE *argv, VALUE self) { VALUE opt; + int orig_argc = argc; struct foreach_arg arg; argc = rb_scan_args(argc, argv, "13:", NULL, NULL, NULL, NULL, &opt); - RETURN_ENUMERATOR(self, argc, argv); + RETURN_ENUMERATOR(self, orig_argc, argv); open_key_args(argc, argv, opt, &arg); if (NIL_P(arg.io)) return Qnil; return rb_ensure(io_s_foreach, (VALUE)&arg, rb_io_close, arg.io); |