overload strlength for scalars

scivision · scivision · commit 4509bb99a7fd · 2025-02-27T08:57:03.000-05:00
diff --git a/+stdlib/absolute.m b/+stdlib/absolute.m
@@ -33,7 +33,7 @@
  return
 end
 
-if stdlib.len(base) == 0
+if strlength(base) == 0
   b = pwd();
 elseif expand_tilde
   b = stdlib.expanduser(base);
@@ -47,7 +47,7 @@
 
 b = stdlib.posix(b);
 
-if stdlib.len(c) == 0
+if strlength(c) == 0
   c = b;
 else
   c = strcat(b, "/", c);
diff --git a/+stdlib/canonical.m b/+stdlib/canonical.m
@@ -26,7 +26,7 @@
   e = p;
 end
 
-if ~stdlib.len(e), return, end
+if ~strlength(e), return, end
 
 if ispc && (startsWith(e, "\\") || startsWith(e, "//"))
   % UNC path is not canonicalized
@@ -44,7 +44,7 @@
   end
 end
 
-if ~stdlib.len(c)
+if ~strlength(c)
   c = stdlib.normalize(e);
 end
 
diff --git a/+stdlib/drop_slash.m b/+stdlib/drop_slash.m
@@ -15,7 +15,7 @@
 % drop repeated slashes inside string
 d = regexprep(s, "/+", "/");
 
-L = stdlib.len(d);
+L = strlength(d);
 
 if L < 2
   if uncslash
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 = stdlib.len(p) && fileattrib(p) == 1;
+y = strlength(p) && fileattrib(p) == 1;
 
 end
 
diff --git a/+stdlib/expanduser.m b/+stdlib/expanduser.m
@@ -14,13 +14,13 @@
 
 e = stdlib.posix(p);
 
-L = stdlib.len(e);
+L = strlength(e);
 if ~L || ~startsWith(e, "~") || (L > 1 && ~startsWith(e, "~/"))
   return
 end
 
 home = stdlib.homedir();
-if ~stdlib.len(home), return, end
+if ~strlength(home), return, end
 
 if L < 2
   e = home;
diff --git a/+stdlib/filesystem_type.m b/+stdlib/filesystem_type.m
@@ -13,7 +13,7 @@
 
 t = "";
 
