Remove quoted.Const.unapply

nicolasstucki · nicolasstucki · commit bd6bc5dc8ea9 · 2020-11-26T17:45:02.000+01:00
This extractor was replaced with the more versatil extractor `quoted.Unlifted.unapply`.

* Remove definition of `quoted.Const.unapply`
* Replace uses of `Const` with `Unlifted`
* Allow unlifting precise types for primitives
* Remove `Unlifted[Unit]`
diff --git a/library/src-bootstrapped/scala/quoted/Unliftable.scala b/library/src-bootstrapped/scala/quoted/Unliftable.scala
@@ -14,39 +14,46 @@ trait Unliftable[T] {
 
 object Unliftable {
 
-  /** Default unliftable for Unit */
-  given UnitUnliftable as Unliftable[Unit] = new PrimitiveUnliftable
-
   /** Default unliftable for Boolean */
-  given BooleanUnliftable as Unliftable[Boolean] = new PrimitiveUnliftable
+  given BooleanUnliftable[T <: Boolean] as Unliftable[T] = new PrimitiveUnliftable
 
   /** Default unliftable for Byte */
-  given ByteUnliftable as Unliftable[Byte] = new PrimitiveUnliftable
+  given ByteUnliftable[T <: Byte] as Unliftable[T] = new PrimitiveUnliftable
 
   /** Default unliftable for Short */
-  given ShortUnliftable as Unliftable[Short] = new PrimitiveUnliftable
+  given ShortUnliftable[T <: Short] as Unliftable[T] = new PrimitiveUnliftable
 
   /** Default unliftable for Int */
-  given IntUnliftable as Unliftable[Int] = new PrimitiveUnliftable
+  given IntUnliftable[T <: Int] as Unliftable[T] = new PrimitiveUnliftable
 
   /** Default unliftable for Long */
-  given LongUnliftable as Unliftable[Long] = new PrimitiveUnliftable
+  given LongUnliftable[T <: Long] as Unliftable[T] = new PrimitiveUnliftable
 
   /** Default unliftable for Float */
-  given FloatUnliftable as Unliftable[Float] = new PrimitiveUnliftable
+  given FloatUnliftable[T <: Float] as Unliftable[T] = new PrimitiveUnliftable
 
   /** Default unliftable for Double */
-  given DoubleUnliftable as Unliftable[Double] = new PrimitiveUnliftable
+  given DoubleUnliftable[T <: Double] as Unliftable[T] = new PrimitiveUnliftable
 
   /** Default unliftable for Char */
-  given CharUnliftable as Unliftable[Char] = new PrimitiveUnliftable
+  given CharUnliftable[T <: Char] as Unliftable[T] = new PrimitiveUnliftable
 
   /** Default unliftable for String */
-  given StringUnliftable as Unliftable[String] = new PrimitiveUnliftable
+  given StringUnliftable[T <: String] as Unliftable[T] = new PrimitiveUnliftable
 
-  private class PrimitiveUnliftable[T <: Unit | Null | Int | Boolean | Byte | Short | Int | Long | Float | Double | Char | String] extends Unliftable[T] {
+  private class PrimitiveUnliftable[T <: Int | Boolean | Byte | Short | Int | Long | Float | Double | Char | String] extends Unliftable[T] {
     /** Lift a quoted primitive value `'{ n }` into `n` */
-    def fromExpr(x: Expr[T]) = Const.unapply(x)
+    def fromExpr(expr: Expr[T]) = {
+      import quotes.reflect._
+      def rec(tree: Term): Option[T] = tree match {
+        case Literal(c) => Some(c.value.asInstanceOf[T])
+        case Block(Nil, e) => rec(e)
+        case Typed(e, _) => rec(e)
+        case Inlined(_, Nil, e) => rec(e)
+        case _  => None
+      }
+      rec(Term.of(expr))
+    }
   }
 
   /** Default unliftable for Option */
@@ -79,8 +86,8 @@ object Unliftable {
   /** Default unliftable for StringContext */
   given StringContextUnliftable as Unliftable[StringContext] = new {
     def fromExpr(x: Expr[StringContext]) = x match {
-      case '{ new StringContext(${Varargs(Consts(args))}: _*) } => Some(StringContext(args: _*))
-      case '{     StringContext(${Varargs(Consts(args))}: _*) } => Some(StringContext(args: _*))
+      case '{ new StringContext(${Varargs(Unlifted(args))}: _*) } => Some(StringContext(args: _*))
+      case '{     StringContext(${Varargs(Unlifted(args))}: _*) } => Some(StringContext(args: _*))
       case _ => None
     }
   }
diff --git a/library/src/scala/quoted/Const.scala b/library/src/scala/quoted/Const.scala
diff --git a/library/src/scala/quoted/Consts.scala b/library/src/scala/quoted/Consts.scala
diff --git a/tests/neg-macros/BigFloat/BigFloatFromDigitsImpl_1.scala b/tests/neg-macros/BigFloat/BigFloatFromDigitsImpl_1.scala
@@ -6,7 +6,7 @@ import scala.quoted._
 object BigFloatFromDigitsImpl:
   def apply(digits: Expr[String])(using Quotes): Expr[BigFloat] =
     digits match
-      case Const(ds) =>
+      case Unlifted(ds) =>
         try
           val BigFloat(m, e) = BigFloat(ds)
           '{BigFloat(${Expr(m)}, ${Expr(e)})}
diff --git a/tests/neg-macros/GenericNumLits/EvenFromDigitsImpl_1.scala b/tests/neg-macros/GenericNumLits/EvenFromDigitsImpl_1.scala
@@ -5,7 +5,7 @@ import Even._
 
 object EvenFromDigitsImpl:
   def apply(digits: Expr[String])(using Quotes): Expr[Even] = digits match {
-    case Const(ds) =>
+    case Unlifted(ds) =>
       val ev =
         try evenFromDigits(ds)
         catch {
diff --git a/tests/neg-macros/i6432/Macro_1.scala b/tests/neg-macros/i6432/Macro_1.scala
@@ -9,7 +9,7 @@ object Macro {
     import quotes.reflect._
     sc match {
       case '{ StringContext(${Varargs(parts)}: _*) } =>
-        for (part @ Const(s) <- parts)
+        for (part @ Unlifted(s) <- parts)
           report.error(s, Term.of(part).pos)
     }
     '{}
diff --git a/tests/neg-macros/i6432b/Macro_1.scala b/tests/neg-macros/i6432b/Macro_1.scala
@@ -9,7 +9,7 @@ object Macro {
     import quotes.reflect._
     sc match {
       case '{ StringContext(${Varargs(parts)}: _*) } =>
-        for (part @ Const(s) <- parts)
+        for (part @ Unlifted(s) <- parts)
           report.error(s, Term.of(part).pos)
     }
     '{}
diff --git a/tests/neg-macros/inline-macro-staged-interpreter/Macro_1.scala b/tests/neg-macros/inline-macro-staged-interpreter/Macro_1.scala
@@ -10,7 +10,7 @@ object E {
 
   implicit def ev1[T: Type]: Unliftable[E[T]] = new Unliftable {
     def fromExpr(x: Expr[E[T]]) = x match {
-      case '{ I(${Const(n)}) } => Some(I(n).asInstanceOf[E[T]])
+      case '{ I(${Unlifted(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
     }
diff --git a/tests/run-macros/BigFloat/BigFloatFromDigitsImpl_1.scala b/tests/run-macros/BigFloat/BigFloatFromDigitsImpl_1.scala
@@ -6,7 +6,7 @@ import scala.quoted._
 object BigFloatFromDigitsImpl:
   def apply(digits: Expr[String])(using Quotes): Expr[BigFloat] =
     digits match
-      case Const(ds) =>
+      case Unlifted(ds) =>
         try
           val BigFloat(m, e) = BigFloat(ds)
           '{BigFloat(${Expr(m)}, ${Expr(e)})}
diff --git a/tests/run-macros/enum-nat-macro/Macros_2.scala b/tests/run-macros/enum-nat-macro/Macros_2.scala
@@ -25,6 +25,6 @@ import Nat._
        case 0 => acc
        case n => inner[Succ[N]](n - 1, '{Succ($acc)})
 
-     val Const(i) = int
+     val Unlifted(i) = int
      require(i >= 0)
      inner[Zero.type](i, '{Zero})
diff --git a/tests/run-macros/expr-map-1/Macro_1.scala b/tests/run-macros/expr-map-1/Macro_1.scala
@@ -9,7 +9,7 @@ private def stringRewriter(e: Expr[Any])(using Quotes): Expr[Any] =
 private object StringRewriter extends ExprMap {
 
   def transform[T](e: Expr[T])(using Quotes, Type[T]): Expr[T] = e match
-    case Const(s: String) =>
+    case '{ ${Unlifted(s)}: String } =>
       Expr(s.reverse) match
         case '{ $x: T } => x
         case _ => e // e had a singlton String type
diff --git a/tests/run-macros/flops-rewrite-2/Macro_1.scala b/tests/run-macros/flops-rewrite-2/Macro_1.scala
@@ -13,22 +13,22 @@ private def rewriteMacro[T: Type](x: Expr[T])(using Quotes): Expr[T] = {
       Transformation[Int] {
         case '{ plus($x, $y) } =>
           (x, y) match {
-            case (Const(0), _) => y
-            case (Const(a), Const(b)) => Expr(a + b)
-            case (_, Const(_)) =>  '{ $y + $x }
+            case (Unlifted(0), _) => y
+            case (Unlifted(a), Unlifted(b)) => Expr(a + b)
+            case (_, Unlifted(_)) =>  '{ $y + $x }
             case _ => '{ $x + $y }
           }
         case '{ times($x, $y) } =>
           (x, y) match {
-            case (Const(0), _) => '{0}
-            case (Const(1), _) => y
-            case (Const(a), Const(b)) => Expr(a * b)
-            case (_, Const(_)) => '{ $y * $x }
+            case (Unlifted(0), _) => '{0}
+            case (Unlifted(1), _) => y
+            case (Unlifted(a), Unlifted(b)) => Expr(a * b)
+            case (_, Unlifted(_)) => '{ $y * $x }
             case _ => '{ $x * $y }
           }
-        case '{ power(${Const(x)}, ${Const(y)}) } =>
+        case '{ power(${Unlifted(x)}, ${Unlifted(y)}) } =>
           Expr(power(x, y))
-        case '{ power($x, ${Const(y)}) } =>
+        case '{ power($x, ${Unlifted(y)}) } =>
           if y == 0 then '{1}
           else '{ times($x, power($x, ${Expr(y-1)})) }
       }),
diff --git a/tests/run-macros/flops-rewrite-3/Macro_1.scala b/tests/run-macros/flops-rewrite-3/Macro_1.scala
@@ -12,22 +12,22 @@ private def rewriteMacro[T: Type](x: Expr[T])(using Quotes): Expr[T] = {
     Transformation.safe[Int] {
       case '{ plus($x, $y) } =>
         (x, y) match {
-          case (Const(0), _) => y
-          case (Const(a), Const(b)) => Expr(a + b)
-          case (_, Const(_)) =>  '{ $y + $x }
+          case (Unlifted(0), _) => y
+          case (Unlifted(a), Unlifted(b)) => Expr(a + b)
+          case (_, Unlifted(_)) =>  '{ $y + $x }
           case _ => '{ $x + $y }
         }
       case '{ times($x, $y) } =>
         (x, y) match {
-          case (Const(0), _) => '{0}
-          case (Const(1), _) => y
-          case (Const(a), Const(b)) => Expr(a * b)
-          case (_, Const(_)) => '{ $y * $x }
+          case (Unlifted(0), _) => '{0}
+          case (Unlifted(1), _) => y
+          case (Unlifted(a), Unlifted(b)) => Expr(a * b)
+          case (_, Unlifted(_)) => '{ $y * $x }
           case _ => '{ $x * $y }
         }
-      case '{ power(${Const(x)}, ${Const(y)}) } =>
+      case '{ power(${Unlifted(x)}, ${Unlifted(y)}) } =>
         Expr(power(x, y))
-      case '{ power($x, ${Const(y)}) } =>
+      case '{ power($x, ${Unlifted(y)}) } =>
         if y == 0 then '{1}
         else '{ times($x, power($x, ${Expr(y-1)})) }
     }
diff --git a/tests/run-macros/i8671/Macro_1.scala b/tests/run-macros/i8671/Macro_1.scala
@@ -14,7 +14,7 @@ object FileName {
   def createFileName(fileName: Expr[String])(using Quotes): Expr[FileName] =
     import quotes.reflect.report
     fileName match {
-      case e@Const(s) =>
+      case e@Unlifted(s) =>
         fileNameFromString(s) match {
             case Right(fn) =>
               '{FileName.unsafe(${Expr(fn.name)})} // Or `Expr(fn)` if there is a `Liftable[FileName]`
diff --git a/tests/run-macros/inline-macro-staged-interpreter/Macro_1.scala b/tests/run-macros/inline-macro-staged-interpreter/Macro_1.scala
@@ -11,8 +11,8 @@ object E {
 
   implicit def ev1[T: Type]: Unliftable[E[T]] = new Unliftable { // TODO use type class derivation
     def fromExpr(x: Expr[E[T]]) = (x match {
-      case '{ I(${Const(n)}) } => Some(I(n))
-      case '{ D(${Const(n)}) } => Some(D(n))
+      case '{ I(${Unlifted(n)}) } => Some(I(n))
+      case '{ D(${Unlifted(n)}) } => Some(D(n))
       case '{ Plus[Int](${Value(x)}, ${Value(y)})(using $op) } => Some(Plus(x, y)(using Plus2.IPlus))
       case '{ Plus[Double](${Value(x)}, ${Value(y)})(using $op) } => Some(Plus(x, y)(using Plus2.DPlus))
       case '{ Times[Int](${Value(x)}, ${Value(y)})(using $op) } => Some(Times(x, y)(using Times2.ITimes))
diff --git a/tests/run-macros/quote-matcher-string-interpolator-2/quoted_1.scala b/tests/run-macros/quote-matcher-string-interpolator-2/quoted_1.scala
@@ -9,8 +9,8 @@ object Macros {
   private def impl(self: Expr[StringContext], args: Expr[Seq[String]])(using Quotes): Expr[String] = {
     (self, args) match {
       case ('{ StringContext(${Varargs(parts)}: _*) }, Varargs(args1)) =>
-        val strParts = parts.map { case Const(str) => str.reverse }
-        val strArgs = args1.map { case Const(str) => str }
+        val strParts = parts.map { case Unlifted(str) => str.reverse }
+        val strArgs = args1.map { case Unlifted(str) => str }
         Expr(StringContext(strParts: _*).s(strArgs: _*))
       case _ => ???
     }
diff --git a/tests/run-macros/quote-matcher-string-interpolator-3/quoted_1.scala b/tests/run-macros/quote-matcher-string-interpolator-3/quoted_1.scala
@@ -8,7 +8,7 @@ object Macros {
 
   private def impl(self: Expr[StringContext], args: Expr[Seq[String]])(using Quotes): Expr[String] = {
     self match {
-      case '{ StringContext(${Varargs(Consts(parts))}: _*) } =>
+      case '{ StringContext(${Varargs(Unlifted(parts))}: _*) } =>
         val upprerParts: List[String] = parts.toList.map(_.toUpperCase)
         val upprerPartsExpr: Expr[List[String]] = Expr.ofList(upprerParts.map(Expr(_)))
         '{ StringContext($upprerPartsExpr: _*).s($args: _*) }
diff --git a/tests/run-macros/quote-matcher-symantics-1/quoted_1.scala b/tests/run-macros/quote-matcher-symantics-1/quoted_1.scala
@@ -10,7 +10,7 @@ object Macros {
 
     def lift(e: Expr[DSL]): Expr[T] = e match {
 
-      case '{ LitDSL(${ Const(c) }) } =>
+      case '{ LitDSL(${ Unlifted(c) }) } =>
         '{ $sym.value(${Expr(c)}) }
 
       case '{ ($x: DSL) + ($y: DSL) } =>
diff --git a/tests/run-macros/quote-matcher-symantics-2/quoted_1.scala b/tests/run-macros/quote-matcher-symantics-2/quoted_1.scala
@@ -21,7 +21,7 @@ object Macros {
 
     def lift(e: Expr[DSL])(implicit env: Map[Int, Expr[T]]): Expr[T] = e match {
 
-      case '{ LitDSL(${Const(c)}) } => sym.value(c)
+      case '{ LitDSL(${Unlifted(c)}) } => sym.value(c)
 
       case '{ ($x: DSL) + ($y: DSL) } => sym.plus(lift(x), lift(y))
 
@@ -35,7 +35,7 @@ object Macros {
           lift(close(body1)(nEnvVar))(env + (i -> lift(value)))
         }
 
-      case '{ envVar(${Const(i)}) } => env(i)
+      case '{ envVar(${Unlifted(i)}) } => env(i)
 
       case _ =>
         import quotes.reflect._
diff --git a/tests/run-macros/quote-matcher-symantics-3/quoted_1.scala b/tests/run-macros/quote-matcher-symantics-3/quoted_1.scala
@@ -18,15 +18,15 @@ object Macros {
     object FromEnv {
       def unapply[T](e: Expr[Any])(using env: Env): Option[Expr[R[T]]] =
         e match
-          case '{envVar[t](${Const(id)})} =>
+          case '{envVar[t](${Unlifted(id)})} =>
             env.get(id).asInstanceOf[Option[Expr[R[T]]]] // We can only add binds that have the same type as the refs
           case _ =>
             None
     }
 
     def lift[T: Type](e: Expr[T])(using env: Env): Expr[R[T]] = ((e: Expr[Any]) match {
-      case Const(e: Int) => '{ $sym.int(${Expr(e)}).asInstanceOf[R[T]] }
-      case Const(e: Boolean) => '{ $sym.bool(${Expr(e)}).asInstanceOf[R[T]] }
+      case '{ ${Unlifted(e)}: Int } => '{ $sym.int(${Expr(e)}).asInstanceOf[R[T]] }
+      case '{ ${Unlifted(e)}: Boolean } => '{ $sym.bool(${Expr(e)}).asInstanceOf[R[T]] }
 
       case '{ ($x: Int) + ($y: Int) } =>
         '{ $sym.add(${lift(x)}, ${lift(y)}).asInstanceOf[R[T]] }
diff --git a/tests/run-macros/quoted-matching-docs-2/Macro_1.scala b/tests/run-macros/quoted-matching-docs-2/Macro_1.scala
@@ -26,11 +26,11 @@ private def sumExpr(args1: Seq[Expr[Int]])(using Quotes): Expr[Int] = {
     }
     val args2 = args1.flatMap(flatSumArgs)
     val staticSum: Int = args2.map {
-      case Const(arg) => arg
+      case Unlifted(arg) => arg
       case _ => 0
     }.sum
     val dynamicSum: Seq[Expr[Int]] = args2.filter {
-      case Const(_) => false
+      case Unlifted(_) => false
       case arg => true
     }
     dynamicSum.foldLeft(Expr(staticSum))((acc, arg) => '{ $acc + $arg })
diff --git a/tests/run-macros/quoted-matching-docs/Macro_1.scala b/tests/run-macros/quoted-matching-docs/Macro_1.scala
@@ -9,15 +9,15 @@ private def sumExprShow(argsExpr: Expr[Seq[Int]]) (using Quotes): Expr[String] =
 
 private def sumExpr(argsExpr: Expr[Seq[Int]])(using Quotes) : Expr[Int] = {
   UnsafeExpr.underlyingArgument(argsExpr) match {
-    case Varargs(Consts(args)) => // args is of type Seq[Int]
+    case Varargs(Unlifted(args)) => // args is of type Seq[Int]
       Expr(args.sum) // precompute result of sum
     case Varargs(argExprs) => // argExprs is of type Seq[Expr[Int]]
       val staticSum: Int = argExprs.map {
-        case Const(arg) => arg
+        case Unlifted(arg) => arg
         case _ => 0
       }.sum
       val dynamicSum: Seq[Expr[Int]] = argExprs.filter {
-        case Const(_) => false
+        case Unlifted(_) => false
         case arg => true
       }
       dynamicSum.foldLeft(Expr(staticSum))((acc, arg) => '{ $acc + $arg })
diff --git a/tests/run-macros/quoted-pattern-open-expr-simple-eval/Macro_1.scala b/tests/run-macros/quoted-pattern-open-expr-simple-eval/Macro_1.scala
@@ -8,7 +8,7 @@ private def evalExpr(using Quotes)(e: Expr[Int]): Expr[Int] = {
       evalExpr(Expr.betaReduce('{$body(${evalExpr(x)})}))
     case '{ ($x: Int) * ($y: Int) } =>
       (x, y) match
-        case (Const(a), Const(b)) => Expr(a * b)
+        case (Unlifted(a), Unlifted(b)) => Expr(a * b)
         case _ => e
     case _ => e
   }
diff --git a/tests/run-macros/tasty-extractors-constants-1.check b/tests/run-macros/tasty-extractors-constants-1.check
@@ -1,5 +1,3 @@
 3
 4
 abc
-null
-OK
diff --git a/tests/run-macros/tasty-extractors-constants-1/quoted_1.scala b/tests/run-macros/tasty-extractors-constants-1/quoted_1.scala
diff --git a/tests/run-macros/tasty-string-interpolation-reporter-test/Macros_1.scala b/tests/run-macros/tasty-string-interpolation-reporter-test/Macros_1.scala
diff --git a/tests/run-staging/quote-valueof.check b/tests/run-staging/quote-valueof.check
diff --git a/tests/run-staging/quote-valueof.scala b/tests/run-staging/quote-valueof.scala

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ object Macro {`
`9`	`9`	`import quotes.reflect._`
`10`	`10`	`sc match {`
`11`	`11`	`case '{ StringContext(${Varargs(parts)}: _*) } =>`
`12`		`- for (part @ Const(s) <- parts)`
	`12`	`+ for (part @ Unlifted(s) <- parts)`
`13`	`13`	`report.error(s, Term.of(part).pos)`
`14`	`14`	`}`
`15`	`15`	`'{}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ object E {`
`10`	`10`
`11`	`11`	`implicit def ev1[T: Type]: Unliftable[E[T]] = new Unliftable {`
`12`	`12`	`def fromExpr(x: Expr[E[T]]) = x match {`
`13`		`- case '{ I(${Const(n)}) } => Some(I(n).asInstanceOf[E[T]])`
	`13`	`+ case '{ I(${Unlifted(n)}) } => Some(I(n).asInstanceOf[E[T]])`
`14`	`14`	`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]])`
`15`	`15`	`case _ => None`
`16`	`16`	`}`