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

fixes #217

Browse source
This commit is contained in:
Araq 2012-10-13 01:59:20 +02:00
commit ffcbe19cd8
3 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
compiler/sigmatch.nim
View file

@ -279,24 +279,24 @@ proc procTypeRel(c: var TCandidate, f, a: PType): TTypeRelation =
var m = typeRel(c, f.sons[0], a.sons[0])
# Subtype is sufficient for return types!
if m < isSubtype or inconsistentVarTypes(f.sons[0], a.sons[0]):
result = isNone
return isNone
elif m == isSubtype: result = isConvertible
else: result = minRel(m, result)
else:
result = isNone
return isNone
elif a.sons[0] != nil:
result = isNone
return isNone
if tfNoSideEffect in f.flags and tfNoSideEffect notin a.flags:
result = isNone
return isNone
elif tfThread in f.flags and a.flags * {tfThread, tfNoSideEffect} == {}:
# noSideEffect implies ``tfThread``! XXX really?
result = isNone
return isNone
elif f.callconv != a.callconv:
# valid to pass a 'nimcall' thingie to 'closure':
if f.callconv == ccClosure and a.callconv == ccDefault:
result = isConvertible
else:
result = isNone
return isNone
else: nil
proc matchTypeClass(c: var TCandidate, f, a: PType): TTypeRelation =