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

Fix #12517 Allow single branch when nimvm statements (#20577)

Browse source 
Allow single branch when statements
This commit is contained in:
Can Lehmann 2022-10-17 08:01:53 +02:00 • committed by GitHub
commit 2102e3b02f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
compiler/semexprs.nim
View file

@ -2422,8 +2422,8 @@ proc semWhen(c: PContext, n: PNode, semCheck = true): PNode =
# ... # ...
var whenNimvm = false var whenNimvm = false
var typ = commonTypeBegin var typ = commonTypeBegin
if n.len == 2 and n[0].kind == nkElifBranch and if n.len in 1..2 and n[0].kind == nkElifBranch and (
n[1].kind == nkElse: n.len == 1 or n[1].kind == nkElse):
let exprNode = n[0][0] let exprNode = n[0][0]
if exprNode.kind == nkIdent: if exprNode.kind == nkIdent:
whenNimvm = lookUp(c, exprNode).magic == mNimvm whenNimvm = lookUp(c, exprNode).magic == mNimvm
@ -2461,7 +2461,10 @@ proc semWhen(c: PContext, n: PNode, semCheck = true): PNode =
else: illFormedAst(n, c.config) else: illFormedAst(n, c.config)
if result == nil: if result == nil:
result = newNodeI(nkEmpty, n.info) result = newNodeI(nkEmpty, n.info)
if whenNimvm: result.typ = typ if whenNimvm:
result.typ = typ
if n.len == 1:
result.add(newTree(nkElse, newNode(nkStmtList)))
proc semSetConstr(c: PContext, n: PNode, expectedType: PType = nil): PNode = proc semSetConstr(c: PContext, n: PNode, expectedType: PType = nil): PNode =
result = newNodeI(nkCurly, n.info) result = newNodeI(nkCurly, n.info)

21
tests/whenstmt/t12517.nim Normal file
View file

@ -0,0 +1,21 @@
# Test based on issue #12517
discard """
nimout: '''
nimvm
both
'''
output: '''
both
'''
"""
proc test() =
when nimvm:
echo "nimvm"
echo "both"
static:
test()
test()