summaryrefslogtreecommitdiff
path: root/ext/pathname
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-09-18 11:10:36 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-09-18 11:10:36 +0000
commit9dffbcfc09dc54d77bfb99dc91e0c5ea01182925 (patch)
tree7bbd15030f545b23aa33475c190fbdd9d57d233e /ext/pathname
parentc095a38cad9acc00f6ddbae74df6a1d7596bd8aa (diff)
* ext/pathname/pathname.c (path_each_entry): Pathname#each_entry
translated from pathname.rb. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29292 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/pathname')
-rw-r--r--ext/pathname/lib/pathname.rb13
-rw-r--r--ext/pathname/pathname.c22
2 files changed, 22 insertions, 13 deletions
diff --git a/ext/pathname/lib/pathname.rb b/ext/pathname/lib/pathname.rb
index 1f29f38..0b7458e 100644
--- a/ext/pathname/lib/pathname.rb
+++ b/ext/pathname/lib/pathname.rb
@@ -484,19 +484,6 @@ class Pathname
end
-class Pathname # * Dir *
-
- # Iterates over the entries (files and subdirectories) in the directory. It
- # yields a Pathname object for each entry.
- #
- # This method has existed since 1.8.1.
- def each_entry(&block) # :yield: pathname
- Dir.foreach(@path) {|f| yield self.class.new(f) }
- end
-
-end
-
-
class Pathname # * Find *
#
# Pathname#find is an iterator to traverse a directory tree in a depth first
diff --git a/ext/pathname/pathname.c b/ext/pathname/pathname.c
index 92c0955..0583b0d 100644
--- a/ext/pathname/pathname.c
+++ b/ext/pathname/pathname.c
@@ -916,6 +916,27 @@ path_opendir(VALUE self)
return rb_block_call(rb_cDir, rb_intern("open"), 1, args, 0, 0);
}
+static VALUE
+each_entry_i(VALUE elt, VALUE klass, int argc, VALUE *argv)
+{
+ return rb_yield(rb_class_new_instance(1, &elt, klass));
+}
+
+/*
+ * Iterates over the entries (files and subdirectories) in the directory. It
+ * yields a Pathname object for each entry.
+ *
+ * This method has available since 1.8.1.
+ */
+static VALUE
+path_each_entry(VALUE self)
+{
+ VALUE args[1];
+
+ args[0] = get_strpath(self);
+ return rb_block_call(rb_cDir, rb_intern("foreach"), 1, args, each_entry_i, rb_obj_class(self));
+}
+
/*
* == Pathname
*
@@ -1176,4 +1197,5 @@ Init_pathname()
rb_define_method(rb_cPathname, "mkdir", path_mkdir, -1);
rb_define_method(rb_cPathname, "rmdir", path_rmdir, 0);
rb_define_method(rb_cPathname, "opendir", path_opendir, 0);
+ rb_define_method(rb_cPathname, "each_entry", path_each_entry, 0);
}