This commit is contained in:
flywind
2021-01-10 15:51:29 -06:00
committed by GitHub
parent f82100ac93
commit 2c6f5ae681
2 changed files with 18 additions and 8 deletions

View File

@@ -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])
@@ -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