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

the new blocks without 'do' produce compatible AST with 'do blocks'

Browse source
This commit is contained in:
Zahary Karadjov 2017-04-09 23:43:29 +03:00
commit 34b2527441
2 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
compiler/parser.nim
View file

@ -1172,7 +1172,7 @@ proc parseMacroColon(p: var TParser, x: PNode): PNode =
result = makeCall(result)
getTok(p)
skipComment(p, result)
let stmtList = newNodeP(nkStmtList, p)
var stmtList = newNodeP(nkStmtList, p)
if p.tok.tokType notin {tkOf, tkElif, tkElse, tkExcept}:
let body = parseStmt(p)
stmtList.add body
@ -1202,9 +1202,9 @@ proc parseMacroColon(p: var TParser, x: PNode): PNode =
if b.kind == nkElse: break
if stmtList.len == 1 and stmtList[0].kind == nkStmtList:
# to keep backwards compatibility (see tests/vm/tstringnil)
result.add stmtList[0]
else:
result.add stmtList
stmtList = stmtList[0]
result.add newProcNode(nkDo, stmtList.info, stmtList,
params = emptyNode, pragmas = emptyNode)
proc parseExprStmt(p: var TParser): PNode =
#| exprStmt = simpleExpr