diff options
| author | Den Shabalin <den.shabalin@gmail.com> | 2013-10-11 15:51:17 +0200 |
|---|---|---|
| committer | Den Shabalin <den.shabalin@gmail.com> | 2013-10-18 17:24:52 +0200 |
| commit | 68a6b57df2534d8b96cee8b3f4ab68159029779a (patch) | |
| tree | 18b7ac469eef76ba5ddc1136bf0464cd3612c1e1 /src/compiler | |
| parent | 27fca0fc3fecef10ece59a4c28282301ce2cd961 (diff) | |
| download | scala-68a6b57df2534d8b96cee8b3f4ab68159029779a.tar.gz scala-68a6b57df2534d8b96cee8b3f4ab68159029779a.tar.bz2 scala-68a6b57df2534d8b96cee8b3f4ab68159029779a.zip | |
eliminate isCaseDefEnd override by moving the logic into stock parser
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/scala/tools/nsc/ast/parser/Parsers.scala | 2 | ||||
| -rw-r--r-- | src/compiler/scala/tools/reflect/quasiquotes/Parsers.scala | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala index 2b6bf657b3..b2570d64e3 100644 --- a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala +++ b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala @@ -671,7 +671,7 @@ self => def isStatSeqEnd = in.token == RBRACE || in.token == EOF - def isCaseDefEnd = in.token == RBRACE || in.token == CASE + def isCaseDefEnd = in.token == RBRACE || in.token == CASE || in.token == EOF def isStatSep(token: Int): Boolean = token == NEWLINE || token == NEWLINES || token == SEMI diff --git a/src/compiler/scala/tools/reflect/quasiquotes/Parsers.scala b/src/compiler/scala/tools/reflect/quasiquotes/Parsers.scala index 983978db7e..71e9274d37 100644 --- a/src/compiler/scala/tools/reflect/quasiquotes/Parsers.scala +++ b/src/compiler/scala/tools/reflect/quasiquotes/Parsers.scala @@ -101,8 +101,6 @@ trait Parsers { self: Quasiquotes => override def isAnnotation: Boolean = super.isAnnotation || (isHole && lookingAhead { isAnnotation }) - override def isCaseDefEnd: Boolean = super.isCaseDefEnd || (in.token == EOF) - override def isModifier: Boolean = super.isModifier || (isHole && lookingAhead { isModifier }) override def isLocalModifier: Boolean = super.isLocalModifier || (isHole && lookingAhead { isLocalModifier }) |