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

https://github.com/nim-lang/Nim/pull/15826/files#r585368355 (#17233)

Browse source
This commit is contained in:
Juan Carlos 2021-03-03 07:58:05 -03:00 • committed by GitHub
commit 4982d1c662
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/pure/includes/osenv.nim
View file

@ -5,9 +5,10 @@ when not declared(os) and not declared(ospaths):
when defined(nodejs): when defined(nodejs):
proc getEnv*(key: string, default = ""): string {.tags: [ReadEnvEffect].} = proc getEnv*(key: string, default = ""): string {.tags: [ReadEnvEffect].} =
var ret: cstring var ret = default.cstring
let key2 = key.cstring let key2 = key.cstring
{.emit: "`ret` = process.env[`key2`];".} {.emit: "const value = process.env[`key2`];".}
{.emit: "if (value !== undefined) { `ret` = value };".}
result = $ret result = $ret
proc existsEnv*(key: string): bool {.tags: [ReadEnvEffect].} = proc existsEnv*(key: string): bool {.tags: [ReadEnvEffect].} =

4
tests/stdlib/tos.nim
View file

@ -566,6 +566,10 @@ block osenv:
doAssert existsEnv(dummyEnvVar) == false doAssert existsEnv(dummyEnvVar) == false
delEnv(dummyEnvVar) # deleting an already deleted env var delEnv(dummyEnvVar) # deleting an already deleted env var
doAssert existsEnv(dummyEnvVar) == false doAssert existsEnv(dummyEnvVar) == false
block:
doAssert getEnv("DUMMY_ENV_VAR_NONEXISTENT", "") == ""
doAssert getEnv("DUMMY_ENV_VAR_NONEXISTENT", " ") == " "
doAssert getEnv("DUMMY_ENV_VAR_NONEXISTENT", "Arrakis") == "Arrakis"
block isRelativeTo: block isRelativeTo:
doAssert isRelativeTo("/foo", "/") doAssert isRelativeTo("/foo", "/")