- Removed HTMLGeneratorPhase and HTMLGeneratorP...

- Removed HTMLGeneratorPhase and HTMLGeneratorPhases

4 files changed, 23 insertions, 86 deletions

diff --git a/config/list/scaladoc.lst b/config/list/scaladoc.lst
index b7c74f3432..2b9a805499 100644
--- a/config/list/scaladoc.lst
+++ b/config/list/scaladoc.lst
@@ -7,8 +7,6 @@ Comment.java
 # DocModule.java
 HTMLGenerator.java
 HTMLGeneratorCommand.java
-HTMLGeneratorPhase.scala
-HTMLGeneratorPhases.scala
 HTTPServer.java
 Location.java
 MLType.scala
diff --git a/sources/scala/tools/scaladoc/HTMLGeneratorPhase.scala b/sources/scala/tools/scaladoc/HTMLGeneratorPhase.scala
deleted file mode 100755
index 05f7eb72de..0000000000
--- a/sources/scala/tools/scaladoc/HTMLGeneratorPhase.scala
+++ /dev/null
@@ -1,31 +0,0 @@
-/*     ____ ____  ____ ____  ______                                     *\
-**    / __// __ \/ __// __ \/ ____/    SOcos COmpiles Scala             **
-**  __\_ \/ /_/ / /__/ /_/ /\_ \       (c) 2002, LAMP/EPFL              **
-** /_____/\____/\___/\____/____/                                        **
-\*                                                                      */
-
-// $Id$
-
-import scalac.Global;
-import scalac.Phase;
-import scalac.PhaseDescriptor;
-import scalac.CompilationUnit;
-import scalac.util.Debug;
-
-package scala.tools.scaladoc {
-
-class HTMLGeneratorPhase(global: Global, descriptor: PhaseDescriptor)
-  extends Phase(global, descriptor)
-{
-
-  override def apply(units: Array[CompilationUnit]): Unit =
-    (new HTMLGenerator(global) {
-      def newTypeIso(global: Global): TypeIsomorphism = new ScalaML(global);
-    }).apply();
-
-  override def apply(unit: CompilationUnit): Unit =
-    throw Debug.abort("!!!");
-
-}
-
-}
diff --git a/sources/scala/tools/scaladoc/HTMLGeneratorPhases.scala b/sources/scala/tools/scaladoc/HTMLGeneratorPhases.scala
deleted file mode 100644
index ad4dd9d85a..0000000000
--- a/sources/scala/tools/scaladoc/HTMLGeneratorPhases.scala
+++ /dev/null
@@ -1,50 +0,0 @@
-/*     ____ ____  ____ ____  ______                                     *\
-**    / __// __ \/ __// __ \/ ____/    SOcos COmpiles Scala             **
-**  __\_ \/ /_/ / /__/ /_/ /\_ \       (c) 2002, LAMP/EPFL              **
-** /_____/\____/\___/\____/____/                                        **
-\*                                                                      */
-
-// $Id$
-
-import scalac.PhaseDescriptor;
-import scalac.util.Debug;
-
-package scala.tools.scaladoc {
-
-/**
- * The class <code>HTMLGeneratorPhases</code> defines the set
- * of processing phases belonging the the HTML generator tool.
- */
-class HTMLGeneratorPhases extends scalac.CompilerPhases {
-
-  //##########################################################################
-  // Public Fields
-
-  /** The phase descriptor of the HTML generator. */
-  val HTMLGENERATOR =
-    try {
-      new PhaseDescriptor(
-        "html generator",
-        "generate html documentation",
-        "generating html",
-        Class.forName("scala.tools.scaladoc.HTMLGeneratorPhase$class"));
-    } catch {
-      case exception =>
-        throw Debug.abort(exception);
-    }
-
-  /** Instance initializer */
-  {
-    val pos = insertAfter(HTMLGENERATOR, ANALYZER);
-    val array = phases();
-    // we skip all phases between HTMLGENERATOR and TERMINAL.
-    var i = pos + 1;
-    while (i < array.length - 1) {
-      array(i).addSkipFlag();
-      i = i + 1;
-    }
-  }
-
-  //##########################################################################
-}
-}
diff --git a/sources/scala/tools/scaladoc/Main.scala b/sources/scala/tools/scaladoc/Main.scala
index 763fa8002c..8bce80a250 100644
--- a/sources/scala/tools/scaladoc/Main.scala
+++ b/sources/scala/tools/scaladoc/Main.scala
@@ -6,7 +6,8 @@
 
 // $Id$
 
-import scala.tools.scalac.Global;
+import scalac.{Global => scalac_Global};
+import scala.tools.scalac.{Global, CompilerPhases};
 import scala.tools.util.Reporter;
 
 package scala.tools.scaladoc {
@@ -27,11 +28,30 @@ object Main {
 
   def main(args: Array[String]): Unit = {
     val reporter = new Reporter();
-    val command = new HTMLGeneratorCommand(
-      PRODUCT, VERSION, reporter, new HTMLGeneratorPhases());
+    val phases = new CompilerPhases(); {
+      // we skip all phases between ANALYZER and TERMINAL.
+      val array = phases.phases();
+      var i = 0;
+      var skip = false;
+      while (i < array.length - 1) {
+        if (skip)
+          array(i).addSkipFlag();
+        else
+          skip = array(i) == phases.ANALYZER;
+        i = i + 1;
+      }
+    }
+    val command = new HTMLGeneratorCommand(PRODUCT, VERSION, reporter, phases);
     if (command.parse(args) && command.files.list.size() > 0) {
       val global = new Global(command);
       global.compile(command.files.toArray(), false);
+      if (reporter.errors() == 0) {
+        val generator = new HTMLGenerator(global) {
+          def newTypeIso(global: scalac_Global): TypeIsomorphism =
+            new ScalaML(global);
+        }
+        generator.apply();
+      }
       global.stop("total");
       global.reporter.printSummary();
     }