parent: simplify and add strempty() internal

scivision · scivision · commit 0bf47e1b5468 · 2025-06-24T22:28:17.000-04:00
diff --git a/+stdlib/absolute.m b/+stdlib/absolute.m
@@ -26,13 +26,13 @@
  return
 end
 
-if strlength(base)
+if ~strempty(base)
   b = stdlib.absolute(base);
 else
   b = pwd();
 end
 
-if strlength(c)
+if ~strempty(c)
   c = strcat(b, '/', c);
 else
   c = b;
diff --git a/+stdlib/exists.m b/+stdlib/exists.m
@@ -18,7 +18,7 @@
 % fileattrib() does not consider URLs to be a file or folder
 % at least through Matlab R2025a.
 
-y = strlength(p) && fileattrib(p) == 1;
+y = ~strempty(p) && fileattrib(p) == 1;
 
 end
 
diff --git a/+stdlib/h5create_group.m b/+stdlib/h5create_group.m
@@ -18,7 +18,7 @@
 else
   % avoid confusing creating file ./~/a.h5
   file = stdlib.expanduser(file);
-  assert(strlength(file) > 0, 'h5create_group:filename_error', "filename must be non-empty")
+  assert(~strempty(file), 'h5create_group:filename_error', "filename must be non-empty")
   dcpl = 'H5P_DEFAULT';
   if isfile(file)
     fid = H5F.open(file, 'H5F_ACC_RDWR', dcpl);
diff --git a/+stdlib/h5save_new.m b/+stdlib/h5save_new.m
@@ -18,7 +18,7 @@ function h5save_new(filename, varname, A, sizeA, compressLevel)
   error('h5save:shape_error', "only scalar size may be 0")
 end
 
-assert(strlength(filename) > 0, 'h5save:filename_error', "filename must be non-empty")
+assert(~strempty(filename), 'h5save:filename_error', "filename must be non-empty")
 
 if isscalar(sizeA)
   if sizeA == 0
diff --git a/+stdlib/h5variables.m b/+stdlib/h5variables.m
@@ -14,7 +14,7 @@
   group {mustBeTextScalar} = ''
 end
 
-if ~strlength(group)
+if strempty(group)
   finf = h5info(file);
 else
   finf = h5info(file, group);
diff --git a/+stdlib/is_absolute.m b/+stdlib/is_absolute.m
@@ -11,10 +11,10 @@
 
 % not Octave is_absolute_filename() because this is a stricter check for "c:" false
 
-y = strlength(stdlib.root_dir(p)) > 0;
+y = ~strempty(stdlib.root_dir(p));
 
 if ispc()
-  y = y && strlength(stdlib.root_name(p)) > 0;
+  y = y && ~strempty(stdlib.root_name(p));
 end
 
 end
diff --git a/+stdlib/join.m b/+stdlib/join.m
@@ -10,21 +10,21 @@
 rnb = stdlib.root_name(base);
 rdo = stdlib.root_dir(other);
 
-if stdlib.is_absolute(other) || (strlength(rno) && ~strcmp(rnb, rno))
+if stdlib.is_absolute(other) || (~strempty(rno) && ~strcmp(rnb, rno))
 
   p = other;
 
-elseif strlength(rdo)
+elseif ~strempty(rdo)
 
-  if strlength(rnb)
+  if ~strempty(rnb)
     p = strcat(rnb, '/', other);
   else
     p = other;
   end
 
-elseif strlength(base)
+elseif ~strempty(base)
 
-  if strlength(other)
+  if ~strempty(other)
     if endsWith(base, {'/', filesep})
       p = strcat(base, other);
     else
diff --git a/+stdlib/ncsave_new.m b/+stdlib/ncsave_new.m
@@ -11,7 +11,7 @@ function ncsave_new(file, varname, A, sizeA, ncdims, compressLevel)
   compressLevel (1,1) double {mustBeInteger,mustBeNonnegative} = 0
 end
 
-assert(strlength(file) > 0, "stdlib:ncsave_new:file", "Empty filename")
+assert(~strempty(file), "stdlib:ncsave_new:file", "Empty filename")
 
 if isscalar(A)
   nccreate(file, varname, "Datatype", class(A), "Format", 'netcdf4')
diff --git a/+stdlib/ncvariables.m b/+stdlib/ncvariables.m
@@ -15,7 +15,7 @@
 end
 
 
