simplify

Author: scivision

+stdlib/canonical.m

@@ -53,6 +53,5 @@
 
 end
 
-%!assert(canonical("", 1, 0), "")
-%!assert(canonical("~", 1, 0), homedir())
-%!assert(canonical("a/b/..", 1, 0), "a")
+%!assert(canonical("", 1), "")
+%!assert(canonical("~", 1), homedir())

+stdlib/file_size.m

@@ -19,5 +19,5 @@
 end
 
 
-%!assert (file_size(''), 0)
+%!assert (isempty(file_size('')))
 %!assert (file_size('file_size.m') > 0)

+stdlib/get_modtime.m

@@ -5,19 +5,13 @@
   p (1,1) string
 end
 
-if stdlib.exists(p)
+t = [];
+if ~stdlib.exists(p), return, end
 
-  t = javaFileObject(p).lastModified() / 1000;
+t = javaFileObject(p).lastModified() / 1000;
 
-  try %#ok<TRYNC>
-    t = datetime(t, "ConvertFrom", "PosixTime");
-  end
-else
-  try
-    t = datetime.empty();
-  catch
-    t = [];
-  end
+try %#ok<TRYNC>
+  t = datetime(t, "ConvertFrom", "PosixTime");
 end
 
 end

+stdlib/ncsave_new.m

@@ -7,7 +7,7 @@ function ncsave_new(file, varname, A, sizeA, ncdims, compressLevel)
   varname (1,1) string
   A {mustBeNonempty}
   sizeA (1,:) double {mustBeInteger,mustBeNonnegative} = []
-  ncdims cell = {}
+  ncdims (1,:) cell = {}
   compressLevel (1,1) double {mustBeInteger,mustBeNonnegative} = 0
 end
 

+stdlib/normalize.m

@@ -65,10 +65,4 @@
 end
 
 
-%!assert(normalize("."), ".")
-%!assert(normalize("./"), ".")
-%!assert(normalize("a/.."), ".")
-%!assert(normalize("a/../b"), "b")
-%!assert(normalize("a/./b"), "a/b")
-%!assert(normalize("a/./b/.."), "a")
-%!assert(normalize(""), ".")
+%!testif 0

+stdlib/private/file_attributes.m

@@ -3,15 +3,15 @@
   p (1,1) string
 end
 
-a = struct.empty;
+a = [];
 
 if stdlib.len(p) == 0
   return
 end
 
 [status, a] = fileattrib(p);
 if status ~= 1
-  a = struct.empty;
+  a = [];
   return
 end
 

+stdlib/private/javaPathObject.m

@@ -6,7 +6,7 @@
   % o = javaFileObject(p).toPath();  % above way about 20% faster
 catch e
   if strcmp(e.identifier, "Octave:undefined-function")
-    o = javafileObject(p).toPath();
+    o = javaFileObject(p).toPath();
   else
     rethrow(e);
   end

+stdlib/root.m

@@ -26,12 +26,12 @@
 
 end
 
-%!assert(root('',0), '')
-%!assert(root('/',0), '/')
+%!assert(root(''), '')
+%!assert(root('/'), '/')
 %!test
 %! if ispc
-%!   assert(root('C:\',0), 'C:/')
-%!   assert(root('C:/',0), 'C:/')
-%!   assert(root('C:',0), 'C:')
-%!   assert(root('C',0), '')
+%!   assert(root('C:\'), 'C:/')
+%!   assert(root('C:/'), 'C:/')
+%!   assert(root('C:'), 'C:')
+%!   assert(root('C'), '')
 %! endif

+stdlib/too_old.m

@@ -1,4 +1,4 @@
-%% TOO_OLD check if Matlab older than R2020b or as specificed by release "r"
+%% TOO_OLD check if Matlab older than R2020b or as specified by release "r"
 % returns true for any version for any Matlab older than R2020b
 % purpose is to avoid verLessThan lint warnings.
 %
@@ -21,4 +21,4 @@
 
 end
 
-%!assert (too_old())
+%!testif 0