diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-08-21 08:37:28 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-08-21 08:37:28 +0000 |
commit | 86b26898ebe3bbb53fa76a41fbf12c41a91ce4bd (patch) | |
tree | 8e543c2b9a9d5d224118817370796f80f893f8e0 | |
parent | b88a5027b86d8bfd8a0892588322e1083e9caa1d (diff) | |
download | ruby-86b26898ebe3bbb53fa76a41fbf12c41a91ce4bd.tar.gz |
* ext/pathname/pathname.c (path_split): Pathname#split translated from
pathname.rb.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29061 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ext/pathname/lib/pathname.rb | 8 | ||||
-rw-r--r-- | ext/pathname/pathname.c | 18 |
3 files changed, 23 insertions, 8 deletions
@@ -1,3 +1,8 @@ +Sat Aug 21 17:36:42 2010 Tanaka Akira <akr@fsij.org> + + * ext/pathname/pathname.c (path_split): Pathname#split translated from + pathname.rb. + Fri Aug 20 10:40:04 2010 Tanaka Akira <akr@fsij.org> * ext/pathname/pathname.c (path_expand_path): Pathname#expand_path diff --git a/ext/pathname/lib/pathname.rb b/ext/pathname/lib/pathname.rb index 2056477eef..4d19aa737c 100644 --- a/ext/pathname/lib/pathname.rb +++ b/ext/pathname/lib/pathname.rb @@ -510,14 +510,6 @@ class Pathname # * IO * end -class Pathname # * File * - - # See <tt>File.split</tt>. Returns the #dirname and the #basename in an - # Array. - def split() File.split(@path).map {|f| self.class.new(f) } end -end - - class Pathname # * FileTest * # See <tt>FileTest.blockdev?</tt>. diff --git a/ext/pathname/pathname.c b/ext/pathname/pathname.c index 2ebb976de2..1d6b9ac2a3 100644 --- a/ext/pathname/pathname.c +++ b/ext/pathname/pathname.c @@ -475,6 +475,23 @@ path_expand_path(int argc, VALUE *argv, VALUE self) } /* + * See <tt>File.split</tt>. Returns the #dirname and the #basename in an Array. + */ +static VALUE +path_split(VALUE self) +{ + VALUE str = get_strpath(self); + VALUE ary, dirname, basename; + ary = rb_funcall(rb_cFile, rb_intern("split"), 1, str); + ary = rb_check_array_type(ary); + dirname = rb_ary_entry(ary, 0); + basename = rb_ary_entry(ary, 1); + dirname = rb_class_new_instance(1, &dirname, rb_obj_class(self)); + basename = rb_class_new_instance(1, &basename, rb_obj_class(self)); + return rb_ary_new3(2, dirname, basename); +} + +/* * == Pathname * * Pathname represents a pathname which locates a file in a filesystem. @@ -697,4 +714,5 @@ Init_pathname() rb_define_method(rb_cPathname, "dirname", path_dirname, 0); rb_define_method(rb_cPathname, "extname", path_extname, 0); rb_define_method(rb_cPathname, "expand_path", path_expand_path, -1); + rb_define_method(rb_cPathname, "split", path_split, 0); } |