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

Return an error symbol as macro output if needed (#8116)

Browse source 
Return an error symbol if the macro output has no type and a typedesc
is expected.

Fixes #7454
This commit is contained in:
LemonBoy 2018-06-27 21:43:08 +02:00 • committed by Andreas Rumpf
commit 52fc16d5d2
2 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
compiler/sem.nim
View file

@ -412,7 +412,12 @@ proc semAfterMacroCall(c: PContext, call, macroResult: PNode,
of tyTypeDesc: of tyTypeDesc:
if result.kind == nkStmtList: result.kind = nkStmtListType if result.kind == nkStmtList: result.kind = nkStmtListType
var typ = semTypeNode(c, result, nil) var typ = semTypeNode(c, result, nil)
result.typ = makeTypeDesc(c, typ) if typ == nil:
localError(c.config, result.info, "expression has no type: " &
renderTree(result, {renderNoComments}))
result = newSymNode(errorSym(c, result))
else:
result.typ = makeTypeDesc(c, typ)
#result = symNodeFromType(c, typ, n.info) #result = symNodeFromType(c, typ, n.info)
else: else:
var retType = s.typ.sons[0] var retType = s.typ.sons[0]

8
tests/macros/t7454.nim Normal file
View file

@ -0,0 +1,8 @@
discard """
errormsg: "expression has no type:"
line: 8
"""
macro p(t: typedesc): typedesc =
discard
var a: p(int)