diff options
| author | Paul Phillips <paulp@improving.org> | 2010-10-11 05:58:45 +0000 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2010-10-11 05:58:45 +0000 |
| commit | a350673750d431c4f6159c908e3aca4af43057c4 (patch) | |
| tree | b7d38fcbee86031e370d4a2a1ce173a2feedfaee /src/compiler/scala/tools/nsc/ast/parser/Parsers.scala | |
| parent | 487e5bf895cde949c6c057e029c0bf96c6232431 (diff) | |
| download | scala-a350673750d431c4f6159c908e3aca4af43057c4.tar.gz scala-a350673750d431c4f6159c908e3aca4af43057c4.tar.bz2 scala-a350673750d431c4f6159c908e3aca4af43057c4.zip | |
Some cleanups in the compiler source.
eliminated the import of ambiguously named classes from e.g.
collection.mutable, obeyed a todo in the parser regarding dropping
lbracket from statement starting tokens. No review.
Diffstat (limited to 'src/compiler/scala/tools/nsc/ast/parser/Parsers.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/ast/parser/Parsers.scala | 5 |
1 files changed, 2 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 392afcc14e..6f41b3ac47 100644 --- a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala +++ b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala @@ -1467,7 +1467,7 @@ self => * | val Pattern1 `=' Expr */ def enumerators(): List[Enumerator] = { - val newStyle = in.token != VAL // todo: deprecate old style + val newStyle = in.token != VAL if (!newStyle) deprecationWarning(in.offset, "for (val x <- ... ) has been deprecated; use for (x <- ... ) instead") val enums = new ListBuffer[Enumerator] @@ -2598,7 +2598,6 @@ self => in.token == TRAIT || in.token == OBJECT || in.token == CASEOBJECT || - in.token == LBRACKET || //todo: remove in.token == AT || isModifier) { stats ++= joinComment(List(topLevelTmplDef)) @@ -2649,7 +2648,7 @@ self => } else if (isExprIntro) { in.flushDoc stats += statement(InTemplate) - } else if (isDefIntro || isModifier || in.token == LBRACKET /*todo: remove */ || in.token == AT) { + } else if (isDefIntro || isModifier || in.token == AT) { stats ++= joinComment(nonLocalDefOrDcl) } else if (!isStatSep) { syntaxErrorOrIncomplete("illegal start of definition", true) |