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

fixes #4432

Browse source
This commit is contained in:
Andreas Rumpf 2016-07-29 00:58:39 +02:00
commit 1ddd2a3865
2 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
compiler/semexprs.nim
View file

@ -191,10 +191,6 @@ proc semConv(c: PContext, n: PNode): PNode =
case status
of convOK:
# handle SomeProcType(SomeGenericProc)
# XXX: This needs fixing. checkConvertible uses typeRel internally, but
# doesn't bother to perform the work done in paramTypeMatchAux/fitNode
# so we are redoing the typeRel work here. Why does semConv exist as a
# separate proc from fitNode?
if op.kind == nkSym and op.sym.isGenericRoutine:
result.sons[1] = fitNode(c, result.typ, result.sons[1])
elif op.kind == nkPar and targetType.kind == tyTuple:
@ -202,8 +198,10 @@ proc semConv(c: PContext, n: PNode): PNode =
of convNotNeedeed:
message(n.info, hintConvFromXtoItselfNotNeeded, result.typ.typeToString)
of convNotLegal:
localError(n.info, errGenerated, msgKindToString(errIllegalConvFromXtoY)%
[op.typ.typeToString, result.typ.typeToString])
result = fitNode(c, result.typ, result.sons[1])
if result == nil:
localError(n.info, errGenerated, msgKindToString(errIllegalConvFromXtoY)%
[op.typ.typeToString, result.typ.typeToString])
else:
for i in countup(0, sonsLen(op) - 1):
let it = op.sons[i]