Rename methods to transform

Author: nicolasstucki

library/src-bootstrapped/scala/quoted/util/ExprMap.scala

@@ -5,10 +5,10 @@ import scala.quoted._
 trait ExprMap {
 
   /** Map an expression `e` with a type `tpe` */
-  def map[T](e: Expr[T])(given qctx: QuoteContext, tpe: Type[T]): Expr[T]
+  def transform[T](e: Expr[T])(given qctx: QuoteContext, tpe: Type[T]): Expr[T]
 
   /** Map subexpressions an expression `e` with a type `tpe` */
-  def mapChildren[T](e: Expr[T])(given qctx: QuoteContext, tpe: Type[T]): Expr[T] = {
+  def transformChildren[T](e: Expr[T])(given qctx: QuoteContext, tpe: Type[T]): Expr[T] = {
     import qctx.tasty.{_, given}
     class MapChildren() {
 
@@ -112,7 +112,7 @@ trait ExprMap {
               type X
               val expr = tree.seal.asInstanceOf[Expr[X]]
               val t = tpe.seal.asInstanceOf[quoted.Type[X]]
-              map(expr)(given qctx, t).unseal
+              transform(expr)(given qctx, t).unseal
           }
       }
 

tests/run-macros/expr-map-1/Macro_1.scala

@@ -4,15 +4,15 @@ import scala.quoted.matching._
 inline def rewrite[T](x: => Any): Any = ${ stringRewriter('x) }
 
 private def stringRewriter(e: Expr[Any])(given QuoteContext): Expr[Any] =
-  StringRewriter.map(e)
+  StringRewriter.transform(e)
 
 private object StringRewriter extends util.ExprMap {
 
-  def map[T](e: Expr[T])(given QuoteContext, Type[T]): Expr[T] = e match
+  def transform[T](e: Expr[T])(given QuoteContext, Type[T]): Expr[T] = e match
     case Const(s: String) =>
       Expr(s.reverse) match
         case '{ $x: T } => x
         case _ => e // e had a singlton String type
-    case _ => mapChildren(e)
+    case _ => transformChildren(e)
 
 }

tests/run-macros/flops-rewrite-2/Macro_1.scala

@@ -35,7 +35,7 @@ private def rewriteMacro[T: Type](x: Expr[T])(given QuoteContext): Expr[T] = {
     fixPoint = true
   )
 
-  val x2 = rewriter.map(x)
+  val x2 = rewriter.transform(x)
 
   '{
     println(${Expr(x.show)})
@@ -64,11 +64,11 @@ private object Rewriter {
 }
 
 private class Rewriter(preTransform: List[Transformation[_]] = Nil, postTransform: List[Transformation[_]] = Nil, fixPoint: Boolean) extends util.ExprMap {
-  def map[T](e: Expr[T])(given QuoteContext, Type[T]): Expr[T] = {
+  def transform[T](e: Expr[T])(given QuoteContext, Type[T]): Expr[T] = {
     val e2 = preTransform.foldLeft(e)((ei, transform) => transform(ei))
-    val e3 = mapChildren(e2)
+    val e3 = transformChildren(e2)
     val e4 = postTransform.foldLeft(e3)((ei, transform) => transform(ei))
-    if fixPoint && !e4.matches(e) then map(e4)
+    if fixPoint && !e4.matches(e) then transform(e4)
     else e4
   }
 

tests/run-macros/flops-rewrite-3/Macro_1.scala

@@ -33,7 +33,7 @@ private def rewriteMacro[T: Type](x: Expr[T])(given QuoteContext): Expr[T] = {
     }
   )
 
-  val x2 = rewriter.map(x)
+  val x2 = rewriter.transform(x)
 
   '{
     println(${Expr(x.show)})
@@ -101,11 +101,11 @@ private class Rewriter private (preTransform: List[Transformation] = Nil, postTr
   def withPost(transform: Transformation): Rewriter =
     new Rewriter(preTransform, transform :: postTransform, fixPoint)
 
-  def map[T](e: Expr[T])(given QuoteContext, Type[T]): Expr[T] = {
+  def transform[T](e: Expr[T])(given QuoteContext, Type[T]): Expr[T] = {
     val e2 = preTransform.foldLeft(e)((ei, transform) => transform(ei))
-    val e3 = mapChildren(e2)
+    val e3 = transformChildren(e2)
     val e4 = postTransform.foldLeft(e3)((ei, transform) => transform(ei))
-    if fixPoint && !e4.matches(e) then map(e4) else e4
+    if fixPoint && !e4.matches(e) then transform(e4) else e4
   }
 
 }

tests/run-macros/flops-rewrite/Macro_1.scala

@@ -13,7 +13,7 @@ private def rewriteMacro[T: Type](x: Expr[T])(given QuoteContext): Expr[T] = {
     }
   )
 
-  val x2 = rewriter.map(x)
+  val x2 = rewriter.transform(x)
 
   '{
     println(${Expr(x.show)})
@@ -29,11 +29,11 @@ private object Rewriter {
 }
 
 private class Rewriter(preTransform: Expr[Any] => Expr[Any], postTransform: Expr[Any] => Expr[Any], fixPoint: Boolean) extends util.ExprMap {
-  def map[T](e: Expr[T])(given QuoteContext, Type[T]): Expr[T] = {
+  def transform[T](e: Expr[T])(given QuoteContext, Type[T]): Expr[T] = {
     val e2 = checkedTransform(e, preTransform)
-    val e3 = mapChildren(e2)
+    val e3 = transformChildren(e2)
     val e4 = checkedTransform(e3, postTransform)
-    if fixPoint && !e4.matches(e) then map(e4)
+    if fixPoint && !e4.matches(e) then transform(e4)
     else e4
   }