From c8af0996fd74a0851ae956fbab9071579e8bf531 Mon Sep 17 00:00:00 2001
From: ringabout <43030857+ringabout@users.noreply.github.com>
Date: Tue, 3 Sep 2024 00:12:48 +0800
Subject: fixes #24033; Yielding from var fails with pairs and destructuring
 (#24046)

fixes #24033
---
 compiler/transf.nim | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'compiler')

diff --git a/compiler/transf.nim b/compiler/transf.nim
index 4061a407c..52b5fc1ff 100644
--- a/compiler/transf.nim
+++ b/compiler/transf.nim
@@ -410,9 +410,15 @@ proc transformYield(c: PTransf, n: PNode): PNode =
       result.add transform(c, v)
 
       for i in 0..<c.transCon.forStmt.len - 2:
-        let lhs = c.transCon.forStmt[i]
-        let rhs = transform(c, newTupleAccess(c.graph, tmp, i))
-        result.add(asgnTo(lhs, rhs))
+        if c.transCon.forStmt[i].kind == nkVarTuple:
+          for j in 0..<c.transCon.forStmt[i].len-1:
+            let lhs = c.transCon.forStmt[i][j]
+            let rhs = transform(c, newTupleAccess(c.graph, newTupleAccess(c.graph, tmp, i), j))
+            result.add(asgnTo(lhs, rhs))
+        else:
+          let lhs = c.transCon.forStmt[i]
+          let rhs = transform(c, newTupleAccess(c.graph, tmp, i))
+          result.add(asgnTo(lhs, rhs))
     else:
       for i in 0..<c.transCon.forStmt.len - 2:
         let lhs = c.transCon.forStmt[i]
-- 
cgit 1.4.1-2-gfad0