Fixes #8243 (#8904)

2018-09-07 17:30:50 +03:00 · 2018-09-07 17:30:50 +03:00 · 1e6eca973d
commit 1e6eca973d
parent e81fe6d32f
2 changed files with 42 additions and 0 deletions
--- a/compiler/closureiters.nim
+++ b/compiler/closureiters.nim
@ -712,6 +712,25 @@ proc lowerStmtListExprs(ctx: var Ctx, n: PNode, needsSplit: var bool): PNode =

      result.add(n)

+  of nkBracketExpr:
+    var lhsNeedsSplit = false
+    var rhsNeedsSplit = false
+    n[0] = ctx.lowerStmtListExprs(n[0], lhsNeedsSplit)
+    n[1] = ctx.lowerStmtListExprs(n[1], rhsNeedsSplit)
+    if lhsNeedsSplit or rhsNeedsSplit:
+      needsSplit = true
+      result = newNodeI(nkStmtListExpr, n.info)
+      if lhsNeedsSplit:
+        let (st, ex) = exprToStmtList(n[0])
+        result.add(st)
+        n[0] = ex
+
+      if rhsNeedsSplit:
+        let (st, ex) = exprToStmtList(n[1])
+        result.add(st)
+        n[1] = ex
+      result.add(n)
+
  of nkWhileStmt:
    var ns = false