Move FILETEST-F to Rakudo::Internals

Also, no longer booleanify for internal usage.
rakudo · Jan 11, 2016 · f90282b · f90282b
1 parent 15b4a8f
commit f90282b
Show file tree

Hide file tree

Showing 4 changed files with 7 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-F(Str $abspath) {
-    nqp::p6bool( nqp::stat(nqp::unbox_s($abspath),nqp::const::STAT_ISREG) );
-}
 sub FILETEST-S(Str $abspath) {
     nqp::p6box_i(nqp::stat(nqp::unbox_s($abspath),nqp::const::STAT_FILESIZE) );
 }

diff --git a/src/core/IO/Local.pm b/src/core/IO/Local.pm
@@ -50,7 +50,7 @@ my role IO::Local {
     method pred(IO::Local:D:) { $!abspath.pred }
 
     method e(IO::Local:D:)   { True }
-    method f(IO::Local:D:)   { FILETEST-F(  $!abspath) }
+    method f(IO::Local:D:)   { ?Rakudo::Internals.FILETEST-F(  $!abspath) }
     method s(IO::Local:D:)   { FILETEST-S(  $!abspath) }
     method l(IO::Local:D:)   { FILETEST-L(  $!abspath) }
     method r(IO::Local:D:)   { FILETEST-R(  $!abspath) }

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

diff --git a/src/core/Rakudo/Internals.pm b/src/core/Rakudo/Internals.pm
@@ -1005,10 +1005,12 @@ my class Rakudo::Internals {
     method FILETEST-E(Str:D \abspath) {
         nqp::stat(nqp::unbox_s(abspath),nqp::const::STAT_EXISTS)
     }
-
     method FILETEST-D(Str:D \abspath) {
         nqp::stat(nqp::unbox_s(abspath),nqp::const::STAT_ISDIR)
     }
+    method FILETEST-F(Str:D \abspath) {
+        nqp::stat(nqp::unbox_s(abspath),nqp::const::STAT_ISREG)
+    }
 }
 
 # vim: ft=perl6 expandtab sw=4