Rename ReifyQuotes to Staging

Author: nicolasstucki

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

@@ -26,7 +26,7 @@ class CompilationUnit(val source: SourceFile) {
   var pickled: Map[ClassSymbol, Array[Byte]] = Map()
 
   /** Will be reset to `true` if contains `Quote`, `Splice` or calls to inline methods.
-   * The information is used in phase ReifyQuotes in order to avoid traversing a quote-less tree.
+   * The information is used in phase `Staging` in order to avoid traversing a quote-less tree.
    */
   var containsQuotesSplicesOrInline: Boolean = false
 

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

@@ -44,7 +44,7 @@ class Compiler {
   /** Phases dealing with TASTY tree pickling and unpickling */
   protected def picklerPhases: List[List[Phase]] =
     List(new Pickler) ::            // Generate TASTY info
-    List(new ReifyQuotes) ::        // Turn quoted trees into explicit run-time data structures
+    List(new Staging) ::            // Inline calls, expand macros and turn quoted trees into explicit run-time data structures
     Nil
 
   /** Phases dealing with the transformation from pickled trees to backend trees */

compiler/src/dotty/tools/dotc/decompiler/TASTYDecompiler.scala

@@ -2,7 +2,6 @@ package dotty.tools.dotc.decompiler
 
 import dotty.tools.dotc.fromtasty._
 import dotty.tools.dotc.core.Phases.Phase
-import dotty.tools.dotc.transform.ReifyQuotes
 
 /** Compiler from tasty to user readable high text representation
  *  of the compiled scala code.

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

@@ -13,7 +13,7 @@ import dotty.tools.dotc.core.StdNames.nme
 import dotty.tools.dotc.core.Symbols.defn
 import dotty.tools.dotc.core.Types.ExprType
 import dotty.tools.dotc.core.quoted.PickledQuotes
-import dotty.tools.dotc.transform.ReifyQuotes
+import dotty.tools.dotc.transform.Staging
 import dotty.tools.dotc.typer.FrontEnd
 import dotty.tools.dotc.util.Positions.Position
 import dotty.tools.dotc.util.SourceFile
@@ -30,7 +30,7 @@ class QuoteCompiler extends Compiler {
     List(List(new QuotedFrontend(putInClass = true)))
 
   override protected def picklerPhases: List[List[Phase]] =
-    List(List(new ReifyQuotes))
+    List(List(new Staging))
 
   override def newRun(implicit ctx: Context): ExprRun = {
     reset()

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

@@ -33,7 +33,7 @@ object Splicer {
    *  and for `~xyz` the tree of `xyz` is interpreted for which the
    *  resulting expression is returned as a `Tree`
    *
-   *  See: `ReifyQuotes`
+   *  See: `Staging`
    */
   def splice(tree: Tree, pos: SourcePosition, classLoader: ClassLoader)(implicit ctx: Context): Tree = tree match {
     case Quoted(quotedTree) => quotedTree
@@ -63,7 +63,7 @@ object Splicer {
     *  and for `~xyz` the tree of `xyz` is interpreted for which the
     *  resulting expression is returned as a `Tree`
     *
-    *  See: `ReifyQuotes`
+    *  See: `Staging`
     */
   def canBeSpliced(tree: Tree)(implicit ctx: Context): Boolean = tree match {
     case Quoted(_) => true

compiler/src/dotty/tools/dotc/transform/ReifyQuotes.scala renamed to compiler/src/dotty/tools/dotc/transform/Staging.scala

@@ -65,9 +65,9 @@ import dotty.tools.dotc.util.SourcePosition
  *  For macro definitions we assume that we have a single ~ directly as the RHS.
  *  The Splicer is used to check that the RHS will be interpretable (with the `Splicer`) once inlined.
  */
-class ReifyQuotes extends MacroTransformWithImplicits {
+class Staging extends MacroTransformWithImplicits {
   import tpd._
-  import ReifyQuotes._
+  import Staging._
 
   /** Classloader used for loading macros */
   private[this] var myMacroClassLoader: java.lang.ClassLoader = _
@@ -79,7 +79,7 @@ class ReifyQuotes extends MacroTransformWithImplicits {
     myMacroClassLoader
   }
 
-  override def phaseName: String = ReifyQuotes.name
+  override def phaseName: String = Staging.name
 
   override def checkPostCondition(tree: Tree)(implicit ctx: Context): Unit = {
     tree match {
@@ -420,7 +420,7 @@ class ReifyQuotes extends MacroTransformWithImplicits {
         else if (body.symbol == defn.DoubleClass) tag("DoubleTag")
         else pickleAsTasty()
       }
-      else ReifyQuotes.toValue(body) match {
+      else Staging.toValue(body) match {
         case Some(value) => pickleAsValue(value)
         case _ => pickleAsTasty()
       }
@@ -644,10 +644,10 @@ class ReifyQuotes extends MacroTransformWithImplicits {
   }
 }
 
-object ReifyQuotes {
+object Staging {
   import tpd._
 
-  val name: String = "reifyQuotes"
+  val name: String = "staging"
 
   def toValue(tree: tpd.Tree): Option[Any] = tree match {
     case Literal(Constant(c)) => Some(c)

docs/docs/reference/changed/compiler-plugins.md

@@ -60,7 +60,7 @@ import dotty.tools.dotc.core.Decorators._
 import dotty.tools.dotc.core.StdNames._
 import dotty.tools.dotc.core.Symbols._
 import dotty.tools.dotc.plugins.{PluginPhase, StandardPlugin}
-import dotty.tools.dotc.transform.{Pickler, ReifyQuotes}
+import dotty.tools.dotc.transform.{Pickler, Staging}
 
 class DivideZero extends StandardPlugin {
   val name: String = "divideZero"
@@ -75,7 +75,7 @@ class DivideZeroPhase extends PluginPhase {
   val phaseName = "divideZero"
 
   override val runsAfter = Set(Pickler.name)
-  override val runsBefore = Set(ReifyQuotes.name)
+  override val runsBefore = Set(Staging.name)
 
   override def transformApply(tree: Apply)(implicit ctx: Context): Tree = {
     tree match {

docs/docs/reference/principled-meta-programming.md

@@ -627,7 +627,7 @@ literals. So it could be done only if symbol literals were abolished.
 
 Quotes and splices are primitive forms in the generated abstract
 syntax trees. They are eliminated in an expansion phase
-`ReifyQuotes`. This phase runs after typing and pickling.
+`Staging`. This phase runs after typing and pickling.
 
 Macro-expansion works outside-in. If the outermost scope is a splice,
 the spliced AST will be evaluated in an interpreter. A call to a

sbt-dotty/sbt-test/sbt-dotty/compiler-plugin/plugin/DivideZero.scala

@@ -10,7 +10,7 @@ import transform.MegaPhase.MiniPhase
 import Decorators._
 import Symbols.Symbol
 import Constants.Constant
-import transform.{Pickler, ReifyQuotes}
+import transform.{Pickler, Staging}
 
 /** Compiler plugin that emits an error when compiling a division by zero */
 class DivideZero extends PluginPhase with StandardPlugin {
@@ -20,7 +20,7 @@ class DivideZero extends PluginPhase with StandardPlugin {
   val phaseName = name
 
   override val runsAfter = Set(Pickler.name)
-  override val runsBefore = Set(ReifyQuotes.name)
+  override val runsBefore = Set(Staging.name)
 
   def init(options: List[String]): List[PluginPhase] = this :: Nil
 

tests/plugins/neg/divideZero/plugin_1.scala

@@ -8,7 +8,7 @@ import transform.MegaPhase.MiniPhase
 import Decorators._
 import Symbols.Symbol
 import Constants.Constant
-import transform.{Pickler, ReifyQuotes}
+import transform.{Pickler, Staging}
 import StdNames._
 
 class DivideZero extends PluginPhase with StandardPlugin {
@@ -18,7 +18,7 @@ class DivideZero extends PluginPhase with StandardPlugin {
   val phaseName = name
 
   override val runsAfter = Set(Pickler.name)
-  override val runsBefore = Set(ReifyQuotes.name)
+  override val runsBefore = Set(Staging.name)
 
   override def init(options: List[String]): List[PluginPhase] = this :: Nil