expanduser: simpler, faster

Author: scivision

+stdlib/expanduser.m

@@ -14,19 +14,24 @@
   p {mustBeTextScalar}
 end
 
-e = char(p);
 
-L = length(e);
-if L == 0 || e(1) ~= '~' || (L > 1 && ~startsWith(e(1:2), {'~/', ['~', filesep()]}))
-  % noop
+pat = ['~[/\', filesep(), ']+|^~$'];
+
+[i0, i1] = regexp(p, pat, 'once');
+
+e = p;
+
+if isempty(i0), return, end
+
+home = stdlib.homedir();
+
+if i1 - i0 == 0
+  e = home;
 else
-  home = stdlib.homedir();
-  if isempty(home)
-    % noop
-  elseif L < 2
-    e = home;
+  if isstring(p)
+    e = strjoin([home, extractAfter(p, i1)], filesep());
   else
-    e = fullfile(home, e(3:end));
+    e = strjoin({home, e(i1:end)}, filesep());
   end
 end
 

test/TestExpanduser.m

@@ -7,9 +7,10 @@
 {'~', stdlib.homedir()},...
 {"~", string(stdlib.homedir())}, ...
 {'~/', stdlib.homedir()},...
-{"~/", string(stdlib.homedir())}, ...
+{"~" + filesep(), string(stdlib.homedir())}, ...
 {"~/c", fullfile(stdlib.homedir(), "c")}, ...
-{"~//c", fullfile(stdlib.homedir(), "c")}};
+{"~//c", fullfile(stdlib.homedir(), "c")}, ...
+{"~" + filesep() + "c", fullfile(stdlib.homedir(), "c")}};
 end
 
 methods(Test, TestTags="impure")