mirrors/Nim
1
0
Fork 0
mirror of https://github.com/nim-lang/Nim.git synced 2026-02-15 23:54:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes #12945 (#12959)

Browse Source
This commit is contained in:
cooldome
2019-12-24 19:34:14 +00:00
committed by Andreas Rumpf
parent 30162908b0
commit 649bf326bf
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
compiler/semexprs.nim
View File

@@ -1789,12 +1789,12 @@ proc semYieldVarResult(c: PContext, n: PNode, restype: PType) =
let e = skipTypes(t[i], {tyGenericInst, tyAlias, tySink})
if e.kind in {tyVar, tyLent}:
e.flags.incl tfVarIsPtr # bugfix for #4048, #4910, #6892
if n[0].kind in {nkPar, nkTupleConstr}:
n[0][i] = takeImplicitAddr(c, n[0][i], e.kind == tyLent)
elif n[0].kind in {nkHiddenStdConv, nkHiddenSubConv} and
n[0][1].kind in {nkPar, nkTupleConstr}:
var a = n[0][1]
a[i] = takeImplicitAddr(c, a[i], e.kind == tyLent)
let tupleConstr = if n[0].kind in {nkHiddenStdConv, nkHiddenSubConv}: n[0][1] else: n[0]
if tupleConstr.kind in {nkPar, nkTupleConstr}:
if tupleConstr[i].kind == nkExprColonExpr:
tupleConstr[i][1] = takeImplicitAddr(c, tupleConstr[i][1], e.kind == tyLent)
else:
tupleConstr[i] = takeImplicitAddr(c, tupleConstr[i], e.kind == tyLent)
else:
localError(c.config, n[0].info, errXExpected, "tuple constructor")
else: discard

4
tests/iter/tmoditer.nim
View File

@@ -4,7 +4,7 @@ discard """
iterator modPairs(a: var array[0..4,string]): tuple[key: int, val: var string] =
for i in 0..a.high:
yield (i, a[i])
yield (key: i, val: a[i])
iterator modItems*[T](a: var array[0..4,T]): var T =
for i in 0..a.high:
@@ -49,7 +49,7 @@ iterator lentItems[T](a: openarray[T]): lent T =
iterator lentPairs[T](a: array[0..1, T]): tuple[key: int, val: lent T] =
for i in 0..a.high:
yield (i, a[i])
yield (key: i, val: a[i])
let arr1 = [1, 2, 3]