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

Fixes #17849 (#18055) [backport:1.2]

Browse source 
* Fixes #17849
* Update compiler/closureiters.nim

Co-authored-by: Andreas Rumpf <rumpf_a@web.de>
This commit is contained in:
Yuriy Glukhov 2021-05-30 23:38:33 +03:00 • committed by GitHub
commit a6bd6c7ed8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/closureiters.nim
View file

@ -606,6 +606,12 @@ proc lowerStmtListExprs(ctx: var Ctx, n: PNode, needsSplit: var bool): PNode =
internalError(ctx.g.config, "lowerStmtListExpr(nkCaseStmt): " & $branch.kind) internalError(ctx.g.config, "lowerStmtListExpr(nkCaseStmt): " & $branch.kind)
result.add(n) result.add(n)
result.add(ctx.newEnvVarAccess(tmp)) result.add(ctx.newEnvVarAccess(tmp))
elif n[0].kind == nkStmtListExpr:
result = newNodeI(nkStmtList, n.info)
let (st, ex) = exprToStmtList(n[0])
result.add(st)
n[0] = ex
result.add(n)
of nkCallKinds, nkChckRange, nkChckRangeF, nkChckRange64: of nkCallKinds, nkChckRange, nkChckRangeF, nkChckRange64:
var ns = false var ns = false

16
tests/iter/tyieldintry.nim
View file

@ -483,5 +483,19 @@ block: # nnkChckRange
test(it, 1, 2, 3) test(it, 1, 2, 3)
echo "ok" block: #17849 - yield in case subject
template yieldInCase: int =
yield 2
3
iterator it(): int {.closure.} =
yield 1
case yieldInCase()
of 1: checkpoint(11)
of 3: checkpoint(13)
else: checkpoint(14)
yield 5
test(it, 1, 2, 13, 5)
echo "ok"