Rename quotation -> transformQuotation and splice -> transformSplice

Author: nicolasstucki

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

@@ -168,12 +168,12 @@ class ReifyQuotes extends MacroTransform {
      *  `scala.quoted.Unpickler.unpickleExpr` that matches `tpe` with
      *  core and splices as arguments.
      */
-    override protected def quotation(body: Tree, quote: Tree)(implicit ctx: Context): Tree = {
+    override protected def transformQuotation(body: Tree, quote: Tree)(implicit ctx: Context): Tree = {
       val isType = quote.symbol eq defn.QuotedType_apply
       assert(!body.symbol.isSplice)
       if (level > 0) {
         val body1 = nested(isQuote = true).transform(body)(quoteContext)
-        super.quotation(body1, quote)
+        super.transformQuotation(body1, quote)
       }
       else body match {
         case body: RefTree if isCaptured(body.symbol, level + 1) =>
@@ -230,7 +230,7 @@ class ReifyQuotes extends MacroTransform {
      *  and make a hole from these parts. Otherwise issue an error, unless we
      *  are in the body of an inline method.
      */
-    protected def splice(splice: Select)(implicit ctx: Context): Tree = {
+    protected def transformSplice(splice: Select)(implicit ctx: Context): Tree = {
       if (level > 1) {
         val body1 = nested(isQuote = false).transform(splice.qualifier)(spliceContext)
         body1.select(splice.name)
@@ -357,15 +357,15 @@ class ReifyQuotes extends MacroTransform {
           case TypeApply(Select(spliceTree @ Spliced(_), _), tp) if tree.symbol == defn.Any_asInstanceOf =>
             // Splice term which should be in the form `x.unary_~.asInstanceOf[T]` where T is an artefact of
             // typer to allow pickling/unpickling phase consistent types
-            splice(spliceTree)
+            transformSplice(spliceTree)
 
           case tree: TypeTree if tree.tpe.typeSymbol.isSplice =>
             val splicedType = tree.tpe.stripTypeVar.asInstanceOf[TypeRef].prefix.termSymbol
-            splice(ref(splicedType).select(tpnme.UNARY_~).withSpan(tree.span))
+            transformSplice(ref(splicedType).select(tpnme.UNARY_~).withSpan(tree.span))
 
           case tree: RefTree if isCaptured(tree.symbol, level) =>
             val t = capturers(tree.symbol).apply(tree)
-            splice(t.select(if (tree.isTerm) nme.UNARY_~ else tpnme.UNARY_~))
+            transformSplice(t.select(if (tree.isTerm) nme.UNARY_~ else tpnme.UNARY_~))
 
           case tree: DefDef if tree.symbol.is(Macro) && level == 0 =>
             // Shrink size of the tree. The methods have already been inlined.

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

@@ -124,17 +124,17 @@ class Staging extends MacroTransform {
     }
 
     /** Transform quoted trees while maintaining phase correctness */
-    override protected def quotation(body: Tree, quote: Tree)(implicit ctx: Context): Tree = {
+    override protected def transformQuotation(body: Tree, quote: Tree)(implicit ctx: Context): Tree = {
       val body1 = transform(body)(quoteContext)
-      super.quotation(body1, quote)
+      super.transformQuotation(body1, 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 splice(splice: Select)(implicit ctx: Context): Tree = {
+    protected def transformSplice(splice: Select)(implicit ctx: Context): Tree = {
       if (level >= 1) {
         val body1 = transform(splice.qualifier)(spliceContext)
         val splice1 = cpy.Select(splice)(body1, splice.name)

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

@@ -56,15 +56,15 @@ abstract class TreeMapWithStages(@constructorOnly ictx: Context) extends TreeMap
   }
 
   /** Transform the quote `quote` which contains the quoted `body`. */
-  protected def quotation(body: Tree, quote: Tree)(implicit ctx: Context): Tree = {
+  protected def transformQuotation(body: Tree, quote: Tree)(implicit ctx: Context): Tree = {
     quote match {
       case quote: Apply => cpy.Apply(quote)(quote.fun, body :: Nil)
       case quote: TypeApply => cpy.TypeApply(quote)(quote.fun, body :: Nil)
     }
   }
 
   /** Transform the splice `splice`. */
-  protected def splice(splice: Select)(implicit ctx: Context): Tree
+  protected def transformSplice(splice: Select)(implicit ctx: Context): Tree
 
   override def transform(tree: Tree)(implicit ctx: Context): Tree = {
     reporting.trace(i"StagingTransformer.transform $tree at $level", show = true) {
@@ -81,13 +81,13 @@ abstract class TreeMapWithStages(@constructorOnly ictx: Context) extends TreeMap
           transform(t) // '(~x) --> x
 
         case Quoted(quotedTree) =>
-          quotation(quotedTree, tree)
+          transformQuotation(quotedTree, tree)
 
         case Spliced(Quoted(quotedTree)) =>
           transform(quotedTree) // ~('x) --> x
 
         case tree @ Spliced(_) =>
-          splice(tree)
+          transformSplice(tree)
 
         case Block(stats, _) =>
           val last = enteredSyms