root: don't coerce

Author: scivision

+stdlib/root_dir.m

@@ -9,16 +9,13 @@
 % * root_dir('path/to/file') returns ''
 
 function r = root_dir(p)
-arguments
-  p (1,1) string
-end
-
-r = "";
 
 if startsWith(p, ["/", filesep])
   r = extractBefore(p, 2);
-elseif ispc() && ~isempty(regexp(p, '^[A-Za-z]:[\\/]','once'))
-  r = extractBetween(p, 3, 3);
+elseif ispc()
+  r = regexp(p, '(?<=^[A-Za-z]:)([\\/])', 'match', 'once');
+else
+  r = extractBefore(p, 1);
 end
 
 end

+stdlib/root_name.m

@@ -6,14 +6,11 @@
 
 
 function r = root_name(p)
-arguments
-  p (1,1) string
-end
-
-r = "";
 
 if ispc() && ~isempty(regexp(p, '^[A-Za-z]:', 'once'))
   r = extractBefore(p, 3);
+else
+  r = extractBefore(p, 1);
 end
 
 end

test/TestDisk.m

@@ -77,7 +77,7 @@ function test_is_mount(tc, B_ps)
 
   if ispc()
     sd = getenv("SystemDrive");
-    tc.assertTrue(sd == stdlib.root_name(sd), sd)
+    tc.assertEqual(sd, stdlib.root_name(sd))
     tc.verifyFalse(stdlib.is_mount(sd, B_ps), sd)
     tc.verifyTrue(stdlib.is_mount(sd + "/", B_ps), sd)
     tc.verifyTrue(stdlib.is_mount(sd + "\", B_ps), sd)

test/TestRoot.m

@@ -13,19 +13,19 @@
 
 function test_root(tc, p)
 r = stdlib.root(p{1});
-tc.assertClass(r, 'string')
-tc.verifyEqual(r, p{2})
+tc.assertClass(r, class(p{1}))
+tc.verifyEqual(r, p{2}, "root(" + p{1} + ")")
 end
 
 function test_root_dir(tc, rd)
 r = stdlib.root_dir(rd{1});
-tc.assertClass(r, 'string')
+tc.assertClass(r, class(rd{1}))
 tc.verifyEqual(r, rd{2}, "root_dir(" + rd{1} + ")")
 end
 
 function test_root_name(tc, rn)
 r = stdlib.root_name(rn{1});
-tc.assertClass(r, 'string')
+tc.assertClass(r, class(rn{1}))
 tc.verifyEqual(r, rn{2})
 end
 
@@ -40,15 +40,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
@@ -59,12 +59,12 @@ function test_root_name(tc, rn)
 p = init_root();
 
 p{4}{2} = "";
-p{5}{2} = "";
+p{5}{2} = '';
 
 if ispc()
   p{6}{2} = "c:";
   p{7}{2} = "c:";
-  p{8}{2} = "c:";
+  p{8}{2} = 'c:';
 end
 
 end
@@ -77,7 +77,7 @@ function test_root_name(tc, rn)
 if ispc()
   p{6}{2} = "";
   p{7}{2} = "/";
-  p{8}{2} = "\";
+  p{8}{2} = '\';
 end
 
 end