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

Fix AST generation for case statements (#8908)

Browse source 
Fixes #7534
This commit is contained in:
LemonBoy 2018-09-07 21:07:06 +02:00 • committed by Andreas Rumpf
commit 91b37311d9
2 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/transf.nim
View file

@ -624,7 +624,11 @@ proc transformCase(c: PTransf, n: PNode): PTransNode =
case it.kind case it.kind
of nkElifBranch: of nkElifBranch:
if ifs.PNode == nil: if ifs.PNode == nil:
ifs = newTransNode(nkIfStmt, it.info, 0) # Generate the right node depending on whether `n` is used as a stmt or
# as an expr
let kind = if n.typ != nil: nkIfExpr else: nkIfStmt
ifs = newTransNode(kind, it.info, 0)
ifs.PNode.typ = n.typ
ifs.add(e) ifs.add(e)
of nkElse: of nkElse:
if ifs.PNode == nil: result.add(e) if ifs.PNode == nil: result.add(e)

7
tests/js/t7534.nim Normal file
View file

@ -0,0 +1,7 @@
proc f(x: int): int =
result = case x
of 1: 2
elif x == 2: 3
else: 1
doAssert 2 == f(f(f(f(1))))