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

added a comment

Browse source
This commit is contained in:
Araq 2015-02-26 02:05:12 +01:00
commit d4a8bde617
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/sigmatch.nim
View file

@ -158,7 +158,7 @@ proc sumGeneric(t: PType): int =
for i in 0 .. <t.len: result += t.sons[i].sumGeneric for i in 0 .. <t.len: result += t.sons[i].sumGeneric
break break
of tyProc: of tyProc:
# proc matche proc better than 'stmt' to disambiguate 'spawn' # proc matches proc better than 'stmt' to disambiguate 'spawn'
return 1 return 1
of tyGenericParam, tyExpr, tyStatic, tyStmt, tyTypeDesc: break of tyGenericParam, tyExpr, tyStatic, tyStmt, tyTypeDesc: break
else: return 0 else: return 0
@ -865,8 +865,8 @@ proc typeRel(c: var TCandidate, f, aOrig: PType, doBind = true): TTypeRelation =
result = typeRel(c, ff, aa) result = typeRel(c, ff, aa)
if result == isNone: return if result == isNone: return
if ff.kind == tyRange and result != isEqual: return isNone if ff.kind == tyRange and result != isEqual: return isNone
result = isGeneric result = isGeneric
# XXX See bug #2220. A[int] should match A[int] better than some generic X
else: else:
result = typeRel(c, lastSon(f), a) result = typeRel(c, lastSon(f), a)