Refactor

Author: nicolasstucki

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

@@ -48,7 +48,7 @@ class PCPCheckAndHeal(@constructorOnly ictx: Context) extends TreeMapWithStages(
       super.transform(tree)
     else tree match {
 
-      // Type tress
+      // Type trees
 
       case _: TypTree =>
         if needsHealing(tree.tpe) then TypeTree(healType(tree.sourcePos)(tree.tpe)).withSpan(tree.span)
@@ -82,6 +82,54 @@ class PCPCheckAndHeal(@constructorOnly ictx: Context) extends TreeMapWithStages(
         super.transform(tree)
     }
 
+  /** Transform quoted trees while maintaining phase correctness */
+  override protected def transformQuotation(body: Tree, quote: Tree)(implicit ctx: Context): Tree = {
+    val taggedTypes = new PCPCheckAndHeal.QuoteTypeTags(quote.span)(using ctx)
+    if (ctx.property(InAnnotation).isDefined)
+      ctx.error("Cannot have a quote in an annotation", quote.sourcePos)
+
+    val contextWithQuote =
+      if level == 0 then contextWithQuoteTypeTags(taggedTypes)(quoteContext)
+      else quoteContext
+    val inQuoteOrSpliceOld = inQuoteOrSplice
+    inQuoteOrSplice = true
+    val body1 = transform(body)(contextWithQuote)
+    inQuoteOrSplice = inQuoteOrSpliceOld
+    val body2 =
+      taggedTypes.getTypeTags match
+        case Nil  => body1
+        case tags => tpd.Block(tags, body1).withSpan(body.span)
+
+    super.transformQuotation(body2, quote)
+  }
+
+  /** Transform splice
+   *  - If inside a quote, transform the contents of the splice.
+   *  - If inside inlined code, expand the macro code.
+   *  - If inside of a macro definition, check the validity of the macro.
+   */
+  protected def transformSplice(body: Tree, splice: Tree)(implicit ctx: Context): Tree = {
+    val inQuoteOrSpliceOld = inQuoteOrSplice
+    inQuoteOrSplice = true
+    val body1 = transform(body)(spliceContext)
+    inQuoteOrSplice = inQuoteOrSpliceOld
+    splice match {
+      case Apply(fun @ TypeApply(_, _ :: Nil), _) if splice.isTerm =>
+        // Type of the splice itsel must also be healed
+        // internal.Quoted.expr[F[T]](... T ...)  -->  internal.Quoted.expr[F[$t]](... T ...)
+        val tp = healType(splice.sourcePos)(splice.tpe.widenTermRefExpr)
+        cpy.Apply(splice)(cpy.TypeApply(fun)(fun.fun, tpd.TypeTree(tp) :: Nil), body1 :: Nil)
+      case Apply(f @ Apply(fun @ TypeApply(_, _), qctx :: Nil), _) if splice.isTerm =>
+        // Type of the splice itsel must also be healed
+        // internal.Quoted.expr[F[T]](... T ...)  -->  internal.Quoted.expr[F[$t]](... T ...)
+        val tp = healType(splice.sourcePos)(splice.tpe.widenTermRefExpr)
+        cpy.Apply(splice)(cpy.Apply(f)(cpy.TypeApply(fun)(fun.fun, tpd.TypeTree(tp) :: Nil), qctx :: Nil), body1 :: Nil)
+      case splice: Select =>
+        val tagRef = getQuoteTypeTags.getTagRef(splice.qualifier.tpe.asInstanceOf[TermRef])
+        ref(tagRef).withSpan(splice.span)
+    }
+  }
+
   /** Check that annotations do not contain quotes and and that splices are valid */
   private def checkAnnotations(tree: Tree)(using Context): Unit =
     tree match
@@ -158,6 +206,7 @@ class PCPCheckAndHeal(@constructorOnly ictx: Context) extends TreeMapWithStages(
     tree
   }
 
+  // TODO return new type or else old?
   protected def tryHeal(sym: Symbol, tp: TypeRef, pos: SourcePosition)(implicit ctx: Context): Option[TypeRef] = {
     val reqType = defn.QuotedTypeClass.typeRef.appliedTo(tp)
     val tag = ctx.typer.inferImplicitArg(reqType, pos.span)
@@ -190,53 +239,6 @@ class PCPCheckAndHeal(@constructorOnly ictx: Context) extends TreeMapWithStages(
     None
   }
 
-  /** Transform quoted trees while maintaining phase correctness */
-  override protected def transformQuotation(body: Tree, quote: Tree)(implicit ctx: Context): Tree = {
-    val taggedTypes = new PCPCheckAndHeal.QuoteTypeTags(quote.span)(using ctx)
-    if (ctx.property(InAnnotation).isDefined)
-      ctx.error("Cannot have a quote in an annotation", quote.sourcePos)
-
-    val contextWithQuote =
-      if level == 0 then contextWithQuoteTypeTags(taggedTypes)(quoteContext)
-      else quoteContext
-    val inQuoteOrSpliceOld = inQuoteOrSplice
-    inQuoteOrSplice = true
-    val body1 = transform(body)(contextWithQuote)
-    inQuoteOrSplice = inQuoteOrSpliceOld
-    val body2 =
-      taggedTypes.getTypeTags match
-        case Nil  => body1
-        case tags => tpd.Block(tags, body1).withSpan(body.span)
-
-    super.transformQuotation(body2, quote)
-  }
-
-  /** Transform splice
-   *  - If inside a quote, transform the contents of the splice.
-   *  - If inside inlined code, expand the macro code.
-   *  - If inside of a macro definition, check the validity of the macro.
-   */
-  protected def transformSplice(body: Tree, splice: Tree)(implicit ctx: Context): Tree = {
-    val inQuoteOrSpliceOld = inQuoteOrSplice
-    inQuoteOrSplice = true
-    val body1 = transform(body)(spliceContext)
-    inQuoteOrSplice = inQuoteOrSpliceOld
-    splice match {
-      case Apply(fun @ TypeApply(_, _ :: Nil), _) if splice.isTerm =>
-        // Type of the splice itsel must also be healed
-        // internal.Quoted.expr[F[T]](... T ...)  -->  internal.Quoted.expr[F[$t]](... T ...)
-        val tp = healType(splice.sourcePos)(splice.tpe.widenTermRefExpr)
-        cpy.Apply(splice)(cpy.TypeApply(fun)(fun.fun, tpd.TypeTree(tp) :: Nil), body1 :: Nil)
-      case Apply(f @ Apply(fun @ TypeApply(_, _), qctx :: Nil), _) if splice.isTerm =>
-        // Type of the splice itsel must also be healed
-        // internal.Quoted.expr[F[T]](... T ...)  -->  internal.Quoted.expr[F[$t]](... T ...)
-        val tp = healType(splice.sourcePos)(splice.tpe.widenTermRefExpr)
-        cpy.Apply(splice)(cpy.Apply(f)(cpy.TypeApply(fun)(fun.fun, tpd.TypeTree(tp) :: Nil), qctx :: Nil), body1 :: Nil)
-      case splice: Select =>
-        val tagRef = getQuoteTypeTags.getTagRef(splice.qualifier.tpe.asInstanceOf[TermRef])
-        ref(tagRef).withSpan(splice.span)
-    }
-  }
 }
 
 object PCPCheckAndHeal {

tests/neg-macros/quote-this.scala

@@ -5,9 +5,9 @@ class Foo {
   def f(using QuoteContext): Unit = '{
     def bar[T](x: T): T = x
     bar[
-      this.type // error
+      this.type  // error
       ] {
-      this // error
+      this  // error
     }
   }