Merge pull request #12099 from cooldome/destructor_too_late
fixes #12092
This commit is contained in:
commit
326a333c8b
2 changed files with 20 additions and 2 deletions
|
|
@ -1622,7 +1622,9 @@ proc semOverride(c: PContext, s: PSym, n: PNode) =
|
||||||
else: break
|
else: break
|
||||||
if obj.kind in {tyObject, tyDistinct, tySequence, tyString}:
|
if obj.kind in {tyObject, tyDistinct, tySequence, tyString}:
|
||||||
obj = canonType(c, obj)
|
obj = canonType(c, obj)
|
||||||
if obj.destructor.isNil:
|
if obj.attachedOps[attachedDestructor] == s:
|
||||||
|
discard "forward declared destructor"
|
||||||
|
elif obj.destructor.isNil and tfCheckedForDestructor notin obj.flags:
|
||||||
obj.attachedOps[attachedDestructor] = s
|
obj.attachedOps[attachedDestructor] = s
|
||||||
else:
|
else:
|
||||||
prevDestructor(c, obj.destructor, obj, n.info)
|
prevDestructor(c, obj.destructor, obj, n.info)
|
||||||
|
|
@ -1687,7 +1689,9 @@ proc semOverride(c: PContext, s: PSym, n: PNode) =
|
||||||
obj = canonType(c, obj)
|
obj = canonType(c, obj)
|
||||||
#echo "ATTACHING TO ", obj.id, " ", s.name.s, " ", cast[int](obj)
|
#echo "ATTACHING TO ", obj.id, " ", s.name.s, " ", cast[int](obj)
|
||||||
let k = if name == "=": attachedAsgn else: attachedSink
|
let k = if name == "=": attachedAsgn else: attachedSink
|
||||||
if obj.attachedOps[k].isNil:
|
if obj.attachedOps[k] == s:
|
||||||
|
discard "forward declared op"
|
||||||
|
elif obj.attachedOps[k].isNil and tfCheckedForDestructor notin obj.flags:
|
||||||
obj.attachedOps[k] = s
|
obj.attachedOps[k] = s
|
||||||
else:
|
else:
|
||||||
prevDestructor(c, obj.attachedOps[k], obj, n.info)
|
prevDestructor(c, obj.attachedOps[k], obj, n.info)
|
||||||
|
|
|
||||||
14
tests/destructor/tdestructor_too_late.nim
Normal file
14
tests/destructor/tdestructor_too_late.nim
Normal file
|
|
@ -0,0 +1,14 @@
|
||||||
|
discard """
|
||||||
|
errmsg: "cannot bind another '=destroy' to: Obj; previous declaration was constructed here implicitly: tdestructor_too_late.nim(7, 16)"
|
||||||
|
"""
|
||||||
|
type Obj* = object
|
||||||
|
v*: int
|
||||||
|
|
||||||
|
proc something(this: sink Obj) =
|
||||||
|
discard
|
||||||
|
|
||||||
|
proc `=destroy`(this: var Obj) =
|
||||||
|
echo "igotdestroyed"
|
||||||
|
this.v = -1
|
||||||
|
|
||||||
|
var test* = Obj(v: 42)
|
||||||
Loading…
Add table
Add a link
Reference in a new issue