Remove quoted.Const.unapply

nicolasstucki · nicolasstucki · commit e03231fd9ec2 · 2020-12-02T10:56:41.000+01:00
This extractor was replaced with the more versatile extractor `quoted.Expr.unapply`.
Usually, it is better to use `expr.unlift`/`expr.unliftOrError` when it is simpler to do so.

* Remove definition of `quoted.Const.unapply`
* Replace uses of `Const` with `Expr`

**Migration**

* Consider using `expr.unlift` and them match on `Option`
* Consider using `expr.unliftOrError`
* Replace `Const(x)` with `Expr(x)` if the type is known
* Replace `Const(x: Int)` with `'{ ${Expr(x)}: Int }` if type of expression must be checked at runtime
diff --git a/library/src-bootstrapped/scala/quoted/Unliftable.scala b/library/src-bootstrapped/scala/quoted/Unliftable.scala
@@ -135,8 +135,8 @@ object Unliftable {
    */
   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(Exprs(args))}: _*) } => Some(StringContext(args: _*))
+      case '{     StringContext(${Varargs(Exprs(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/bench/string-interpolation-macro/Macro.scala b/tests/bench/string-interpolation-macro/Macro.scala
@@ -9,7 +9,7 @@ object Macro {
     var res: Expr[String] = null
     for _ <- 0 to 5_000 do
       (strCtxExpr, argsExpr) match {
-        case ('{ StringContext(${Varargs(Consts(parts))}: _*) }, Varargs(Consts(args))) =>
+        case ('{ StringContext(${Varargs(Exprs(parts))}: _*) }, Varargs(Unlifted(args))) =>
           res = Expr(StringContext(parts: _*).s(args: _*))
         case _ => ???
       }
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 @ Expr(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 @ Expr(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(${Expr(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/neg-with-compiler/GenericNumLits/EvenFromDigitsImpl_1.scala b/tests/neg-with-compiler/GenericNumLits/EvenFromDigitsImpl_1.scala
@@ -4,8 +4,8 @@ import scala.quoted._
 import Even._
 
 object EvenFromDigitsImpl:
-  def apply(digits: Expr[String])(using Quotes): Expr[Even] = digits match {
-    case Const(ds) =>
+  def apply(digits: Expr[String])(using Quotes): Expr[Even] = digits.unlift match {
+    case Some(ds) =>
       val ev =
         try evenFromDigits(ds)
         catch {
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 Type[T])(using Quotes): Expr[T] = e match
-    case Const(s: String) =>
+    case '{ ${Expr(s)}: String } =>
       Expr(s.reverse) match
         case '{ $x: T } => x
         case _ => e // e had a singlton String type
diff --git a/tests/run-macros/expr-map-3/Macro_1.scala b/tests/run-macros/expr-map-3/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 Type[T])(using Quotes): Expr[T] = e match
-    case '{ ${Unlifted(s)}: String } =>
+    case '{ ${Expr(s)}: String } =>
       // checkIfValid(s)
       val s2: String & T = s
       Expr(s2)
diff --git a/tests/run-macros/flops-rewrite-2/Macro_1.scala b/tests/run-macros/flops-rewrite-2/Macro_1.scala
@@ -26,9 +26,9 @@ private def rewriteMacro[T: Type](x: Expr[T])(using Quotes): Expr[T] = {
             case (_, Some(_)) => '{ $y * $x }
             case _ => '{ $x * $y }
           }
-        case '{ power(${Const(x)}, ${Const(y)}) } =>
+        case '{ power(${Expr(x)}, ${Expr(y)}) } =>
           Expr(power(x, y))
-        case '{ power($x, ${Const(y)}) } =>
+        case '{ power($x, ${Expr(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
@@ -25,9 +25,9 @@ private def rewriteMacro[T: Type](x: Expr[T])(using Quotes): Expr[T] = {
           case (_, Some(_)) => '{ $y * $x }
           case _ => '{ $x * $y }
         }
-      case '{ power(${Const(x)}, ${Const(y)}) } =>
+      case '{ power(${Expr(x)}, ${Expr(y)}) } =>
         Expr(power(x, y))
-      case '{ power($x, ${Const(y)}) } =>
+      case '{ power($x, ${Expr(y)}) } =>
         if y == 0 then '{1}
         else '{ times($x, power($x, ${Expr(y-1)})) }
     }
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(${Expr(n)}) } => Some(I(n))
+      case '{ D(${Expr(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-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(Exprs(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(${ Expr(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(${Expr(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(${Expr(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](${Expr(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 '{ ${Expr(e)}: Int } => '{ $sym.int(${Expr(e)}).asInstanceOf[R[T]] }
+      case '{ ${Expr(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/Macro_1.scala b/tests/run-macros/quoted-matching-docs/Macro_1.scala
@@ -9,7 +9,7 @@ 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(Exprs(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(_.unlift.getOrElse(0)).sum
diff --git a/tests/run-macros/tasty-extractors-constants-1.check b/tests/run-macros/tasty-extractors-constants-1.check
@@ -2,4 +2,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
@@ -11,12 +11,12 @@ object Macros {
     val buff = new StringBuilder
     def stagedPrintln(x: Any): Unit = buff append java.util.Objects.toString(x) append "\n"
 
-    Expr(3) match { case Const(n) => stagedPrintln(n) }
-    '{4} match { case Const(n) => stagedPrintln(n) }
-    '{"abc"} match { case Const(n) => stagedPrintln(n) }
+    Expr(3) match { case Expr(n) => stagedPrintln(n) }
+    '{4} match { case Expr(n) => stagedPrintln(n) }
+    '{"abc"} match { case Expr(n) => stagedPrintln(n) }
     '{null} match { case '{null} => stagedPrintln(null) }
 
-    '{new Object} match { case Const(n) => println(n); case _ => stagedPrintln("OK") }
+    // '{new Object} match { case Expr(n) => println(n); case _ => stagedPrintln("OK") }
 
     '{print(${Expr(buff.result())})}
   }

Original file line number	Diff line number	Diff line change
`@@ -135,8 +135,8 @@ object Unliftable {`
`135`	`135`	`*/`
`136`	`136`	`given StringContextUnliftable as Unliftable[StringContext] = new {`
`137`	`137`	`def fromExpr(x: Expr[StringContext]) = x match {`
`138`		`- case '{ new StringContext(${Varargs(Consts(args))}: _) } => Some(StringContext(args: _))`
`139`		`- case '{ StringContext(${Varargs(Consts(args))}: _) } => Some(StringContext(args: _))`
	`138`	`+ case '{ new StringContext(${Varargs(Exprs(args))}: _) } => Some(StringContext(args: _))`
	`139`	`+ case '{ StringContext(${Varargs(Exprs(args))}: _) } => Some(StringContext(args: _))`
`140`	`140`	`case _ => None`
`141`	`141`	`}`
`142`	`142`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ object Macro {`
`9`	`9`	`var res: Expr[String] = null`
`10`	`10`	`for _ <- 0 to 5_000 do`
`11`	`11`	`(strCtxExpr, argsExpr) match {`
`12`		`- case ('{ StringContext(${Varargs(Consts(parts))}: _*) }, Varargs(Consts(args))) =>`
	`12`	`+ case ('{ StringContext(${Varargs(Exprs(parts))}: _*) }, Varargs(Unlifted(args))) =>`
`13`	`13`	`res = Expr(StringContext(parts: _).s(args: _))`
`14`	`14`	`case _ => ???`
`15`	`15`	`}`
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 @ Expr(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(${Expr(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`	`}`