diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/pathname/lib/pathname.rb | 9 | ||||
| -rw-r--r-- | ext/pathname/pathname.c | 34 | ||||
| -rw-r--r-- | test/pathname/test_pathname.rb | 4 |
4 files changed, 43 insertions, 9 deletions
@@ -1,3 +1,8 @@ +Tue Sep 14 05:13:04 2010 Tanaka Akira <[email protected]> + + * ext/pathname/pathname.c (path_s_glob): Pathname.glob translated + from pathname.rb. + Tue Sep 14 01:24:51 2010 Yutaka Kanemoto <[email protected]> * ext/socket/raddrinfo.c (ruby_getaddrinfo__aix): suppress a diff --git a/ext/pathname/lib/pathname.rb b/ext/pathname/lib/pathname.rb index 6cf6419e52..e519dd56d2 100644 --- a/ext/pathname/lib/pathname.rb +++ b/ext/pathname/lib/pathname.rb @@ -485,15 +485,6 @@ end class Pathname # * Dir * - # See <tt>Dir.glob</tt>. Returns or yields Pathname objects. - def Pathname.glob(*args) # :yield: pathname - if block_given? - Dir.glob(*args) {|f| yield self.new(f) } - else - Dir.glob(*args).map {|f| self.new(f) } - end - end - # See <tt>Dir.getwd</tt>. Returns the current working directory as a Pathname. def Pathname.getwd() self.new(Dir.getwd) end class << self; alias pwd getwd end diff --git a/ext/pathname/pathname.c b/ext/pathname/pathname.c index d1090f841c..eca94b4d16 100644 --- a/ext/pathname/pathname.c +++ b/ext/pathname/pathname.c @@ -813,6 +813,39 @@ path_zero_p(VALUE self) return rb_funcall(rb_mFileTest, rb_intern("zero?"), 1, get_strpath(self)); } +static VALUE +glob_i(VALUE elt, VALUE klass, int argc, VALUE *argv) +{ + return rb_yield(rb_class_new_instance(1, &elt, klass)); +} + +/* + * See <tt>Dir.glob</tt>. Returns or yields Pathname objects. + */ +static VALUE +path_s_glob(int argc, VALUE *argv, VALUE klass) +{ + VALUE args[2]; + int n; + + n = rb_scan_args(argc, argv, "11", &args[0], &args[1]); + if (rb_block_given_p()) { + return rb_block_call(rb_cDir, rb_intern("glob"), n, args, glob_i, klass); + } + else { + VALUE ary; + long i; + ary = rb_funcall2(rb_cDir, rb_intern("glob"), n, args); + 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 * @@ -1066,4 +1099,5 @@ Init_pathname() rb_define_method(rb_cPathname, "world_writable?", path_world_writable_p, 0); rb_define_method(rb_cPathname, "writable_real?", path_writable_real_p, 0); rb_define_method(rb_cPathname, "zero?", path_zero_p, 0); + rb_define_singleton_method(rb_cPathname, "glob", path_s_glob, -1); } diff --git a/test/pathname/test_pathname.rb b/test/pathname/test_pathname.rb index 55ef46690d..340af2423d 100644 --- a/test/pathname/test_pathname.rb +++ b/test/pathname/test_pathname.rb @@ -1152,6 +1152,10 @@ class TestPathname < Test::Unit::TestCase open("f", "w") {|f| f.write "abc" } Dir.mkdir("d") assert_equal([Pathname("d"), Pathname("f")], Pathname.glob("*").sort) + a = [] + Pathname.glob("*") {|path| a << path } + a.sort! + assert_equal([Pathname("d"), Pathname("f")], a) } end |