discard destroys its argument in-place (#9478)
This commit is contained in:
parent
9884129058
commit
f39aa1b40b
2 changed files with 22 additions and 0 deletions
|
|
@ -601,6 +601,10 @@ proc p(n: PNode; c: var Con): PNode =
|
||||||
of nkNone..nkNilLit, nkTypeSection, nkProcDef, nkConverterDef, nkMethodDef,
|
of nkNone..nkNilLit, nkTypeSection, nkProcDef, nkConverterDef, nkMethodDef,
|
||||||
nkIteratorDef, nkMacroDef, nkTemplateDef, nkLambda, nkDo, nkFuncDef:
|
nkIteratorDef, nkMacroDef, nkTemplateDef, nkLambda, nkDo, nkFuncDef:
|
||||||
result = n
|
result = n
|
||||||
|
of nkDiscardStmt:
|
||||||
|
result = n
|
||||||
|
if n[0].typ != nil and hasDestructor(n[0].typ):
|
||||||
|
result = genDestroy(c, n[0].typ, n[0])
|
||||||
of nkCast, nkHiddenStdConv, nkHiddenSubConv, nkConv:
|
of nkCast, nkHiddenStdConv, nkHiddenSubConv, nkConv:
|
||||||
result = copyNode(n)
|
result = copyNode(n)
|
||||||
# Destination type
|
# Destination type
|
||||||
|
|
|
||||||
18
tests/destructor/tdiscard.nim
Normal file
18
tests/destructor/tdiscard.nim
Normal file
|
|
@ -0,0 +1,18 @@
|
||||||
|
type
|
||||||
|
O = object
|
||||||
|
|
||||||
|
var dCalls = 0
|
||||||
|
|
||||||
|
proc `=destroy`(x: var O) = inc dCalls
|
||||||
|
proc `=sink`(x: var O, y: O) = doAssert false
|
||||||
|
|
||||||
|
proc newO(): O = discard
|
||||||
|
|
||||||
|
proc main() =
|
||||||
|
doAssert dCalls == 0
|
||||||
|
discard newO()
|
||||||
|
doAssert dCalls == 1
|
||||||
|
discard newO()
|
||||||
|
doAssert dCalls == 2
|
||||||
|
|
||||||
|
main()
|
||||||
Loading…
Add table
Add a link
Reference in a new issue