fix bug: isAbsolutePath now works with -d:js; add tests

nim-lang · Feb 22, 2020 · a854c9f · a854c9f
1 parent 28c2724
commit a854c9f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/lib/pure/os.nim b/lib/pure/os.nim
@@ -277,8 +277,10 @@ proc isAbsolute*(path: string): bool {.rtl, noSideEffect, extern: "nos$1", raise
     result = path[0] != ':'
   elif defined(RISCOS):
     result = path[0] == '$'
-  elif defined(posix):
+  elif defined(posix) or defined(js):
     result = path[0] == '/'
+  else:
+    doAssert false # if ever hits here, adapt as needed
 
 when FileSystemCaseSensitive:
   template `!=?`(a, b: char): bool = a != b

diff --git a/tests/js/tos.nim b/tests/js/tos.nim
@@ -5,3 +5,8 @@ import os
 block:
   doAssert "./foo//./bar/".normalizedPath == "foo/bar"
   doAssert relativePath(".//foo/bar", "foo") == "bar"
+  doAssert "/".isAbsolute
+  doAssert relativePath(getCurrentDir()) == "."
+  doAssert relativePath(getCurrentDir() / "foo", "bar") == "../foo"
+  doAssert relativePath("", "bar") == ""
+  doAssert normalizedPath(".///foo//./") == "foo"
diff --git a/tests/stdlib/tos.nim b/tests/stdlib/tos.nim
@@ -342,6 +342,7 @@ block ospaths:
   doAssert relativePath("", "foo") == ""
   doAssert relativePath("././/foo", "foo//./") == "."
 
+  doAssert relativePath(getCurrentDir()) == "."
   doAssert relativePath(getCurrentDir() / "bar") == "bar"
   doAssert relativePath(getCurrentDir() / "bar", "foo") == "../bar".unixToNativePath
   doAssert relativePath("bar", getCurrentDir() / "foo") == "../bar".unixToNativePath