canonical: functionalize, test

Author: scivision

+stdlib/+native/canonical.m

@@ -0,0 +1,15 @@
+function c = canonical(file, strict)
+
+if stdlib.strempty(file)
+  c = "";
+  return
+end
+
+p = matlab.io.internal.filesystem.resolvePath(file);
+c = p.ResolvedPath;
+
+if ~strict && stdlib.strempty(c)
+  c = string(stdlib.normalize(file));
+end
+
+end

+stdlib/+native/canonical_legacy.m

@@ -0,0 +1,17 @@
+function c = canonical_legacy(file, strict)
+
+c = "";
+
+if stdlib.strempty(file), return, end
+
+[s, r] = fileattrib(file);
+
+if s == 1
+  c = r.Name;
+elseif ~strict
+  c = stdlib.normalize(file);
+end
+
+c = string(c);
+
+end

+stdlib/canonical.m

@@ -15,41 +15,14 @@
 function c = canonical(p, strict)
 arguments
   p {mustBeTextScalar}
-  strict logical = false
+  strict (1,1) logical = false
 end
 
-if stdlib.strempty(p)
-  c = "";
-  return
-end
 
 if isMATLABReleaseOlderThan('R2024a')
-  c = acanon(p, strict);
+  c = stdlib.native.canonical_legacy(p, strict);
 else
-  pth = matlab.io.internal.filesystem.resolvePath(p);
-  c = pth.ResolvedPath;
-  if ~strict && stdlib.strempty(c)
-    c = stdlib.normalize(p);
-  end
-end
-
-c = string(c);
-
-end
-
-
-function c = acanon(p, strict)
-
-c = "";
-
-if stdlib.strempty(p), return, end
-
-[s, r] = fileattrib(p);
-
-if s == 1
-  c = r.Name;
-elseif ~strict
-  c = stdlib.normalize(p);
+  c = stdlib.native.canonical(p, strict);
 end
 
 end

test/TestCanonical.m

@@ -9,6 +9,7 @@
 {"not-exist/a/..", "not-exist"}, ...
 {"./not-exist", "not-exist"}
 };
+fun = {@stdlib.canonical, @stdlib.native.canonical, @stdlib.native.canonical_legacy}
 end
 
 methods(TestClassSetup)
@@ -21,8 +22,8 @@ function pkg_path(tc)
 
 methods(Test, TestTags="impure")
 
-function test_canonical(tc, p)
-tc.verifyEqual(stdlib.canonical(p{1}), p{2})
+function test_canonical(tc, p, fun)
+tc.verifyEqual(fun(p{1}, false), p{2})
 end
 
 end