root*: string, any size array

Author: scivision

+stdlib/root_dir.m

@@ -10,23 +10,19 @@
 
 function r = root_dir(p)
 arguments
-  p {mustBeTextScalar}
+  p string
 end
 
 sep = characterListPattern("/" + filesep);
-pat = (textBoundary + sep);
-if ispc()
-  pat = pat | (lookBehindBoundary(lettersPattern(1) + ":") + sep);
-end
 
-r = extract(p, pat);
-if isempty(r)
-  r = '';
-  if isstring(p)
-    r = "";
-  end
-elseif iscell(r)
-  r = r{1};
+r = repmat("", size(p));
+
+i = startsWith(p, sep);
+r(i) = extractBefore(p(i), 2);
+
+if ispc()
+  i = startsWith(p, lettersPattern(1) + ":" + sep);
+  r(i) = extractBetween(p(i), 3, 3);
 end
 
 end

+stdlib/root_name.m

@@ -7,24 +7,14 @@
 
 function r = root_name(p)
 arguments
-  p {mustBeTextScalar}
+  p string
 end
 
-if ispc()
-  r = extract(p, textBoundary + lettersPattern(1) + ":");
-  if ~isempty(r) && iscell(r)
-    r = r{1};
-  end
-else
-  r = '';
-end
+r = repmat("", size(p));
 
-if isempty(r)
-  r = '';
-  if isstring(p)
-    r = "";
-  end
+if ispc()
+  i = startsWith(p, textBoundary + lettersPattern(1) + ":");
+  r(i) = extractBefore(p(i), 3);
 end
 
-
 end

test/TestFilePure.m

@@ -1,11 +1,5 @@
 classdef TestFilePure < matlab.unittest.TestCase
 
-properties (TestParameter)
-p = {{"", ""}, {"a/b", ""}, {'/etc', ''}}
-pu = {{"c:/etc", ""}}
-pw = {{"c:/etc", "c:"}}
-end
-
 methods(TestClassSetup)
 function pkg_path(tc)
 fsp = matlab.unittest.fixtures.PathFixture(fileparts(fileparts(mfilename('fullpath'))));
@@ -27,23 +21,6 @@ function test_posix(tc)
 
 end
 
-function test_root_name(tc, p)
-tc.verifyEqual(stdlib.root_name(p{1}), p{2})
-end
-end
-
-methods(Test, TestTags=["pure", "unix"])
-function test_root_name_unix(tc, pu)
-tc.assumeTrue(isunix)
-tc.verifyEqual(stdlib.root_name(pu{1}), pu{2})
-end
-end
-
-methods(Test, TestTags=["pure", "windows"])
-function test_root_name_windows(tc, pw)
-tc.assumeTrue(ispc, "This test is only for Windows")
-tc.verifyEqual(stdlib.root_name(pw{1}), pw{2})
-end
 end
 
 end

test/TestRoot.m

@@ -16,15 +16,21 @@ function pkg_path(tc)
 methods (Test, TestTags="pure")
 
 function test_root(tc, p)
-tc.verifyEqual(stdlib.root(p{1}), p{2})
+r = stdlib.root(p{1});
+tc.assertClass(r, 'string')
+tc.verifyEqual(r, p{2})
 end
 
 function test_root_dir(tc, rd)
-tc.verifyEqual(stdlib.root_dir(rd{1}), rd{2}, "root_dir(" + rd{1} + ")")
+r = stdlib.root_dir(rd{1});
+tc.assertClass(r, 'string')
+tc.verifyEqual(r, rd{2}, "root_dir(" + rd{1} + ")")
 end
 
 function test_root_name(tc, rn)
-tc.verifyEqual(stdlib.root_name(rn{1}), rn{2})
+r = stdlib.root_name(rn{1});
+tc.assertClass(r, 'string')
+tc.verifyEqual(r, rn{2})
 end
 
 end
@@ -38,15 +44,15 @@ function test_root_name(tc, rn)
 {"a/b", ""}, ...
 {"./a/b", ""}, ...
 {"/etc", "/"}, ...
-{'/etc', '/'}, ...
+{'/etc', "/"}, ...
 {"c:", ""}, ...
 {"c:/etc", ""}, ...
-{'c:\etc', ''}};
+{'c:\etc', ""}};
 
 if ispc()
 p{6}{2} = "c:";
 p{7}{2} = "c:/";
-p{8}{2} = 'c:\';
+p{8}{2} = "c:\";
 end
 
 end
@@ -57,12 +63,12 @@ function test_root_name(tc, rn)
 rn = init_root();
 
 rn{4}{2} = "";
-rn{5}{2} = '';
+rn{5}{2} = "";
 
 if ispc()
 rn{6}{2} = "c:";
 rn{7}{2} = "c:";
-rn{8}{2} = 'c:';
+rn{8}{2} = "c:";
 end
 
 end
@@ -75,7 +81,7 @@ function test_root_name(tc, rn)
 if ispc()
 rd{6}{2} = "";
 rd{7}{2} = "/";
-rd{8}{2} = '\';
+rd{8}{2} = "\";
 end
 
 end