Move FILETEST-RW to Rakudo::Internals

rakudo · Jan 11, 2016 · 43b5642 · 43b5642
1 parent fe726c0
commit 43b5642
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/src/core/IO.pm b/src/core/IO.pm
@@ -122,10 +122,6 @@ sub REMOVE-DIR(Str $path --> True) {
     } }
 }
 
-sub FILETEST-RW(Str $abspath) {
-    my str $p = nqp::unbox_s($abspath);
-    nqp::p6bool(nqp::filereadable($p) && nqp::filewritable($p));
-}
 sub FILETEST-X(Str $abspath) {
     nqp::p6bool(nqp::fileexecutable(nqp::unbox_s($abspath)));
 }
@@ -201,7 +197,7 @@ sub FILETEST-ALL(Str $path, *@tests) {
     # most common cases
     if @tests.join -> $tests {
         return Rakudo::Internals.FILETEST-R($path)   if $tests eq "r";
-        return FILETEST-RW($path)  if $tests eq "rw";
+        return Rakudo::Internals.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
@@ -55,7 +55,7 @@ my role IO::Local {
     method l(IO::Local:D:)   { ?Rakudo::Internals.FILETEST-L(  $!abspath) }
     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:)  { FILETEST-RW( $!abspath) }
+    method rw(IO::Local:D:)  { ?Rakudo::Internals.FILETEST-RW( $!abspath) }
     method x(IO::Local:D:)   { FILETEST-X(  $!abspath) }
     method rwx(IO::Local:D:) { FILETEST-RWX($!abspath) }
     method z(IO::Local:D:)   { FILETEST-Z(  $!abspath) }

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

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