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

bugfix: constraint matching for tyGenericInst; implements #130

Browse source
This commit is contained in:
Araq 2012-07-19 08:41:57 +02:00
commit c9513c2e5a
3 changed files with 32 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
compiler/semtypes.nim
View file

@ -198,7 +198,14 @@ proc semTypeIdent(c: PContext, n: PNode): PSym =
return result.typ.sym
else:
return result.typ.sym
if result.kind != skType: GlobalError(n.info, errTypeExpected)
if result.kind != skType:
# this implements the wanted ``var v: V, x: V`` feature ...
var ov: TOverloadIter
var amb = InitOverloadIter(ov, c, n)
while amb != nil and amb.kind != skType:
amb = nextOverloadIter(ov, c, n)
if amb != nil: result = amb
else: GlobalError(n.info, errTypeExpected)
if result.typ.kind != tyGenericParam:
# XXX get rid of this hack!
reset(n[])

2
compiler/sigmatch.nim
View file

@ -249,7 +249,7 @@ proc tupleRel(c: var TCandidate, f, a: PType): TTypeRelation =
proc matchTypeClass(c: var TCandidate, f, a: PType): TTypeRelation =
for i in countup(0, f.sonsLen - 1):
let son = f.sons[i]
var match = son.kind == skipTypes(a, {tyRange}).kind
var match = son.kind == skipTypes(a, {tyRange, tyGenericInst}).kind
if not match:
case son.kind