Implement IO::Spec.dirname (instead of .directory)

.directory will still work, but is deprecated
rakudo · Sep 29, 2014 · 4191d07 · 4191d07
1 parent a6af28f
commit 4191d07
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/src/core/IO/Path.pm b/src/core/IO/Path.pm
@@ -37,8 +37,12 @@ my class IO::Path is Cool does IO::FileTestable {
     method basename(IO::Path:D:) {
         self.parts<basename>
     }
+    method dirname(IO::Path:D:) {
+        self.parts<dirname>
+    }
     method directory(IO::Path:D:) {
-        self.parts<directory>
+        DEPRECATED("dirname");
+        self.parts<dirname>
     }
     method volume(IO::Path:D:) {
         self.parts<volume>

diff --git a/src/core/IO/Spec/Unix.pm b/src/core/IO/Spec/Unix.pm
@@ -71,7 +71,9 @@ my class IO::Spec::Unix is IO::Spec {
         $dirname  = '.'  if $dirname eq ''  && $basename ne '';
         # shell dirname '' produces '.', but we don't because it's probably user error
 
-        return (:volume(''), :$dirname, :$basename );
+        # temporary, for the transition period
+        (:volume(''), :$dirname, :$basename, :directory($dirname));
+#        (:volume(''), :$dirname, :$basename);
     }
 
 

diff --git a/src/core/IO/Spec/Win32.pm b/src/core/IO/Spec/Win32.pm
@@ -67,7 +67,9 @@ my class IO::Spec::Win32 is IO::Spec::Unix {
         $basename = '\\' if $dirname eq any('/', '\\') && $basename eq '';
         $dirname  = '.'  if $dirname eq ''             && $basename ne '';
 
-        return (:$volume, :$dirname, :$basename);
+        # temporary, for the transition period
+        (:$volume, :$dirname, :$basename, :directory($dirname));
+#        (:$volume, :$dirname, :$basename);
     }
 
     method join ($volume, $dirname is copy, $file is copy) {