mirror of
https://github.com/nim-lang/Nim.git
synced 2026-01-07 21:43:33 +00:00
Fix capture for object types (#13315)
* Fix capture for object|tuple|... types * Add test case
This commit is contained in:
@@ -184,7 +184,7 @@ macro capture*(locals: openArray[typed], body: untyped): untyped {.since: (1, 1)
|
||||
## echo r[0] & ", or " & r[1] # output: to be, or not to be
|
||||
var params = @[newIdentNode("auto")]
|
||||
for arg in locals:
|
||||
params.add(newIdentDefs(ident(arg.strVal), freshIdentNodes getTypeImpl arg))
|
||||
params.add(newIdentDefs(ident(arg.strVal), freshIdentNodes getTypeInst arg))
|
||||
result = newNimNode(nnkCall)
|
||||
result.add(newProc(newEmptyNode(), params, body, nnkProcDef))
|
||||
for arg in locals: result.add(arg)
|
||||
|
||||
@@ -1,6 +1,9 @@
|
||||
discard """
|
||||
output: '''
|
||||
to be, or not to be'''
|
||||
to be, or not to be
|
||||
(v: 1)
|
||||
(v: 1)
|
||||
'''
|
||||
joinable: false
|
||||
"""
|
||||
|
||||
@@ -9,4 +12,15 @@ import sequtils, sugar
|
||||
let m = @[proc (s: string): string = "to " & s, proc (s: string): string = "not to " & s]
|
||||
var l = m.mapIt(capture([it], proc (s: string): string = it(s)))
|
||||
let r = l.mapIt(it("be"))
|
||||
echo r[0] & ", or " & r[1]
|
||||
echo r[0] & ", or " & r[1]
|
||||
|
||||
type O = object
|
||||
v: int
|
||||
var o = O(v: 1)
|
||||
var execute: proc()
|
||||
capture [o]:
|
||||
execute = proc() =
|
||||
echo o
|
||||
execute()
|
||||
o.v = -1
|
||||
execute()
|
||||
|
||||
Reference in New Issue
Block a user