jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add array constructors

Browse source
This commit is contained in:
Andrii Riabushenko 2018-11-30 09:47:55 +00:00
commit ca473d0f94
1 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

20
compiler/destroyer.nim
View file

@ -426,7 +426,7 @@ proc pArg(arg: PNode; c: var Con; isSink: bool): PNode =
result.add arg[0] result.add arg[0]
for i in 1..<arg.len: for i in 1..<arg.len:
result.add pArg(arg[i], c, i < L and parameters[i].kind == tySink) result.add pArg(arg[i], c, i < L and parameters[i].kind == tySink)
elif arg.kind in {nkObjConstr, nkTupleConstr, nkCharLit..nkFloat128Lit}: elif arg.kind in {nkBracket, nkObjConstr, nkTupleConstr, nkBracket, nkCharLit..nkFloat128Lit}:
discard "object construction to sink parameter: nothing to do" discard "object construction to sink parameter: nothing to do"
result = arg result = arg
elif arg.kind == nkSym and arg.sym.kind in InterestingSyms and isLastRead(arg, c): elif arg.kind == nkSym and arg.sym.kind in InterestingSyms and isLastRead(arg, c):
@ -535,25 +535,31 @@ proc moveOrCopy(dest, ri: PNode; c: var Con): PNode =
branch = copyNode(ri[i]) branch = copyNode(ri[i])
branch.add moveOrCopyIfTyped(ri[i][0]) branch.add moveOrCopyIfTyped(ri[i][0])
result.add branch result.add branch
of nkBracket:
# array constructor
let ri2 = copyTree(ri)
for i in 0..<ri.len:
# everything that is passed to an array constructor is consumed,
# so these all act like 'sink' parameters:
ri2[i] = pArg(ri[i], c, isSink = true)
result = genSink(c, dest.typ, dest, ri2)
of nkObjConstr: of nkObjConstr:
result = genSink(c, dest.typ, dest, ri)
let ri2 = copyTree(ri) let ri2 = copyTree(ri)
for i in 1..<ri.len: for i in 1..<ri.len:
# everything that is passed to an object constructor is consumed, # everything that is passed to an object constructor is consumed,
# so these all act like 'sink' parameters: # so these all act like 'sink' parameters:
ri2[i].sons[1] = pArg(ri[i][1], c, isSink = true) ri2[i][1] = pArg(ri[i][1], c, isSink = true)
result.add ri2 result = genSink(c, dest.typ, dest, ri2)
of nkTupleConstr: of nkTupleConstr:
result = genSink(c, dest.typ, dest, ri)
let ri2 = copyTree(ri) let ri2 = copyTree(ri)
for i in 0..<ri.len: for i in 0..<ri.len:
# everything that is passed to an tuple constructor is consumed, # everything that is passed to an tuple constructor is consumed,
# so these all act like 'sink' parameters: # so these all act like 'sink' parameters:
if ri[i].kind == nkExprColonExpr: if ri[i].kind == nkExprColonExpr:
ri2[i].sons[1] = pArg(ri[i][1], c, isSink = true) ri2[i][1] = pArg(ri[i][1], c, isSink = true)
else: else:
ri2[i] = pArg(ri[i], c, isSink = true) ri2[i] = pArg(ri[i], c, isSink = true)
result.add ri2 result = genSink(c, dest.typ, dest, ri2)
of nkSym: of nkSym:
if ri.sym.kind != skParam and isLastRead(ri, c): if ri.sym.kind != skParam and isLastRead(ri, c):
# Rule 3: `=sink`(x, z); wasMoved(z) # Rule 3: `=sink`(x, z); wasMoved(z)