Move FILETEST-X to Rakudo::Internals

Also, no longer booleanify for internal usage.
rakudo · Jan 11, 2016 · 4e78adc · 4e78adc
1 parent 43b5642
commit 4e78adc
Show file tree

Hide file tree

Showing 4 changed files with 8 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-X(Str $abspath) {
-    nqp::p6bool(nqp::fileexecutable(nqp::unbox_s($abspath)));
-}
 sub FILETEST-RWX(Str $abspath) {
     my str $p = nqp::unbox_s($abspath);
     nqp::p6bool(

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

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

diff --git a/src/core/Rakudo/Internals.pm b/src/core/Rakudo/Internals.pm
@@ -1027,6 +1027,9 @@ my class Rakudo::Internals {
         my str $abspath = nqp::unbox_s(abspath);
         nqp::filereadable($abspath) && nqp::filewritable($abspath)
     }
+    method FILETEST-X(Str:D \abspath) {
+        nqp::fileexecutable(nqp::unbox_s(abspath))
+    }
 }
 
 # vim: ft=perl6 expandtab sw=4