canonical: simplify with only one method"

Author: scivision

+stdlib/+legacy/canonical.m

@@ -7,29 +7,29 @@
 % This also resolves Windows short paths to long paths.
 %
 %%% Inputs
-% * p: path to make canonical
+% * file: path to make canonical
 % * strict: if true, only return canonical path if it exists. If false, return normalized path if path does not exist.
 %%% Outputs
 % * c: canonical path, if determined
-% * b: backend used
 
-function [c, b] = canonical(p, strict)
-arguments
-  p string
-  strict (1,1) logical = false
+function c = canonical(file, strict)
+if nargin < 2
+  strict = false;
 end
 
-try
-  c = stdlib.native.canonical(p, strict);
-  b = 'native';
-catch e
-  switch e.identifier
-    case {'MATLAB:UndefinedFunction', 'MATLAB:undefinedVarOrClass'}
-      c = stdlib.legacy.canonical(p, strict);
-      b = 'legacy';
-    otherwise
-      rethrow(e)
-  end
+if stdlib.strempty(file)
+  c = extractBefore(file, 1);
+  return
+end
+
+[s, r] = fileattrib(file);
+
+if s == 1
+  c = r.Name;
+elseif ~strict
+  c = stdlib.normalize(file);
+else
+  c = extractBefore(file, 1);
 end
 
 end

+stdlib/+native/canonical.m

@@ -1,13 +1,9 @@
 %% IS_ABSOLUTE is path absolute
 %
 % * Windows, absolute paths must be at least 3 character long, starting with a root name followed by a slash
-%
 % * non-Windows, absolute paths must start with a slash
 
 function y = is_absolute(p)
-arguments
-  p (1,1) string
-end
 
 y = ~stdlib.strempty(stdlib.root_dir(p));
 

+stdlib/canonical.m

@@ -0,0 +1,17 @@
+function c = canonical(file, strict)
+if nargin < 2
+  strict = false;
+end
+
+rp = matlab.io.internal.filesystem.resolvePath(file);
+c = string({rp.ResolvedPath});
+
+if strict
+  return
+end
+
+if stdlib.strempty(c) && ~stdlib.strempty(file)
+  c = stdlib.normalize(file);
+end
+
+end

+stdlib/is_absolute.m

@@ -3,11 +3,11 @@
   TestCanonical < matlab.unittest.TestCase
 
 properties (TestParameter)
-p = {{'', ""}, ...
+p = {{'', ''}, ...
 {"", ""}, ...
 {"not-exist", "not-exist"}, ...
 {"a/../b", "a/../b"}, ...
-{append(mfilename("fullpath"), '.m/..'), string(fileparts(mfilename("fullpath")))}, ...
+{append(mfilename("fullpath"), '.m/..'), fileparts(mfilename("fullpath"))}, ...
 {"not-exist/a/..", "not-exist/a/.."}, ...
 {"./not-exist", "not-exist"}
 };
@@ -22,33 +22,10 @@ function test_dirs(tc)
 
 methods (Test, TestTags={'R2019b'})
 function test_canonical(tc, p)
-[c, b] = stdlib.canonical(p{1}, false);
-tc.verifyEqual(c, p{2})
-
-if stdlib.matlabOlderThan('R2024a')
-  tc.assertEqual(b, 'legacy')
-else
-  tc.assertEqual(b, 'native')
-end
-end
-
-function test_legacy_canonical(tc, p)
-c = stdlib.legacy.canonical(p{1}, false);
+c = stdlib.canonical(p{1}, false);
 tc.verifyEqual(c, p{2})
 end
-end
-
-
-methods (Test, TestTags={'R2024a'})
-function test_canonical_array(tc)
-tc.assumeFalse(stdlib.matlabOlderThan('R2024a'))
 
-in = ["", "hi", "/ok"];
-
-c = stdlib.canonical(in, false);
-exp = ["", "hi", "/ok"];
-tc.verifyEqual(c, exp)
-end
 end
 
 end

example/+native/canonical.m

@@ -48,8 +48,8 @@ function test_resolve_fullpath(tc, p)
 
 a = p;
 switch a
-  case {'', "", '.', "."}, b = string(pwd());
-  case {'..', ".."}, b = string(fileparts(pwd()));
+  case {'', "", '.', "."}, b = pwd();
+  case {'..', ".."}, b = fileparts(pwd());
 end
 
 tc.verifyEqual(stdlib.resolve(a, false), b)