parent: use choose_method

Author: scivision

+stdlib/+native/parent.m

@@ -13,8 +13,6 @@
   p = strcat(p, filesep);
 end
 
-if isstring(pth)
-  p = string(p);
-end
+p = string(p);
 
 end

+stdlib/+python/parent.m

@@ -2,12 +2,12 @@
 
 try
   p = string(py.str(py.pathlib.Path(pth).parent));
-  if ispc() && strcmp(p, stdlib.root_name(pth))
-    p = strcat(p, filesep);
+  if ispc() && p == stdlib.root_name(pth)
+    p = p + filesep;
   end
 catch e
   p = "";
-  warning(e.identifier, "%s", e.message)
+  warning(e.identifier, "parent(%s) failed: %s", pth, e.message)
 end
 
 end

+stdlib/parent.m

@@ -1,36 +1,17 @@
 %% PARENT parent directory of path
 %
 %% Examples:
-% parent("a/b/c") == "a/b"
-% parent("a/b/c/") == "a/b"
-%
-% MEX is about 10x faster than plain Matlab for this function
+% stdlib.parent("a/b/c") == "a/b"
+% stdlib.parent("a/b/c/") == "a/b"
 
-function p = parent(pth)
+function p = parent(pth, method)
 arguments
   pth {mustBeTextScalar}
+  method (1,:) string = ["java", "python", "native"]
 end
 
-if stdlib.has_java()
-  p = stdlib.java.parent(pth);
-elseif stdlib.has_python()
-  p = stdlib.python.parent(pth);
-else
-  p = stdlib.native.parent(pth);
-end
+fun = choose_method(method, "parent");
 
-end
+p = fun(pth);
 
-%!assert(parent("/a/b/c"), fullfile('/a','b'))
-%!assert(parent("/a/b/c/"), fullfile('/a','b'))
-%!assert(parent('/a///b'), fullfile('/a'))
-%!assert(parent('a/b/'), 'a')
-%!assert(parent('a//b/'), 'a')
-%!assert(parent('a//b'), 'a')
-%!test
-%! if ispc
-%!   assert(parent('c:/a'), 'c:\')
-%!   assert(parent('c:\a\'), 'c:\')
-%!   assert(parent('c:\'), 'c:\')
-%!   assert(parent('c:'), 'c:\')
-%! end
+end

+stdlib/private/choose_method.m

@@ -26,6 +26,6 @@
   end
 end
 
-error("Could not find %s using %s", name, method)
+error("Could not find %s using %s", name, join(method, ','))
 
 end

test/TestParent.m

@@ -2,7 +2,7 @@
 
 properties (TestParameter)
 p = init_parent()
-fun = {@stdlib.parent, @stdlib.java.parent, @stdlib.python.parent}
+method = {"java", "python", "native"}
 end
 
 methods(TestClassSetup)
@@ -14,10 +14,10 @@ function pkg_path(tc)
 
 methods (Test, TestTags="pure")
 
-function test_parent(tc, p, fun)
-is_capable(tc, fun)
+function test_parent(tc, p, method)
+is_capable(tc, str2func("stdlib." + method + ".parent"))
 
-tc.verifyEqual(fun(p{1}), p{2}, sprintf("parent(%s)", p{1}))
+tc.verifyEqual(stdlib.parent(p{1}, method), p{2}, sprintf("parent(%s, %s)", p{1}, method))
 end
 
 end

test/TestResolve.m

@@ -72,7 +72,7 @@ function test_resolve_fullpath(tc, p)
   a = p;
   switch a
     case {'', "", '.', "."}, b = string(tc.td);
-    case {'..', ".."}, b = string(stdlib.parent(tc.td));
+    case {'..', ".."}, b = string(fileparts(tc.td));
   end
 
 tc.verifyEqual(stdlib.resolve(a), b)