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

custom pragmas: proper error handling

Browse source
This commit is contained in:
Andreas Rumpf 2018-02-12 16:40:15 +01:00
commit fc967cc715
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
compiler/pragmas.nim
View file

@ -657,15 +657,16 @@ proc pragmaGuard(c: PContext; it: PNode; kind: TSymKind): PSym =
result = qualifiedLookUp(c, n, {checkUndeclared}) result = qualifiedLookUp(c, n, {checkUndeclared})
proc semCustomPragma(c: PContext, n: PNode): PNode = proc semCustomPragma(c: PContext, n: PNode): PNode =
assert(n.kind in nkPragmaCallKinds + {nkIdent})
if n.kind == nkIdent: if n.kind == nkIdent:
result = newTree(nkCall, n) result = newTree(nkCall, n)
elif n.kind == nkExprColonExpr: elif n.kind == nkExprColonExpr:
# pragma: arg -> pragma(arg) # pragma: arg -> pragma(arg)
result = newTree(nkCall, n[0], n[1]) result = newTree(nkCall, n[0], n[1])
else: elif n.kind in nkPragmaCallKinds + {nkIdent}:
result = n result = n
else:
invalidPragma(n)
return n
let r = c.semOverloadedCall(c, result, n, {skTemplate}, {}) let r = c.semOverloadedCall(c, result, n, {skTemplate}, {})
if r.isNil or sfCustomPragma notin r[0].sym.flags: if r.isNil or sfCustomPragma notin r[0].sym.flags: