From 05745ccfb367ab670ebbad8c992edf2cf70d8b4b Mon Sep 17 00:00:00 2001 From: akr Date: Tue, 17 Aug 2010 04:02:32 +0000 Subject: * ext/pathname/pathname.c (path_dirname): Pathname#dirname translated from pathname.rb. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29020 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ ext/pathname/lib/pathname.rb | 3 --- ext/pathname/pathname.c | 12 ++++++++++++ 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index ec522b2135..30424b7cf2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Aug 17 13:00:07 2010 Tanaka Akira + + * ext/pathname/pathname.c (path_dirname): Pathname#dirname translated + from pathname.rb. + Tue Aug 17 07:50:37 2010 Nobuyoshi Nakada * ext/readline/extconf.rb: check functions more. diff --git a/ext/pathname/lib/pathname.rb b/ext/pathname/lib/pathname.rb index 44152b9b6c..487402c21b 100644 --- a/ext/pathname/lib/pathname.rb +++ b/ext/pathname/lib/pathname.rb @@ -512,9 +512,6 @@ end class Pathname # * File * - # See File.dirname. Returns all but the last component of the path. - def dirname() self.class.new(File.dirname(@path)) end - # See File.extname. Returns the file's extension. def extname() File.extname(@path) end diff --git a/ext/pathname/pathname.c b/ext/pathname/pathname.c index 36e5cb378a..e548ac56f5 100644 --- a/ext/pathname/pathname.c +++ b/ext/pathname/pathname.c @@ -438,6 +438,17 @@ path_basename(int argc, VALUE *argv, VALUE self) return rb_class_new_instance(1, &str, rb_obj_class(self)); } +/* + * See File.dirname. Returns all but the last component of the path. + */ +static VALUE +path_dirname(VALUE self) +{ + VALUE str = get_strpath(self); + str = rb_funcall(rb_cFile, rb_intern("dirname"), 1, str); + return rb_class_new_instance(1, &str, rb_obj_class(self)); +} + /* * == Pathname * @@ -658,4 +669,5 @@ Init_pathname() rb_define_method(rb_cPathname, "truncate", path_truncate, 1); rb_define_method(rb_cPathname, "utime", path_utime, 2); rb_define_method(rb_cPathname, "basename", path_basename, -1); + rb_define_method(rb_cPathname, "dirname", path_dirname, 0); } -- cgit v1.2.3