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

test cases for the new handling of iterators by the is operator

Browse source
This commit is contained in:
Zahary Karadjov 2014-03-06 23:03:02 +02:00
commit 249dd70273
3 changed files with 36 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
compiler/sigmatch.nim
View file

@ -410,7 +410,10 @@ proc procTypeRel(c: var TCandidate, f, a: PType): TTypeRelation =
return isNone
when useEffectSystem:
if not compatibleEffects(f, a): return isNone
of tyNil: result = f.allowsNil
of tyNil:
result = f.allowsNil
of tyIter:
if tfIterator in f.flags: result = typeRel(c, f.base, a.base)
else: discard
proc typeRangeRel(f, a: PType): TTypeRelation {.noinline.} =
@ -923,8 +926,11 @@ proc typeRel(c: var TCandidate, f, aOrig: PType, doBind = true): TTypeRelation =
result = isNone
of tyIter:
if a.kind == f.kind: result = typeRel(c, f.base, a.base)
else: result = isNone
if a.kind == tyIter or
(a.kind == tyProc and tfIterator in a.flags):
result = typeRel(c, f.base, a.base)
else:
result = isNone
of tyStmt:
result = isGeneric