Skip to content

Commit 0628582

Browse files
committed
use reference to the phase name in ErrorMessagesTests
1 parent 3ed711b commit 0628582

File tree

4 files changed

+106
-125
lines changed

4 files changed

+106
-125
lines changed

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

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,45 +4,32 @@ import dotty.tools.dotc.CompilationUnit
44
import dotty.tools.dotc.ast.Trees.{PackageDef, ValDef}
55
import dotty.tools.dotc.ast.tpd
66
import dotty.tools.dotc.core.Phases.Phase
7-
import dotty.tools.dotc.core.Names.TypeName
87

98
import scala.collection.mutable
10-
import scala.collection.JavaConverters._
11-
import scala.tools.asm.{ClassVisitor, CustomAttr, FieldVisitor, MethodVisitor}
9+
import scala.tools.asm.CustomAttr
1210
import scala.tools.nsc.backend.jvm._
13-
import dotty.tools.dotc
14-
import dotty.tools.dotc.transform.Erasure
1511
import dotty.tools.dotc.transform.SymUtils._
1612
import dotty.tools.dotc.interfaces
1713
import java.util.Optional
1814

19-
import scala.reflect.ClassTag
2015
import dotty.tools.dotc.core._
2116
import dotty.tools.dotc.sbt.ExtractDependencies
22-
import Periods._
23-
import SymDenotations._
2417
import Contexts._
25-
import Types._
2618
import Symbols._
27-
import Denotations._
2819
import Decorators._
2920

30-
import Phases._
31-
import java.lang.AssertionError
32-
import java.io.{DataOutputStream, File => JFile}
33-
import java.nio.file.{Files, FileSystem, FileSystems, Path => JPath}
21+
import java.io.DataOutputStream
3422

35-
import dotty.tools.io.{Directory, File, Jar}
23+
import dotty.tools.io.Directory
3624

3725
import scala.tools.asm
3826
import scala.tools.asm.tree._
39-
import dotty.tools.dotc.util.{DotClass, Positions}
4027
import tpd._
4128
import StdNames._
4229
import dotty.tools.io._
4330

4431
class GenBCode extends Phase {
45-
def phaseName: String = "genBCode"
32+
def phaseName: String = GenBCode.name
4633
private val entryPoints = new mutable.HashSet[Symbol]()
4734
def registerEntryPoint(sym: Symbol) = entryPoints += sym
4835

@@ -80,6 +67,10 @@ class GenBCode extends Phase {
8067
}
8168
}
8269

70+
object GenBCode {
71+
val name: String = "genBCode"
72+
}
73+
8374
class GenBCodePipeline(val entryPoints: List[Symbol], val int: DottyBackendInterface)(implicit val ctx: Context) extends BCodeSyncAndTry {
8475

8576
var tree: Tree = _

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

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,12 @@ package dotty.tools.dotc
22
package transform
33

44
import core._
5-
import Names._
6-
import StdNames.nme
7-
import Types._
85
import dotty.tools.dotc.transform.MegaPhase._
9-
import ast.Trees._
106
import Flags._
117
import Contexts.Context
128
import Symbols._
13-
import Constants._
14-
import Denotations._
15-
import SymDenotations._
16-
import Decorators.StringInterpolators
179
import dotty.tools.dotc.ast.tpd
18-
import dotty.tools.dotc.core.Annotations.ConcreteAnnotation
19-
import scala.collection.mutable
20-
import DenotTransformers._
21-
import Names.Name
22-
import NameOps._
2310
import Decorators._
24-
import TypeUtils._
2511
import reporting.diagnostic.messages.{MissingCompanionForStatic, StaticFieldsOnlyAllowedInObjects}
2612

2713
/** A transformer that check that requirements of Static fields\methods are implemented:
@@ -39,7 +25,7 @@ import reporting.diagnostic.messages.{MissingCompanionForStatic, StaticFieldsOnl
3925
class CheckStatic extends MiniPhase {
4026
import ast.tpd._
4127

42-
override def phaseName = "checkStatic"
28+
override def phaseName = CheckStatic.name
4329

4430
override def transformTemplate(tree: tpd.Template)(implicit ctx: Context): tpd.Tree = {
4531
val defns = tree.body.collect{case t: ValOrDefDef => t}
@@ -91,3 +77,7 @@ class CheckStatic extends MiniPhase {
9177
} else tree
9278
}
9379
}
80+
81+
object CheckStatic {
82+
val name = "checkStatic"
83+
}

compiler/src/dotty/tools/dotc/typer/RefChecks.scala

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@ package typer
33

44
import transform._
55
import core._
6-
import config._
7-
import Symbols._, SymDenotations._, Types._, Contexts._, Decorators._, Flags._, Names._, NameOps._
8-
import StdNames._, Denotations._, Scopes._, Constants.Constant, SymUtils._
6+
import Symbols._, Types._, Contexts._, Flags._, Names._, NameOps._
7+
import StdNames._, Denotations._, SymUtils._
98
import NameKinds.DefaultGetterName
109
import Annotations._
1110
import util.Positions._
@@ -16,17 +15,17 @@ import Trees._
1615
import MegaPhase._
1716
import config.Printers.{checks, noPrinter}
1817
import util.DotClass
19-
import scala.util.{Try, Success, Failure}
20-
import config.{ScalaVersion, NoScalaVersion}
18+
import scala.util.Failure
19+
import config.NoScalaVersion
2120
import Decorators._
2221
import typer.ErrorReporting._
23-
import DenotTransformers._
2422

2523
object RefChecks {
2624
import tpd._
27-
import reporting.diagnostic.Message
2825
import reporting.diagnostic.messages._
2926

27+
val name = "refchecks"
28+
3029
private val defaultMethodFilter = new NameFilter {
3130
def apply(pre: Type, name: Name)(implicit ctx: Context): Boolean = name.is(DefaultGetterName)
3231
}
@@ -910,7 +909,7 @@ class RefChecks extends MiniPhase { thisPhase =>
910909
import reporting.diagnostic.messages.ForwardReferenceExtendsOverDefinition
911910
import dotty.tools.dotc.reporting.diagnostic.messages.UnboundPlaceholderParameter
912911

913-
override def phaseName: String = "refchecks"
912+
override def phaseName: String = RefChecks.name
914913

915914
// Needs to run after ElimRepeated for override checks involving varargs methods
916915
override def runsAfter = Set(ElimRepeated.name)

0 commit comments

Comments
 (0)