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

fixed another semicolon related parsing bug

Browse source
This commit is contained in:
Araq 2013-10-02 07:57:30 +02:00
commit 422327c010
2 changed files with 21 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
compiler/parser.nim
View file

@ -1798,10 +1798,9 @@ proc parseStmt(p: var TParser): PNode =
if p.tok.indent == p.currInd: if p.tok.indent == p.currInd:
nil nil
elif p.tok.tokType == tkSemicolon: elif p.tok.tokType == tkSemicolon:
while p.tok.tokType == tkSemicolon: getTok(p)
getTok(p) if p.tok.indent < 0 or p.tok.indent == p.currInd: discard
if p.tok.indent < 0 or p.tok.indent == p.currInd: discard else: break
else: return
else: else:
if p.tok.indent > p.currInd: if p.tok.indent > p.currInd:
parMessage(p, errInvalidIndentation) parMessage(p, errInvalidIndentation)

18
tests/compile/tindent1.nim → tests/run/tindent1.nim
View file

@ -1,3 +1,6 @@
discard """
output: '''Success'''
"""
const romanNumbers1 = const romanNumbers1 =
[ [
@ -22,3 +25,18 @@ const romanNumbers4 = [
] ]
proc main =
var j = 0
while j < 10:
inc(j);
if j == 5: doAssert false
var j = 0
while j < 10:
inc(j);
if j == 5: doAssert false
main()
echo "Success"