relative_to: subfunction

Author: scivision

+stdlib/relative_to.m

@@ -16,44 +16,70 @@
   other {mustBeTextScalar}
 end
 
+if stdlib.has_python()
+  rel = relative_to_python(base, other);
+elseif stdlib.dotnet_api() >= 5
+  rel = relative_to_dotnet(base, other);
+else
+  error('no supported relative path method found, please install .NET or "buildtool mex"')
+end
 
-if stdlib.dotnet_api() >= 5
+end
 
-  if strempty(base) && strempty(other), rel = "."; return, end
 
-  if strempty(other), rel = base; return, end
-  if strempty(base), rel = other; return, end
+function rel = relative_to_dotnet(base, other)
 
-  bis = stdlib.is_absolute(base);
-  ois = stdlib.is_absolute(other);
+if strempty(base) && strempty(other)
+  rel = ".";
+  return
+end
 
-  if bis ~= ois, rel = ""; return, end
+if strempty(other)
+  rel = base;
+  return
+end
+if strempty(base)
+  rel = other;
+  return
+end
 
-  base = fullfile(base);
-  other = fullfile(other);
+bis = stdlib.is_absolute(base);
+ois = stdlib.is_absolute(other);
 
-  if bis && ~(startsWith(base, other) || startsWith(other, base))
-    rel = "";
+if bis ~= ois
+  rel = ""; 
+  return
+end
+
+base = fullfile(base);
+other = fullfile(other);
+
+if bis && ~(startsWith(base, other) || startsWith(other, base))
+  rel = "";
+else
+  % https://learn.microsoft.com/en-us/dotnet/api/system.io.path.getrelativepath
+  rel = string(System.IO.Path.GetRelativePath(base, other));
+end
+
+end
+
+
+function rel = relative_to_python(base, other)
+
+try
+  bp = py.pathlib.Path(other);
+  if stdlib.python_version() >= "3.12"
+    r = bp.relative_to(base, pyargs(walk_up=true));
   else
-    % https://learn.microsoft.com/en-us/dotnet/api/system.io.path.getrelativepath
-    rel = string(System.IO.Path.GetRelativePath(base, other));
+    r = bp.relative_to(base);
   end
-elseif stdlib.has_python()
-  try
-    bp = py.pathlib.Path(other);
-    if stdlib.python_version() >= "3.12"
-      r = bp.relative_to(base, pyargs(walk_up=true));
-    else
-      r = bp.relative_to(base);
-    end
-    rel = string(py.str(r));
-  catch e
-    if e.identifier == "MATLAB:Python:PyException" && startsWith(e.message, 'Python Error: ValueError')
-      rel = "";
-    end
+  rel = string(py.str(r));
+catch e
+  if e.identifier == "MATLAB:Python:PyException" && startsWith(e.message, 'Python Error: ValueError')
+    rel = "";
+  else
+    rethrow(e)
   end
-else
-  error('no supported relative path method found, please install .NET or "buildtool mex"')
 end
 
 end

test/TestRelative.m

@@ -8,14 +8,14 @@
 methods (Test)
 
 function test_relative_to(tc, pr)
-tc.assumeTrue((stdlib.dotnet_api() >= 5) || stdlib.is_mex_fun("stdlib.relative_to"))
+tc.assumeTrue(stdlib.has_python() || (stdlib.dotnet_api() >= 5) || stdlib.is_mex_fun("stdlib.relative_to"))
 
 tc.verifyEqual(stdlib.relative_to(pr{1}, pr{2}), pr{3}, ...
   "relative_to(" + pr{1} + "," + pr{2}+")")
 end
 
 function test_proximate_to(tc, pp)
-tc.assumeTrue((stdlib.dotnet_api() >= 5) || stdlib.is_mex_fun("stdlib.proximate_to"))
+tc.assumeTrue(stdlib.has_python() || (stdlib.dotnet_api() >= 5) || stdlib.is_mex_fun("stdlib.proximate_to"))
 
 tc.verifyEqual(stdlib.proximate_to(pp{1}, pp{2}), pp{3}, ...
   "proximate_to(" + pp{1} + ", " + pp{2}+")")