Move FILETEST-S to Rakudo::Internals

Also, no longer box the returned native int
rakudo · Jan 11, 2016 · 6803444 · 6803444
1 parent f90282b
commit 6803444
Show file tree

Hide file tree

Showing 4 changed files with 9 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-S(Str $abspath) {
-    nqp::p6box_i(nqp::stat(nqp::unbox_s($abspath),nqp::const::STAT_FILESIZE) );
-}
 sub FILETEST-L(Str $abspath) {
     nqp::p6bool(nqp::fileislink(nqp::unbox_s($abspath)));
 }

diff --git a/src/core/IO/Local.pm b/src/core/IO/Local.pm
@@ -51,7 +51,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:)   { FILETEST-S(  $!abspath) }
+    method s(IO::Local:D:)   {  Rakudo::Internals.FILETEST-S(  $!abspath) }
     method l(IO::Local:D:)   { FILETEST-L(  $!abspath) }
     method r(IO::Local:D:)   { FILETEST-R(  $!abspath) }
     method w(IO::Local:D:)   { FILETEST-W(  $!abspath) }

diff --git a/src/core/IO/Path.pm b/src/core/IO/Path.pm
@@ -548,9 +548,11 @@ my class IO::Path is Cool {
     }
 
     method s() {
-        fail X::IO::DoesNotExist.new(:path(self.Str),:trying<s>) if !$.e;
-        fail X::IO::NotAFile.new(:path(self.Str),:trying<s>)     if !$.f;
-        FILETEST-S($!abspath);
+        $.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() {

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