posix, expanduser: don't coerce

Author: scivision

+stdlib/canonical.m

@@ -14,7 +14,7 @@
 
 function c = canonical(p, expand_tilde)
 arguments
-  p (1,1) string
+  p {mustBeTextScalar}
   expand_tilde (1,1) logical = true
 end
 
@@ -26,9 +26,7 @@
   e = p;
 end
 
-if ~strlength(e), return, end
-
-if ispc && (startsWith(e, "\\") || startsWith(e, "//"))
+if ~strlength(e) || (ispc && (startsWith(e, "\\") || startsWith(e, "//")))
   % UNC path is not canonicalized
   return
 end
@@ -48,7 +46,7 @@
   c = stdlib.normalize(e);
 end
 
-c = stdlib.posix(c);
+c = string(stdlib.posix(c));
 
 end
 

+stdlib/expanduser.m

@@ -9,28 +9,27 @@
 
 function e = expanduser(p)
 arguments
-  p (1,1) string
+  p {mustBeTextScalar}
 end
 
-e = stdlib.posix(p);
+e = stdlib.posix(char(p));
 
-L = strlength(e);
-if ~L || ~startsWith(e, "~") || (L > 1 && ~startsWith(e, "~/"))
-  return
-end
-
-home = stdlib.homedir();
-if ~strlength(home), return, end
-
-if L < 2
-  e = home;
-  return
+L = length(e);
+if L == 0 || e(1) ~= '~' || (L > 1 && ~strcmp(e(1:2), '~/'))
+  % noop
+else
+  home = stdlib.homedir();
+  if isempty(home)
+    % noop
+  elseif L < 2
+    e = home;
+  else
+    e = strcat(home, '/', e(3:end));
+  end
 end
 
-if ischar(e)
-  e = strcat(home, '/', e(3:end));
-else
-  e = home + "/" + e{1}(3:end);
+if isstring(p)
+  e = string(e);
 end
 
 end

+stdlib/handle2filename.m

@@ -6,7 +6,7 @@
   fileHandle (1,1) {mustBeInteger}
 end
 
-n = "";
+n = '';
 
 if fileHandle >= 0
   n = stdlib.posix(fopen(fileHandle));

+stdlib/posix.m

@@ -5,7 +5,7 @@
 
 function r = posix(p)
 arguments
-  p (1,1) string
+  p {mustBeTextScalar}
 end
 
 if ispc

test/TestAbsolute.m

@@ -27,7 +27,7 @@
 methods(TestClassSetup)
 function set_cwd(tc)
 import matlab.unittest.fixtures.CurrentFolderFixture
-tc.td = stdlib.posix(tc.createTemporaryFolder());
+tc.td = string(stdlib.posix(tc.createTemporaryFolder()));
 tc.applyFixture(CurrentFolderFixture(tc.td))
 end
 end

test/TestCanonical.m

@@ -1,11 +1,14 @@
 classdef TestCanonical < matlab.unittest.TestCase
 
 properties(TestParameter)
