non-java normalize, more than 10x faster

Author: scivision

+stdlib/canonical.m

@@ -45,7 +45,7 @@
   else
     % for non-existing path, return normalized relative path
     % like C++ filesystem weakly_canonical()
-    c = stdlib.normalize(c);
+    c = stdlib.normalize(c, use_java);
     return
   end
 end

+stdlib/normalize.m

@@ -1,4 +1,4 @@
-function n = normalize(p)
+function n = normalize(p, use_java)
 %% normalize(p)
 % normalize(p) remove redundant elements of path p
 % path need not exist, normalized path is returned
@@ -10,9 +10,53 @@
 % https://docs.oracle.com/en/java/javase/21/docs/api/java.base/java/nio/file/Path.html#normalize()
 arguments
   p (1,1) string
+  use_java (1,1) logical = false
 end
 
-n = stdlib.posix(java.io.File(p).toPath().normalize());
+if use_java
+  n = stdlib.posix(java.io.File(p).toPath().normalize());
+else
+
+  n = stdlib.posix(p);
+
+  % use split to remove /../ and /./ and duplicated /
+  parts = split(n, "/");
+  i0 = 1;
+  if startsWith(n, "/")
+    n = "/";
+  elseif ispc && strlength(n) >= 2 && isletter(extractBetween(n, 1, 1)) && extractBetween(n, 2, 2) == ":"
+    n = parts(1);
+    i0 = 2;
+  else
+    n = "";
+  end
+
+  for i = i0:length(parts)
+    if parts(i) == ".."
+      if n == ""
+        n = parts(i);
+      elseif endsWith(n, "..")
+        n = n + "/" + parts(i);
+      else
+        j = strfind(n, "/");
+        if isempty(j)
+          n = "";
+        else
+          n = extractBefore(n, j(end));
+        end
+      end
+    elseif all(parts(i) ~= [".", ""])
+      if n == ""
+        n = parts(i);
+      elseif n == "/"
+        n = n + parts(i);
+      else
+        n = n + "/" + parts(i);
+      end
+    end
+  end
+
+end
 
 if(strlength(n) == 0), n = "."; end
 

+stdlib/relative_to.m

@@ -5,8 +5,8 @@
 end
 
 % must remove trailing slashes
-base = stdlib.normalize(base);
-other = stdlib.normalize(other);
+base = stdlib.normalize(base, true);
+other = stdlib.normalize(other, true);
 
 if base == other
   r = ".";

test/TestFilePure.m

@@ -23,9 +23,9 @@
 in_suffix = {"", "/foo/bar/baz", "/foo/bar/baz/", "foo/bar/baz.txt", "foo/bar/baz.txt.gz", ".stat", ".stat.txt"}
 ref_suffix = {"", "", "", ".txt", ".gz", ".stat", ".txt"}
 
-in_norm = {"", "a/b/", "a/../c", "a/b/../c", "a/b/../../c", "a/b/../../c/..", ...
+in_norm = {"", "//a/b/", "/a/b/", "a/b/", "a/../c", "a/b/../c", "a/b/../../c", "a/b/../../c/..", ...
     "a/b/../../c/../..", "a////b"}
-ref_norm = {".", "a/b", "c", "a/c", "c", ".", ...
+ref_norm = {".", "/a/b", "/a/b", "a/b", "c", "a/c", "c", ".", ...
     "..", "a/b"}
 
 in_root