-if stdlib.len(p) && ~stdlib.exists(p), return, end
+if strlength(p) && ~stdlib.exists(p), return, end
 
 op = javaPathObject(p);
 
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(stdlib.len(file) > 0, 'h5create_group:filename_error', "filename must be non-empty")
+  assert(strlength(file) > 0, '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(stdlib.len(filename) > 0, 'h5save:filename_error', "filename must be non-empty")
+assert(strlength(filename) > 0, '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 (1,1) string = ""
 end
 
-if ~stdlib.len(group)
+if ~strlength(group)
   finf = h5info(file);
 else
   finf = h5info(file, group);
diff --git a/+stdlib/is_absolute.m b/+stdlib/is_absolute.m
@@ -13,7 +13,7 @@
 
 y = false;
 
-L = stdlib.len(p);
+L = strlength(p);
 if ~L || (ispc && L < 3)
   return
 end
@@ -24,7 +24,7 @@
   else
     s = extractBetween(p, 3, 3);
   end
-  y = stdlib.len(stdlib.root_name(p)) && (strcmp(s, '/') || strcmp(s, '\'));
+  y = strlength(stdlib.root_name(p)) && (strcmp(s, '/') || strcmp(s, '\'));
 else
   y = strncmp(p, "/", 1);
 end
diff --git a/+stdlib/is_prefix.m b/+stdlib/is_prefix.m
@@ -11,9 +11,9 @@
 pr = stdlib.drop_slash(prefix);
 p = stdlib.drop_slash(pth);
 
-Lp = stdlib.len(p);
+Lp = strlength(p);
 
-s = Lp && startsWith(p, pr) && (Lp >= stdlib.len(pr));
+s = Lp && startsWith(p, pr) && (Lp >= strlength(pr));
 
 end
 
diff --git a/+stdlib/is_subdir.m b/+stdlib/is_subdir.m
@@ -11,7 +11,7 @@
 s = stdlib.drop_slash(subdir);
 d = stdlib.drop_slash(dir);
 
-s = startsWith(s, d) && (stdlib.len(s) > stdlib.len(d));
+s = startsWith(s, d) && (strlength(s) > strlength(d));
 
 end
 
diff --git a/+stdlib/join.m b/+stdlib/join.m
@@ -16,10 +16,10 @@
 end
 
 p = b;
-if stdlib.len(o)
+if strlength(o)
   if endsWith(p, "/")
     p = strcat(p, o);
-  elseif stdlib.len(p)
+  elseif strlength(p)
     p = strcat(p, "/", o);
   else
     p = o;
diff --git a/+stdlib/len.m b/+stdlib/len.m
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(stdlib.len(file) > 0, "stdlib:ncsave_new:file", "Empty filename")
+assert(strlength(file) > 0, "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 stdlib.len(group) == 0
+if strlength(group) == 0
   finf = ncinfo(file);
 else
   finf = ncinfo(file, group);
diff --git a/+stdlib/normalize.m b/+stdlib/normalize.m
@@ -62,7 +62,7 @@
 end
 
 
-if ~stdlib.len(n)
+if ~strlength(n)
   n = ".";
 end
 
diff --git a/+stdlib/parent.m b/+stdlib/parent.m
@@ -14,12 +14,12 @@
 
 p = stdlib.drop_slash(pth);
 
-if ~stdlib.len(p)
+if ~strlength(p)
   p = ".";
   return
 elseif is_root_stub(p)
   % 2 or 3 char drive letter
-  if stdlib.len(p) == 2
+  if strlength(p) == 2
     p = strcat(p, "/");
   end
   return
@@ -44,15 +44,15 @@
 
 p = stdlib.posix(p);
 
-if ~stdlib.len(p)
+if ~strlength(p)
   p = ".";
 end
 
 end
 
 
 function s = is_root_stub(p)
-  s = ispc() && any(stdlib.len(p) == [2,3]) && stdlib.len(stdlib.root_name(p));
+  s = ispc() && any(strlength(p) == [2,3]) && strlength(stdlib.root_name(p));
 end
 
 
diff --git a/+stdlib/private/file_attributes.m b/+stdlib/private/file_attributes.m
@@ -5,7 +5,7 @@
 
 a = [];
 
-if stdlib.len(p) == 0, return, end
+if strlength(p) == 0, return, end
 
 [status, a] = fileattrib(p);
 if status ~= 1
diff --git a/+stdlib/private/strlength.m b/+stdlib/private/strlength.m
@@ -0,0 +1,17 @@
+%% STRLENGTH get length of character or scalar string
+% assumes single string or character vector
+% for GNU Octave until it builds in strlength
+
+function L = strlength(s)
+
+L = [];
+
+if ischar(s)
+  L = length(s);
+elseif isstring(s)
+  L = builtin('strlength', char(s));
+end
+
+end
+
+%!assert(strlength('abc'), 3)
diff --git a/+stdlib/root.m b/+stdlib/root.m
@@ -10,7 +10,7 @@
 
 r = stdlib.root_name(p);
 
-if ~stdlib.len(r)
+if ~strlength(r)
   if strncmp(p, "/", 1)
     r = "/";
   end
diff --git a/+stdlib/root_name.m b/+stdlib/root_name.m
@@ -12,7 +12,7 @@
 
 r = "";
 
-if ~ispc || stdlib.len(p) < 2, return, end
+if ~ispc || strlength(p) < 2, return, end
 
 if ischar(p)
   if p(2) == ':' && isletter(p(1)) %#ok<UNRCH>
diff --git a/+stdlib/stem.m b/+stdlib/stem.m
@@ -7,7 +7,7 @@
 
 [~, n, s] = fileparts(p);
 
-if stdlib.len(n)
+if strlength(n)
   st = n;
 else
   st = s;
diff --git a/+stdlib/subprocess_run_octave.m b/+stdlib/subprocess_run_octave.m
@@ -53,7 +53,7 @@
   end
 end
 
-if stdlib.len(cwd) > 0
+if strlength(cwd) > 0
   % 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 stdlib.len(stdin) > 0
+if strlength(stdin) > 0
   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 && stdlib.len(stdout) > 0
+if nargout < 2 && strlength(stdout) > 0
   disp(stdout)
 end
-if nargout < 3 && stdlib.len(stderr) > 0
+if nargout < 3 && strlength(stderr) > 0
   warning(stderr)
 end
 
@@ -123,7 +123,7 @@
   line = reader.readLine();
 end
 
-if stdlib.len(msg) > 0 && msg(end) == newline
+if strlength(msg) > 0 && msg(end) == newline
   msg(end) = [];
 end
 
diff --git a/+stdlib/which.m b/+stdlib/which.m
@@ -27,16 +27,17 @@
 end
 
 % path given
-if isempty(fpath) || all(strlength(fpath) == 0)
+if isempty(fpath)
   fpath = string(getenv("PATH"));
 end
 
 if isscalar(fpath)
   fpath = split(fpath, pathsep).';
 end
-fpath = fpath(strlength(fpath)>0);
 
 for p = fpath
+  if ~strlength(p), continue, end
+
   e = p + "/" + filename;
   if isfile(e) && stdlib.is_exe(e)
     if find_all
diff --git a/+stdlib/with_suffix.m b/+stdlib/with_suffix.m
@@ -15,11 +15,11 @@
 f = "";
 
 r = stdlib.parent(p);
-if ~stdlib.len(r), return, end
+if ~strlength(r), return, end
 
 s = stdlib.stem(p);
 
-if stdlib.len(s) == 0
+if strlength(s) == 0
   f = stdlib.join(p, suffix);
   return
 end
