canonical: simplify

Author: scivision

+stdlib/canonical.m

@@ -26,39 +26,38 @@
   c = p;
 end
 
+if ~stdlib.len(c)
+  return
+end
+
 if ispc && startsWith(c, "\\")
   % UNC path is not canonicalized
   return
 end
 
-e = stdlib.exists(c, use_java);
-
-if ~stdlib.is_absolute(c)
-  if e
-    if ~expand_tilde && ~use_java && startsWith(c, "~")
-      c = stdlib.normalize(c, use_java);
-      return
-    else
-      % workaround Java/Matlab limitations
-      c = stdlib.posix(pwd()) + "/" + c;
-    end
+if stdlib.exists(c, use_java)
+  if stdlib.isoctave()
+    c = canonicalize_file_name(c);
   else
-    % for non-existing path, return normalized relative path
-    % like C++ filesystem weakly_canonical()
-    c = stdlib.normalize(c, use_java);
-    return
+    % errors if path does not exist. Errors on leading ~
+    c = builtin('_canonicalizepath', c);
   end
+
+  c = stdlib.posix(c);
+  return
 end
 
+% like C++ filesystem weakly_canonical()
+
 if use_java
   c = java.io.File(c).getCanonicalPath();
-elseif e
-  % errors if path does not exist. Errors on leading ~
-  c = builtin('_canonicalizepath', c);
 else
   c = stdlib.normalize(c, use_java);
 end
 
 c = stdlib.posix(c);
 
-end % function
+end
+
+%!assert(canonical("", 0,0), "")
+%!assert(canonical("~",1,0), homedir(0))

+stdlib/is_absolute.m

@@ -14,6 +14,7 @@
   % https://docs.oracle.com/en/java/javase/22/docs/api/java.base/java/io/File.html#isAbsolute()
   isabs = java.io.File(p).toPath().isAbsolute();
 elseif ischar(p)
+  % not is_absolute_filename() because this is a stricter check for "c:" false
   L = length(p);
   if ispc
     isabs = L > 2 && ~isempty(stdlib.root_name(p)) && (p(3) == '\' || p(3) == '/');

+stdlib/normalize.m

@@ -21,7 +21,7 @@
   n = stdlib.posix(p);
 
   % use split to remove /../ and /./ and duplicated /
-  parts = split(n, "/");
+  parts = split(n, '/');
   i0 = 1;
   if startsWith(n, "/")
     n = "/";

test/TestResolve.m

@@ -47,14 +47,13 @@ function test_canonical(tc)
 import matlab.unittest.fixtures.TemporaryFolderFixture
 import matlab.unittest.fixtures.CurrentFolderFixture
 import matlab.unittest.constraints.StartsWithSubstring
-import matlab.unittest.constraints.EndsWithSubstring
 
 td = tc.applyFixture(TemporaryFolderFixture).Folder;
 tc.applyFixture(CurrentFolderFixture(td))
 
 % all non-existing files
 
-tc.verifyEqual(stdlib.canonical(""), ".")
+tc.verifyEqual(stdlib.canonical(""), "")
 
 pabs = stdlib.canonical('2foo');
 tc.verifyThat(pabs, StartsWithSubstring("2foo"))
@@ -69,10 +68,8 @@ function test_canonical(tc)
 r = stdlib.parent(mfilename('fullpath'));
 tc.verifyEqual(stdlib.canonical(fullfile(r, "..")), stdlib.parent(r))
 
-% on windows, ~ is expanded even without expanduser
-if ~ispc
-tc.verifyThat(stdlib.canonical("~", false), EndsWithSubstring("~"))
-end
+% ~ is expanded even without expanduser when path exists
+tc.verifyEqual(stdlib.canonical("~/nobody/a/..", false), "~/nobody")
 
 h = stdlib.homedir;
 tc.verifyEqual(stdlib.canonical("~"), h)