diff options
author | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-04-14 09:19:52 +0000 |
---|---|---|
committer | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-04-14 09:19:52 +0000 |
commit | f5f1a18ceb87cd8ffa065a57b95f6d716ed6902c (patch) | |
tree | f5b9f01d28de0c0b38e285a9ad85ad0e9a6eb067 | |
parent | feb1dfdfc6dedfb929e08c4f3aaf21f4983c8b25 (diff) |
* enum.c (enum_find, enum_reject): Return an enumerator if no
block is given.
* io.c (rb_io_each_line, rb_io_each_byte, rb_io_s_foreach,
argf_each_line, argf_each_byte): Ditto.
* string.c (str_gsub): Ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@16010 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 10 | ||||
-rw-r--r-- | NEWS | 13 | ||||
-rw-r--r-- | enum.c | 2 | ||||
-rw-r--r-- | io.c | 14 | ||||
-rw-r--r-- | string.c | 3 |
5 files changed, 38 insertions, 4 deletions
@@ -1,3 +1,13 @@ +Mon Apr 14 18:14:19 2008 Akinori MUSHA <knu@iDaemons.org> + + * enum.c (enum_find, enum_reject): Return an enumerator if no + block is given. + + * io.c (rb_io_each_line, rb_io_each_byte, rb_io_s_foreach, + argf_each_line, argf_each_byte): Ditto. + + * string.c (str_gsub): Ditto. + Mon Apr 14 18:10:05 2008 NAKAMURA Usaku <usa@ruby-lang.org> * enum.c (find_index_i, find_index_iter_i): add prototype for VC. @@ -68,8 +68,10 @@ with all sufficient information, see the ChangeLog file. New methods. + * Enumerable#find * Enumerable#find_all * Enumerable#partition + * Enumerable#reject * Enumerable#select * Enumerable#sort_by @@ -105,6 +107,16 @@ with all sufficient information, see the ChangeLog file. Return an enumerator if no block is given. + * IO#each + * IO#each_line + * IO#each_byte + * IO.foreach + * ARGF.each + * ARGF.each_line + * ARGF.each_byte + + Return an enumerator if no block is given. + * Numeric#step Return an enumerator if no block is given. @@ -137,6 +149,7 @@ with all sufficient information, see the ChangeLog file. * String#each_byte * String#each * String#each_lines + * String#gsub(pattern) Return an enumerator if no block is given. @@ -219,6 +219,7 @@ enum_find(argc, argv, obj) VALUE if_none; rb_scan_args(argc, argv, "01", &if_none); + RETURN_ENUMERATOR(obj, argc, argv); rb_iterate(rb_each, obj, find_i, (VALUE)&memo); if (memo != Qundef) { return memo; @@ -366,6 +367,7 @@ enum_reject(obj) { VALUE ary = rb_ary_new(); + RETURN_ENUMERATOR(obj, 0, 0); rb_iterate(rb_each, obj, reject_i, ary); return ary; @@ -1964,6 +1964,7 @@ rb_io_each_line(argc, argv, io) VALUE str; VALUE rs; + RETURN_ENUMERATOR(io, argc, argv); if (argc == 0) { rs = rb_rs; } @@ -1999,6 +2000,7 @@ rb_io_each_byte(io) FILE *f; int c; + RETURN_ENUMERATOR(io, 0, 0); GetOpenFile(io, fptr); for (;;) { @@ -5268,14 +5270,16 @@ io_s_foreach(arg) */ static VALUE -rb_io_s_foreach(argc, argv) +rb_io_s_foreach(argc, argv, self) int argc; VALUE *argv; + VALUE self; { VALUE fname; struct foreach_arg arg; rb_scan_args(argc, argv, "11", &fname, &arg.sep); + RETURN_ENUMERATOR(self, argc, argv); SafeStringValue(fname); if (argc == 1) { @@ -5527,12 +5531,14 @@ argf_readchar() } static VALUE -argf_each_line(argc, argv) +argf_each_line(argc, argv, argf) int argc; VALUE *argv; + VALUE argf; { VALUE str; + RETURN_ENUMERATOR(argf, argc, argv); if (!next_argv()) return Qnil; if (TYPE(current_file) != T_FILE) { for (;;) { @@ -5548,10 +5554,12 @@ argf_each_line(argc, argv) } static VALUE -argf_each_byte() +argf_each_byte(argf) + VALUE argf; { VALUE byte; + RETURN_ENUMERATOR(argf, 0, 0); while (!NIL_P(byte = argf_getc())) { rb_yield(byte); } @@ -2096,7 +2096,8 @@ str_gsub(argc, argv, str, bang) char *buf, *bp, *sp, *cp; int tainted = 0; - if (argc == 1 && rb_block_given_p()) { + if (argc == 1) { + RETURN_ENUMERATOR(str, argc, argv); iter = 1; } else if (argc == 2) { |