Merge pull request #7299 from dotty-staging/remove-asFunction-implicit-class

Replace AsFunction implicit class with Expr.reduce

Author: liufengyun

community-build/community-projects/xml-interpolator

@@ -135,24 +135,20 @@ expressiveness.
 
 ### From `Expr`s to Functions and Back
 
-The `Expr` companion object contains an implicit `AsFunction` conversion that turns a tree
+The `Expr` companion object contains a `betaReduce` conversion that turns a tree
 describing a function into a function mapping trees to trees.
 ```scala
 object Expr {
   ...
-  implicit class AsFunction[...](...) { ... }
+  def betaReduce[...](...)(...): ... = ...
 }
 ```
-This decorator gives `Expr` the `apply` operation of an applicative functor, where `Expr`s
-over function types can be applied to `Expr` arguments. The definition
-of `AsFunction(f).apply(x)` is assumed to be functionally the same as
+The definition of `Expr.betaReduce(f)(x)` is assumed to be functionally the same as
 `'{($f)($x)}`, however it should optimize this call by returning the
 result of beta-reducing `f(x)` if `f` is a known lambda expression.
-
-The `AsFunction` decorator distributes applications of `Expr` over function
-arrows:
+`Expr.betaReduce` distributes applications of `Expr` over function arrows:
 ```scala
-AsFunction(_).apply: Expr[S => T] => (Expr[S] => Expr[T])
+Expr.betaReduce(_): Expr[(T1, ..., Tn) => R] => ((Expr[T1], ..., Expr[Tn]) => Expr[R])
 ```
 Its dual, let’s call it `reflect`, can be defined as follows:
 ```scala

docs/docs/reference/metaprogramming/macros.md

@@ -28,20 +28,31 @@ package quoted {
     /** Converts a tuple `(T1, ..., Tn)` to `(Expr[T1], ..., Expr[Tn])` */
     type TupleOfExpr[Tup <: Tuple] = Tuple.Map[Tup, [X] =>> (given QuoteContext) => Expr[X]]
 
-    implicit class AsFunction[F, Args <: Tuple, R](f: Expr[F])(given tf: TupledFunction[F, Args => R], qctx: QuoteContext) {
-      /** Beta-reduces the function appication. Generates the an expression only containing the body of the function */
-      def apply[G](given tg: TupledFunction[G, TupleOfExpr[Args] => Expr[R]]): G = {
-        import qctx.tasty._
-        tg.untupled(args => qctx.tasty.internal.betaReduce(f.unseal, args.toArray.toList.map(_.asInstanceOf[QuoteContext => Expr[_]](qctx).unseal)).seal.asInstanceOf[Expr[R]])
-      }
+    /** `Expr.betaReduce(f)(x1, ..., xn)` is functionally the same as `'{($f)($x1, ..., $xn)}`, however it optimizes this call
+     *   by returning the result of beta-reducing `f(x1, ..., xn)` if `f` is a known lambda expression.
+     *
+     *  `Expr.betaReduce` distributes applications of `Expr` over function arrows
+     *   ```scala
+     *   Expr.betaReduce(_): Expr[(T1, ..., Tn) => R] => ((Expr[T1], ..., Expr[Tn]) => Expr[R])
+     *   ```
+     */
+    def betaReduce[F, Args <: Tuple, R, G](f: Expr[F])(given tf: TupledFunction[F, Args => R], tg: TupledFunction[G, TupleOfExpr[Args] => Expr[R]], qctx: QuoteContext): G = {
+      import qctx.tasty._
+      tg.untupled(args => qctx.tasty.internal.betaReduce(f.unseal, args.toArray.toList.map(_.asInstanceOf[QuoteContext => Expr[_]](qctx).unseal)).seal.asInstanceOf[Expr[R]])
     }
 
