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

fixes #429 and tstmtexpr

Browse source
This commit is contained in:
Zahary Karadjov 2013-05-12 21:01:39 +03:00
commit b3103c4657
6 changed files with 35 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

7
compiler/sigmatch.nim
View file

@ -683,11 +683,12 @@ proc localConvMatch(c: PContext, m: var TCandidate, f, a: PType,
proc ParamTypesMatchAux(c: PContext, m: var TCandidate, f, a: PType,
arg, argOrig: PNode): PNode =
var r: TTypeRelation
if f.kind == tyExpr:
if f.sonsLen == 0:
let fMaybeExpr = f.skipTypes({tyDistinct})
if fMaybeExpr.kind == tyExpr:
if fMaybeExpr.sonsLen == 0:
r = isGeneric
else:
let match = matchTypeClass(m, f, a)
let match = matchTypeClass(m, fMaybeExpr, a)
if match != isGeneric: r = isNone
else:
# XXX: Ideally, this should happen much earlier somewhere near