Skip to content

Commit

Permalink
fix #16650 (#16660)
Browse files Browse the repository at this point in the history
  • Loading branch information
ringabout committed Jan 10, 2021
1 parent f82100a commit 2c6f5ae
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 8 deletions.
7 changes: 6 additions & 1 deletion compiler/semfold.nim
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ import
platform, math, msgs, idents, renderer, types,
commands, magicsys, modulegraphs, strtabs, lineinfos

from system/memory import nimCStrLen

proc errorType*(g: ModuleGraph): PType =
## creates a type representing an error state
result = newType(tyError, nextTypeId(g.idgen), g.owners[^1])
Expand Down Expand Up @@ -133,7 +135,10 @@ proc evalOp(m: TMagic, n, a, b, c: PNode; g: ModuleGraph): PNode =
if a.kind == nkNilLit:
result = newIntNodeT(Zero, n, g)
elif a.kind in {nkStrLit..nkTripleStrLit}:
result = newIntNodeT(toInt128(a.strVal.len), n, g)
if a.typ.kind == tyString:
result = newIntNodeT(toInt128(a.strVal.len), n, g)
elif a.typ.kind == tyCString:
result = newIntNodeT(toInt128(nimCStrLen(a.strVal)), n, g)
else:
result = newIntNodeT(toInt128(a.len), n, g)
of mUnaryPlusI, mUnaryPlusF64: result = a # throw `+` away
Expand Down
19 changes: 12 additions & 7 deletions tests/system/tostring.nim
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
discard """
output: "DONE: tostring.nim"
"""

doAssert "@[23, 45]" == $(@[23, 45])
doAssert "[32, 45]" == $([32, 45])
doAssert """@["", "foo", "bar"]""" == $(@["", "foo", "bar"])
Expand Down Expand Up @@ -108,13 +104,22 @@ bar(nilstring)
static:
stringCompare()

# bug 8847
# issue #8847
var a2: cstring = "fo\"o2"

block:
var s: string
s.addQuoted a2
doAssert s == "\"fo\\\"o2\""


echo "DONE: tostring.nim"
# issue #16650
template fn() =
doAssert len(cstring"ab\0c") == 5
doAssert len(cstring("ab\0c")) == 2
when nimvm:
discard
else:
let c = cstring("ab\0c")
doAssert len(c) == 2
fn()
static: fn()

0 comments on commit 2c6f5ae

Please sign in to comment.