Skip to content

Commit a51f0fb

Browse files
committed
Rename SuperPhase -> MegaPhase
and add @switch annotation to core match in it.
1 parent 70b46a8 commit a51f0fb

File tree

73 files changed

+84
-712
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+84
-712
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package dotty.tools.backend.jvm
33
import dotty.tools.dotc.ast.tpd
44
import dotty.tools.dotc.core.Contexts.Context
55
import dotty.tools.dotc.core.Types
6-
import dotty.tools.dotc.transform.SuperPhase._
6+
import dotty.tools.dotc.transform.MegaPhase._
77
import dotty.tools.dotc.ast.tpd
88
import dotty.tools.dotc
99
import dotty.tools.dotc.backend.jvm.DottyPrimitives

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import dotty.tools.dotc.ast.Trees._
55
import dotty.tools.dotc.core.Contexts.Context
66
import dotty.tools.dotc.core.Symbols._
77
import dotty.tools.dotc.core.Flags.Trait
8-
import dotty.tools.dotc.transform.SuperPhase.MiniPhase
8+
import dotty.tools.dotc.transform.MegaPhase.MiniPhase
99

1010
/** Collect all super calls to trait members.
1111
*

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import dotty.tools.dotc.ast.Trees.Thicket
44
import dotty.tools.dotc.ast.{Trees, tpd}
55
import dotty.tools.dotc.core.Contexts.Context
66
import dotty.tools.dotc.core.Types
7-
import dotty.tools.dotc.transform.SuperPhase._
7+
import dotty.tools.dotc.transform.MegaPhase._
88
import dotty.tools.dotc
99
import dotty.tools.dotc.backend.jvm.DottyPrimitives
1010
import dotty.tools.dotc.core.Flags.FlagSet

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import Symbols._
66
import Contexts._, Names._, Phases._, printing.Texts._, printing.Printer, printing.Showable
77
import util.Positions.Position, util.SourcePosition
88
import collection.mutable.ListBuffer
9-
import dotty.tools.dotc.transform.SuperPhase
9+
import dotty.tools.dotc.transform.MegaPhase
1010
import ast.tpd._
1111
import scala.language.implicitConversions
1212
import printing.Formatting._
@@ -152,7 +152,7 @@ object Decorators {
152152
*/
153153
implicit class PhaseListDecorator(val names: List[String]) extends AnyVal {
154154
def containsPhase(phase: Phase): Boolean = phase match {
155-
case phase: SuperPhase => phase.miniPhases.exists(containsPhase)
155+
case phase: MegaPhase => phase.miniPhases.exists(containsPhase)
156156
case _ =>
157157
names exists { name =>
158158
name == "all" || {

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import Denotations._
1111
import Decorators._
1212
import config.Printers.config
1313
import scala.collection.mutable.{ListBuffer, ArrayBuffer}
14-
import dotty.tools.dotc.transform.SuperPhase._
14+
import dotty.tools.dotc.transform.MegaPhase._
1515
import dotty.tools.dotc.transform._
1616
import Periods._
1717
import typer.{FrontEnd, RefChecks}
@@ -111,7 +111,7 @@ object Phases {
111111
assert(false, s"Only tree transforms can be squashed, ${phase.phaseName} can not be squashed")
112112
}
113113
}
114-
val superPhase = new SuperPhase(filteredPhaseBlock.asInstanceOf[List[MiniPhase]].toArray)
114+
val superPhase = new MegaPhase(filteredPhaseBlock.asInstanceOf[List[MiniPhase]].toArray)
115115
prevPhases ++= filteredPhaseBlock.map(_.getClazz)
116116
superPhase
117117
} else { // block of a single phase, no squashing
@@ -141,7 +141,7 @@ object Phases {
141141
val flatPhases = collection.mutable.ListBuffer[Phase]()
142142

143143
phasess.foreach(p => p match {
144-
case p: SuperPhase => flatPhases ++= p.miniPhases
144+
case p: MegaPhase => flatPhases ++= p.miniPhases
145145
case _ => flatPhases += p
146146
})
147147

@@ -169,7 +169,7 @@ object Phases {
169169
while (i < phasess.length) {
170170
val phase = phasess(i)
171171
phase match {
172-
case p: SuperPhase =>
172+
case p: MegaPhase =>
173173
val miniPhases = p.miniPhases
174174
miniPhases.foreach{ phase =>
175175
checkRequirements(phase)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package dotty.tools.dotc
22
package transform
33

44
import core._
5-
import SuperPhase._
5+
import MegaPhase._
66
import Contexts.Context
77
import Flags._
88
import SymUtils._

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package dotty.tools.dotc
22
package transform
33

44
import core._
5-
import SuperPhase._
5+
import MegaPhase._
66
import Contexts.Context
77
import Flags._
88
import SymUtils._

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package dotty.tools.dotc
22
package transform
33

4-
import SuperPhase._
4+
import MegaPhase._
55
import core.DenotTransformers._
66
import core.Symbols._
77
import core.Contexts._

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package transform
33

44
import core._
55
import Names._
6-
import dotty.tools.dotc.transform.SuperPhase._
6+
import dotty.tools.dotc.transform.MegaPhase._
77
import ast.Trees._
88
import Flags._
99
import Types._

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import core._
55
import Names._
66
import StdNames.nme
77
import Types._
8-
import dotty.tools.dotc.transform.SuperPhase._
8+
import dotty.tools.dotc.transform.MegaPhase._
99
import ast.Trees._
1010
import Flags._
1111
import Contexts.Context

0 commit comments

Comments
 (0)