suffix: simplicity and reliability

Author: scivision

+stdlib/suffix.m

@@ -5,13 +5,10 @@
   p string
 end
 
-pat = textBoundary("start") + asManyOfPattern(wildcardPattern + ".", 1);
+[~, n, s] = fileparts(p);
 
-s = extractAfter(p, pat);
-
-i = ~ismissing(s);
-s(~i) = "";
-
-s(i) = strcat('.', s(i));
+if strempty(n)
+  s = n;
+end
 
 end

+stdlib/with_suffix.m

@@ -12,11 +12,7 @@
   suffix {mustBeTextScalar}
 end
 
-i = ~lookBehindBoundary("/" | filesep);
-
-pat = (i + "." + alphanumericsPattern + textBoundary('end')) | textBoundary('end');
-
-f = extractBefore(p, pat);
+f = extractBefore(p, stdlib.suffix(p));
 
 i = strempty(f);
 f(i) = p(i);

test/TestSuffix.m

@@ -3,8 +3,11 @@
 properties (TestParameter)
 p = {{"", ""}, {"/a/b/c", ""}, ...
   {"/a/b/c/", ""}, {"a/b/c.txt", ".txt"}, ...
+  {"a/a.b/hi.txt", ".txt"}, ...
+  {"a/a.b/matlab", ""}, ...
   {"a/b/c.txt.gz", ".gz"}, ...
-  {'.stat', ".stat"}, ...
+  {'.stat', ""}, ...
+  {'a/.stat', ""}, ...
   {'.stat.txt', ".txt"}}
 end
 

test/TestWhich.m

@@ -41,8 +41,8 @@ function test_which_absolute(tc, mexe)
 tc.assumeThat(r, matlab.unittest.constraints.IsFile)
 tc.assumeTrue(stdlib.is_exe(r))
 
-tc.verifyNotEmpty(stdlib.which(r), r)
-tc.verifyNotEmpty(stdlib.which(mexe), r)
+tc.verifyGreaterThan(strlength(stdlib.which(r)), 0, "Expected which(%s) to find %s", r, r)
+tc.verifyGreaterThan(strlength(stdlib.which(mexe)), 0, "Expected which(%s) to find %s", mexe, r)
 
 end
 

test/TestWithSuffix.m

@@ -10,6 +10,7 @@
 {"c.nc", "", "c"}, ...
 {"", ".nc", ".nc"}, ...
 {"hello.txt.gz", ".bz", "hello.txt.bz"}, ...
+{"a/b.c/hello.txt", ".gz", "a/b.c/hello.gz"}, ...
 {'a/b/', '.h5', "a/b/.h5"}, ...
 {"a/b/.h5", '.nc', "a/b/.h5.nc"}, ...
 {".h5", ".nc", ".h5.nc"}, ...