fixes endless recursion with static type parameters
This commit is contained in:
parent
ece23d39bc
commit
442dc30922
2 changed files with 27 additions and 2 deletions
|
|
@ -1016,9 +1016,17 @@ proc typeRel(c: var TCandidate, f, aOrig: PType, doBind = true): TTypeRelation =
|
||||||
if result != isNone: put(c.bindings, f, aOrig)
|
if result != isNone: put(c.bindings, f, aOrig)
|
||||||
else:
|
else:
|
||||||
result = isNone
|
result = isNone
|
||||||
|
elif prev.kind == tyStatic:
|
||||||
|
if aOrig.kind == tyStatic:
|
||||||
|
result = typeRel(c, prev.lastSon, a)
|
||||||
|
if result != isNone and prev.n != nil:
|
||||||
|
if not exprStructuralEquivalent(prev.n, aOrig.n):
|
||||||
|
result = isNone
|
||||||
|
else: result = isNone
|
||||||
else:
|
else:
|
||||||
result = typeRel(c, prev, aOrig)
|
# XXX endless recursion?
|
||||||
|
#result = typeRel(c, prev, aOrig)
|
||||||
|
result = isNone
|
||||||
of tyTypeDesc:
|
of tyTypeDesc:
|
||||||
var prev = PType(idTableGet(c.bindings, f))
|
var prev = PType(idTableGet(c.bindings, f))
|
||||||
if prev == nil:
|
if prev == nil:
|
||||||
|
|
|
||||||
17
tests/metatype/tstaticvector.nim
Normal file
17
tests/metatype/tstaticvector.nim
Normal file
|
|
@ -0,0 +1,17 @@
|
||||||
|
|
||||||
|
type
|
||||||
|
RectArray*[R, C: static[int], T] = distinct array[R * C, T]
|
||||||
|
|
||||||
|
StaticMatrix*[R, C: static[int], T] = object
|
||||||
|
elements*: RectArray[R, C, T]
|
||||||
|
|
||||||
|
StaticVector*[N: static[int], T] = StaticMatrix[N, 1, T]
|
||||||
|
|
||||||
|
proc foo*[N, T](a: StaticVector[N, T]): T = 0.T
|
||||||
|
proc foobar*[N, T](a, b: StaticVector[N, T]): T = 0.T
|
||||||
|
|
||||||
|
|
||||||
|
var a: StaticVector[3, int]
|
||||||
|
|
||||||
|
echo foo(a) # OK
|
||||||
|
echo foobar(a, a) # <--- hangs compiler
|
||||||
Loading…
Add table
Add a link
Reference in a new issue