From a388c35741b4e9718ddd1d1f781a56f6bc0373c0 Mon Sep 17 00:00:00 2001 From: Andrii Riabushenko Date: Sat, 31 Aug 2019 09:56:39 +0100 Subject: support forward declared destructors --- compiler/semstmts.nim | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/compiler/semstmts.nim b/compiler/semstmts.nim index dff67f175..262deba5e 100644 --- a/compiler/semstmts.nim +++ b/compiler/semstmts.nim @@ -1595,7 +1595,9 @@ proc semOverride(c: PContext, s: PSym, n: PNode) = else: break if obj.kind in {tyObject, tyDistinct, tySequence, tyString}: obj = canonType(c, obj) - if obj.destructor.isNil and tfCheckedForDestructor notin obj.flags: + if obj.attachedOps[attachedDestructor] == s: + discard "forward declared destructor" + elif obj.destructor.isNil and tfCheckedForDestructor notin obj.flags: obj.attachedOps[attachedDestructor] = s else: prevDestructor(c, obj.destructor, obj, n.info) @@ -1660,7 +1662,9 @@ proc semOverride(c: PContext, s: PSym, n: PNode) = obj = canonType(c, obj) #echo "ATTACHING TO ", obj.id, " ", s.name.s, " ", cast[int](obj) let k = if name == "=": attachedAsgn else: attachedSink - if obj.attachedOps[k].isNil and tfCheckedForDestructor notin obj.flags: + if obj.attachedOps[k] == s: + discard "forward declared op" + elif obj.attachedOps[k].isNil and tfCheckedForDestructor notin obj.flags: obj.attachedOps[k] = s else: prevDestructor(c, obj.attachedOps[k], obj, n.info) -- cgit 1.4.1-2-gfad0