diff options
author | Felix Mulder <felix.mulder@gmail.com> | 2016-04-11 09:23:04 +0200 |
---|---|---|
committer | Felix Mulder <felix.mulder@gmail.com> | 2016-04-11 09:23:04 +0200 |
commit | dfcb26ec6806d361334f12cb31e574ef57b2f7c5 (patch) | |
tree | a8c1c4973fe3bec4b1cb5ae057e034695e97bc12 /src | |
parent | fcf0efe1d70bd71b212f07a5764196860a7c4148 (diff) | |
download | dotty-dfcb26ec6806d361334f12cb31e574ef57b2f7c5.tar.gz dotty-dfcb26ec6806d361334f12cb31e574ef57b2f7c5.tar.bz2 dotty-dfcb26ec6806d361334f12cb31e574ef57b2f7c5.zip |
Fix issues with `enterBlock` for comment parsing
Diffstat (limited to 'src')
-rw-r--r-- | src/dotty/tools/dotc/parsing/Parsers.scala | 2 | ||||
-rw-r--r-- | src/dotty/tools/dotc/parsing/Scanners.scala | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/dotty/tools/dotc/parsing/Parsers.scala b/src/dotty/tools/dotc/parsing/Parsers.scala index cdfc366a7..ded17c67c 100644 --- a/src/dotty/tools/dotc/parsing/Parsers.scala +++ b/src/dotty/tools/dotc/parsing/Parsers.scala @@ -1879,7 +1879,7 @@ object Parsers { in.nextToken() TypeDef(name, tparams, typ()).withMods(mods).setComment(docstring) case SUPERTYPE | SUBTYPE | SEMI | NEWLINE | NEWLINES | COMMA | RBRACE | EOF => - TypeDef(name, tparams, typeBounds()).withMods(mods) + TypeDef(name, tparams, typeBounds()).withMods(mods).setComment(docstring) case _ => syntaxErrorOrIncomplete("`=', `>:', or `<:' expected") EmptyTree diff --git a/src/dotty/tools/dotc/parsing/Scanners.scala b/src/dotty/tools/dotc/parsing/Scanners.scala index 7ebe63397..6fe86502f 100644 --- a/src/dotty/tools/dotc/parsing/Scanners.scala +++ b/src/dotty/tools/dotc/parsing/Scanners.scala @@ -180,15 +180,15 @@ object Scanners { /** All doc comments as encountered, each list contains doc comments from * the same block level. Starting with the deepest level and going upward */ - private[this] var docsPerBlockStack: List[List[Comment]] = List(List()) + private[this] var docsPerBlockStack: List[List[Comment]] = List(Nil) /** Adds level of nesting to docstrings */ def enterBlock(): Unit = - docsPerBlockStack = Nil ::: docsPerBlockStack + docsPerBlockStack = List(Nil) ::: docsPerBlockStack /** Removes level of nesting for docstrings */ def exitBlock(): Unit = docsPerBlockStack = docsPerBlockStack match { - case x :: xs => List(List()) + case x :: Nil => List(Nil) case _ => docsPerBlockStack.tail } |