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

fixes #1799

Browse source
This commit is contained in:
Araq 2015-10-25 01:24:32 +02:00
commit 5206c310e6
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/docgen.nim
View file

@ -158,7 +158,7 @@ proc genRecComment(d: PDoc, n: PNode): Rope =
if n == nil: return nil
result = genComment(d, n).rope
if result == nil:
if n.kind notin {nkEmpty..nkNilLit}:
if n.kind notin {nkEmpty..nkNilLit, nkEnumTy}:
for i in countup(0, len(n)-1):
result = genRecComment(d, n.sons[i])
if result != nil: return

5
compiler/parser.nim
View file

@ -123,7 +123,7 @@ proc rawSkipComment(p: var TParser, node: PNode) =
getTok(p)
proc skipComment(p: var TParser, node: PNode) =
if p.tok.indent < 0: rawSkipComment(p, node)
if p.tok.indent < 0 or realInd(p): rawSkipComment(p, node)
proc skipInd(p: var TParser) =
if p.tok.indent >= 0:
@ -887,7 +887,7 @@ proc parseTuple(p: var TParser, indentAllowed = false): PNode =
skipComment(p, result)
if realInd(p):
withInd(p):
skipComment(p, result)
rawSkipComment(p, result)
while true:
case p.tok.tokType
of tkSymbol, tkAccent:
@ -1608,6 +1608,7 @@ proc parseEnum(p: var TParser): PNode =
getTok(p)
addSon(result, ast.emptyNode)
optInd(p, result)
rawSkipComment(p, result)
while true:
var a = parseSymbol(p)
if a.kind == nkEmpty: return