diff options
author | michelou <michelou@epfl.ch> | 2009-02-24 14:14:01 +0000 |
---|---|---|
committer | michelou <michelou@epfl.ch> | 2009-02-24 14:14:01 +0000 |
commit | 0f81e1686bef598c5353a7187a332f3008492f29 (patch) | |
tree | 875ecf733730c066f016f44a1e3d8751b07f5d39 /src/compiler/scala/tools/nsc | |
parent | 57e95eb403c325594e17c6f84852bbdc49954fd6 (diff) | |
download | scala-0f81e1686bef598c5353a7187a332f3008492f29.tar.gz scala-0f81e1686bef598c5353a7187a332f3008492f29.tar.bz2 scala-0f81e1686bef598c5353a7187a332f3008492f29.zip |
removed deprecated for-loops and units
Diffstat (limited to 'src/compiler/scala/tools/nsc')
-rw-r--r-- | src/compiler/scala/tools/nsc/MainTokenMetric.scala | 6 | ||||
-rw-r--r-- | src/compiler/scala/tools/nsc/ScalaDoc.scala | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/compiler/scala/tools/nsc/MainTokenMetric.scala b/src/compiler/scala/tools/nsc/MainTokenMetric.scala index 5b88700dfb..20b4b2c48b 100644 --- a/src/compiler/scala/tools/nsc/MainTokenMetric.scala +++ b/src/compiler/scala/tools/nsc/MainTokenMetric.scala @@ -15,7 +15,7 @@ object MainTokenMetric { private var reporter: ConsoleReporter = _ - def tokenMetric(compiler: Global, fnames: List[String]): unit = { + def tokenMetric(compiler: Global, fnames: List[String]) { import compiler.CompilationUnit import compiler.syntaxAnalyzer.UnitScanner import ast.parser.Tokens.EOF @@ -24,8 +24,8 @@ object MainTokenMetric { val s = new UnitScanner(new CompilationUnit(compiler.getSourceFile(source))) s.nextToken var i = 0 - while(s.token != EOF) { - i = i + 1 + while (s.token != EOF) { + i += 1 s.nextToken } Console.println(i.toString + " " + source.toString()) diff --git a/src/compiler/scala/tools/nsc/ScalaDoc.scala b/src/compiler/scala/tools/nsc/ScalaDoc.scala index bb41e0fa04..ba985d9094 100644 --- a/src/compiler/scala/tools/nsc/ScalaDoc.scala +++ b/src/compiler/scala/tools/nsc/ScalaDoc.scala @@ -14,8 +14,8 @@ import scala.tools.nsc.reporters.{Reporter, ConsoleReporter} import scala.tools.nsc.util.FakePos //{Position} -/** The main class for scaladoc, a frontend for the Scala compiler - * that generates documentation from source files. +/** The main class for scaladoc, a front-end for the Scala compiler + * that generates documentation from source files. */ object ScalaDoc { @@ -45,7 +45,7 @@ object ScalaDoc { } try { object compiler extends Global(command.settings, reporter) { - override protected def computeInternalPhases() : Unit = { + override protected def computeInternalPhases() { phasesSet += syntaxAnalyzer phasesSet += analyzer.namerFactory phasesSet += analyzer.typerFactory |