diff options
| author | Andreas Rumpf <rumpf_a@web.de> | 2018-07-06 17:27:02 +0200 |
|---|---|---|
| committer | Andreas Rumpf <rumpf_a@web.de> | 2018-07-06 17:27:02 +0200 |
| commit | 963f4314431c99aa352fd1e69690b199086f5410 (patch) | |
| tree | df85aaf1d2b0fb34bbd3600ca94dba6102810c62 /compiler/ccgexprs.nim | |
| parent | 32230ffe31e1f338a6191090b182ebbbfdd6cbca (diff) | |
| parent | 8bcaee1fdf2054f026d6fdb760f67624b6dfe0e6 (diff) | |
| download | Nim-963f4314431c99aa352fd1e69690b199086f5410.tar.gz | |
Merge branch 'araq-devel' of github.com:nim-lang/Nim into araq-devel
Diffstat (limited to 'compiler/ccgexprs.nim')
| -rw-r--r-- | compiler/ccgexprs.nim | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/compiler/ccgexprs.nim b/compiler/ccgexprs.nim index fdafa1927..9b31167e3 100644 --- a/compiler/ccgexprs.nim +++ b/compiler/ccgexprs.nim @@ -1769,6 +1769,7 @@ proc convStrToCStr(p: BProc, n: PNode, d: var TLoc) = initLocExpr(p, n.sons[0], a) putIntoDest(p, d, n, ropecg(p.module, "#nimToCStringConv($1)", [rdLoc(a)]), +# "($1 ? $1->data : (NCSTRING)\"\")" % [a.rdLoc], a.storage) proc convCStrToStr(p: BProc, n: PNode, d: var TLoc) = |