jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

relativePath("foo", "foo") is now ".", not "" (#13452)

Browse source
This commit is contained in:
Timothee Cour 2020-02-22 00:07:53 -08:00 • committed by GitHub
commit a43583f9c8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 37 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
lib/pure/os.nim
View file

@ -65,6 +65,8 @@ when weirdTarget and defined(nimErrorProcCanHaveBody):
else:
{.pragma: noNimScript.}
proc normalizePathAux(path: var string){.inline, raises: [], noSideEffect.}
type
ReadEnvEffect* = object of ReadIOEffect ## Effect that denotes a read
## from an environment variable.
@ -359,9 +361,13 @@ proc relativePath*(path, base: string; sep = DirSep): string {.
assert relativePath("/Users/me/bar/z.nim", "/Users/me", '/') == "bar/z.nim"
assert relativePath("", "/users/moo", '/') == ""
assert relativePath("foo", ".", '/') == "foo"
assert relativePath("foo", "foo", '/') == "."
if path.len == 0: return ""
let base = if base == ".": "" else: base
var base = if base == ".": "" else: base
var path = path
path.normalizePathAux
base.normalizePathAux
when doslikeFileSystem:
if isAbsolute(path) and isAbsolute(base):
@ -411,6 +417,9 @@ proc relativePath*(path, base: string; sep = DirSep): string {.
if not f.hasNext(path): break
ff = f.next(path)
when not defined(nimOldRelativePathBehavior):
if result.len == 0: result.add "."
proc isRelativeTo*(path: string, base: string): bool {.since: (1, 1).} =
## Returns true if `path` is relative to `base`.
runnableExamples:
@ -1353,7 +1362,7 @@ when not weirdTarget:
raise newException(ValueError, "The specified root is not absolute: " & root)
joinPath(root, path)
proc normalizePath*(path: var string) {.rtl, extern: "nos$1", tags: [], noNimScript.} =
proc normalizePath*(path: var string) {.rtl, extern: "nos$1", tags: [].} =
## Normalize a path.
##
## Consecutive directory separators are collapsed, including an initial double slash.
@ -1402,7 +1411,9 @@ proc normalizePath*(path: var string) {.rtl, extern: "nos$1", tags: [], noNimScr
else:
path = "."
proc normalizedPath*(path: string): string {.rtl, extern: "nos$1", tags: [], noNimScript.} =
proc normalizePathAux(path: var string) = normalizePath(path)
proc normalizedPath*(path: string): string {.rtl, extern: "nos$1", tags: [].} =
## Returns a normalized path for the current OS.
##
## See also: