summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-08-20 14:35:53 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-08-20 14:35:53 +0000
commit0bbb9095d481f951f0b2bcd3aec457ff4d21b1f2 (patch)
treee3b051c599389828fa00bc6ec11deb15786d7aa3
parent2cbe10731af04bf8316dcedb50781c2c6fd4e1cd (diff)
downloadruby-0bbb9095d481f951f0b2bcd3aec457ff4d21b1f2.tar.gz
ruby-0bbb9095d481f951f0b2bcd3aec457ff4d21b1f2.tar.xz
ruby-0bbb9095d481f951f0b2bcd3aec457ff4d21b1f2.zip
* dir.c (dir_foreach): return Enumerator if no block given.
[ruby-dev:31525] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@13118 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog3
-rw-r--r--dir.c1
2 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 374cab6f1..f9c0fec49 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@ Mon Aug 20 23:28:39 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* string.c (Init_String): remove Symbol.intern and Symbol#dump.
[ruby-dev:31525]
+ * dir.c (dir_foreach): return Enumerator if no block given.
+ [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
diff --git a/dir.c b/dir.c
index ecffc37f9..f7b7eb193 100644
--- a/dir.c
+++ b/dir.c
@@ -1729,6 +1729,7 @@ dir_foreach(VALUE io, VALUE dirname)
{
VALUE dir;
+ RETURN_ENUMERATOR(io, 1, &dirname);
dir = dir_open_dir(dirname);
rb_ensure(dir_each, dir, dir_close, dir);
return Qnil;