canonical, resolve: don't coerce type

Author: scivision

+stdlib/canonical.m

@@ -42,11 +42,15 @@
   end
 end
 
+c =stdlib.posix(c);
+
 if ~strlength(c)
   c = stdlib.normalize(e);
 end
 
-c = string(stdlib.posix(c));
+if isstring(p)
+  c = string(c);
+end
 
 end
 

+stdlib/expanduser.m

@@ -12,10 +12,10 @@
   p {mustBeTextScalar}
 end
 
-e = stdlib.posix(char(p));
+e = char(p);
 
 L = length(e);
-if L == 0 || e(1) ~= '~' || (L > 1 && ~strcmp(e(1:2), '~/'))
+if L == 0 || e(1) ~= '~' || (L > 1 && ~startsWith(e(1:2), {'~/', ['~', filesep()]}))
   % noop
 else
   home = stdlib.homedir();

test/TestCanonical.m

@@ -5,9 +5,9 @@
 {"", ""}, ...
 {"not-exist", "not-exist"}, ...
 {"a/../b", "b"}, ...
-{'~', string(stdlib.homedir())}, ...
+{'~', stdlib.homedir()}, ...
 {"~", string(stdlib.homedir())}, ...
-{'~/', string(stdlib.homedir())}, ...
+{'~/', stdlib.homedir()}, ...
 {"~/", string(stdlib.homedir())}, ...
 {"~/..", string(stdlib.parent(stdlib.homedir()))}, ...
 {mfilename("fullpath") + ".m/..", string(stdlib.parent(mfilename("fullpath")))}, ...

test/TestResolve.m

@@ -13,8 +13,6 @@ function test_resolve_relative(tc)
 
 % all non-existing files
 
-tc.verifyEqual(stdlib.resolve(""), string(stdlib.posix(pwd())))
-
 pabs = stdlib.resolve('2foo', true);
 pabs2 = stdlib.resolve('4foo', true);
 tc.verifyThat(pabs, ~StartsWithSubstring("2"))
@@ -49,19 +47,17 @@ function test_resolve_fullpath(tc, p)
 
 function p = init_resolve()
 
-c = stdlib.posix(pwd());
-
 p = {...
-{'', string(c)}, ...
-{"", string(c)}, ...
-{"not-exist", c + "/not-exist"}, ...
-{"a/../b", c + "/b"}, ...
-{'~', string(stdlib.homedir())}, ...
+{'', stdlib.posix(pwd())}, ...
+{"", string(stdlib.posix(pwd()))}, ...
+{'~', stdlib.homedir()}, ...
 {"~", string(stdlib.homedir())}, ...
-{'~/', string(stdlib.homedir())}, ...
+{'~/', stdlib.homedir()}, ...
 {"~/", string(stdlib.homedir())}, ...
 {"~/..", string(stdlib.parent(stdlib.homedir()))}, ...
 {mfilename("fullpath") + ".m/..", string(stdlib.parent(mfilename("fullpath")))}, ...
-{"~/not-exist/a/..", stdlib.homedir() + "/not-exist"}
+{"a/../b", stdlib.posix(pwd()) + "/b"}, ...
+{"not-exist", stdlib.posix(pwd()) + "/not-exist"}, ...
+{"~/not-exist/a/..", stdlib.homedir() + "/not-exist"}...
 };
 end