-if strlength(group) == 0
+if strempty(group)
   finf = ncinfo(file);
 else
   finf = ncinfo(file, group);
diff --git a/+stdlib/normalize.m b/+stdlib/normalize.m
@@ -25,7 +25,7 @@
 i0 = 1;
 if strncmp(n, "/", 1)
   n = "/";
-elseif ispc() && strlength(n) >= 2 && strlength(stdlib.root_name(p))
+elseif ispc() && strlength(n) >= 2 && ~strempty(stdlib.root_name(p))
   n = parts(1);
   i0 = 2;
 else
@@ -62,7 +62,7 @@
 end
 
 
-if ~strlength(n)
+if strempty(n)
   n = ".";
 end
 
diff --git a/+stdlib/parent.m b/+stdlib/parent.m
@@ -12,35 +12,17 @@
   pth {mustBeTextScalar}
 end
 
-p = stdlib.drop_slash(pth);
-
-if ~strlength(p)
-  p = '.';
-elseif is_root_stub(p)
-  % 2 or 3 char drive letter
-  if strlength(p) == 2
-    p = strcat(p, '/');
-  end
-elseif strcmp(p, stdlib.root(p))
-  % noop
-else
-  j = strfind(p, '/');
-  if isempty(j)
-    p = '';
-  elseif ischar(p)
-    p = p(1:j(end)-1);
-  else
-    p = p{1}(1:j(end)-1);
-  end
-
-  if is_root_stub(p)
-    p = stdlib.root(pth);
-    return
-  end
+f = fullfile(char(pth));
+if endsWith(f, {'/', filesep}) && ~strcmp(f, stdlib.root(f))
+  f = f(1:end-1);
 end
 
-if ~strlength(p)
+p = fileparts(f);
+
+if strempty(p)
   p = '.';
+elseif ispc() && strcmp(p, stdlib.root_name(pth))
+  p = strcat(p, filesep);
 end
 
 if isstring(pth)
@@ -49,12 +31,6 @@
 
 end
 
-
-function s = is_root_stub(p)
-  s = ispc() && any(strlength(p) == [2,3]) && strlength(stdlib.root_name(p));
-end
-
-
 %!assert(parent("/a/b/c"), "/a/b")
 %!assert(parent("/a/b/c/"), "/a/b")
 %!assert(parent('/a///b'), '/a')
diff --git a/+stdlib/private/coerce_ds.m b/+stdlib/private/coerce_ds.m
@@ -10,7 +10,7 @@
   return
 end
 
-if strlength(dtype) == 0
+if strempty(dtype)
   return
 end
 
diff --git a/+stdlib/private/file_attributes.m b/+stdlib/private/file_attributes.m
@@ -5,7 +5,7 @@
 
 a = [];
 
-if strlength(p) == 0, return, end
+if strempty(p), return, end
 
 [status, a] = fileattrib(p);
 if status ~= 1
diff --git a/+stdlib/root_dir.m b/+stdlib/root_dir.m
@@ -18,7 +18,7 @@
 
 if startsWith(p, {'/', filesep})
   r = pc(1);
-elseif strlength(p) > 2 && strlength(stdlib.root_name(p))
+elseif strlength(p) > 2 && ~strempty(stdlib.root_name(p))
   if any(pc(3) == ['/', filesep])
     r = pc(3);
   end
diff --git a/+stdlib/stem.m b/+stdlib/stem.m
@@ -7,10 +7,10 @@
 
 [~, n, s] = fileparts(p);
 
-if strlength(n)
-  st = n;
-else
+if strempty(n)
   st = s;
+else
+  st = n;
 end
 
 end
diff --git a/+stdlib/subprocess_run.m b/+stdlib/subprocess_run.m
@@ -60,7 +60,7 @@
   end
 end
 
-if strlength(opt.cwd) > 0
+if ~strempty(opt.cwd)
   % https://docs.oracle.com/en/java/javase/21/docs/api/java.base/java/lang/ProcessBuilder.html#directory(java.io.File)
   assert(isfolder(opt.cwd), "directory %s does not exist", opt.cwd)
   proc.directory(java.io.File(opt.cwd));
@@ -81,7 +81,7 @@
 h = proc.start();
 
 %% stdin pipe
-if strlength(opt.stdin) > 0
+if ~strempty(opt.stdin)
   writer = java.io.BufferedWriter(java.io.OutputStreamWriter(h.getOutputStream()));
   stdin_text = opt.stdin;
   if ~endsWith(stdin_text, newline)