-    implicit class AsContextualFunction[F, Args <: Tuple, R](f: Expr[F])(given tf: TupledFunction[F, (given Args) => R], qctx: QuoteContext) {
-      /** Beta-reduces the function appication. Generates the an expression only containing the body of the function */
-      def apply[G](given tg: TupledFunction[G, TupleOfExpr[Args] => Expr[R]]): G = {
-        import qctx.tasty._
-        tg.untupled(args => qctx.tasty.internal.betaReduce(f.unseal, args.toArray.toList.map(_.asInstanceOf[QuoteContext => Expr[_]](qctx).unseal)).seal.asInstanceOf[Expr[R]])
-      }
+    /** `Expr.betaReduceGiven(f)(x1, ..., xn)` is functionally the same as `'{($f)(given $x1, ..., $xn)}`, however it optimizes this call
+     *   by returning the result of beta-reducing `f(given x1, ..., xn)` if `f` is a known lambda expression.
+     *
+     *  `Expr.betaReduceGiven` distributes applications of `Expr` over function arrows
+     *   ```scala
+     *   Expr.betaReduceGiven(_): Expr[(given T1, ..., Tn) => R] => ((Expr[T1], ..., Expr[Tn]) => Expr[R])
+     *   ```
+     *  Note: The
+     */
+    def betaReduceGiven[F, Args <: Tuple, R, G](f: Expr[F])(given tf: TupledFunction[F, (given Args) => R], tg: TupledFunction[G, TupleOfExpr[Args] => Expr[R]], qctx: QuoteContext): G = {
+      import qctx.tasty._
+      tg.untupled(args => qctx.tasty.internal.betaReduce(f.unseal, args.toArray.toList.map(_.asInstanceOf[QuoteContext => Expr[_]](qctx).unseal)).seal.asInstanceOf[Expr[R]])
     }
 
     /** Returns a null expresssion equivalent to `'{null}` */

library/src/scala/quoted/Expr.scala

@@ -1,6 +1,6 @@
 import scala.quoted._
 
-def testImpl(f: Expr[(Int, Int) => Int])(given QuoteContext): Expr[Int] = f('{1}, '{2})
+def testImpl(f: Expr[(Int, Int) => Int])(given QuoteContext): Expr[Int] = Expr.betaReduce(f)('{1}, '{2})
 
 inline def test(f: (Int, Int) => Int) = ${
   testImpl('f)

tests/pos/i6783.scala

@@ -24,7 +24,7 @@ object Optional {
   // FIXME fix issue #5097 and enable private
   /*private*/ def mapImpl[A >: Null : Type, B >: Null : Type](opt: Expr[Optional[A]], f: Expr[A => B])(given QuoteContext): Expr[Optional[B]] = '{
     if ($opt.isEmpty) new Optional(null)
-    else new Optional(${f('{$opt.value})})
+    else new Optional(${Expr.betaReduce(f)('{$opt.value})})
   }
 
 }

tests/run-macros/gestalt-optional-staging/Macro_1.scala

@@ -13,9 +13,9 @@ object Macros {
     while (i < size) {
       ${
         for (j <- new UnrolledRange(0, unrollSize)) '{
-          val index = i + ${j}
+          val index = i + $j
           val element = ($seq)(index)
-          ${ f('element) } // or `($f)(element)` if `f` should not be inlined
+          ${ Expr.betaReduce(f)('element) } // or `($f)(element)` if `f` should not be inlined
         }
       }
       i += ${unrollSize}

tests/run-macros/i4734/Macro_1.scala

@@ -17,7 +17,7 @@ object Macro {
       ${
         for (j <- new UnrolledRange(0, unrollSize)) '{
           val element = ($seq)(i + ${j})
-          ${f('element)} // or `($f)(element)` if `f` should not be inlined
+          ${Expr.betaReduce(f)('element)} // or `($f)(element)` if `f` should not be inlined
         }
       }
       i += ${unrollSize}

tests/run-macros/i4735/Macro_1.scala

@@ -15,5 +15,5 @@ def mcrProxy(expr: Expr[Boolean])(given QuoteContext): Expr[Unit] = {
 def mcrImpl[T](func: Expr[Seq[Box[T]] => Unit], expr: Expr[T])(given ctx: QuoteContext, tt: Type[T]): Expr[Unit] = {
   import ctx.tasty._
   val arg = Expr.ofSeq(Seq('{(Box($expr))}))
-  func(arg)
+  Expr.betaReduce(func)(arg)
 }

tests/run-macros/i7008/macro_1.scala

@@ -12,11 +12,11 @@ object Macros {
       var i = $start
       val j = $end
       while (i < j) {
-        ${f.apply('i)}
+        ${Expr.betaReduce(f)('i)}
         i += 1
       }
       while {
-        ${f.apply('i)}
+        ${Expr.betaReduce(f)('i)}
         i += 1
         i < j
       } do ()

tests/run-macros/quote-inline-function/quoted_1.scala

@@ -72,7 +72,7 @@ object StringNum extends Symantics[String] {
   def value(x: Int)(given QuoteContext): Expr[String] = Expr(x.toString)
   def plus(x: Expr[String], y: Expr[String])(given QuoteContext): Expr[String] = '{ s"${$x} + ${$y}" } // '{ x + " + " + y }
   def times(x: Expr[String], y: Expr[String])(given QuoteContext): Expr[String] = '{ s"${$x} * ${$y}" }
-  def app(f: Expr[String => String], x: Expr[String])(given QuoteContext): Expr[String] = f(x) // functions are beta reduced
+  def app(f: Expr[String => String], x: Expr[String])(given QuoteContext): Expr[String] = Expr.betaReduce(f)(x)
   def lam(body: Expr[String] => Expr[String])(given QuoteContext): Expr[String => String] = '{ (x: String) => ${body('x)} }
 }