summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorIngo Maier <ingo.maier@epfl.ch>2009-03-30 14:15:43 +0000
committerIngo Maier <ingo.maier@epfl.ch>2009-03-30 14:15:43 +0000
commit55d14ccdd60e4387562164c237ae792f5b52a752 (patch)
tree189aa482e634657d08348d19d02ece3216ac3c34 /src
parent8ffa7ff6be9b00e444432312823591360c788227 (diff)
downloadscala-55d14ccdd60e4387562164c237ae792f5b52a752.tar.gz
scala-55d14ccdd60e4387562164c237ae792f5b52a752.tar.bz2
scala-55d14ccdd60e4387562164c237ae792f5b52a752.zip
Initialization order strikes again. Fix for #1811
Diffstat (limited to 'src')
-rw-r--r--src/compiler/scala/tools/nsc/ScalaDoc.scala17
1 files changed, 8 insertions, 9 deletions
diff --git a/src/compiler/scala/tools/nsc/ScalaDoc.scala b/src/compiler/scala/tools/nsc/ScalaDoc.scala
index ba985d9094..092f02a259 100644
--- a/src/compiler/scala/tools/nsc/ScalaDoc.scala
+++ b/src/compiler/scala/tools/nsc/ScalaDoc.scala
@@ -45,13 +45,13 @@ object ScalaDoc {
}
try {
object compiler extends Global(command.settings, reporter) {
- override protected def computeInternalPhases() {
- phasesSet += syntaxAnalyzer
- phasesSet += analyzer.namerFactory
- phasesSet += analyzer.typerFactory
- }
- override val onlyPresentation = true
- }
+ override protected def computeInternalPhases() {
+ phasesSet += syntaxAnalyzer
+ phasesSet += analyzer.namerFactory
+ phasesSet += analyzer.typerFactory
+ }
+ override def onlyPresentation = true
+ }
if (reporter.hasErrors) {
reporter.flush()
return
@@ -76,7 +76,7 @@ object ScalaDoc {
val generator = new DefaultDocDriver {
lazy val global: compiler.type = compiler
lazy val settings = docSettings
- }
+ }
generator.process(run.units)
reporter.printSummary()
}
@@ -93,5 +93,4 @@ object ScalaDoc {
process(args)
exit(if (reporter.hasErrors) 1 else 0)
}
-
}