summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2007-02-02 18:16:08 +0000
committerMartin Odersky <odersky@gmail.com>2007-02-02 18:16:08 +0000
commit828377d9c0c86471a1c18ba11ff13460400729cf (patch)
tree9b368a14e396e5c781bf6f62dd41edb5f6597b05 /src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
parentffa9da234de5621dfc6d8e760b5368ca68a6520f (diff)
downloadscala-828377d9c0c86471a1c18ba11ff13460400729cf.tar.gz
scala-828377d9c0c86471a1c18ba11ff13460400729cf.tar.bz2
scala-828377d9c0c86471a1c18ba11ff13460400729cf.zip
deprecated checks moved to refchecks.
Diffstat (limited to 'src/compiler/scala/tools/nsc/ast/parser/Parsers.scala')
-rw-r--r--src/compiler/scala/tools/nsc/ast/parser/Parsers.scala7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
index 3290333d2d..7450aea91e 100644
--- a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
+++ b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
@@ -1421,7 +1421,7 @@ trait Parsers requires SyntaxAnalyzer {
mods | mod
}
- /** AccessQualifier ::= "[" Id | this "]"
+ /** AccessQualifier ::= "[" (Id | this) "]"
*/
def accessQualifierOpt(mods: Modifiers) = {
var result = mods
@@ -1440,8 +1440,8 @@ trait Parsers requires SyntaxAnalyzer {
*/
def accessModifierOpt(): Modifiers = normalize {
in.token match {
- case PRIVATE => accessQualifierOpt(Modifiers(Flags.PRIVATE))
- case PROTECTED => accessQualifierOpt(Modifiers(Flags.PROTECTED))
+ case PRIVATE => in.nextToken(); accessQualifierOpt(Modifiers(Flags.PRIVATE))
+ case PROTECTED => in.nextToken(); accessQualifierOpt(Modifiers(Flags.PROTECTED))
case _ => NoMods
}
}
@@ -1450,7 +1450,6 @@ trait Parsers requires SyntaxAnalyzer {
* Modifier ::= LocalModifier
* | AccessModifier
* | override
- * | (private | protected) [ "[" Id | this "]" ]
*/
def modifiers(): Modifiers = normalize {
def loop(mods: Modifiers): Modifiers = in.token match {