Rename SuperPhase -> MegaPhase

and add @switch annotation to core match in it.

Author: odersky

compiler/src/dotty/tools/backend/jvm/CollectEntryPoints.scala

@@ -3,7 +3,7 @@ package dotty.tools.backend.jvm
 import dotty.tools.dotc.ast.tpd
 import dotty.tools.dotc.core.Contexts.Context
 import dotty.tools.dotc.core.Types
-import dotty.tools.dotc.transform.SuperPhase._
+import dotty.tools.dotc.transform.MegaPhase._
 import dotty.tools.dotc.ast.tpd
 import dotty.tools.dotc
 import dotty.tools.dotc.backend.jvm.DottyPrimitives

compiler/src/dotty/tools/backend/jvm/CollectSuperCalls.scala

@@ -5,7 +5,7 @@ import dotty.tools.dotc.ast.Trees._
 import dotty.tools.dotc.core.Contexts.Context
 import dotty.tools.dotc.core.Symbols._
 import dotty.tools.dotc.core.Flags.Trait
-import dotty.tools.dotc.transform.SuperPhase.MiniPhase
+import dotty.tools.dotc.transform.MegaPhase.MiniPhase
 
 /** Collect all super calls to trait members.
  *

compiler/src/dotty/tools/backend/jvm/LabelDefs.scala

@@ -4,7 +4,7 @@ import dotty.tools.dotc.ast.Trees.Thicket
 import dotty.tools.dotc.ast.{Trees, tpd}
 import dotty.tools.dotc.core.Contexts.Context
 import dotty.tools.dotc.core.Types
-import dotty.tools.dotc.transform.SuperPhase._
+import dotty.tools.dotc.transform.MegaPhase._
 import dotty.tools.dotc
 import dotty.tools.dotc.backend.jvm.DottyPrimitives
 import dotty.tools.dotc.core.Flags.FlagSet

compiler/src/dotty/tools/dotc/core/Decorators.scala

@@ -6,7 +6,7 @@ import Symbols._
 import Contexts._, Names._, Phases._, printing.Texts._, printing.Printer, printing.Showable
 import util.Positions.Position, util.SourcePosition
 import collection.mutable.ListBuffer
-import dotty.tools.dotc.transform.SuperPhase
+import dotty.tools.dotc.transform.MegaPhase
 import ast.tpd._
 import scala.language.implicitConversions
 import printing.Formatting._
@@ -152,7 +152,7 @@ object Decorators {
    */
   implicit class PhaseListDecorator(val names: List[String]) extends AnyVal {
     def containsPhase(phase: Phase): Boolean = phase match {
-      case phase: SuperPhase => phase.miniPhases.exists(containsPhase)
+      case phase: MegaPhase => phase.miniPhases.exists(containsPhase)
       case _ =>
         names exists { name =>
           name == "all" || {

compiler/src/dotty/tools/dotc/core/Phases.scala

@@ -11,7 +11,7 @@ import Denotations._
 import Decorators._
 import config.Printers.config
 import scala.collection.mutable.{ListBuffer, ArrayBuffer}
-import dotty.tools.dotc.transform.SuperPhase._
+import dotty.tools.dotc.transform.MegaPhase._
 import dotty.tools.dotc.transform._
 import Periods._
 import typer.{FrontEnd, RefChecks}
@@ -111,7 +111,7 @@ object Phases {
                     assert(false, s"Only tree transforms can be squashed, ${phase.phaseName} can not be squashed")
                 }
               }
-              val superPhase = new SuperPhase(filteredPhaseBlock.asInstanceOf[List[MiniPhase]].toArray)
+              val superPhase = new MegaPhase(filteredPhaseBlock.asInstanceOf[List[MiniPhase]].toArray)
               prevPhases ++= filteredPhaseBlock.map(_.getClazz)
               superPhase
             } else { // block of a single phase, no squashing
@@ -141,7 +141,7 @@ object Phases {
       val flatPhases = collection.mutable.ListBuffer[Phase]()
 
       phasess.foreach(p => p match {
-        case p: SuperPhase => flatPhases ++= p.miniPhases
+        case p: MegaPhase => flatPhases ++= p.miniPhases
         case _ => flatPhases += p
       })
 
@@ -169,7 +169,7 @@ object Phases {
       while (i < phasess.length) {
         val phase = phasess(i)
         phase match {
-          case p: SuperPhase =>
+          case p: MegaPhase =>
             val miniPhases = p.miniPhases
             miniPhases.foreach{ phase =>
               checkRequirements(phase)

compiler/src/dotty/tools/dotc/transform/ArrayConstructors.scala

@@ -2,7 +2,7 @@ package dotty.tools.dotc
 package transform
 
 import core._
-import SuperPhase._
+import MegaPhase._
 import Contexts.Context
 import Flags._
 import SymUtils._

compiler/src/dotty/tools/dotc/transform/AugmentScala2Traits.scala

@@ -2,7 +2,7 @@ package dotty.tools.dotc
 package transform
 
 import core._
-import SuperPhase._
+import MegaPhase._
 import Contexts.Context
 import Flags._
 import SymUtils._

compiler/src/dotty/tools/dotc/transform/CapturedVars.scala

@@ -1,7 +1,7 @@
 package dotty.tools.dotc
 package transform
 
-import SuperPhase._
+import MegaPhase._
 import core.DenotTransformers._
 import core.Symbols._
 import core.Contexts._

compiler/src/dotty/tools/dotc/transform/CheckReentrant.scala

@@ -3,7 +3,7 @@ package transform
 
 import core._
 import Names._
-import dotty.tools.dotc.transform.SuperPhase._
+import dotty.tools.dotc.transform.MegaPhase._
 import ast.Trees._
 import Flags._
 import Types._

compiler/src/dotty/tools/dotc/transform/CheckStatic.scala

@@ -5,7 +5,7 @@ import core._
 import Names._
 import StdNames.nme
 import Types._
-import dotty.tools.dotc.transform.SuperPhase._
+import dotty.tools.dotc.transform.MegaPhase._
 import ast.Trees._
 import Flags._
 import Contexts.Context

compiler/src/dotty/tools/dotc/transform/ClassOf.scala

@@ -7,7 +7,7 @@ import core.Contexts.Context
 import core.StdNames.nme
 import core.Symbols.{defn,TermSymbol}
 import core.TypeErasure
-import SuperPhase._
+import MegaPhase._
 
 /** Rewrite `classOf` calls as follow:
  *

compiler/src/dotty/tools/dotc/transform/CollectEntryPoints.scala

@@ -8,7 +8,7 @@ import dotty.tools.dotc.core.Symbols.NoSymbol
 import scala.annotation.tailrec
 import dotty.tools.dotc.core._
 import Symbols._
-import dotty.tools.dotc.transform.SuperPhase._
+import dotty.tools.dotc.transform.MegaPhase._
 import dotty.tools.dotc.ast.tpd
 import dotty.tools.dotc.core.Contexts.Context
 import scala.collection.mutable

compiler/src/dotty/tools/dotc/transform/Constructors.scala

@@ -2,7 +2,7 @@ package dotty.tools.dotc
 package transform
 
 import core._
-import SuperPhase._
+import MegaPhase._
 import dotty.tools.dotc.ast.tpd._
 import dotty.tools.dotc.core.Contexts.Context
 import dotty.tools.dotc.core.StdNames._

compiler/src/dotty/tools/dotc/transform/CrossCastAnd.scala

@@ -4,7 +4,7 @@ import dotty.tools.dotc.ast.tpd
 import dotty.tools.dotc.core.Contexts.Context
 import dotty.tools.dotc.core.Flags
 import dotty.tools.dotc.core.Types.{NoType, Type, AndType}
-import dotty.tools.dotc.transform.SuperPhase._
+import dotty.tools.dotc.transform.MegaPhase._
 import tpd._
 
 import scala.collection.mutable.ListBuffer

compiler/src/dotty/tools/dotc/transform/DropEmptyCompanions.scala.disabled

@@ -12,8 +12,8 @@ import ast.Trees._
 import collection.mutable
 import Decorators._
 import NameOps._
-import SuperPhase.MiniPhase
-import dotty.tools.dotc.transform.SuperPhase.TransformerInfo
+import MegaPhase.MiniPhase
+import dotty.tools.dotc.transform.MegaPhase.TransformerInfo
 
 /** Remove companion objects that are empty
  *  Lots of constraints here:

compiler/src/dotty/tools/dotc/transform/DropInlined.scala

@@ -3,7 +3,7 @@ package transform
 
 import typer.Inliner
 import core.Contexts.Context
-import SuperPhase.MiniPhase
+import MegaPhase.MiniPhase
 
 /** Drop Inlined nodes */
 class DropInlined extends MiniPhase {

compiler/src/dotty/tools/dotc/transform/ElimByName.scala

@@ -1,7 +1,7 @@
 package dotty.tools.dotc
 package transform
 
-import SuperPhase._
+import MegaPhase._
 import core._
 import DenotTransformers.InfoTransformer
 import Symbols._

compiler/src/dotty/tools/dotc/transform/ElimErasedValueType.scala

@@ -3,7 +3,7 @@ package transform
 
 import ast.{Trees, tpd}
 import core._, core.Decorators._
-import SuperPhase._, Phases.Phase
+import MegaPhase._, Phases.Phase
 import Types._, Contexts._, Constants._, Names._, NameOps._, Flags._, DenotTransformers._
 import SymDenotations._, Symbols._, StdNames._, Annotations._, Trees._, Scopes._, Denotations._
 import TypeErasure.ErasedValueType, ValueClasses._

compiler/src/dotty/tools/dotc/transform/ElimJavaPackages.scala

@@ -4,7 +4,7 @@ import dotty.tools.dotc.ast.tpd._
 import dotty.tools.dotc.core.Contexts.Context
 import dotty.tools.dotc.core.Flags._
 import dotty.tools.dotc.core.Types.{Type, TypeRef}
-import dotty.tools.dotc.transform.SuperPhase.MiniPhase
+import dotty.tools.dotc.transform.MegaPhase.MiniPhase
 
 /**
   * Eliminates syntactic references to Java packages, so that there's no chance

compiler/src/dotty/tools/dotc/transform/ElimOuterSelect.scala

@@ -2,7 +2,7 @@ package dotty.tools.dotc
 package transform
 
 import core._
-import SuperPhase.MiniPhase
+import MegaPhase.MiniPhase
 import Contexts.Context
 import Types._
 import Decorators._

compiler/src/dotty/tools/dotc/transform/ElimRepeated.scala

@@ -5,7 +5,7 @@ import core._
 import Names._
 import StdNames.nme
 import Types._
-import dotty.tools.dotc.transform.SuperPhase._
+import dotty.tools.dotc.transform.MegaPhase._
 import ast.Trees._
 import Flags._
 import Contexts.Context

compiler/src/dotty/tools/dotc/transform/ElimStaticThis.scala

@@ -7,7 +7,7 @@ import Flags._
 import dotty.tools.dotc.ast.tpd
 import dotty.tools.dotc.core.StdNames._
 import dotty.tools.dotc.core.SymDenotations.SymDenotation
-import SuperPhase.MiniPhase
+import MegaPhase.MiniPhase
 import dotty.tools.dotc.core.Types.{ThisType, TermRef}
 
 /** Replace This references to module classes in static methods by global identifiers to the

compiler/src/dotty/tools/dotc/transform/ExpandPrivate.scala

@@ -15,7 +15,7 @@ import Types._
 import collection.mutable
 import Decorators._
 import ast.Trees._
-import SuperPhase._
+import MegaPhase._
 import java.io.File.separatorChar
 
 import ValueClasses._

compiler/src/dotty/tools/dotc/transform/ExpandSAMs.scala

@@ -4,7 +4,7 @@ package transform
 import core._
 import Contexts._, Symbols._, Types._, Flags._, Decorators._, StdNames._, Constants._
 import SymDenotations.SymDenotation
-import SuperPhase._
+import MegaPhase._
 import SymUtils._
 import ast.untpd
 import ast.Trees._

compiler/src/dotty/tools/dotc/transform/ExplicitOuter.scala

@@ -1,7 +1,7 @@
 package dotty.tools.dotc
 package transform
 
-import SuperPhase._
+import MegaPhase._
 import core.DenotTransformers._
 import core.Symbols._
 import core.Contexts._

compiler/src/dotty/tools/dotc/transform/ExplicitSelf.scala

@@ -4,7 +4,7 @@ package transform
 import core._
 import Contexts.Context
 import Types._
-import SuperPhase._
+import MegaPhase._
 import Decorators._
 import ast.Trees._
 import Flags._

compiler/src/dotty/tools/dotc/transform/ExtensionMethods.scala

@@ -5,7 +5,7 @@
 package dotty.tools.dotc
 package transform
 
-import dotty.tools.dotc.transform.SuperPhase._
+import dotty.tools.dotc.transform.MegaPhase._
 import ValueClasses._
 import dotty.tools.dotc.ast.{Trees, tpd}
 import scala.collection.{ mutable, immutable }

compiler/src/dotty/tools/dotc/transform/FirstTransform.scala

@@ -5,7 +5,7 @@ import core._
 import Names._
 import dotty.tools.dotc.ast.tpd
 import dotty.tools.dotc.core.Phases.NeedsCompanions
-import dotty.tools.dotc.transform.SuperPhase._
+import dotty.tools.dotc.transform.MegaPhase._
 import ast.Trees._
 import Flags._
 import Types._

compiler/src/dotty/tools/dotc/transform/Flatten.scala

@@ -8,7 +8,7 @@ import Contexts.{Context, FreshContext}
 import Flags._
 import SymDenotations.SymDenotation
 import collection.mutable
-import SuperPhase.MiniPhase
+import MegaPhase.MiniPhase
 import util.Store
 
 /** Lift nested classes to toplevel */

compiler/src/dotty/tools/dotc/transform/FunctionXXLForwarders.scala

@@ -9,7 +9,7 @@ import Definitions._
 import DenotTransformers._
 import StdNames._
 import Symbols._
-import SuperPhase._
+import MegaPhase._
 import Types._
 
 

compiler/src/dotty/tools/dotc/transform/FunctionalInterfaces.scala

@@ -1,7 +1,7 @@
 package dotty.tools.dotc
 package transform
 
-import SuperPhase._
+import MegaPhase._
 import core.DenotTransformers._
 import core.Symbols._
 import core.Contexts._

compiler/src/dotty/tools/dotc/transform/GetClass.scala

@@ -6,7 +6,7 @@ import core.Contexts.Context
 import core.StdNames.nme
 import core.Phases.Phase
 import TypeUtils._
-import SuperPhase.MiniPhase
+import MegaPhase.MiniPhase
 
 /** Rewrite `getClass` calls as follow:
   *

compiler/src/dotty/tools/dotc/transform/Getters.scala

@@ -9,7 +9,7 @@ import Types._
 import Symbols._
 import SymUtils._
 import Constants._
-import SuperPhase._
+import MegaPhase._
 import Flags._
 import Decorators._
 import ValueClasses._

compiler/src/dotty/tools/dotc/transform/HoistSuperArgs.scala

@@ -1,7 +1,7 @@
 package dotty.tools.dotc
 package transform
 
-import SuperPhase._
+import MegaPhase._
 import core.DenotTransformers._
 import core.Symbols._
 import core.Contexts._

compiler/src/dotty/tools/dotc/transform/InterceptedMethods.scala

@@ -1,7 +1,7 @@
 package dotty.tools.dotc
 package transform
 
-import SuperPhase._
+import MegaPhase._
 import core.Denotations._
 import core.SymDenotations._
 import core.Contexts._

compiler/src/dotty/tools/dotc/transform/IsInstanceOfEvaluator.scala

@@ -2,7 +2,7 @@ package dotty.tools.dotc
 package transform
 
 import dotty.tools.dotc.util.Positions._
-import SuperPhase.MiniPhase
+import MegaPhase.MiniPhase
 import core._
 import Contexts.Context, Types._, Constants._, Decorators._, Symbols._
 import TypeUtils._, TypeErasure._, Flags._

compiler/src/dotty/tools/dotc/transform/LambdaLift.scala

@@ -1,7 +1,7 @@
 package dotty.tools.dotc
 package transform
 
-import SuperPhase._
+import MegaPhase._
 import core.DenotTransformers._
 import core.Symbols._
 import core.Contexts._

compiler/src/dotty/tools/dotc/transform/LazyVals.scala

@@ -14,7 +14,7 @@ import NameKinds._
 import StdNames.nme
 import rewrite.Rewrites.patch
 import util.Positions.Position
-import dotty.tools.dotc.transform.SuperPhase._
+import dotty.tools.dotc.transform.MegaPhase._
 import dotty.tools.dotc.ast.Trees._
 import dotty.tools.dotc.ast.{untpd, tpd}
 import dotty.tools.dotc.core.Constants.Constant

compiler/src/dotty/tools/dotc/transform/LiftTry.scala

@@ -1,7 +1,7 @@
 package dotty.tools.dotc
 package transform
 
-import SuperPhase._
+import MegaPhase._
 import core.DenotTransformers._
 import core.Symbols._
 import core.Contexts._

compiler/src/dotty/tools/dotc/transform/LinkScala2Impls.scala

@@ -2,7 +2,7 @@ package dotty.tools.dotc
 package transform
 
 import core._
-import SuperPhase._
+import MegaPhase._
 import Contexts.Context
 import Flags._
 import SymUtils._