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

Merge pull request #4531 from oderwat/ctring-to.nimstring-nil-fix

Browse source 
Fix for cstring nil to string nil conversion with `$`
This commit is contained in:
Andreas Rumpf 2016-07-29 02:03:07 +02:00 • committed by GitHub
commit 99f5ed8c53
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/system/sysstr.nim
View file

@ -85,7 +85,8 @@ proc toNimStr(str: cstring, len: int): NimString {.compilerProc.} =
copyMem(addr(result.data), str, len + 1) copyMem(addr(result.data), str, len + 1)
proc cstrToNimstr(str: cstring): NimString {.compilerRtl.} = proc cstrToNimstr(str: cstring): NimString {.compilerRtl.} =
result = toNimStr(str, str.len) if str == nil: NimString(nil)
else: toNimStr(str, str.len)
proc copyString(src: NimString): NimString {.compilerRtl.} = proc copyString(src: NimString): NimString {.compilerRtl.} =
if src != nil: if src != nil: