parent
a6ba3116b2
commit
6f7f043c9b
2 changed files with 15 additions and 4 deletions
|
|
@ -1517,11 +1517,12 @@ proc typeMismatch*(conf: ConfigRef; info: TLineInfo, formal, actual: PType) =
|
||||||
localError(conf, info, msg)
|
localError(conf, info, msg)
|
||||||
|
|
||||||
proc isTupleRecursive(t: PType, cycleDetector: var IntSet): bool =
|
proc isTupleRecursive(t: PType, cycleDetector: var IntSet): bool =
|
||||||
if t == nil: return
|
if t == nil:
|
||||||
|
return false
|
||||||
|
if cycleDetector.containsOrIncl(t.id):
|
||||||
|
return true
|
||||||
case t.kind:
|
case t.kind:
|
||||||
of tyTuple:
|
of tyTuple:
|
||||||
if cycleDetector.containsOrIncl(t.id):
|
|
||||||
return true
|
|
||||||
var cycleDetectorCopy: IntSet
|
var cycleDetectorCopy: IntSet
|
||||||
for i in 0..<t.len:
|
for i in 0..<t.len:
|
||||||
assign(cycleDetectorCopy, cycleDetector)
|
assign(cycleDetectorCopy, cycleDetector)
|
||||||
|
|
@ -1530,7 +1531,7 @@ proc isTupleRecursive(t: PType, cycleDetector: var IntSet): bool =
|
||||||
of tyAlias, tyRef, tyPtr, tyGenericInst, tyVar, tyLent, tySink, tyArray, tyUncheckedArray, tySequence:
|
of tyAlias, tyRef, tyPtr, tyGenericInst, tyVar, tyLent, tySink, tyArray, tyUncheckedArray, tySequence:
|
||||||
return isTupleRecursive(t.lastSon, cycleDetector)
|
return isTupleRecursive(t.lastSon, cycleDetector)
|
||||||
else:
|
else:
|
||||||
discard
|
return false
|
||||||
|
|
||||||
proc isTupleRecursive*(t: PType): bool =
|
proc isTupleRecursive*(t: PType): bool =
|
||||||
var cycleDetector = initIntSet()
|
var cycleDetector = initIntSet()
|
||||||
|
|
|
||||||
10
tests/types/tillegaltyperecursion3.nim
Normal file
10
tests/types/tillegaltyperecursion3.nim
Normal file
|
|
@ -0,0 +1,10 @@
|
||||||
|
discard """
|
||||||
|
errormsg: "illegal recursion in type 'Weird'"
|
||||||
|
"""
|
||||||
|
|
||||||
|
# issue #3456
|
||||||
|
|
||||||
|
import tables
|
||||||
|
type
|
||||||
|
Weird = ref seq[Weird]
|
||||||
|
var t = newTable[int, Weird]()
|
||||||
Loading…
Add table
Add a link
Reference in a new issue