canonical: choose_method

Author: scivision

+stdlib/+native/canonical_legacy.m renamed to +stdlib/+legacy/canonical.m

@@ -1,4 +1,4 @@
-function c = canonical_legacy(file, strict)
+function c = canonical(file, strict)
 
 c = "";
 

+stdlib/canonical.m

@@ -12,17 +12,15 @@
 %%% Outputs
 % * c: canonical path, if determined
 
-function c = canonical(p, strict)
+function c = canonical(p, strict, method)
 arguments
   p {mustBeTextScalar}
   strict (1,1) logical = false
+  method (1,:) string = ["native", "legacy"]
 end
 
+fun = choose_method(method, "canonical", 'R2024a');
 
-if isMATLABReleaseOlderThan('R2024a')
-  c = stdlib.native.canonical_legacy(p, strict);
-else
-  c = stdlib.native.canonical(p, strict);
-end
+c = fun(p, strict);
 
 end

test/TestCanonical.m

@@ -9,7 +9,7 @@
 {"not-exist/a/..", "not-exist"}, ...
 {"./not-exist", "not-exist"}
 };
-fun = {@stdlib.canonical, @stdlib.native.canonical, @stdlib.native.canonical_legacy}
+fun = {"native", "legacy"}
 end
 
 methods(TestClassSetup)
@@ -23,9 +23,13 @@ function pkg_path(tc)
 methods(Test, TestTags="impure")
 
 function test_canonical(tc, p, fun)
-is_capable(tc, fun)
-
-tc.verifyEqual(fun(p{1}, false), p{2})
+try
+  c = stdlib.canonical(p{1}, false, fun);
+catch e
+  tc.verifyEqual(e.identifier, 'stdlib:choose_method:NameError', e.message)
+  return
+end
+tc.verifyEqual(c, p{2})
 end
 
 end

test/is_capable.m

@@ -42,12 +42,6 @@ function is_capable(tc, f)
     tc.assumeTrue(isunix(), "unix only function")
   end
 
-elseif contains(n, ".native.")
-
-  if endsWith(n, "canonical")
-    tc.assumeFalse(isMATLABReleaseOlderThan('R2024a'))
-  end
-
 end
 
 end