Extract QuoteTypeTags

Author: nicolasstucki

compiler/src/dotty/tools/dotc/staging/HealType.scala

@@ -8,6 +8,7 @@ import dotty.tools.dotc.core.Symbols._
 import dotty.tools.dotc.core.Types._
 import dotty.tools.dotc.staging.StagingContext.*
 import dotty.tools.dotc.staging.StagingLevel.*
+import dotty.tools.dotc.staging.QuoteTypeTags.*
 import dotty.tools.dotc.transform.SymUtils._
 import dotty.tools.dotc.typer.Implicits.SearchFailureType
 import dotty.tools.dotc.util.SrcPos

compiler/src/dotty/tools/dotc/staging/PCPCheckAndHeal.scala

@@ -12,6 +12,7 @@ import dotty.tools.dotc.core.Symbols._
 import dotty.tools.dotc.core.Types._
 import dotty.tools.dotc.staging.StagingContext.*
 import dotty.tools.dotc.staging.StagingLevel.*
+import dotty.tools.dotc.staging.QuoteTypeTags.*
 import dotty.tools.dotc.util.Property
 import dotty.tools.dotc.util.Spans._
 import dotty.tools.dotc.util.SrcPos
@@ -98,7 +99,7 @@ class PCPCheckAndHeal extends TreeMapWithStages {
 
   /** Transform quoted trees while maintaining phase correctness */
   override protected def transformQuotation(body: Tree, quote: Apply)(using Context): Tree = {
-    val taggedTypes = new PCPCheckAndHeal.QuoteTypeTags(quote.span)
+    val taggedTypes = new QuoteTypeTags(quote.span)
 
     if (ctx.property(InAnnotation).isDefined)
       report.error("Cannot have a quote in an annotation", quote.srcPos)
@@ -236,35 +237,3 @@ class PCPCheckAndHeal extends TreeMapWithStages {
     tp
   }
 }
-
-object PCPCheckAndHeal {
-  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.Underlying).withSpan(span)
-      val alias = ctx.typeAssigner.assignType(untpd.TypeBoundsTree(rhs, rhs), rhs, rhs, EmptyTree)
-      val local = newSymbol(
-        owner = ctx.owner,
-        name = UniqueName.fresh((splicedTree.symbol.name.toString + "$_").toTermName).toTypeName,
-        flags = Synthetic,
-        info = TypeAlias(splicedTree.tpe.select(tpnme.Underlying)),
-        coord = span).asType
-      local.addAnnotation(Annotation(defn.QuotedRuntime_SplicedTypeAnnot, span))
-      ctx.typeAssigner.assignType(untpd.TypeDef(local.name, alias), local)
-    }
-
-  }
-
-}

compiler/src/dotty/tools/dotc/staging/QuoteTypeTags.scala

@@ -0,0 +1,52 @@
+package dotty.tools.dotc.staging
+
+import dotty.tools.dotc.ast.{tpd, untpd}
+import dotty.tools.dotc.core.Annotations._
+import dotty.tools.dotc.core.Contexts._
+import dotty.tools.dotc.core.Decorators._
+import dotty.tools.dotc.core.Flags._
+import dotty.tools.dotc.core.NameKinds._
+import dotty.tools.dotc.core.StdNames._
+import dotty.tools.dotc.core.Symbols._
+import dotty.tools.dotc.core.Types._
+import dotty.tools.dotc.staging.StagingLevel.*
+import dotty.tools.dotc.util.Property
+import dotty.tools.dotc.util.Spans._
+
+object QuoteTypeTags {
+
+  private val TaggedTypes = new Property.Key[QuoteTypeTags]
+
+  def contextWithQuoteTypeTags(taggedTypes: QuoteTypeTags)(using Context) =
+    ctx.fresh.setProperty(TaggedTypes, taggedTypes)
+
+  def getQuoteTypeTags(using Context): QuoteTypeTags =
+    ctx.property(TaggedTypes).get
+}
+
+class QuoteTypeTags(span: Span)(using Context) {
+  import tpd.*
+
+  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.Underlying).withSpan(span)
+    val alias = ctx.typeAssigner.assignType(untpd.TypeBoundsTree(rhs, rhs), rhs, rhs, EmptyTree)
+    val local = newSymbol(
+      owner = ctx.owner,
+      name = UniqueName.fresh((splicedTree.symbol.name.toString + "$_").toTermName).toTypeName,
+      flags = Synthetic,
+      info = TypeAlias(splicedTree.tpe.select(tpnme.Underlying)),
+      coord = span).asType
+    local.addAnnotation(Annotation(defn.QuotedRuntime_SplicedTypeAnnot, span))
+    ctx.typeAssigner.assignType(untpd.TypeDef(local.name, alias), local)
+  }
+}

