diff options
author | Felix Mulder <felix.mulder@gmail.com> | 2016-03-10 19:02:01 +0100 |
---|---|---|
committer | Felix Mulder <felix.mulder@gmail.com> | 2016-04-07 08:40:27 +0200 |
commit | 8513dd692cf690a48b69329b60e1cbb852842f12 (patch) | |
tree | a167c83c241b8e022a9f1761d72723d6a5089d40 /src | |
parent | 6c8265c6cc3555e00f82cf4909fea5e95d1a2f94 (diff) | |
download | dotty-8513dd692cf690a48b69329b60e1cbb852842f12.tar.gz dotty-8513dd692cf690a48b69329b60e1cbb852842f12.tar.bz2 dotty-8513dd692cf690a48b69329b60e1cbb852842f12.zip |
Change tests to be based on JUnit, rename comments variable
Diffstat (limited to 'src')
-rw-r--r-- | src/dotty/tools/dotc/parsing/Scanners.scala | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/dotty/tools/dotc/parsing/Scanners.scala b/src/dotty/tools/dotc/parsing/Scanners.scala index 9ad982e45..5ec6823e4 100644 --- a/src/dotty/tools/dotc/parsing/Scanners.scala +++ b/src/dotty/tools/dotc/parsing/Scanners.scala @@ -182,19 +182,19 @@ object Scanners { */ var revComments: List[Comment] = Nil - /** The currently closest docstring, replaced every time a new docstring is - * encountered + /** All doc comments as encountered, each list contains doc comments from + * the same block level. Starting with the deepest level and going upward */ - var closestDocString: List[List[Comment]] = List(List()) + var docsPerBlockStack: List[List[Comment]] = List(List()) /** Adds level of nesting to docstrings */ def enterBlock(): Unit = - closestDocString = Nil ::: closestDocString + docsPerBlockStack = Nil ::: docsPerBlockStack /** Removes level of nesting for docstrings */ - def exitBlock(): Unit = closestDocString = closestDocString match { + def exitBlock(): Unit = docsPerBlockStack = docsPerBlockStack match { case x :: xs => List(List()) - case _ => closestDocString.tail + case _ => docsPerBlockStack.tail } /** Returns the closest docstring preceding the position supplied */ @@ -204,10 +204,10 @@ object Scanners { case Nil => c } - closestDocString match { + docsPerBlockStack match { case (list @ (x :: xs)) :: _ => { val c = closest(x, xs) - closestDocString = list.dropWhile(_ != c).tail :: closestDocString.tail + docsPerBlockStack = list.dropWhile(_ != c).tail :: docsPerBlockStack.tail Some(c.chrs) } case _ => None @@ -591,7 +591,7 @@ object Scanners { val comment = Comment(pos, flushBuf(commentBuf)) if (comment.isDocComment) - closestDocString = (closestDocString.head :+ comment) :: closestDocString.tail + docsPerBlockStack = (docsPerBlockStack.head :+ comment) :: docsPerBlockStack.tail if (keepComments) revComments = comment :: revComments |