diff options
Diffstat (limited to 'src/main/scala/firrtl/LexerHelper.scala')
| -rw-r--r-- | src/main/scala/firrtl/LexerHelper.scala | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/main/scala/firrtl/LexerHelper.scala b/src/main/scala/firrtl/LexerHelper.scala index cc17ac46..3ddfc5b9 100644 --- a/src/main/scala/firrtl/LexerHelper.scala +++ b/src/main/scala/firrtl/LexerHelper.scala @@ -15,7 +15,7 @@ import firrtl.antlr.FIRRTLParser abstract class LexerHelper { - import FIRRTLParser.{NEWLINE, INDENT, DEDENT} + import FIRRTLParser.{DEDENT, INDENT, NEWLINE} private val tokenBuffer = mutable.Queue.empty[Token] private val indentations = mutable.Stack[Int]() @@ -58,9 +58,9 @@ abstract class LexerHelper { def handleNewlineToken(token: Token): Token = { @tailrec - def nonNewline(token: Token) : (Token, Token) = { + def nonNewline(token: Token): (Token, Token) = { val nextNext = pullToken() - if(nextNext.getType == NEWLINE) + if (nextNext.getType == NEWLINE) nonNewline(nextNext) else (token, nextNext) @@ -94,10 +94,11 @@ abstract class LexerHelper { } } - val t = if (tokenBuffer.isEmpty) - pullToken() - else - tokenBuffer.dequeue + val t = + if (tokenBuffer.isEmpty) + pullToken() + else + tokenBuffer.dequeue if (reachedEof) t @@ -117,8 +118,8 @@ abstract class LexerHelper { setType(tokenType) tokenType match { case `NEWLINE` => setText("<NEWLINE>") - case `INDENT` => setText("<INDENT>") - case `DEDENT` => setText("<DEDENT>") + case `INDENT` => setText("<INDENT>") + case `DEDENT` => setText("<DEDENT>") } } |