use strncmp, strcat to simplify/dedupe"

Author: scivision

+stdlib/absolute.m

@@ -44,17 +44,9 @@
 b = stdlib.posix(b);
 
 if stdlib.is_absolute(b)
-  if ischar(c)
-    c = strcat(b, '/', c);
-  else
-    c = b + "/" + c;
-  end
+  c = strcat(b, "/", c);
 else
-  if ischar(c)
-    c = strcat(pwd(), '/', b, '/', c);
-  else
-    c = pwd() + "/" + b + "/" + c;
-  end
+  c = strcat(pwd(), "/", b, "/", c);
 end
 
 c = stdlib.drop_slash(c);

+stdlib/expanduser.m

@@ -16,17 +16,10 @@
 e = stdlib.drop_slash(p);
 
 L = stdlib.len(e);
-if ~L
+if ~L || ~strncmp(e, "~", 1) || (L > 1 && ~strncmp(e, "~/", 2))
   return
 end
 
-if ischar(e)
-  ng = e(1) ~= '~' || (L > 1 && e(1) == '~' && e(2) ~= '/');
-else
-  ng = ~startsWith(e, "~") || (L > 1 && ~startsWith(e, "~/"));
-end
-if ng, return, end
-
 home = stdlib.homedir(use_java);
 
 if stdlib.len(home) == 0

+stdlib/join.m

@@ -16,7 +16,7 @@
 b = stdlib.drop_slash(base);
 o = stdlib.drop_slash(other);
 
-if startsWith(o, "/") || (ispc && stdlib.is_absolute(o, false))
+if strncmp(o, "/", 1) || (ispc && stdlib.is_absolute(o, false))
   p = o;
   return
 end
@@ -36,8 +36,8 @@
 
 end
 
-%!assert(join("", ""), "")
-%!assert(join("", "b"), "b")
-%!assert(join("a", ""), "a")
-%!assert(join("a", "b"), "a/b")
-%!assert(join("a", "/b/c"), "/b/c")
+%!assert(join("", "", 1), "")
+%!assert(join("", "b", 1), "b")
+%!assert(join("a", "", 1), "a")
+%!assert(join("a", "b", 1), "a/b")
+%!assert(join("a", "/b/c", 1), "/b/c")

+stdlib/normalize.m

@@ -69,10 +69,10 @@
 end
 
 
-%!assert(normalize("."), ".")
-%!assert(normalize("./"), ".")
-%!assert(normalize("a/.."), ".")
-%!assert(normalize("a/../b"), "b")
-%!assert(normalize("a/./b"), "a/b")
-%!assert(normalize("a/./b/.."), "a")
-%!assert(normalize(""), ".")
+%!assert(normalize(".",1), ".")
+%!assert(normalize("./",1), ".")
+%!assert(normalize("a/..",1), ".")
+%!assert(normalize("a/../b",1), "b")
+%!assert(normalize("a/./b",1), "a/b")
+%!assert(normalize("a/./b/..",1), "a")
+%!assert(normalize("",1), ".")

+stdlib/parent.m

@@ -14,11 +14,7 @@
 if is_root_stub(p)
   % 2 or 3 char drive letter
   if stdlib.len(p) == 2
-    if ischar(p)
-      p = strcat(p, '/');
-    else
-      p = p + "/";
-    end
+    p = strcat(p, "/");
   end
   return
 end

+stdlib/root.m

@@ -17,28 +17,28 @@
 
   r = stdlib.root_name(p);
 
-  if strlength(r) == 0
-    if startsWith(p, "/")
+  if ~stdlib.len(r)
+    if strncmp(p, "/", 1)
       r = "/";
     end
 
     return
   end
 
-  if ispc && r == p
+  if ispc && strcmp(r, p)
     return
   end
 
-  r = r + "/";
+  r = strcat(r, "/");
 
 end
 
-%!assert(root(''), '')
-%!assert(root('/'), '/')
+%!assert(root('',0), '')
+%!assert(root('/',0), '/')
 %!test
 %! if ispc
-%!   assert(root('C:\'), 'C:/')
-%!   assert(root('C:/'), 'C:/')
-%!   assert(root('C:'), 'C:')
-%!   assert(root('C'), '')
+%!   assert(root('C:\',0), 'C:/')
+%!   assert(root('C:/',0), 'C:/')
+%!   assert(root('C:',0), 'C:')
+%!   assert(root('C',0), '')
 %! endif

+stdlib/with_suffix.m

@@ -23,17 +23,11 @@
 
 if strcmp(r, '.')
   f = s;
-elseif ischar(r)
-  f = strcat(r, '/', s);
 else
-  f = r + "/" + s;
+  f = strcat(r, "/", s);
 end
 
-if ischar(r)
-  f = strcat(f, suffix);
-else
-  f = f + suffix;
-end
+f = strcat(f, suffix);
 
 end