Move FILETEST-L to Rakudo::Internals

Also, no longer booleanify for internal usage.
rakudo · Jan 11, 2016 · 18e981c · 18e981c
1 parent 6803444
commit 18e981c
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,9 +122,6 @@ sub REMOVE-DIR(Str $path --> True) {
     } }
 }
 
-sub FILETEST-L(Str $abspath) {
-    nqp::p6bool(nqp::fileislink(nqp::unbox_s($abspath)));
-}
 sub FILETEST-R(Str $abspath) {
     nqp::p6bool(nqp::filereadable(nqp::unbox_s($abspath)));
 }

diff --git a/src/core/IO/Local.pm b/src/core/IO/Local.pm
@@ -52,7 +52,7 @@ my role IO::Local {
     method e(IO::Local:D:)   { True }
     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:)   { FILETEST-L(  $!abspath) }
+    method l(IO::Local:D:)   { ?Rakudo::Internals.FILETEST-L(  $!abspath) }
     method r(IO::Local:D:)   { FILETEST-R(  $!abspath) }
     method w(IO::Local:D:)   { FILETEST-W(  $!abspath) }
     method rw(IO::Local:D:)  { FILETEST-RW( $!abspath) }

diff --git a/src/core/IO/Path.pm b/src/core/IO/Path.pm
@@ -541,23 +541,24 @@ my class IO::Path is Cool {
           !! fail X::IO::DoesNotExist.new(:path(~self),:trying<d>)
     }
 
-    method f() {
+    method f(--> Bool) {
         $.e
           ?? ?Rakudo::Internals.FILETEST-F($!abspath)
           !! fail X::IO::DoesNotExist.new(:path(~self),:trying<f>)
     }
 
-    method s() {
+    method s(--> Int) {
         $.e
           ?? $.f
             ?? Rakudo::Internals.FILETEST-S($!abspath)
             !! fail X::IO::NotAFile.new(:path(~self),:trying<s>)
           !! fail X::IO::DoesNotExist.new(:path(~self),:trying<s>)
     }
 
-    method l() {
-        fail X::IO::DoesNotExist.new(:path(self.Str),:trying<l>) if !$.e;
-        FILETEST-L($!abspath);
+    method l(--> Bool) {
+        $.e
+          ?? ?Rakudo::Internals.FILETEST-L($!abspath)
+          !! fail X::IO::DoesNotExist.new(:path(~self),:trying<l>)
     }
 
     method r() {

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