Remove FILETEST-E to Rakudo::Internals

Also, no longer booleanify for internal usage.
rakudo · Jan 11, 2016 · 14b73ac · 14b73ac
1 parent 308c469
commit 14b73ac
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/src/core/IO.pm b/src/core/IO.pm
@@ -42,16 +42,16 @@ sub CHANGE-DIRECTORY($path,$base,&test) {
 
     my $abspath = Rakudo::Internals.MAKE-CLEAN-PARTS(
       Rakudo::Internals.MAKE-ABSOLUTE-PATH($path,$base)).join('/');
-    FILETEST-E($abspath) && FILETEST-D($abspath) && test($abspath)
+    Rakudo::Internals.FILETEST-E($abspath)
+      && FILETEST-D($abspath)
+      && test($abspath)
       ?? IO::Path.new-from-absolute-path($abspath.chop)
       !! fail X::IO::Chdir.new(
-           :$path,
-           :os-error( "does not exist, is not a dir or no access" ),
-         );
+           :$path, :os-error( "does not exist, is not a dir or no access" ))
 }
 
 sub COPY-FILE(Str $from, Str $to, :$createonly --> True) {
-    if $createonly and FILETEST-E($to) {
+    if $createonly && Rakudo::Internals.FILETEST-E($to) {
         fail X::IO::Copy.new(
           :$from,
           :$to,
@@ -66,7 +66,7 @@ sub COPY-FILE(Str $from, Str $to, :$createonly --> True) {
 }
 
 sub RENAME-PATH(Str $from, Str $to, :$createonly --> True) {
-    if $createonly and FILETEST-E($to) {
+    if $createonly && Rakudo::Internals.FILETEST-E($to) {
         fail X::IO::Rename.new(
           :$from,
           :$to,
@@ -122,9 +122,6 @@ sub REMOVE-DIR(Str $path --> True) {
     } }
 }
 
-sub FILETEST-E(Str $abspath) {
-    nqp::p6bool( nqp::stat(nqp::unbox_s($abspath),nqp::const::STAT_EXISTS) );
-}
 sub FILETEST-D(Str $abspath) {
     nqp::p6bool( nqp::stat(nqp::unbox_s($abspath),nqp::const::STAT_ISDIR) );
 }

diff --git a/src/core/IO/Path.pm b/src/core/IO/Path.pm
@@ -565,7 +565,7 @@ my class IO::Path is Cool {
         $result;
     }
 
-    method e() { $!e //= FILETEST-E($.abspath) }
+    method e() { $!e //= ?Rakudo::Internals.FILETEST-E($.abspath) }
 
     method d() {
         fail X::IO::DoesNotExist.new(:path(self.Str),:trying<d>) if !$.e;

diff --git a/src/core/Rakudo/Internals.pm b/src/core/Rakudo/Internals.pm
@@ -1001,6 +1001,10 @@ my class Rakudo::Internals {
           ?? nqp::p6box_s(nqp::substr($path,nqp::chars($root)))
           !! path;
     }
+
+    method FILETEST-E(Str:D \abspath) {
+        nqp::stat(nqp::unbox_s(abspath),nqp::const::STAT_EXISTS)
+    }
 }
 
 # vim: ft=perl6 expandtab sw=4