add drop_slash(), relative_to and proximate_to don't normalize

Author: scivision

+stdlib/join.m

@@ -1,46 +1,44 @@
 %% JOIN join two paths with posix file separator
 
-function p = join(a, b, use_java)
+function p = join(base, other, use_java)
 arguments
-  a (1,1) string
-  b (1,1) string
+  base (1,1) string
+  other (1,1) string
   use_java (1,1) logical = false
 end
 
-if a == "" && b == ""
+if base == "" && other == ""
   p = "";
   return
 end
 
-a = stdlib.posix(a);
-b = stdlib.posix(b);
+b = stdlib.drop_slash(base);
+o = stdlib.drop_slash(other);
 
-if a == ""
-  p = b;
+if b == ""
+  p = o;
   return
 end
 
-if b == ""
-  p = a;
+if o == ""
+  p = b;
   return
 end
 
 
 if use_java
 
-p = java.io.File(a).toPath().resolve(b);
+p = java.io.File(b).toPath().resolve(o);
 
 else
 
-if startsWith(b, "/") || (ispc && stdlib.is_absolute(b))
-  p = b;
+if startsWith(o, "/") || (ispc && stdlib.is_absolute(o))
+  p = o;
   return
 end
 
-p = a + "/" + b;
+p = b + "/" + o;
 
 end
 
-p = stdlib.normalize(p);
-
 end

+stdlib/relative_to.m

@@ -7,22 +7,23 @@
 end
 
 % must remove trailing slashes
-base = stdlib.normalize(base, true);
-other = stdlib.normalize(other, true);
+base = stdlib.drop_slash(base);
+other = stdlib.drop_slash(other);
 
 if base == other
   r = ".";
-else
-  b = java.io.File(base).toPath();
-  o = java.io.File(other).toPath();
-  try
-    r = stdlib.posix(b.relativize(o));
-  catch e
-    if contains(e.message, 'java.lang.IllegalArgumentException')
-      r = "";
-    else
-      rethrow(e);
-    end
+  return
+end
+
+b = java.io.File(base).toPath();
+o = java.io.File(other).toPath();
+try
+  r = stdlib.posix(b.relativize(o));
+catch e
+  if contains(e.message, 'java.lang.IllegalArgumentException')
+    r = "";
+  else
+    rethrow(e);
   end
 end
 

test/TestFilePure.m

@@ -26,8 +26,8 @@
 {"", "/", "/"}, ...
 {"a", "b//", "a/b"}, ...
 {"a//", "b//", "a/b"}, ...
-{"a/b/../", "c/d/../", "a/c"}, ...
-{"a/b", "..", "a"}, ...
+{"a/b/../", "c/d/../", "a/b/../c/d/.."}, ...
+{"a/b", "..", "a/b/.."}, ...
 {"a/b", "c/d", "a/b/c/d"}, ...
 {"ab/cd", "/ef", "/ef"} ...
 };
@@ -61,7 +61,7 @@
 {'Hello', 'Hello', '.'}, ...
 {'Hello', 'Hello/', '.'}, ...
 {'./this/one', './this/two', '../two'}, ...
-{'/path/same', '/path/same/hi/..', '.'}, ...
+{'/path/same', '/path/same/hi/..', 'hi/..'}, ...
 {'', '/', ''}, ...
 {'/', '', ''}, ...
 {'/', '/', '.'}, ...
@@ -71,8 +71,7 @@
 {'/a/b', '/a/b', '.'}, ...
 {'/a/b', '/a', '..'}, ...
 {'/a/b/c/d', '/a/b', '../..'}, ...
-{'/this/one', '/this/two', '../two'}, ...
-{'/path/same', '/path/same/hi/..', '.'}};
+{'/this/one', '/this/two', '../two'}};
 
 p_proximate_to = p_relative_to;