canonical: empty returns pwd(). Use R2026b resolveFilePath() when avail

Author: scivision

+stdlib/+legacy/canonical.m

@@ -0,0 +1,10 @@
+function c = canonical(file)
+
+[s, r] = fileattrib(file);
+if s == 1
+  c = r.Name;
+else
+  c = missing;
+end
+
+end

+stdlib/canonical.m

@@ -18,36 +18,27 @@
   strict (1,1) logical = false
 end
 
-c = '';
-
-try
+if stdlib.strempty(file)
+  c = pwd();
+elseif ~stdlib.exists(file)
+  if strict
+    c = missing;
+    return
+  end
+  c = stdlib.normalize(file);
+elseif stdlib.matlabOlderThan('R2025a')
+  c = stdlib.legacy.canonical(file);
+elseif stdlib.matlabOlderThan('R2026b')
   p = filePermissions(file);
   c = p.AbsolutePath;
-  if ischar(file)
-    c = char(c);
-  end
-catch e
-  if ~stdlib.strempty(file)
-    switch e.identifier
-      case 'MATLAB:io:filesystem:filePermissions:CannotFindLocation'
-        if ~strict
-          c = stdlib.normalize(file);
-        end
-      case {'MATLAB:UndefinedFunction', 'Octave:undefined-function'}
-        [s, r] = fileattrib(file);
-        if s == 1
-          c = r.Name;
-        elseif ~strict
-          c = stdlib.normalize(file);
-        end
-      otherwise
-        rethrow(e)
-    end
-  end
+else
+  c = resolveFilePath(file);
+end
 
-  if isstring(file)
-    c = string(c);
-  end
+if isstring(file)
+  c = string(c);
+elseif ischar(file)
+  c = char(c);
 end
 
 end

example/+javafun/canonical.m

@@ -2,7 +2,7 @@
 % https://docs.oracle.com/en/java/javase/21/docs/api/java.base/java/io/File.html#getCanonicalPath()
 
 % incorrect result if relative path and any component of path does not exist
-% disp("java")
+
 c = javaFileObject(p).getCanonicalPath();
 
 end

test/TestCanonical.m

@@ -3,8 +3,7 @@
   TestCanonical < matlab.unittest.TestCase
 
 properties (TestParameter)
-p = {{'', ''}, ...
-{'', ''}, ...
+p = {
 {'not-exist', 'not-exist'}, ...
 {'a/../b', 'a/../b'}, ...
 {'not-exist/a/..', 'not-exist/a/..'}, ...
@@ -27,9 +26,17 @@ function test_canonical(tc, p)
 tc.verifyEqual(stdlib.canonical(string(p{1}), false), string(p{2}))
 end
 
-function test_canonical_cwd(tc)
+function test_canonical_empty(tc)
+tc.verifyEqual(stdlib.canonical('', false), pwd())
+tc.verifyEqual(stdlib.canonical('', true), pwd())
+tc.verifyEqual(stdlib.canonical(""), string(pwd()))
+end
+
+function test_canonical_strict(tc)
 c = stdlib.canonical('.', true);
 tc.verifyEqual(c, pwd())
+
+tc.verifyEqual(stdlib.canonical('not-exist', true), missing)
 end
 
 end