samepath: array

Author: scivision

+stdlib/+native/samepath.m

@@ -4,12 +4,11 @@
 
 function y = samepath(path1, path2)
 
-if stdlib.strempty(path1) || stdlib.strempty(path2)
-  y = false;
-else
-  c1 = stdlib.canonical(path1, true);
-  c2 = stdlib.canonical(path2, true);
-  y = ~stdlib.strempty(c1) && strcmp(c1, c2);
-end
+i = stdlib.strempty(path1) | stdlib.strempty(path2);
+y(i) = false;
+
+c1 = stdlib.canonical(path1(~i), true);
+c2 = stdlib.canonical(path2(~i), true);
+y(~i) = ~stdlib.strempty(c1) & strcmp(c1, c2);
 
 end

+stdlib/samepath.m

@@ -14,15 +14,19 @@
 
 function y = samepath(path1, path2, backend)
 arguments
-  path1 {mustBeTextScalar}
-  path2 {mustBeTextScalar}
+  path1 string
+  path2 string
   backend (1,:) string = ["python", "java", "sys", "native"]
 end
 
 % For this function, Python is over 10x faster than Java
 
-fun = hbackend(backend, "samepath");
+[fun, b] = hbackend(backend, "samepath");
 
-y = fun(path1, path2);
+if (isscalar(path1) && isscalar(path2)) || b == "native"
+  y = fun(path1, path2);
+else
+  y = arrayfun(fun, path1, path2);
+end
 
 end

test/TestSame.m

@@ -7,7 +7,7 @@
 {"..", pwd() + "/.."}, ...
 {pwd(), pwd() + "/."}}
 
-fun = {'sys', 'java', 'python', 'native'}
+backend = {'sys', 'java', 'python', 'native'}
 end
 
 methods(TestClassSetup)
@@ -19,22 +19,35 @@ function pkg_path(tc)
 
 methods(Test)
 
-function test_samepath(tc, p_same, fun)
-tc.assertNotEmpty(which("stdlib." + fun + ".samepath"))
+function test_samepath(tc, p_same, backend)
+tc.assertNotEmpty(which("stdlib." + backend + ".samepath"))
 try
-  y = stdlib.samepath(p_same{:}, fun);
-  tc.verifyTrue(y)
+  r = stdlib.samepath(p_same{:}, backend);
+  tc.verifyClass(r, 'logical')
+  tc.verifyTrue(r)
 catch e
   tc.verifyEqual(e.identifier, 'stdlib:hbackend:NameError', e.message)
 end
 end
 
 
-function test_samepath_notexist(tc, fun)
+function test_samepath_notexist(tc, backend)
 t = tempname();
 try
-  tc.verifyFalse(stdlib.samepath("", "", fun))
-  tc.verifyFalse(stdlib.samepath(t, t, fun))
+  tc.verifyFalse(stdlib.samepath("", "", backend))
+  tc.verifyFalse(stdlib.samepath(t, t, backend))
+catch e
+  tc.verifyEqual(e.identifier, 'stdlib:hbackend:NameError', e.message)
+end
+end
+
+
+function test_samepath_array(tc, backend)
+in = [string(mfilename), string(mfilename('fullpath'))] + ".m";
+try
+  r = stdlib.samepath(in, fliplr(in), backend);
+  tc.verifyClass(r, 'logical')
+  tc.verifyEqual(r, [true, true])
 catch e
   tc.verifyEqual(e.identifier, 'stdlib:hbackend:NameError', e.message)
 end