join: do not posix()

simplify

add root_dir() and use

join work like <filesystem> append

Author: scivision

+stdlib/is_absolute.m

@@ -6,29 +6,18 @@
 
 function y = is_absolute(p)
 arguments
-  p (1,:) char
+  p {mustBeTextScalar}
 end
 
 % not Octave is_absolute_filename() because this is a stricter check for "c:" false
 
-y = false;
-
-L = strlength(p);
-if ~L || (ispc() && L < 3)
-  return
-end
-
-if ispc
-  y = strlength(stdlib.root_name(p)) && any(p(3) == ['/', '\']);
-else
-  y = p(1) == '/';
-end
+y = strlength(stdlib.root_dir(p)) > 0;
 
 end
 
 %!assert(is_absolute(''), false)
 %!test
-%! if ispc
+%! if ispc()
 %!   assert(is_absolute('C:\'))
 %!   assert(is_absolute('C:/'))
 %!   assert(!is_absolute('C:'))

+stdlib/join.m

@@ -6,24 +6,34 @@
   other {mustBeTextScalar}
 end
 
+rno = stdlib.root_name(other);
+rnb = stdlib.root_name(base);
+rdo = stdlib.root_dir(other);
 
-b = stdlib.posix(base);
-o = stdlib.posix(other);
+if stdlib.is_absolute(other) || (strlength(rno) && ~strcmp(rnb, rno))
 
-if startsWith(o, '/') || (ispc() && stdlib.is_absolute(o))
-  p = o;
-  return
-end
+  p = other;
+
+elseif strlength(rdo)
+
+  p = strcat(rnb, '/', other);
+
+elseif strlength(base)
 
-p = b;
-if strlength(o)
-  if endsWith(p, '/')
-    p = strcat(p, o);
-  elseif strlength(p)
-    p = strcat(p, '/', o);
+  if strlength(other)
+    if endsWith(base, {'/', filesep})
+      p = strcat(base, other);
+    else
+      p = strcat(base, '/', other);
+    end
   else
-    p = o;
+    p = base;
   end
+
+else
+
+  p = other;
+
 end
 
 end

+stdlib/root.m

@@ -1,26 +1,12 @@
 %% ROOT get root path
 % ROOT(P) returns the root path of P.
-% root is the root_name + root_directory.
-
 
 function r = root(p)
 arguments
   p {mustBeTextScalar}
 end
 
-r = stdlib.root_name(p);
-
-if ~strlength(r)
-  if strncmp(p, '/', 1)
-    r = '/';
-  end
-elseif ~(ispc() && strcmp(r, p))
-  r = strcat(r, '/');
-end
-
-if isstring(p)
-  r = string(r);
-end
+r = strcat(stdlib.root_name(p), stdlib.root_dir(p));
 
 end
 

+stdlib/root_dir.m

@@ -0,0 +1,33 @@
+%% ROOT_DIR get root directory
+% Examples:
+
+%% Windows
+% * root_dir('C:\path\to\file') returns '\'
+% * root_dir('C:path\to\file') returns ''
+%% Unix
+% * root_dir('/path/to/file') returns '/'
+% * root_dir('path/to/file') returns ''
+
+function r = root_dir(p)
+arguments
+  p {mustBeTextScalar}
+end
+
+r = '';
+
+if isunix()
+  if strncmp(p, '/', 1)
+    r = '/';
+  end
+elseif strlength(p) >= 2 && strlength(stdlib.root_name(p))
+  p = char(p);
+  if any(p(3) == ['/', filesep])
+    r = p(3);
+  end
+end
+
+if isstring(p)
+  r = string(r);
+end
+
+end

test/TestJoin.m

@@ -13,7 +13,7 @@
 {"a/b", "c/d", "a/b/c/d"}, ...
 {"ab/cd", "/ef", "/ef"}, ...
 {stdlib.homedir(), "", stdlib.homedir()}, ...
-{matlabroot, "bin", stdlib.posix(matlabroot + "/bin")}
+{matlabroot, "bin", matlabroot + "/bin"}
 }
 end
 

test/TestRoot.m

@@ -2,22 +2,35 @@
 
 properties (TestParameter)
 p = init_root()
+rn = init_root_name()
+rd = init_root_dir()
 end
 
 methods (Test)
+
 function test_root(tc, p)
 tc.verifyEqual(stdlib.root(p{1}), p{2})
 end
+
+function test_root_dir(tc, rd)
+tc.verifyEqual(stdlib.root_dir(rd{1}), rd{2})
 end
 
+function test_root_name(tc, rn)
+tc.verifyEqual(stdlib.root_name(rn{1}), rn{2})
 end
 
+end
+
+end % class
+
 
 function p = init_root()
 
 p = {{"", ""}, ...
 {"a/b", ""}, ...
 {"./a/b", ""}, ...
+{"/etc", "/"}, ...
 {'/etc', '/'}, ...
 {"c:", ""}, ...
 {"c:/etc", ""}};
@@ -28,3 +41,28 @@ function test_root(tc, p)
 end
 
 end
+
+
+function rn = init_root_name()
+
+rn = init_root();
+
+rn{4}{2} = "";
+rn{5}{2} = '';
+
+if ispc()
+rn{6}{2} = "c:";
+end
+
+end
+
+
+function rd = init_root_dir()
+
+rd = init_root();
+
+if ispc()
+rd{6}{2} = "/";
+end
+
+end