mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* ext/pathname/pathname.c (path_entries): Pathname#entries translated
from pathname.rb. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29253 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
d3a0629afc
commit
f84f164413
3 changed files with 30 additions and 4 deletions
|
@ -1,3 +1,8 @@
|
|||
Wed Sep 15 07:22:20 2010 Tanaka Akira <akr@fsij.org>
|
||||
|
||||
* ext/pathname/pathname.c (path_entries): Pathname#entries translated
|
||||
from pathname.rb.
|
||||
|
||||
Wed Sep 15 02:13:44 2010 Aaron Patterson <aaron@tenderlovemaking.com>
|
||||
|
||||
* ext/fiddle/closure.c : Don't use FFI closure alloc on OpenBSD.
|
||||
|
|
|
@ -486,10 +486,6 @@ end
|
|||
|
||||
class Pathname # * Dir *
|
||||
|
||||
# Return the entries (files and subdirectories) in the directory, each as a
|
||||
# Pathname object.
|
||||
def entries() Dir.entries(@path).map {|f| self.class.new(f) } end
|
||||
|
||||
# Iterates over the entries (files and subdirectories) in the directory. It
|
||||
# yields a Pathname object for each entry.
|
||||
#
|
||||
|
|
|
@ -857,6 +857,30 @@ path_s_getwd(VALUE klass)
|
|||
return rb_class_new_instance(1, &str, klass);
|
||||
}
|
||||
|
||||
/*
|
||||
* Return the entries (files and subdirectories) in the directory, each as a
|
||||
* Pathname object.
|
||||
*
|
||||
* The result may contain the current directory #<Pathname:.> and the parent
|
||||
* directory #<Pathname:..>.
|
||||
*/
|
||||
static VALUE
|
||||
path_entries(VALUE self)
|
||||
{
|
||||
VALUE klass, str, ary;
|
||||
long i;
|
||||
klass = rb_obj_class(self);
|
||||
str = get_strpath(self);
|
||||
ary = rb_funcall(rb_cDir, rb_intern("entries"), 1, str);
|
||||
ary = rb_convert_type(ary, T_ARRAY, "Array", "to_ary");
|
||||
for (i = 0; i < RARRAY_LEN(ary); i++) {
|
||||
VALUE elt = RARRAY_PTR(ary)[i];
|
||||
elt = rb_class_new_instance(1, &elt, klass);
|
||||
rb_ary_store(ary, i, elt);
|
||||
}
|
||||
return ary;
|
||||
}
|
||||
|
||||
/*
|
||||
* == Pathname
|
||||
*
|
||||
|
@ -1113,4 +1137,5 @@ Init_pathname()
|
|||
rb_define_singleton_method(rb_cPathname, "glob", path_s_glob, -1);
|
||||
rb_define_singleton_method(rb_cPathname, "getwd", path_s_getwd, 0);
|
||||
rb_define_singleton_method(rb_cPathname, "pwd", path_s_getwd, 0);
|
||||
rb_define_method(rb_cPathname, "entries", path_entries, 0);
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue