Update Unliftable API

* Align with Liftable API definitions
* Simplify implementation signatures

Author: nicolasstucki

community-build/community-projects/dotty-cps-async

@@ -56,7 +56,7 @@ object Expr {
      *  Otherwise returns the `Some` of the value.
      */
     def unlift(using qctx: QuoteContext, unlift: Unliftable[T]): Option[T] =
-      unlift(expr)
+      unlift.fromExpr(expr)
 
     /** Return the unlifted value of this expression.
      *
@@ -67,7 +67,7 @@ object Expr {
       def reportError =
         val msg = s"Expected a known value. \n\nThe value of: ${expr.show}\ncould not be unlifted using $unlift"
         report.throwError(msg, expr)
-      unlift(expr).getOrElse(reportError)
+      unlift.fromExpr(expr).getOrElse(reportError)
   end extension
 
   /** `e.betaReduce` returns an expression that is functionally equivalent to `e`,

community-build/community-projects/utest

@@ -13,7 +13,7 @@ object Unlifted {
    *  ```
    */
   def unapply[T](expr: Expr[T])(using unlift: Unliftable[T], qxtc: QuoteContext): Option[T] =
-    unlift(expr)
+    unlift.fromExpr(expr)
 
   /** Matches literal sequence of literal constant value expressions and return a sequence of values.
    *

library/src-bootstrapped/scala/quoted/Expr.scala

@@ -9,7 +9,7 @@ object E {
   def impl[T: Type](x: Expr[E[T]]) (using QuoteContext): Expr[T] = x.unliftOrError.lift
 
   implicit def ev1[T: Type]: Unliftable[E[T]] = new Unliftable {
-    def apply(x: Expr[E[T]]) (using QuoteContext): Option[E[T]] = x match {
+    def fromExpr(x: Expr[E[T]]) = x match {
       case '{ I(${Const(n)}) } => Some(I(n).asInstanceOf[E[T]])
       case '{ Plus[T](${Value(x)}, ${Value(y)})(using $op) } if op.matches('{Plus2.IPlus}) => Some(Plus(x, y)(using Plus2.IPlus.asInstanceOf[Plus2[T]]).asInstanceOf[E[T]])
       case _ => None

library/src-bootstrapped/scala/quoted/Unliftable.scala

@@ -10,7 +10,7 @@ object E {
     expr.unliftOrError.lift
 
   implicit def ev1[T: Type]: Unliftable[E[T]] = new Unliftable { // TODO use type class derivation
-    def apply(x: Expr[E[T]]) (using QuoteContext): Option[E[T]] = (x match {
+    def fromExpr(x: Expr[E[T]]) = (x match {
       case '{ I(${Const(n)}) } => Some(I(n))
       case '{ D(${Const(n)}) } => Some(D(n))
       case '{ Plus[Int](${Value(x)}, ${Value(y)})(using $op) } => Some(Plus(x, y)(using Plus2.IPlus))

library/src-bootstrapped/scala/quoted/Unlifted.scala

@@ -8,7 +8,7 @@ object Test {
   def main(args: Array[String]): Unit = withQuoteContext {
 
     implicit def UnliftableInt: Unliftable[Int] = new {
-      def apply(n: Expr[Int])(using QuoteContext): Option[Int] = n match {
+      def fromExpr(n: Expr[Int]) = n match {
         case '{ 0 } => Some(0)
         case '{ 1 } => Some(1)
         case '{ 2 } => Some(1)
@@ -17,15 +17,15 @@ object Test {
     }
 
     implicit def UnliftableBoolean: Unliftable[Boolean] = new Unliftable[Boolean] {
-      def apply(b: Expr[Boolean])(using QuoteContext): Option[Boolean] = b match {
+      def fromExpr(b: Expr[Boolean]) = b match {
         case '{ true } => Some(true)
         case '{ false } => Some(false)
         case _ => None
       }
     }
 
     implicit def UnliftableList[T: Unliftable: Type]: Unliftable[List[T]] = new {
-      def apply(xs: Expr[List[T]])(using QuoteContext): Option[List[T]] = (xs: Expr[Any]) match {
+      def fromExpr(xs: Expr[List[T]]) = (xs: Expr[Any]) match {
         case '{ ($xs1: List[T]).::($x) } =>
           for { head <- x.unlift; tail <- xs1.unlift }
           yield head :: tail
@@ -35,7 +35,7 @@ object Test {
     }
 
     implicit def UnliftableOption[T: Unliftable: Type]: Unliftable[Option[T]] = new {
-      def apply(expr: Expr[Option[T]])(using QuoteContext): Option[Option[T]] = expr match {
+      def fromExpr(expr: Expr[Option[T]]) = expr match {
         case '{ Some[T]($x) } => for (v <- x.unlift) yield Some(v)
         case '{ None } => Some(None)
         case _ => None