This commit is contained in:
Araq 2018-10-02 23:31:39 +02:00
commit 7ac1e6e528
3 changed files with 31 additions and 9 deletions

View file

@ -73,7 +73,7 @@ proc sameMethodBucket(a, b: PSym): MethodResult =
bb = bb.lastSon
else:
break
if sameType(aa, bb):
if sameType(a.typ.sons[i], b.typ.sons[i]):
if aa.kind == tyObject and result != Invalid:
result = Yes
elif aa.kind == tyObject and bb.kind == tyObject:
@ -83,7 +83,7 @@ proc sameMethodBucket(a, b: PSym): MethodResult =
result = Yes
else:
return No
elif diff != high(int):
elif diff != high(int) and sfFromGeneric notin (a.flags+b.flags):
result = Invalid
else:
return No