Remove old Staging implementation

Author: nicolasstucki

compiler/src/dotty/tools/dotc/Compiler.scala

@@ -38,8 +38,7 @@ class Compiler {
   protected def frontendPhases: List[List[Phase]] =
     List(new FrontEnd) ::           // Compiler frontend: scanner, parser, namer, typer
     List(new YCheckPositions) ::    // YCheck positions
-    List(new Staging2) ::            // Check PCP, heal quoted types and expand macros
-    // List(new Staging) ::            // Check PCP, heal quoted types and expand macros
+    List(new Staging) ::            // Check PCP, heal quoted types and expand macros
     List(new sbt.ExtractDependencies) :: // Sends information on classes' dependencies to sbt via callbacks
     List(new semanticdb.ExtractSemanticDB) :: // Extract info into .semanticdb files
     List(new PostTyper) ::          // Additional checks and cleanups after type checking

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

@@ -242,31 +242,31 @@ class PCPCheckAndHeal2(@constructorOnly ictx: Context) extends TreeMapWithStages
 object PCPCheckAndHeal2 {
   import tpd._
 
-  // class QuoteTypeTags(span: Span)(using Context) {
-
-  //   private val tags = collection.mutable.LinkedHashMap.empty[Symbol, TypeDef]
-
-  //   def getTagRef(spliced: TermRef): TypeRef = {
-  //     val typeDef = tags.getOrElseUpdate(spliced.symbol, mkTagSymbolAndAssignType(spliced))
-  //     typeDef.symbol.typeRef
-  //   }
-
-  //   def getTypeTags: List[TypeDef] = tags.valuesIterator.toList
-
-  //   private def mkTagSymbolAndAssignType(spliced: TermRef): TypeDef = {
-  //     val splicedTree = tpd.ref(spliced).withSpan(span)
-  //     val rhs = splicedTree.select(tpnme.splice).withSpan(span)
-  //     val alias = ctx.typeAssigner.assignType(untpd.TypeBoundsTree(rhs, rhs), rhs, rhs, EmptyTree)
-  //     val local = ctx.newSymbol(
-  //       owner = ctx.owner,
-  //       name = UniqueName.fresh((splicedTree.symbol.name.toString + "$_").toTermName).toTypeName,
-  //       flags = Synthetic,
-  //       info = TypeAlias(splicedTree.tpe.select(tpnme.splice)),
-  //       coord = span).asType
-  //     local.addAnnotation(Annotation(defn.InternalQuoted_QuoteTypeTagAnnot))
-  //     ctx.typeAssigner.assignType(untpd.TypeDef(local.name, alias), local)
-  //   }
-
-  // }
+  class QuoteTypeTags(span: Span)(using Context) {
+
+    private val tags = collection.mutable.LinkedHashMap.empty[Symbol, TypeDef]
+
+    def getTagRef(spliced: TermRef): TypeRef = {
+      val typeDef = tags.getOrElseUpdate(spliced.symbol, mkTagSymbolAndAssignType(spliced))
+      typeDef.symbol.typeRef
+    }
+
+    def getTypeTags: List[TypeDef] = tags.valuesIterator.toList
+
+    private def mkTagSymbolAndAssignType(spliced: TermRef): TypeDef = {
+      val splicedTree = tpd.ref(spliced).withSpan(span)
+      val rhs = splicedTree.select(tpnme.splice).withSpan(span)
+      val alias = ctx.typeAssigner.assignType(untpd.TypeBoundsTree(rhs, rhs), rhs, rhs, EmptyTree)
+      val local = ctx.newSymbol(
+        owner = ctx.owner,
+        name = UniqueName.fresh((splicedTree.symbol.name.toString + "$_").toTermName).toTypeName,
+        flags = Synthetic,
+        info = TypeAlias(splicedTree.tpe.select(tpnme.splice)),
+        coord = span).asType
+      local.addAnnotation(Annotation(defn.InternalQuoted_QuoteTypeTagAnnot))
+      ctx.typeAssigner.assignType(untpd.TypeDef(local.name, alias), local)
+    }
+
+  }
 
 }

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

@@ -29,11 +29,11 @@ import scala.annotation.constructorOnly
  *
  *  Type healing consists in transforming a phase inconsistent type `T` into `${ implicitly[Type[T]] }`.
  */
-class Staging2 extends MacroTransform {
+class Staging extends MacroTransform {
   import tpd._
   import Staging._
 
-  override def phaseName: String = Staging2.name
+  override def phaseName: String = Staging.name
 
   override def allowsImplicitSearch: Boolean = true
 
@@ -82,6 +82,6 @@ class Staging2 extends MacroTransform {
 }
 
 
-object Staging2 {
+object Staging {
   val name: String = "staging2"
 }