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

make usage of foo is a user-defined error more informative (#13833)

Browse source
This commit is contained in:
Timothee Cour 2020-04-01 08:49:29 -07:00 • committed by GitHub
commit 216fd59c44
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
compiler/suggest.nim
View file

@ -523,14 +523,16 @@ proc warnAboutDeprecated(conf: ConfigRef; info: TLineInfo; s: PSym) =
proc userError(conf: ConfigRef; info: TLineInfo; s: PSym) = proc userError(conf: ConfigRef; info: TLineInfo; s: PSym) =
let pragmaNode = extractPragma(s) let pragmaNode = extractPragma(s)
template bail(prefix: string) =
localError(conf, info, "$1usage of '$2' is an {.error.} defined at $3" %
[prefix, s.name.s, toFileLineCol(conf, s.ast.info)])
if pragmaNode != nil: if pragmaNode != nil:
for it in pragmaNode: for it in pragmaNode:
if whichPragma(it) == wError and it.safeLen == 2 and if whichPragma(it) == wError and it.safeLen == 2 and
it[1].kind in {nkStrLit..nkTripleStrLit}: it[1].kind in {nkStrLit..nkTripleStrLit}:
localError(conf, info, it[1].strVal & "; usage of '$1' is a user-defined error" % s.name.s) bail(it[1].strVal & "; ")
return return
localError(conf, info, "usage of '$1' is a user-defined error" % s.name.s) bail("")
proc markOwnerModuleAsUsed(c: PContext; s: PSym) = proc markOwnerModuleAsUsed(c: PContext; s: PSym) =
var module = s var module = s