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

Adds some examples to JoinPath and / procs.

Browse source
This commit is contained in:
Grzegorz Adam Hankiewicz 2013-07-06 15:14:46 +02:00
commit b5811cc73c
1 changed files with 25 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

32
lib/pure/os.nim
View file

@ -474,8 +474,17 @@ proc JoinPath*(head, tail: string): string {.
## .. code-block:: nimrod ## .. code-block:: nimrod
## "usr/lib" ## "usr/lib"
## ##
## If head is the empty string, tail is returned. ## If head is the empty string, tail is returned. If tail is the empty
## If tail is the empty string, head is returned. ## string, head is returned with a trailing path separator. If tail starts
## with a path separator it will be removed when concatenated to head. Other
## path separators not located on boundaries won't be modified. More
## examples on Unix:
##
## .. code-block:: nimrod
## assert JoinPath("usr", "") == "usr/"
## assert JoinPath("", "lib") == "lib"
## assert JoinPath("", "/lib") == "/lib"
## assert JoinPath("usr/", "/lib") == "usr/lib"
if len(head) == 0: if len(head) == 0:
result = tail result = tail
elif head[len(head)-1] in {DirSep, AltSep}: elif head[len(head)-1] in {DirSep, AltSep}:
@ -491,15 +500,24 @@ proc JoinPath*(head, tail: string): string {.
proc JoinPath*(parts: varargs[string]): string {.noSideEffect, proc JoinPath*(parts: varargs[string]): string {.noSideEffect,
rtl, extern: "nos$1OpenArray".} = rtl, extern: "nos$1OpenArray".} =
## The same as `JoinPath(head, tail)`, but works with any number ## The same as `JoinPath(head, tail)`, but works with any number of directory
## of directory parts. ## parts. You need to pass at least one element or the proc will assert in
## debug builds and crash on release builds.
result = parts[0] result = parts[0]
for i in 1..high(parts): for i in 1..high(parts):
result = JoinPath(result, parts[i]) result = JoinPath(result, parts[i])
proc `/` * (head, tail: string): string {.noSideEffect.} = proc `/` * (head, tail: string): string {.noSideEffect.} =
## The same as ``joinPath(head, tail)`` ## The same as ``JoinPath(head, tail)``
return joinPath(head, tail) ##
## Here are some examples for Unix:
##
## .. code-block:: nimrod
## assert "usr" / "" == "usr/"
## assert "" / "lib" == "lib"
## assert "" / "/lib" == "/lib"
## assert "usr/" / "/lib" == "usr/lib"
return JoinPath(head, tail)
proc SplitPath*(path: string): tuple[head, tail: string] {. proc SplitPath*(path: string): tuple[head, tail: string] {.
noSideEffect, rtl, extern: "nos$1".} = noSideEffect, rtl, extern: "nos$1".} =
@ -1498,7 +1516,7 @@ proc getAppFilename*(): string {.rtl, extern: "nos$1", tags: [FReadIO].} =
if len(result) > 0 and result[0] != DirSep: # not an absolute path? if len(result) > 0 and result[0] != DirSep: # not an absolute path?
# iterate over any path in the $PATH environment variable # iterate over any path in the $PATH environment variable
for p in split(string(getEnv("PATH")), {PathSep}): for p in split(string(getEnv("PATH")), {PathSep}):
var x = joinPath(p, result) var x = JoinPath(p, result)
if ExistsFile(x): return x if ExistsFile(x): return x
proc getApplicationFilename*(): string {.rtl, extern: "nos$1", deprecated.} = proc getApplicationFilename*(): string {.rtl, extern: "nos$1", deprecated.} =