Matlab < R2020b compatibility: filename, root

Author: scivision

+stdlib/absolute.m

@@ -17,7 +17,7 @@
 
 function c = absolute(p, base)
 arguments
-  p string
+  p (1,1) string
   base (1,1) string = pwd()
 end
 

+stdlib/filename.m

@@ -7,21 +7,23 @@
 
 function f = filename(p, backend)
 arguments
-  p string
+  p (1,1) string
   backend = 'fileparts'
 end
 
-% the pattern backend is a litle slower than
 % fileparts is 5x to 10x faster than regexp and pattern
 switch backend
   case 'fileparts'
     [~, f, ext] = fileparts(p);
     f = f + ext;
-  case 'pattern'
-    f = extractAfter(p, asManyOfPattern(wildcardPattern + ("/" | filesep)));
+% the pattern backend is a litle slower than regexp. Commented out for < R2020b compatibility
+  % case 'pattern'
+  %   f = extractAfter(p, asManyOfPattern(wildcardPattern + ("/" | filesep)));
   case 'regexp'
     f = regexp(p, ['[^/\' filesep ']*$'], 'match', 'once');
-    f(ismissing(f)) = "";
+    if ismissing(f)
+      f = "";
+    end
   otherwise, error('must be backend "pattern", "regexp" or "fileparts"')
 end
 

+stdlib/is_absolute.m

@@ -6,17 +6,13 @@
 
 function y = is_absolute(p)
 arguments
-  p string
+  p (1,1) string
 end
 
-y = false(size(p));
+y = ~stdlib.strempty(stdlib.root_dir(p));
 
-i = ~stdlib.strempty(stdlib.root_dir(p));
-
-y(i) = true;
-
-if ispc()
-  y(i) = ~stdlib.strempty(stdlib.root_name(p(i)));
+if ispc() && y
+  y = ~stdlib.strempty(stdlib.root_name(p));
 end
 
 end

+stdlib/parent.m

@@ -10,18 +10,15 @@
 
 function p = parent(file)
 arguments
-  file string
+  file (1,1) string
 end
 
 p = fileparts(stdlib.drop_slash(file));
 
-i = stdlib.strempty(p);
-p(i) = ".";
-
-% the ~all(i) is for Windows Matlab < R2025a
-if ispc() && ~all(i)
-  i = p(~i) == stdlib.root_name(file(~i));
-  p(i) = p(i) + "/";
+if stdlib.strempty(p)
+  p = ".";
+elseif ispc() && p == stdlib.root_name(file)
+  p = p + "/";
 end
 
 end

+stdlib/resolve.m

@@ -11,7 +11,7 @@
 
 function r = resolve(p, strict)
 arguments
-  p string
+  p (1,1) string
   strict (1,1) logical = false
 end
 

+stdlib/root_dir.m

@@ -10,17 +10,15 @@
 
 function r = root_dir(p)
 arguments
-  p string
+  p (1,1) string
 end
 
-r = repmat("", size(p));
+r = "";
 
-i = startsWith(p, ["/", filesep]);
-r(i) = extractBefore(p(i), 2);
-
-if ispc()
-  i = startsWith(p, lettersPattern(1) + ":" + characterListPattern("/" + filesep));
-  r(i) = extractBetween(p(i), 3, 3);
+if startsWith(p, ["/", filesep])
+  r = extractBefore(p, 2);
+elseif ispc() && ~isempty(regexp(p, '^[A-Za-z]:[\\/]','once'))
+  r = extractBetween(p, 3, 3);
 end
 
 end

+stdlib/root_name.m

@@ -7,14 +7,13 @@
 
 function r = root_name(p)
 arguments
-  p string
+  p (1,1) string
 end
 
-r = repmat("", size(p));
+r = "";
 
-if ispc()
-  i = startsWith(p, lettersPattern(1) + ":");
-  r(i) = extractBefore(p(i), 3);
+if ispc() && ~isempty(regexp(p, '^[A-Za-z]:', 'once'))
+  r = extractBefore(p, 3);
 end
 
 end

test/TestAbsolute.m

@@ -50,16 +50,6 @@ function test_absolute2arg(tc, p2)
 tc.verifyEqual(rabs, string(r))
 end
 
-
-function test_absolute_array(tc)
-
-in = ["", "hi"];
-r = stdlib.absolute(in);
-
-tc.verifyEqual(r, [pwd(), fullfile(pwd(), "hi")])
-
-end
-
 end
 
 end

test/TestExpanduser.m

@@ -1,13 +1,23 @@
 classdef (SharedTestFixtures={ matlab.unittest.fixtures.PathFixture(fileparts(fileparts(mfilename('fullpath'))))}, ...
-          TestTags = {'R2021a', 'impure'}) ...
+          TestTags = {'R2019b', 'impure'}) ...
     TestExpanduser < matlab.unittest.TestCase
 
 properties (TestParameter)
-p
+p = init_exp()
+end
+
+
+methods (Test)
+
+function test_expanduser(tc, p)
+tc.verifyEqual(stdlib.expanduser(p{1}), p{2})
+end
+
+end
+
 end
 
 
-methods (TestParameterDefinition, Static)
 function p = init_exp()
 
 if ispc
@@ -27,14 +37,3 @@
 {"~" + filesep() + "c", fullfile(h, "c")}};
 
 end
-end
-
-methods (Test)
-
-function test_expanduser(tc, p)
-tc.verifyEqual(stdlib.expanduser(p{1}), p{2})
-end
-
-end
-
-end

test/TestFilename.m

@@ -1,14 +1,25 @@
 classdef (SharedTestFixtures={ matlab.unittest.fixtures.PathFixture(fileparts(fileparts(mfilename('fullpath'))))}, ...
-          TestTags = {'R2021a', 'pure'}) ...
+          TestTags = {'R2019b', 'pure'}) ...
     TestFilename < matlab.unittest.TestCase
 
 properties (TestParameter)
-p
-backend = {'regexp', 'pattern'}
+p = init_p()
+backend = {'regexp'}
+end
+
+
+methods (Test)
+
+function test_filename(tc, p, backend)
+fn = stdlib.filename(p{1}, backend);
+tc.verifyEqual(fn, p{2})
+end
+
+end
+
 end
 
 
-methods (TestParameterDefinition, Static)
 function p = init_p()
 p = {
 {'', ""}, ...
@@ -24,23 +35,3 @@
   p{end+1} = {"c:/df\df.txt", "df.txt"};
 end
 end
-end
-
-
-methods (Test)
-
-function test_filename(tc, p, backend)
-fn = stdlib.filename(p{1}, backend);
-tc.verifyEqual(fn, p{2})
-end
-
-function test_filename_array(tc, backend)
-in = ["", "a", "a/b/c", "a/b/", "a/b/c.txt", "a/b/.hidden", "a/b/c/"];
-exp = ["", "a", "c",    "",     "c.txt",     ".hidden", ""];
-out = stdlib.filename(in, backend);
-tc.verifyEqual(out, exp)
-end
-
-end
-
-end