-p = {{"", ""}, ...
+p = {{'', ""}, ...
+{"", ""}, ...
 {"not-exist", "not-exist"}, ...
 {"a/../b", "b"}, ...
-{"~", stdlib.homedir()}, ...
-{"~/", stdlib.homedir()}, ...
+{'~', string(stdlib.homedir())}, ...
+{"~", string(stdlib.homedir())}, ...
+{'~/', string(stdlib.homedir())}, ...
+{"~/", string(stdlib.homedir())}, ...
 {"~/..", stdlib.parent(stdlib.homedir())}, ...
 {mfilename("fullpath") + ".m/..", stdlib.parent(mfilename("fullpath"))}, ...
 {"~/not-exist/a/..", stdlib.homedir() + "/not-exist"}, ...

test/TestExpanduser.m

@@ -0,0 +1,23 @@
+classdef TestExpanduser < matlab.unittest.TestCase
+
+properties(TestParameter)
+
+p = {{'', ''}, {"", ""}, ...
+{"~abc", "~abc"}, ...
+{'~', stdlib.homedir()},...
+{"~", string(stdlib.homedir())}, ...
+{'~/', strcat(stdlib.homedir(), '/')},...
+{"~/", stdlib.homedir() + "/"}, ...
+{"~/c", stdlib.homedir() + "/c"}, ...
+{"~//c", stdlib.homedir() + "//c"}};
+end
+
+methods(Test)
+
+function test_expanduser(tc, p)
+tc.verifyEqual(stdlib.expanduser(p{1}), p{2})
+end
+
+end
+
+end

test/TestFileImpure.m

@@ -3,16 +3,13 @@
 properties(TestParameter)
 p_is_writable = {{pwd(), true}, {"not-exists", false}, {"", false}};
 
-p_expand = {{"", ""}, {"~abc", "~abc"}, {"~", stdlib.homedir()}, ...
-  {"~/c", stdlib.homedir() + "/c"}, {'~//c', stdlib.homedir() + "//c"}};
-
 p_same = {...
 {"","", false}, ...
 {tempname(), tempname(), false}, ...
 {"..", "./..", true}, ...
 {"..", pwd() + "/..", true}}
 
-ph = {{0, '"stdin"'}, {1, '"stdout"'}, {2, '"stderr"'}, {fopen(tempname()), ""}}
+ph = {{0, '"stdin"'}, {1, '"stdout"'}, {2, '"stderr"'}, {fopen(tempname()), ''}}
 
 p_file_size = {mfilename("fullpath") + ".m"}
 end
@@ -32,11 +29,6 @@ function test_is_writable(tc, p_is_writable)
 end
 
 
-function test_expanduser(tc, p_expand)
-tc.verifyEqual(stdlib.expanduser(p_expand{1}), p_expand{2})
-end
-
-
 function test_null_file(tc)
 import matlab.unittest.constraints.IsFile
 tc.assumeFalse(ispc)
@@ -66,7 +58,7 @@ function test_get_pid(tc)
 
 
 function test_handle2filename(tc, ph)
-tc.verifyEqual(stdlib.handle2filename(ph{1}), string(ph{2}))
+tc.verifyEqual(stdlib.handle2filename(ph{1}), ph{2})
 end
 
 end

test/TestResolve.m

@@ -11,11 +11,9 @@ function test_resolve_relative(tc)
 import matlab.unittest.constraints.StartsWithSubstring
 import matlab.unittest.constraints.ContainsSubstring
 
-td = stdlib.posix(pwd());
-
 % all non-existing files
 
-tc.verifyEqual(stdlib.resolve("", true), stdlib.posix(td))
+tc.verifyEqual(stdlib.resolve(""), string(stdlib.posix(pwd())))
 
 pabs = stdlib.resolve('2foo', true);
 pabs2 = stdlib.resolve('4foo', true);
@@ -54,11 +52,14 @@ function test_resolve_fullpath(tc, p)
 c = stdlib.posix(pwd());
 
 p = {...
-{"", c}, ...
+{'', string(c)}, ...
+{"", string(c)}, ...
 {"not-exist", c + "/not-exist"}, ...
 {"a/../b", c + "/b"}, ...
-{"~", stdlib.homedir()}, ...
-{"~/", stdlib.homedir()}, ...
+{'~', string(stdlib.homedir())}, ...
+{"~", string(stdlib.homedir())}, ...
+{'~/', string(stdlib.homedir())}, ...
+{"~/", string(stdlib.homedir())}, ...
 {"~/..", stdlib.parent(stdlib.homedir())}, ...
 {mfilename("fullpath") + ".m/..", stdlib.parent(mfilename("fullpath"))}, ...
 {"~/not-exist/a/..", stdlib.homedir() + "/not-exist"}

test/TestWindowsCOM.m

@@ -2,7 +2,7 @@
 
 properties (TestParameter)
 Pn = {""}
-Pmr = {string(matlabroot), stdlib.posix(matlabroot)}
+Pmr = {matlabroot, stdlib.posix(matlabroot)}
 end
 
 methods (Test)
@@ -38,9 +38,9 @@ function test_short_file(tc, Pmr)
   if contains(Pmr, " ")
     tc.verifySubstring(s, "~")
   end
-  tc.verifyEqual(stdlib.canonical(s), stdlib.posix(Pmr), "shortname didn't resolve same as canonical")
+  tc.verifyEqual(stdlib.canonical(s), string(stdlib.posix(Pmr)), "shortname didn't resolve same as canonical")
 else
-  tc.verifyEqual(s, Pmr)
+  tc.verifyEqual(s, string(Pmr))
 end
 
 end