@@ -131,10 +131,10 @@
 setenv("GFORTRAN_STDERR_UNIT", errold);
 setenv("GFORTRAN_STDIN_UNIT", inold);
 
-if nargout < 2 && opt.stdout && strlength(stdout) > 0
+if nargout < 2 && opt.stdout && ~strempty(stdout)
   disp(stdout)
 end
-if nargout < 3 && opt.stderr && strlength(stderr) > 0
+if nargout < 3 && opt.stderr && ~strempty(stderr)
   warning(stderr)
 end
 
diff --git a/+stdlib/subprocess_run_octave.m b/+stdlib/subprocess_run_octave.m
@@ -53,7 +53,7 @@
   end
 end
 
-if strlength(cwd) > 0
+if ~strempty(cwd)
   % https://docs.oracle.com/en/java/javase/23/docs/api/java.base/java/lang/ProcessBuilder.html#directory(java.io.File)
   proc.directory(javaFileObject(cwd));
 end
@@ -63,7 +63,7 @@
 h = proc.start();
 
 %% stdin pipe
-if strlength(stdin) > 0
+if ~strempty(stdin)
   os = javaObject("java.io.OutputStream", h.getOutputStream());
   writer = javaObject("java.io.BufferedWriter", os);
   writer.write(stdin);
@@ -100,10 +100,10 @@
 
 stderr = strcat(tmsg, stderr);
 
-if nargout < 2 && strlength(stdout) > 0
+if nargout < 2 && ~strempty(stdout)
   disp(stdout)
 end
-if nargout < 3 && strlength(stderr) > 0
+if nargout < 3 && ~strempty(stderr)
   warning(stderr)
 end
 
diff --git a/+stdlib/which.m b/+stdlib/which.m
@@ -46,7 +46,7 @@
     p = fp;
   end
 
-  if ~strlength(p), continue, end
+  if strempty(p), continue, end
 
   e = strcat(p, '/', filename);
   if isfile(e) && stdlib.is_exe(e)
diff --git a/+stdlib/with_suffix.m b/+stdlib/with_suffix.m
@@ -16,19 +16,19 @@
 f = '';
 
 r = stdlib.parent(p);
-if ~strlength(r), return, end
+if strempty(r), return, end
 
 s = stdlib.stem(p);
 
-if strlength(s) == 0
+if strempty(s)
   f = stdlib.join(p, suffix);
   return
 end
 
 if strcmp(r, '.')
   f = s;
 else
-  f = strcat(r, '/', s);
+  f = strcat(r, filesep, s);
 end
 
 f = strcat(f, suffix);
diff --git a/buildfile.m b/buildfile.m
@@ -211,12 +211,10 @@ function build_exe(context)
 ["src/is_admin.cpp", "src/admin_fs.cpp"] ...
 "src/is_char_device.cpp", ...
 ["src/normalize.cpp", normal], ...
-["src/parent.cpp", "src/parent_fs.cpp", normal], ...
 "src/relative_to.cpp", ...
 "src/proximate_to.cpp", ...
 "src/disk_available.cpp", ...
 "src/disk_capacity.cpp", ...
-"src/with_suffix.cpp", ...
 ["src/is_wsl.cpp", linux], ...
 "src/set_permissions.cpp", ...
 ["src/is_rosetta.cpp", mac], ...
diff --git a/octave_build.m b/octave_build.m
@@ -18,7 +18,6 @@ function octave_build(overwrite)
 fullfile(d, "is_rosetta.cpp"), ...
 fullfile(d, "is_admin.cpp"), ...
 fullfile(d, "normalize.cpp"), ...
-fullfile(d, "parent.cpp"), ...
 fullfile(d, "proximate_to.cpp"), ...
 fullfile(d, "relative_to.cpp"), ...
 };
diff --git a/src/octave/parent.cpp b/src/octave/parent.cpp
diff --git a/src/parent.cpp b/src/parent.cpp
diff --git a/src/parent_fs.cpp b/src/parent_fs.cpp
diff --git a/src/with_suffix.cpp b/src/with_suffix.cpp
diff --git a/test/TestNormalize.m b/test/TestNormalize.m
diff --git a/test/TestParent.m b/test/TestParent.m
diff --git a/test/TestResolve.m b/test/TestResolve.m
diff --git a/test/TestWithSuffix.m b/test/TestWithSuffix.m
