canonical: more correct/simple implementation

Author: scivision

+stdlib/canonical.m

@@ -22,29 +22,35 @@
 
 
 if expand_tilde
-  c = stdlib.expanduser(p, use_java);
+  e = stdlib.expanduser(p, use_java);
 else
-  c = p;
+  e = p;
 end
 
-if ispc && (startsWith(c, "\\") || startsWith(c, "//"))
+if ispc && (startsWith(e, "\\") || startsWith(e, "//"))
   % UNC path is not canonicalized
   return
 end
 
-if stdlib.exists(c, use_java)
-  if stdlib.isoctave()
-    % empty if any component of path does not exist
-    c = canonicalize_file_name(c);
-  elseif use_java
-    % incorrect result if any component of path does not exist
-    c = javaFileObject(c).getCanonicalPath();
-  else
-    % errors if any component of path does not exist.
-    c = builtin('_canonicalizepath', c);
+c = "";
+
+if stdlib.isoctave()
+% empty if any component of path does not exist
+  c = canonicalize_file_name(e);
+elseif use_java && stdlib.is_absolute(e, true)
+% incorrect result if relative path and any component of path does not exist
+% disp("java")
+  c = javaFileObject(e).getCanonicalPath();
+else
+% errors if any component of path does not exist.
+% disp("builtin")
+  try %#ok<TRYNC>
+    c = builtin('_canonicalizepath', e);
   end
-elseif stdlib.len(c)
-  c = stdlib.normalize(c, use_java);
+end
+
+if ~stdlib.len(c)
+  c = stdlib.normalize(e, use_java);
 end
 
 c = stdlib.posix(c);

test/TestCanonical.m

@@ -3,8 +3,11 @@
 properties(TestParameter)
 use_java = num2cell(unique([stdlib.has_java(), false]))
 
-p = {{"", ""}, {"not-exist", "not-exist"}, {"a/../b", "b"}, ...
-{"~", stdlib.homedir()}, {"~/", stdlib.homedir()}, ...
+p = {{"", stdlib.posix(pwd())}, ...
+{"not-exist", "not-exist"}, ...
+{"a/../b", "b"}, ...
+{"~", stdlib.homedir()}, ...
+{"~/", stdlib.homedir()}, ...
 {"~/..", stdlib.parent(stdlib.homedir())}, ...
 {mfilename("fullpath") + ".m/..", stdlib.parent(mfilename("fullpath"))}, ...
 {"~/not-exist/a/..", stdlib.homedir() + "/not-exist"}