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

give a better error message for some template expansions (#19871)

Browse source
This commit is contained in:
Andreas Rumpf 2022-06-09 14:21:18 +02:00 • committed by GitHub
commit 25d89269eb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/semstmts.nim
View file

@ -140,7 +140,9 @@ proc discardCheck(c: PContext, result: PNode, flags: TExprFlags) =
n[0] = result n[0] = result
elif result.typ.kind != tyError and c.config.cmd != cmdInteractive: elif result.typ.kind != tyError and c.config.cmd != cmdInteractive:
var n = result var n = result
while n.kind in skipForDiscardable: n = n.lastSon while n.kind in skipForDiscardable:
if n.kind == nkTryStmt: n = n[0]
else: n = n.lastSon
var s = "expression '" & $n & "' is of type '" & var s = "expression '" & $n & "' is of type '" &
result.typ.typeToString & "' and has to be used (or discarded)" result.typ.typeToString & "' and has to be used (or discarded)"
if result.info.line != n.info.line or if result.info.line != n.info.line or
@ -483,7 +485,7 @@ proc semVarMacroPragma(c: PContext, a: PNode, n: PNode): PNode =
for i in 0 ..< pragmas.len: for i in 0 ..< pragmas.len:
let it = pragmas[i] let it = pragmas[i]
let key = if it.kind in nkPragmaCallKinds and it.len >= 1: it[0] else: it let key = if it.kind in nkPragmaCallKinds and it.len >= 1: it[0] else: it
when false: when false:
let lhs = b[0] let lhs = b[0]
let clash = strTableGet(c.currentScope.symbols, lhs.ident) let clash = strTableGet(c.currentScope.symbols, lhs.ident)