diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/pathname/lib/pathname.rb | 13 | ||||
| -rw-r--r-- | ext/pathname/pathname.c | 22 |
3 files changed, 27 insertions, 13 deletions
@@ -1,3 +1,8 @@ +Sat Sep 18 20:09:51 2010 Tanaka Akira <akr@fsij.org> + + * ext/pathname/pathname.c (path_each_entry): Pathname#each_entry + translated from pathname.rb. + Fri Sep 17 23:44:07 2010 Kouhei Sutou <kou@cozmixng.org> * lib/rexml/xpath_parser.rb, test/rexml/test_xpath.rb: diff --git a/ext/pathname/lib/pathname.rb b/ext/pathname/lib/pathname.rb index 1f29f38376..0b7458e6cb 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 92c09555ee..0583b0da3e 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); } |