Move REMOVE-ROOT to Rakudo::Internals

and streamline with new gained knowledge  :-)

src/core/IO.pm

@@ -38,21 +38,6 @@ enum ProtocolType (
 # obfuscated names, will have to do.  They should also provide excellent
 # optimizing targets.
 
-sub REMOVE-ROOT(Str $r, Str $p) {
-    my str $root  = nqp::unbox_s($r);
-    my str $path  = nqp::unbox_s($p);
-    my int $chars = nqp::chars($root);
-
-    return $p if $chars >= nqp::chars($path);  # makes no sense
-
-    my int $i;
-    while $i < $chars && nqp::ordat($root,$i) == nqp::ordat($path,$i) {
-        $i = $i + 1;
-    }
-
-    $i == $chars ?? nqp::box_s(nqp::substr($path,$i),Str) !! $p;
-}
-
 sub CHANGE-DIRECTORY($path,$base,&test) {
 
     my $abspath = Rakudo::Internals.MAKE-CLEAN-PARTS(

src/core/IO/Local.pm

@@ -12,8 +12,12 @@ my role IO::Local {
     method absolute(IO::Local:D:) { $!abspath }
 
     proto method relative(|) { * }
-    multi method relative(IO::Local:D:) { REMOVE-ROOT($*CWD ~ '/',$!abspath) }
-    multi method relative(IO::Local:D: $root) { REMOVE-ROOT($root,$!abspath) }
+    multi method relative(IO::Local:D:) {
+        Rakudo::Internals.REMOVE-ROOT($*CWD ~ '/',$!abspath)
+    }
+    multi method relative(IO::Local:D: $root) {
+        Rakudo::Internals.REMOVE-ROOT($root,$!abspath)
+    }
 
     method !parts() { @!parts = $!abspath.split('/') unless @!parts }
     method volume(IO::Local:D:)    {

src/core/Rakudo/Internals.pm

@@ -992,6 +992,15 @@ my class Rakudo::Internals {
         nqp::push($parts,"");
         $parts
     }
+
+    method REMOVE-ROOT(Str:D \root, Str:D \path) {
+        my str $root = nqp::unbox_s(root);
+        my str $path = nqp::unbox_s(path);
+
+        nqp::eqat($path,$root,0)
+          ?? nqp::p6box_s(nqp::substr($path,nqp::chars($root)))
+          !! path;
+    }
 }
 
 # vim: ft=perl6 expandtab sw=4