make tests green again
This commit is contained in:
parent
60b187513e
commit
8f457f6ebb
4 changed files with 17 additions and 6 deletions
|
|
@ -53,7 +53,18 @@ proc pickBestCandidate(c: PContext, headSymbol: PNode,
|
||||||
if symx.kind in filter:
|
if symx.kind in filter:
|
||||||
syms.add((symx, o.lastOverloadScope))
|
syms.add((symx, o.lastOverloadScope))
|
||||||
symx = nextOverloadIter(o, c, headSymbol)
|
symx = nextOverloadIter(o, c, headSymbol)
|
||||||
if syms.len == 0: return
|
if syms.len == 0:
|
||||||
|
when false:
|
||||||
|
if skIterator notin filter:
|
||||||
|
# also try iterators, but these are 2nd class:
|
||||||
|
symx = initOverloadIter(o, c, headSymbol)
|
||||||
|
while symx != nil:
|
||||||
|
if symx.kind == skIterator:
|
||||||
|
syms.add((symx, 100))
|
||||||
|
symx = nextOverloadIter(o, c, headSymbol)
|
||||||
|
if syms.len == 0: return
|
||||||
|
else:
|
||||||
|
return
|
||||||
|
|
||||||
var z: TCandidate
|
var z: TCandidate
|
||||||
initCandidate(c, best, syms[0][0], initialBinding, symScope)
|
initCandidate(c, best, syms[0][0], initialBinding, symScope)
|
||||||
|
|
|
||||||
|
|
@ -914,7 +914,8 @@ proc sameTypeAux(x, y: PType, c: var TSameTypeClosure): bool =
|
||||||
while a.kind == tyDistinct: a = a.sons[0]
|
while a.kind == tyDistinct: a = a.sons[0]
|
||||||
if a.kind != b.kind: return false
|
if a.kind != b.kind: return false
|
||||||
|
|
||||||
if x.kind == tyGenericInst:
|
# this is required by tunique_type but makes no sense really:
|
||||||
|
if x.kind == tyGenericInst and IgnoreTupleFields notin c.flags:
|
||||||
let
|
let
|
||||||
lhs = x.skipGenericAlias
|
lhs = x.skipGenericAlias
|
||||||
rhs = y.skipGenericAlias
|
rhs = y.skipGenericAlias
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,6 @@
|
||||||
import unittest, sequtils, nre, optional_nonstrict
|
import unittest, sequtils
|
||||||
|
import nre except toSeq
|
||||||
|
import optional_nonstrict
|
||||||
|
|
||||||
suite "find":
|
suite "find":
|
||||||
test "find text":
|
test "find text":
|
||||||
|
|
|
||||||
3
todo.txt
3
todo.txt
|
|
@ -1,9 +1,6 @@
|
||||||
version 1.0 battle plan
|
version 1.0 battle plan
|
||||||
=======================
|
=======================
|
||||||
|
|
||||||
- tests/stdlib/tnre.nim
|
|
||||||
- tests/closure/tflatmap.nim
|
|
||||||
|
|
||||||
- fix "high priority" bugs
|
- fix "high priority" bugs
|
||||||
- try to fix as many compiler crashes as reasonable
|
- try to fix as many compiler crashes as reasonable
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue