simplify

Author: scivision

+stdlib/filename.m

@@ -12,17 +12,16 @@
 
 p = stdlib.posix(p);
 
-i = strfind(p, "/");
-
-if isempty(i)
-  f = p;
-elseif ischar(p)
-  f = p(i(end)+1:end);
-else
-  f = extractAfter(p, i(end));
+parts = strsplit(p, "/");
+
+f = parts{end};
+
+try %#ok<TRYNC>
+  f = string(f);
 end
 
 end
 
 
 %!assert (filename('a/b/c.txt'), 'c.txt')
+%!assert (filename('a/b/'), '')

+stdlib/is_prefix.m

@@ -11,20 +11,11 @@
 pr = stdlib.drop_slash(prefix);
 p = stdlib.drop_slash(pth);
 
-if ischar(pr)
-  w = ~isempty(strfind(p, "..")) || ~isempty(strfind(pr, "..")); %#ok<STREMP>
-  s = strfind(p, pr) == 1 && (length(p) >= length(pr));
-else
-  w = contains(p, "..") || contains(pr, "..");
-  s = startsWith(p, pr) && (strlength(p) >= strlength(pr));
-end
-
-if ~strcmp(pr, p) && w
-  warning("is_prefix: %s and/or %s is ambiguous input with '..'  consider using stdlib.canonical() first", pr, p)
-end
+s = startsWith(p, pr) && (stdlib.len(p) >= stdlib.len(pr));
 
 end
 
 %!assert(is_prefix("a", "a"))
 %!assert(is_prefix("a", "a/"))
 %!assert(is_prefix("a", "a/b"))
+%!assert(!is_prefix("a/b/c", "a/b"))

+stdlib/is_subdir.m

@@ -8,21 +8,10 @@
   dir (1,1) string
 end
 
-
 s = stdlib.drop_slash(subdir);
 d = stdlib.drop_slash(dir);
 
-if ischar(subdir)
-  w = ~isempty(strfind(d, "..")) || ~isempty(strfind(s, "..")); %#ok<STREMP,UNRCH>
-  s = strfind(s, d) == 1 && (length(s) > length(d));
-else
-  w = contains(d, "..") || contains(s, "..");
-  s = startsWith(s, d) && (strlength(s) > strlength(d));
-end
-
-if ~strcmp(s, d) && w
-  warning("is_subdir: %s and/or %s is ambiguous input with '..'  consider using stdlib.canonical() first", s, d)
-end
+s = startsWith(s, d) && (stdlib.len(s) > stdlib.len(d));
 
 end
 

+stdlib/join.m

@@ -22,11 +22,11 @@
 end
 
 p = b;
-if strlength(o)
+if stdlib.len(o)
   if endsWith(p, "/")
-    p = p + o;
-  elseif strlength(p)
-    p = p + "/" + o;
+    p = strcat(p, o);
+  elseif stdlib.len(p)
+    p = strcat(p, "/", o);
   else
     p = o;
   end
@@ -36,8 +36,8 @@
 
 end
 
-%!assert(join("", "", 1), "")
-%!assert(join("", "b", 1), "b")
-%!assert(join("a", "", 1), "a")
-%!assert(join("a", "b", 1), "a/b")
-%!assert(join("a", "/b/c", 1), "/b/c")
+%!assert(join("", "",0), "")
+%!assert(join("", "b",0), "b")
+%!assert(join("a", "",0), "a")
+%!assert(join("a", "b",0), "a/b")
+%!assert(join("a", "/b/c",0), "/b/c")

test/TestCanonical.m

@@ -1,8 +1,9 @@
 classdef TestCanonical < matlab.unittest.TestCase
 
-properties (TestParameter)
-p_canonical = ...
-{{"", ""}, {"not-exist", "not-exist"}, {"a/../b", "b"}, ...
+properties(TestParameter)
+use_java = num2cell(unique([stdlib.has_java(), false]))
+
+p = {{"", ""}, {"not-exist", "not-exist"}, {"a/../b", "b"}, ...
 {"~", stdlib.homedir()}, {"~/", stdlib.homedir()}, ...
 {"~/..", stdlib.parent(stdlib.homedir())}, ...f
 {mfilename("fullpath") + ".m/..", stdlib.parent(mfilename("fullpath"))}};
@@ -11,8 +12,8 @@
 
 methods(Test)
 
-function test_canonical(tc, p_canonical)
-tc.verifyEqual(stdlib.canonical(p_canonical{1}), p_canonical{2})
+function test_canonical(tc, p, use_java)
+tc.verifyEqual(stdlib.canonical(p{1}, true, use_java), p{2})
 end
 
 function test_static(tc)