Move FILETEST-R to Rakudo::Internals

Also, no longer booleanify for internal usage.
rakudo · Jan 11, 2016 · 42191ca · 42191ca
1 parent 18e981c
commit 42191ca
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 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-R(Str $abspath) {
-    nqp::p6bool(nqp::filereadable(nqp::unbox_s($abspath)));
-}
 sub FILETEST-W(Str $abspath) {
     nqp::p6bool(nqp::filewritable(nqp::unbox_s($abspath)));
 }
@@ -206,7 +203,7 @@ sub FILETEST-ALL(Str $path, *@tests) {
 
     # most common cases
     if @tests.join -> $tests {
-        return FILETEST-R($path)   if $tests eq "r";
+        return Rakudo::Internals.FILETEST-R($path)   if $tests eq "r";
         return FILETEST-RW($path)  if $tests eq "rw";
         return FILETEST-RWX($path) if $tests eq "rwx";
     }

diff --git a/src/core/IO/Local.pm b/src/core/IO/Local.pm
@@ -53,7 +53,7 @@ my role IO::Local {
     method f(IO::Local:D:)   { ?Rakudo::Internals.FILETEST-F(  $!abspath) }
     method s(IO::Local:D:)   {  Rakudo::Internals.FILETEST-S(  $!abspath) }
     method l(IO::Local:D:)   { ?Rakudo::Internals.FILETEST-L(  $!abspath) }
-    method r(IO::Local:D:)   { FILETEST-R(  $!abspath) }
+    method r(IO::Local:D:)   { ?Rakudo::Internals.FILETEST-R(  $!abspath) }
     method w(IO::Local:D:)   { FILETEST-W(  $!abspath) }
     method rw(IO::Local:D:)  { FILETEST-RW( $!abspath) }
     method x(IO::Local:D:)   { FILETEST-X(  $!abspath) }

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

diff --git a/src/core/Rakudo/Internals.pm b/src/core/Rakudo/Internals.pm
@@ -1017,6 +1017,9 @@ my class Rakudo::Internals {
     method FILETEST-L(Str:D \abspath) {
         nqp::fileislink(nqp::unbox_s(abspath))
     }
+    method FILETEST-R(Str:D \abspath) {
+        nqp::filereadable(nqp::unbox_s(abspath))
+    }
 }
 
 # vim: ft=perl6 expandtab sw=4