drop_slash: no input coerce

Author: scivision

+stdlib/drop_slash.m

@@ -5,37 +5,32 @@
 
 function d = drop_slash(p)
 arguments
-  p (1,1) string
+  p {mustBeTextScalar}
 end
 
 s = stdlib.posix(p);
 
-uncslash = ispc && startsWith(s, "//");
+uncslash = ispc && startsWith(s, '//');
 
 % drop repeated slashes inside string
-d = regexprep(s, "/+", "/");
+d = regexprep(s, '/+', '/');
 
 L = strlength(d);
 
 if L < 2
   if uncslash
-    d = "//";
+    d = '//';
   end
-  return;
+elseif ~ispc || (L ~= 3 || ~strcmp(d, stdlib.root(s)))
+  d = regexprep(d, '/$', '');
 end
 
-if ~ispc || (L ~= 3 || ~strcmp(d, stdlib.root(s)))
-  if ischar(s)
-    if d(end) == '/'
-      d = d(1:end-1);
-    end
-  else
-    d = strip(d, "right", "/");
-  end
+if uncslash
+  d = strcat('/', d);
 end
 
-if uncslash
-  d = strcat("/", d);
+if isstring(p)
+  d = string(d);
 end
 
 end

test/TestFilePure.m

@@ -2,21 +2,28 @@
 
 properties (TestParameter)
 p = init_root_name()
+pds = {{'/', '/'}, {'a//b', 'a/b'}, {'a//b/', 'a/b'}, {'a//b/c', 'a/b/c'}};
 end
 
 
 methods (Test)
 
 function test_posix(tc)
-import matlab.unittest.constraints.ContainsSubstring
 
+tc.verifyEqual(stdlib.posix(''), '')
 tc.verifyEqual(stdlib.posix(""), "")
 
 if ispc
-  tc.verifyThat(stdlib.posix("c:\foo"), ~ContainsSubstring("\"))
+  tc.verifyEqual(stdlib.posix("c:\abc"), "c:/abc")
 end
 end
 
+
+function test_drop_slash(tc, pds)
+import matlab.unittest.constraints.Matches
+tc.verifyThat(stdlib.drop_slash(pds{1}), Matches(pds{2}))
+end
+
 function test_root_name(tc, p)
 tc.verifyEqual(stdlib.root_name(p{1}), p{2})
 end

test/TestParent.m

@@ -24,24 +24,19 @@ function test_parent(tc, p)
 {"a/", "\."}, ...
 {"a/b", "a"}, ...
 {'a/b/', 'a'}, ...
+{'a//b', 'a'}, ...
 {"ab/.parent", "ab"}, ...
 {"ab/.parent.txt", "ab"}, ...
 {"a/b/../.parent.txt", "a/b/\.\."}, ...
-{"a/////b////c", "a/b"}, ...
-{"c:/", "."}, ...
-{"c:\", "."}, ...
-{"c:/a/b", "c:/a"}, ...
-{"c:\a/b", "c:\\a"}
-};
+{"a/////b////c", "a/b"}};
 
 if ispc
-p{12}{2} = "c:/";
-p{13}{2} = "c:/";
-p{14}{2} = "c:/a";
-p{15}{2} = "c:/a";
-p{end+1} =  {"c:/a", "c:/"};
+p{end+1} = {"c:/", "c:/"};
+p{end+1} = {"c:\", "c:/"};
+p{end+1} = {"c:/a/b", "c:/a"};
+p{end+1} = {"c:\a/b", "c:/a"};
+p{end+1} = {"c:/a", "c:/"};
 p{end+1} = {"c:", "c:/"};
-
 end
 
 end