Rename StagingContext to QuoteContext

Author: nicolasstucki

compiler/src/dotty/tools/dotc/quoted/Interpreter.scala

@@ -24,7 +24,7 @@ import dotty.tools.dotc.core.Symbols._
 import dotty.tools.dotc.core.TypeErasure
 import dotty.tools.dotc.core.Types._
 import dotty.tools.dotc.quoted._
-import dotty.tools.dotc.staging.StagingContext.*
+import dotty.tools.dotc.staging.QuoteContext.*
 import dotty.tools.dotc.typer.ImportInfo.withRootImports
 import dotty.tools.dotc.util.SrcPos
 import dotty.tools.dotc.reporting.Message

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

@@ -6,7 +6,7 @@ import dotty.tools.dotc.core.Decorators._
 import dotty.tools.dotc.core.Flags._
 import dotty.tools.dotc.core.Symbols._
 import dotty.tools.dotc.core.Types._
-import dotty.tools.dotc.staging.StagingContext.*
+import dotty.tools.dotc.staging.QuoteContext.*
 import dotty.tools.dotc.staging.StagingLevel.*
 import dotty.tools.dotc.staging.QuoteTypeTags.*
 import dotty.tools.dotc.transform.SymUtils._

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

@@ -10,7 +10,7 @@ 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.StagingContext.*
+import dotty.tools.dotc.staging.QuoteContext.*
 import dotty.tools.dotc.staging.StagingLevel.*
 import dotty.tools.dotc.staging.QuoteTypeTags.*
 import dotty.tools.dotc.util.Property
@@ -146,11 +146,11 @@ class PCPCheckAndHeal extends TreeMapWithStages {
         // `quoted.runtime.Expr.quote[F[T]](... T ...)`  -->  `internal.Quoted.expr[F[$t]](... T ...)`
         val tp = healType(splice.srcPos)(splice.tpe.widenTermRefExpr)
         cpy.Apply(splice)(cpy.TypeApply(fun)(fun.fun, tpd.TypeTree(tp) :: Nil), body1 :: Nil)
-      case f @ Apply(fun @ TypeApply(_, _), qctx :: Nil) =>
+      case f @ Apply(fun @ TypeApply(_, _), quotes :: Nil) =>
         // Type of the splice itself must also be healed
         // `quoted.runtime.Expr.quote[F[T]](... T ...)`  -->  `internal.Quoted.expr[F[$t]](... T ...)`
         val tp = healType(splice.srcPos)(splice.tpe.widenTermRefExpr)
-        cpy.Apply(splice)(cpy.Apply(f)(cpy.TypeApply(fun)(fun.fun, tpd.TypeTree(tp) :: Nil), qctx :: Nil), body1 :: Nil)
+        cpy.Apply(splice)(cpy.Apply(f)(cpy.TypeApply(fun)(fun.fun, tpd.TypeTree(tp) :: Nil), quotes :: Nil), body1 :: Nil)
     }
   }
 

…/tools/dotc/staging/StagingContext.scala …ty/tools/dotc/staging/QuoteContext.scalacompiler/src/dotty/tools/dotc/staging/StagingContext.scala renamed to compiler/src/dotty/tools/dotc/staging/QuoteContext.scala compiler/src/dotty/tools/dotc/staging/StagingContext.scala renamed to compiler/src/dotty/tools/dotc/staging/QuoteContext.scala

@@ -7,17 +7,17 @@ import dotty.tools.dotc.util.Property
 import dotty.tools.dotc.staging.PCPCheckAndHeal
 import dotty.tools.dotc.staging.StagingLevel.*
 
-object StagingContext {
+object QuoteContext {
 
   /** A key to be used in a context property that tracks the quotation stack.
    *  Stack containing the Quotes references received by the surrounding quotes.
    */
   private val QuotesStack = new Property.Key[List[tpd.Tree]]
 
   /** 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 =
+  def pushQuotes(quotes: tpd.Tree)(using Context): Context =
     val old = ctx.property(QuotesStack).getOrElse(List.empty)
-    quoteContext.setProperty(QuotesStack, qctxRef :: old)
+    quoteContext.setProperty(QuotesStack, quotes :: old)
 
   /** 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/Inlining.scala

@@ -12,7 +12,7 @@ import dotty.tools.dotc.quoted._
 import dotty.tools.dotc.inlines.Inlines
 import dotty.tools.dotc.ast.TreeMapWithImplicits
 import dotty.tools.dotc.core.DenotTransformers.IdentityDenotTransformer
-import dotty.tools.dotc.staging.StagingContext.*
+import dotty.tools.dotc.staging.QuoteContext.*
 import dotty.tools.dotc.staging.StagingLevel
 
 import scala.collection.mutable.ListBuffer

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

@@ -22,7 +22,7 @@ import dotty.tools.dotc.core.StdNames._
 import dotty.tools.dotc.quoted._
 import dotty.tools.dotc.config.ScalaRelease.*
 import dotty.tools.dotc.staging.PCPCheckAndHeal
-import dotty.tools.dotc.staging.StagingContext.*
+import dotty.tools.dotc.staging.QuoteContext.*
 import dotty.tools.dotc.staging.StagingLevel.*
 import dotty.tools.dotc.staging.QuoteTypeTags
 

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

@@ -10,7 +10,7 @@ import dotty.tools.dotc.core.Symbols._
 import dotty.tools.dotc.core.Types._
 import dotty.tools.dotc.util.SrcPos
 import dotty.tools.dotc.transform.SymUtils._
-import dotty.tools.dotc.staging.StagingContext.*
+import dotty.tools.dotc.staging.QuoteContext.*
 import dotty.tools.dotc.staging.StagingLevel.*
 import dotty.tools.dotc.staging.PCPCheckAndHeal
 import dotty.tools.dotc.staging.HealType

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

@@ -15,7 +15,7 @@ import dotty.tools.dotc.core.StdNames._
 import dotty.tools.dotc.core.Symbols._
 import dotty.tools.dotc.core.Types._
 import dotty.tools.dotc.inlines.PrepareInlineable
-import dotty.tools.dotc.staging.StagingContext.*
+import dotty.tools.dotc.staging.QuoteContext.*
 import dotty.tools.dotc.staging.StagingLevel.*
 import dotty.tools.dotc.transform.SymUtils._
 import dotty.tools.dotc.typer.Implicits._