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

.error for routines now can also have a custom error message; improve error message for 'nil' strings

Browse source
This commit is contained in:
Araq 2018-09-25 00:28:39 +02:00
commit 548fc778c9
4 changed files with 33 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/pragmas.nim
View file

@ -954,12 +954,12 @@ proc singlePragma(c: PContext, sym: PSym, n: PNode, i: var int,
recordPragma(c, it, "warning", s)
message(c.config, it.info, warnUser, s)
of wError:
if sym != nil and sym.isRoutine:
if sym != nil and (sym.isRoutine or sym.kind == skType):
# This is subtle but correct: the error *statement* is only
# allowed for top level statements. Seems to be easier than
# distinguishing properly between
# ``proc p() {.error}`` and ``proc p() = {.error: "msg".}``
noVal(c, it)
if it.kind in nkPragmaCallKinds: discard getStrLitNode(c, it)
incl(sym.flags, sfError)
else:
let s = expectStrLit(c, it)