ok

Author: yglukhov

compiler/closureiters.nim

@@ -1330,9 +1330,9 @@ proc replaceDeletedStates(ctx: var Ctx, n: PNode): PNode =
     if c.kind == nkIntLit:
       let idx = c.intVal
       if idx >= 0 and idx < ctx.states.len and ctx.states[idx].label == c and ctx.states[idx].deletable:
-        let ns = ctx.replaceDeletedStates(ctx.states[idx].body)
-        assert(ns.kind == nkStmtList and ns.len == 1 and ns[0].kind == nkGotoState and ns[0][0].kind == nkIntLit)
-        n[i] = ns[0][0]
+        let gt = ctx.replaceDeletedStates(skipStmtList(ctx.states[idx].body))
+        assert(gt.kind == nkGotoState)
+        n[i] = gt[0]
     else:
       n[i] = ctx.replaceDeletedStates(c)
 
@@ -1350,7 +1350,6 @@ proc replaceInlinedStates(ctx: var Ctx, n: PNode): PNode =
     else:
       n[i] = ctx.replaceInlinedStates(c)
 
-
 proc deleteEmptyStates(ctx: var Ctx) =
   # 1. Assign temporary indexes to state labels to facilitate
   # countStateOccurences. Label number will correspond to index in
@@ -1543,7 +1542,7 @@ proc transformClosureIterator*(g: ModuleGraph; idgen: IdGenerator; fn: PSym, n:
   # echo "LOWERED: ", renderTree(n)
 
   if n.hasYieldsInExpressions():
-    internalError(ctx.g.config, "yield in expr not lowered")
+    internalError(ctx.g.config, n.info, "yield in expr not lowered")
 
   # Splitting transformation
   discard ctx.transformClosureIteratorBody(n, gotoOut)