diff options
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | array.c | 2 | ||||
-rw-r--r-- | io.c | 2 |
3 files changed, 5 insertions, 2 deletions
@@ -6,6 +6,9 @@ Mon Aug 20 23:28:39 2007 Yukihiro Matsumoto <matz@ruby-lang.org> * dir.c (dir_foreach): return Enumerator if no block given. [ruby-dev:31525] + * io.c (rb_io_s_foreach): argument count check before making + Enumerator. [ruby-dev:31525] + Mon Aug 20 23:17:14 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> * vm_core.h (struct rb_thread_struct): removed first_func_arg and @@ -922,7 +922,7 @@ rb_ary_rindex(int argc, VALUE *argv, VALUE ary) long i = RARRAY_LEN(ary); if (rb_scan_args(argc, argv, "01", &val) == 0) { - RETURN_ENUMERATOR(ary, 0, 0); + RETURN_ENUMERATOR(ary, 0, 0); while (i--) { if (RTEST(rb_yield(RARRAY_PTR(ary)[i]))) return LONG2NUM(i); @@ -5185,8 +5185,8 @@ rb_io_s_foreach(int argc, VALUE *argv, VALUE self) VALUE fname; struct foreach_arg arg; - RETURN_ENUMERATOR(self, argc, argv); rb_scan_args(argc, argv, "12", &fname, NULL, NULL); + RETURN_ENUMERATOR(self, argc, argv); FilePathValue(fname); arg.io = rb_io_open(RSTRING_PTR(fname), "r"); if (NIL_P(arg.io)) return Qnil; |