Move FILETEST-Z to Rakudo::Internals

rakudo · Jan 11, 2016 · 0c4db8d · 0c4db8d
1 parent a9c8fe4
commit 0c4db8d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/src/core/IO.pm b/src/core/IO.pm
@@ -122,9 +122,6 @@ sub REMOVE-DIR(Str $path --> True) {
     } }
 }
 
-sub FILETEST-Z(Str $abspath) {
-    nqp::p6bool(nqp::stat(nqp::unbox_s($abspath),nqp::const::STAT_FILESIZE)==0);
-}
 #?if moar
 sub FILETEST-MODIFIED(Str $abspath) {
     Instant.from-posix( nqp::p6box_n(

diff --git a/src/core/IO/Local.pm b/src/core/IO/Local.pm
@@ -58,7 +58,7 @@ my role IO::Local {
     method rw(IO::Local:D:)  { ?Rakudo::Internals.FILETEST-RW( $!abspath) }
     method x(IO::Local:D:)   { ?Rakudo::Internals.FILETEST-X(  $!abspath) }
     method rwx(IO::Local:D:) { ?Rakudo::Internals.FILETEST-RWX($!abspath) }
-    method z(IO::Local:D:)   { FILETEST-Z(  $!abspath) }
+    method z(IO::Local:D:)   { ?Rakudo::Internals.FILETEST-Z(  $!abspath) }
     method modified(IO::Local:D:) { FILETEST-MODIFIED($!abspath) }
     method accessed(IO::Local:D:) { FILETEST-ACCESSED($!abspath) }
     method changed(IO::Local:D:)  { FILETEST-CHANGED( $!abspath) }

diff --git a/src/core/IO/Path.pm b/src/core/IO/Path.pm
@@ -592,9 +592,11 @@ my class IO::Path is Cool {
     }
 
     method z() {
-        fail X::IO::DoesNotExist.new(:path(self.Str),:trying<z>) if !$.e;
-        fail X::IO::NotAFile.new(:path(self.Str),:trying<z>)     if !$.f;
-        FILETEST-Z($!abspath);
+        $.e
+          ?? $.f
+            ?? ?Rakudo::Internals.FILETEST-Z($!abspath)
+            !! fail X::IO::NotAFile.new(:path(~self),:trying<z>)
+          !! fail X::IO::DoesNotExist.new(:path(~self),:trying<z>)
     }
 
     method modified() {

diff --git a/src/core/Rakudo/Internals.pm b/src/core/Rakudo/Internals.pm
@@ -1036,6 +1036,10 @@ my class Rakudo::Internals {
           && nqp::filewritable($abspath)
           && nqp::fileexecutable($abspath)
     }
+    method FILETEST-Z(Str:D \abspath) {
+        nqp::iseq_i(
+          nqp::stat(nqp::unbox_s(abspath),nqp::const::STAT_FILESIZE),0)
+    }
 }
 
 # vim: ft=perl6 expandtab sw=4