absolute: improve efficiency

Author: scivision

+stdlib/absolute.m

@@ -26,7 +26,9 @@
 
 cwd = stdlib.posix(pwd());
 
-if strlength(p) == 0 && strlength(base) == 0
+Lb = stdlib.len(base);
+
+if stdlib.len(p) == 0 && Lb == 0
    c = cwd;
    return
 end
@@ -37,24 +39,36 @@
   c = p;
 end
 
-if stdlib.is_absolute(c)
+if stdlib.is_absolute(c, use_java)
   c = stdlib.posix(c);
 else
   % .getAbsolutePath(), .toAbsolutePath()
   % default is Documents/Matlab, which is probably not wanted.
-  if strlength(base) == 0
-    c = cwd + "/" + c;
+  if Lb == 0
+    if ischar(cwd)
+      c = strcat(cwd, '/', c);
+    else
+      c = cwd + "/" + c;
+    end
   else
     d = stdlib.absolute(base, "", expand_tilde, use_java);
-    if isempty(c) || strlength(c) == 0
+    if isempty(c) || stdlib.len(c) == 0
       c = d;
     else
-      c = d + "/" + c;
+      if ischar(d)
+        c = strcat(d, '/', c);
+      else
+        c = d + "/" + c;
+      end
     end
   end
 end
 
 % not needed:
 % https://docs.oracle.com/en/java/javase/21/docs/api/java.base/java/io/File.html#getAbsolutePath()
 
-end % function
+end
+
+
+%!assert(absolute('', '', 0,0), posix(pwd))
+%!assert(absolute('a/b', '', 0,0), posix(fullfile(pwd, 'a/b')))

+stdlib/h5create_group.m

@@ -16,7 +16,7 @@
 if isa(file, 'H5ML.id')
   fid = file;
 else
-  % avoid confusing creating file ./~/foo.h5
+  % avoid confusing creating file ./~/a.h5
   file = stdlib.expanduser(file);
   dcpl = 'H5P_DEFAULT';
   if isfile(file)

+stdlib/h5save.m

@@ -32,7 +32,7 @@ function h5save(filename, varname, A, opts)
   mustBeReal(A)
 end
 
-% avoid confusing creating file ./~/foo.h5
+% avoid confusing creating file ./~/a.h5
 filename = stdlib.expanduser(filename);
 
 % coerce if needed

+stdlib/ncsave.m

@@ -24,7 +24,7 @@ function ncsave(filename, varname, A, opts)
   mustBeReal(A)
 end
 
-% avoid creating confusing file ./~/foo.nc
+% avoid creating confusing file ./~/a.nc
 filename = stdlib.expanduser(filename);
 
 % coerce if needed

+stdlib/parent.m

@@ -54,8 +54,8 @@
 %!assert(parent('a//b'), 'a')
 %!test
 %! if ispc
-%!   assert(parent('c:/foo'), 'c:/')
-%!   assert(parent('c:\foo\'), 'c:/')
+%!   assert(parent('c:/a'), 'c:/')
+%!   assert(parent('c:\a\'), 'c:/')
 %!   assert(parent('c:\'), 'c:/')
 %!   assert(parent('c:'), 'c:/')
 %! end

+stdlib/with_suffix.m

@@ -34,7 +34,7 @@
 
 
 %!assert(with_suffix("", ""), "")
-%!assert(with_suffix("foo.h5", ".nc"), "foo.nc")
-%!assert(with_suffix("foo", ".nc"), "foo.nc")
-%!assert(with_suffix("foo.h5", ""), "foo")
-%!assert(with_suffix("foo", ""), "foo")
+%!assert(with_suffix("a.h5", ".nc"), "a.nc")
+%!assert(with_suffix("a", ".nc"), "a.nc")
+%!assert(with_suffix("a.h5", ""), "a")
+%!assert(with_suffix("a", ""), "a")

test/TestFileImpure.m

@@ -28,7 +28,7 @@
 cwd = fileparts(mfilename("fullpath"));
 top = fullfile(cwd, "..");
 addpath(top)
-p_expand = {{"", ""}, {"~abc", "~abc"}, {"~", stdlib.homedir()}, {"~/foo", stdlib.homedir() + "/foo"}, {'~/////c', stdlib.homedir() + "/c"}};
+p_expand = {{"", ""}, {"~abc", "~abc"}, {"~", stdlib.homedir()}, {"~/c", stdlib.homedir() + "/c"}, {'~/////c', stdlib.homedir() + "/c"}};
 end
 end
 

test/TestFilePure.m

@@ -8,8 +8,8 @@
 p_relative_to
 p_proximate_to
 p_is_absolute
-in_filename = {"", "/foo/bar/baz", "/foo/bar/baz/", "foo/bar/baz.txt", "foo/bar/baz.txt.gz"}
-ref_filename = {"", "baz", "", "baz.txt", "baz.txt.gz"}
+in_filename = {"", "/a/b/c", "/a/b/c/", "a/b/c.txt", "a/b/c.txt.gz"}
+ref_filename = {"", "c", "", "c.txt", "c.txt.gz"}
 dir_is_subdir
 sub_is_subdir
 ref_is_subdir
@@ -30,7 +30,7 @@
 {"ab/cd", "/ef", "/ef"} ...
 };
 
-in_suffix = {"", "/foo/bar/baz", "/foo/bar/baz/", "foo/bar/baz.txt", "foo/bar/baz.txt.gz", ".stat", ".stat.txt"}
+in_suffix = {"", "/a/b/c", "/a/b/c/", "a/b/c.txt", "a/b/c.txt.gz", ".stat", ".stat.txt"}
 ref_suffix = {"", "", "", ".txt", ".gz", ".stat", ".txt"}
 
 in_norm = {"", "a/..", "//a/b/", "/a/b/", "a/b/", "a/../c", "a/b/../c", "a/b/../../c", "a/b/../../c/..", ...
@@ -226,13 +226,13 @@ function test_stem(tc)
 
 tc.verifyEqual(stdlib.stem(""), "")
 
-tc.verifyEqual(stdlib.stem("/foo/bar/baz"), "baz")
-tc.verifyEqual(stdlib.stem("/foo/bar/baz/"), "")
+tc.verifyEqual(stdlib.stem("/a/b/c"), "c")
+tc.verifyEqual(stdlib.stem("/a/b/c/"), "")
 
-tc.verifyEqual(stdlib.stem("foo/bar/baz/"), "")
+tc.verifyEqual(stdlib.stem("a/b/c/"), "")
 
-tc.verifyEqual(stdlib.stem("foo/bar/baz.txt"), "baz")
-tc.verifyEqual(stdlib.stem("foo/bar/baz.txt.gz"), "baz.txt")
+tc.verifyEqual(stdlib.stem("a/b/c.txt"), "c")
+tc.verifyEqual(stdlib.stem("a/b/c.txt.gz"), "c.txt")
 
 end