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

containerID is no longer needed for generics

Browse source
This commit is contained in:
Zahary Karadjov 2013-03-01 12:12:53 +02:00
commit 0774af169b
6 changed files with 4 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

9
compiler/sigmatch.nim
View file

@ -493,11 +493,10 @@ proc typeRel(c: var TCandidate, f, a: PType): TTypeRelation =
# simply no match for now:
nil
elif x.kind == tyGenericInst and
(f.sons[0].containerID == x.sons[0].containerID) and
(sonsLen(x) - 1 == sonsLen(f)):
assert(x.sons[0].kind == tyGenericBody)
for i in countup(1, sonsLen(f) - 1):
if x.sons[i].kind == tyGenericParam:
(f.sons[0] == x.sons[0]) and
(sonsLen(x) - 1 == sonsLen(f)):
for i in countup(1, sonsLen(f) - 1):
if x.sons[i].kind == tyGenericParam:
InternalError("wrong instantiated type!")
elif typeRel(c, f.sons[i], x.sons[i]) <= isSubtype: return
result = isGeneric