compiler/src/dotty/tools/dotc/staging/StagingContext.scala

@@ -14,19 +14,11 @@ object StagingContext {
    */
   private val QuotesStack = new Property.Key[List[tpd.Tree]]
 
-  private val TaggedTypes = new Property.Key[PCPCheckAndHeal.QuoteTypeTags]
-
   /** Context with an incremented quotation level and pushes a reference to a Quotes on the quote context stack */
   def pushQuotes(qctxRef: tpd.Tree)(using Context): Context =
     val old = ctx.property(QuotesStack).getOrElse(List.empty)
     quoteContext.setProperty(QuotesStack, qctxRef :: old)
 
-  def contextWithQuoteTypeTags(taggedTypes: PCPCheckAndHeal.QuoteTypeTags)(using Context) =
-    ctx.fresh.setProperty(TaggedTypes, taggedTypes)
-
-  def getQuoteTypeTags(using Context): PCPCheckAndHeal.QuoteTypeTags =
-    ctx.property(TaggedTypes).get
-
   /** Context with a decremented quotation level and pops the Some of top of the quote context stack or None if the stack is empty.
    *  The quotation stack could be empty if we are in a top level splice or an erroneous splice directly within a top level splice.
    */

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

@@ -24,6 +24,7 @@ import dotty.tools.dotc.config.ScalaRelease.*
 import dotty.tools.dotc.staging.PCPCheckAndHeal
 import dotty.tools.dotc.staging.StagingContext.*
 import dotty.tools.dotc.staging.StagingLevel.*
+import dotty.tools.dotc.staging.QuoteTypeTags
 
 import scala.annotation.constructorOnly
 
@@ -191,7 +192,7 @@ class Splicing extends MacroTransform:
     private var refBindingMap = mutable.Map.empty[Symbol, (Tree, Symbol)]
     /** Reference to the `Quotes` instance of the current level 1 splice */
     private var quotes: Tree | Null = null // TODO: add to the context
-    private var healedTypes: PCPCheckAndHeal.QuoteTypeTags | Null = null // TODO: add to the context
+    private var healedTypes: QuoteTypeTags | Null = null // TODO: add to the context
 
     def transformSplice(tree: tpd.Tree, tpe: Type, holeIdx: Int)(using Context): tpd.Tree =
       assert(level == 0)
@@ -261,7 +262,7 @@ class Splicing extends MacroTransform:
     private def transformLevel0QuoteContent(tree: Tree)(using Context): Tree =
       // transform and collect new healed types
       val old = healedTypes
-      healedTypes = new PCPCheckAndHeal.QuoteTypeTags(tree.span)
+      healedTypes = new QuoteTypeTags(tree.span)
       val tree1 = transform(tree)
       val newHealedTypes = healedTypes.nn.getTypeTags
       healedTypes = old
@@ -359,7 +360,7 @@ class Splicing extends MacroTransform:
 
     private def capturedPartTypes(tpt: Tree)(using Context): Tree =
       val old = healedTypes
-      healedTypes = PCPCheckAndHeal.QuoteTypeTags(tpt.span)
+      healedTypes = QuoteTypeTags(tpt.span)
       val capturePartTypes = new TypeMap {
         def apply(tp: Type) = tp match {
           case typeRef @ TypeRef(prefix, _) if isCaptured(prefix.typeSymbol) || isCaptured(prefix.termSymbol) =>