relative_to: simplify

Author: scivision

+stdlib/canonical.m

@@ -61,3 +61,4 @@
 
 %!assert(canonical("", 0,0), "")
 %!assert(canonical("~",1,0), homedir())
+%!assert(canonical("a/b/..",0,0), "a")

+stdlib/normalize.m

@@ -17,7 +17,7 @@
 if stdlib.isoctave()
   n = stdlib.posix(javaObject("java.io.File", p).toPath().normalize().toString());
 elseif use_java
-  n = stdlib.posix(java.io.File(p).toPath().normalize());
+  n = stdlib.posix(java.io.File(p).toPath().normalize().toString());
 else
 
   n = stdlib.posix(p);

+stdlib/proximate_to.m

@@ -7,10 +7,15 @@
 end
 
 r = stdlib.relative_to(base, other);
-if strlength(r) > 0
+if stdlib.len(r) > 0
   return;
 end
 
 r = other;
 
 end
+
+%!assert(proximate_to("/a/b", "/a/b"), ".")
+%!assert(proximate_to("/a/b", "/a/b/c"), "c")
+%!assert(proximate_to("/a/b", "/a/b/c/"), "c")
+%!assert(proximate_to("/a/b", "d"), "d")

+stdlib/relative_to.m

@@ -10,21 +10,37 @@
 base = stdlib.drop_slash(base);
 other = stdlib.drop_slash(other);
 
-if base == other
+if strcmp(base, other)
   r = ".";
   return
 end
 
-b = java.io.File(base).toPath();
-o = java.io.File(other).toPath();
+if stdlib.isoctave()
+  b = javaObject("java.io.File", base).toPath();
+  o = javaObject("java.io.File", other).toPath();
+else
+  b = java.io.File(base).toPath();
+  o = java.io.File(other).toPath();
+end
+
 try
-  r = stdlib.posix(b.relativize(o));
+  r = stdlib.posix(b.relativize(o).toString());
 catch e
-  if contains(e.message, 'java.lang.IllegalArgumentException')
-    r = "";
+  r = "";
+  if stdlib.isoctave()
+    if isempty(strfind(e.message, "'other' is different type of Path")) && isempty(strfind(e.message, "'other' has different root"))
+      rethrow(e);
+    end
   else
-    rethrow(e);
+    if ~any(contains(e.message, ["'other' is different type of Path", "'other' has different root"]))
+      rethrow(e);
+    end
   end
 end
 
 end
+
+%!assert(relative_to("/a/b", "/a/b"), ".")
+%!assert(relative_to("/a/b", "/a/b/c"), "c")
+%!assert(relative_to("/a/b", "/a/b/c/"), "c")
+%!assert(relative_to("/a/b", "d"), "")

+stdlib/root.m

@@ -21,7 +21,7 @@
     r = stdlib.posix(o.toString());
   end
 elseif use_java
-  r = stdlib.posix(java.io.File(p).toPath().getRoot());
+  r = stdlib.posix(java.io.File(p).toPath().getRoot().toString());
 else
 
 r = stdlib.root_name(p);