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

fixed merge conflict

Browse source
This commit is contained in:
Andreas Rumpf 2018-06-04 16:16:50 +02:00
commit 12996c08a1
30 changed files with 879 additions and 332 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/sem.nim
View file

@ -158,7 +158,7 @@ proc commonType*(x, y: PType): PType =
a = a.lastSon.skipTypes({tyGenericInst})
b = b.lastSon.skipTypes({tyGenericInst})
if a.kind == tyObject and b.kind == tyObject:
result = commonSuperclass(a, b)
result = commonSuperclass(a, b, k)
# this will trigger an error later:
if result.isNil or result == a: return x
if result == b: return y