efficiency

Author: scivision

+stdlib/canonical.m

@@ -21,19 +21,21 @@
   return
 end
 
-if stdlib.isoctave() || isMATLABReleaseOlderThan('R2024a')
-  c = acanon(p);
-else
+try
   pth = matlab.io.internal.filesystem.resolvePath(p);
   c = pth.ResolvedPath;
   if strempty(c)
     c = stdlib.normalize(p);
   end
+catch e
+  if strcmp(e.identifier, 'MATLAB:undefinedVarOrClass') || startsWith(e.message, 'member')
+    c = acanon(p);
+  else
+    rethrow(e)
+  end
 end
 
-try %#ok<*TRYNC>
-  c = string(c);
-end
+c = string(c);
 
 end
 

+stdlib/device.m

@@ -14,7 +14,7 @@
   if err == 0
     i = s.dev;
   end
-elseif isunix() && stdlib.has_java() && stdlib.java_api() >= 11
+elseif isunix() && stdlib.java_api() >= 11
   % Java 1.8 is buggy in some corner cases, so we require at least 11.
   i = java.nio.file.Files.getAttribute(javaPathObject(path), "unix:dev", javaLinkOption());
 end

+stdlib/h5variables.m

@@ -28,9 +28,7 @@
   names = {ds.Name};
 end
 
-try %#ok<TRYNC>
-  names = string(names);
-end
+names = string(names);
 
 end
 

+stdlib/hard_link_count.m

@@ -17,7 +17,7 @@
   if err == 0
     c = s.nlink;
   end
-elseif isunix() && stdlib.has_java()
+elseif isunix()
   c = java.nio.file.Files.getAttribute(javaPathObject(p), "unix:nlink", javaLinkOption());
 end
 

+stdlib/inode.m

@@ -14,7 +14,7 @@
   if err == 0
     i = s.ino;
   end
-elseif isunix() && stdlib.has_java() && stdlib.java_api() >= 11
+elseif isunix() && stdlib.java_api() >= 11
   % Java 1.8 is buggy in some corner cases, so we require at least 11.
   i = java.nio.file.Files.getAttribute(javaPathObject(path), "unix:ino", javaLinkOption());
 end

+stdlib/is_exe.m

@@ -8,17 +8,21 @@
 end
 % need to have string array type for p(:)
 
-if ~stdlib.isoctave() && ~isMATLABReleaseOlderThan('R2025a')
+try
   if isunix
     props = ["UserExecute", "GroupExecute", "OtherExecute"];
   else
     props = "Readable";
   end
   t = getPermissions(filePermissions(p), props);
   ok = isfile(p(:)) & any(t{:,:}, 2);
-else
-  a = file_attributes_legacy(p);
-  ok = isfile(p) && (a.UserExecute || a.GroupExecute || a.OtherExecute);
+catch e
+  switch e.identifier
+    case {'MATLAB:UndefinedFunction', 'Octave:undefined-function'}
+      a = file_attributes_legacy(p);
+      ok = isfile(p) && (a.UserExecute || a.GroupExecute || a.OtherExecute);
+    otherwise, rethrow(e)
+  end
 end
 
 end

+stdlib/is_readable.m

@@ -2,16 +2,21 @@
 
 function ok = is_readable(p)
 
-if ~stdlib.isoctave() && ~isMATLABReleaseOlderThan('R2025a')
+try
   props = "Readable";
   if isunix
     props = [props, "GroupRead", "OtherRead"];
   end
   t = getPermissions(filePermissions(p), props);
   ok = any(t{:,:}, 2);
-else
-  a = file_attributes_legacy(p);
-  ok = a.UserRead || a.GroupRead || a.OtherRead;
+catch e
+  switch e.identifier
+    case {'MATLAB:UndefinedFunction', 'Octave:undefined-function'}
+      a = file_attributes_legacy(p);
+      ok = a.UserRead || a.GroupRead || a.OtherRead;
+    otherwise, rethrow(e)
+  end
 end
 
+end
 %!assert (is_readable('is_readable.m'))

+stdlib/is_symlink.m

@@ -2,10 +2,6 @@
 % optional: mex
 
 function ok = is_symlink(p)
-arguments
-  p {mustBeTextScalar}
-end
-
 
 try
   ok = isSymbolicLink(p);

+stdlib/is_url.m

@@ -2,9 +2,6 @@
 % e.g. https://example.invalid is true
 
 function y = is_url(s)
-arguments
-  s {mustBeTextScalar}
-end
 
 y = startsWith(s, alphanumericsPattern + "://");
 

+stdlib/is_writable.m

@@ -2,16 +2,20 @@
 
 function ok = is_writable(p)
 
-if ~stdlib.isoctave() && ~isMATLABReleaseOlderThan('R2025a')
+try
   props = "Writable";
   if isunix
     props = [props, "GroupWrite", "OtherWrite"];
   end
   t = getPermissions(filePermissions(p), props);
   ok = any(t{:,:}, 2);
-else
-  a = file_attributes_legacy(p);
-  ok = a.UserWrite || a.GroupWrite || a.OtherWrite;
+catch e
+  switch e.identifier
+    case {'MATLAB:UndefinedFunction', 'Octave:undefined-function'}
+      a = file_attributes_legacy(p);
+      ok = a.UserWrite || a.GroupWrite || a.OtherWrite;
+    otherwise, rethrow(e)
+  end
 end
 
 end