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

Merge branch 'master' of github.com:Araq/Nimrod

Browse source
This commit is contained in:
Araq 2013-07-20 20:18:21 +02:00
commit 84534ce4b8
30 changed files with 894 additions and 494 deletions
Download patch file Download diff file Expand all files Collapse all files

7
compiler/semexprs.nim
View file

@ -751,8 +751,11 @@ proc semEcho(c: PContext, n: PNode): PNode =
checkMinSonsLen(n, 1)
for i in countup(1, sonsLen(n) - 1):
var arg = semExprWithType(c, n.sons[i])
n.sons[i] = semExpr(c, buildStringify(c, arg))
n.sons[i] = semExprWithType(c, buildStringify(c, arg))
let t = n.sons[i].typ
if t == nil or t.skipTypes(abstractInst).kind != tyString:
LocalError(n.info, errGenerated,
"implicitly invoked '$' does not return string")
let t = n.sons[0].typ
if tfNoSideEffect notin t.flags: incl(c.p.owner.flags, sfSideEffect)
result = n