absolute: speed and don't coerce

Author: scivision

+stdlib/absolute.m

@@ -16,23 +16,31 @@
 % non-existant path is made absolute relative to pwd
 
 function c = absolute(p, base)
-arguments
-  p (1,1) string
-  base (1,1) string = pwd()
+if nargin < 2
+  base = pwd();
 end
 
-i = stdlib.is_absolute(p);
-c(i) = p(i);
+if stdlib.is_absolute(p)
+  c = p;
+  return
+end
 
 % avoid infinite recursion
-if ~stdlib.is_absolute(base)
-  base = fullfile(pwd(), base);
+if stdlib.is_absolute(base)
+  c = base;
+else
+  c = pwd();
+  if ~stdlib.strempty(base)
+    c = append(c, '/', base);
+  end
 end
 
-i = ~i;
-c(i) = base;
-
-i = i & ~stdlib.strempty(p);
-c(i) = fullfile(base, p(i));
+if ~stdlib.strempty(p)
+  if endsWith(c, ["/", filesep])
+    c = append(c, p);
+  else
+    c = append(c, '/', p);
+  end
+end
 
 end

test/TestAbsolute.m

@@ -3,8 +3,8 @@
     TestAbsolute < matlab.unittest.TestCase
 
 properties (TestParameter)
-p1 = {'', "", "hi", "./hi", "../hi"};
-p2 = {{'', ""}, {'', ""}, {"", ""}, {"", ""}, {"", "hi"}, {"hi", ""}, {'there', "hi"}};
+p1 = {'', "hi", "./hi", "../hi"};
+p2 = {{'', ''}, {'', 'hi'}, {"hi", ""}, {'there', 'hi'}};
 end
 
 
@@ -19,35 +19,35 @@ function test_dirs(tc)
 
 function test_absolute1arg(tc, p1)
 
-r = pwd();
-
 if strlength(p1)
-  r = fullfile(r, p1);
+  r = append(pwd(), '/', p1);
+else
+  r = pwd();
 end
 
 rabs = stdlib.absolute(p1);
 
-tc.verifyClass(rabs, 'string')
-tc.verifyEqual(rabs, string(r))
+tc.verifyClass(rabs, class(p1))
+tc.verifyEqual(rabs, r)
 end
 
 
 function test_absolute2arg(tc, p2)
 
-r = pwd();
-
 if strlength(p2{2})
-  r = fullfile(r, p2{2});
+  r = append(pwd(), '/', p2{2});
+else
+  r = pwd();
 end
 
 if strlength(p2{1})
-  r = fullfile(r, p2{1});
+  r = append(r, '/', p2{1});
 end
 
 rabs = stdlib.absolute(p2{1}, p2{2});
 
-tc.verifyClass(rabs, 'string')
-tc.verifyEqual(rabs, string(r))
+tc.verifyClass(rabs, class(p2{1}))
+tc.verifyEqual(rabs, r)
 end
 
 end