filename: validate input

Author: scivision

+stdlib/filename.m

@@ -7,19 +7,17 @@
 
 function f = filename(p, method)
 arguments
-  p
-  method = 'pattern'
+  p string
+  method {mustBeMember(method, {'pattern', 'regexp'})} = 'pattern'
 end
 
 % the pattern method is a few percent faster than regexp  
 switch method
-  case 'pattern', f = extractAfter(p, asManyOfPattern(wildcardPattern + ("/" | filesep)));
+  case 'pattern'
+    f = extractAfter(p, asManyOfPattern(wildcardPattern + ("/" | filesep)));
   case 'regexp'
     f = regexp(p, ['[^/\' filesep ']*$'], 'match', 'once');
-    try %#ok<TRYNC>
-      f(ismissing(f)) = "";
-    end
-  otherwise, error('unknown method %s', method)
+    f(ismissing(f)) = "";
 end
 
 end

+stdlib/private/choose_method.m

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

test/TestFilename.m

@@ -31,11 +31,11 @@ function test_filename_empty(tc, e, method)
 
 function p = init_p()
 p = {
-{'', ''}, ...
+{'', ""}, ...
 {"", ""}, ...
 {"Hi", "Hi"}, ...
 {"/a/b/c", "c"}, ...
-{'a/b/c.txt', 'c.txt'}, ...
+{'a/b/c.txt', "c.txt"}, ...
 {"a///b//c.txt.gz", "c.txt.gz"}, ...
 {"a/b/.hello", ".hello"}
 };