Replace tasty.util.ConstantExtractor with quoted.matching.Literal

Author: nicolasstucki

library/src/scala/tasty/util/ConstantExtractor.scala

@@ -44,11 +44,9 @@ object Macros {
   }
 
   def power(n: Expr[Int], x: Expr[Double])(implicit reflect: Reflection): Expr[Double] = {
-    import reflect._
-
-    val Constant = new ConstantExtractor(reflect)
+    import quoted.matching.Literal
     n match {
-      case Constant(n1) => powerCode(n1, x)
+      case Literal(n1) => powerCode(n1, x)
       case _ => '{ dynamicPower($n, $x) }
     }
   }

tests/run-with-compiler/tasty-extractors-constants-2/quoted_1.scala

@@ -1,5 +1,7 @@
 import scala.quoted._
 
+import scala.quoted.matching._
+
 import scala.tasty._
 import scala.tasty.util._
 
@@ -8,19 +10,16 @@ object Macros {
   implicit inline def testMacro: Unit = ${impl}
 
   def impl(implicit reflect: Reflection): Expr[Unit] = {
-    import reflect._
 
     val buff = new StringBuilder
     def stagedPrintln(x: Any): Unit = buff append java.util.Objects.toString(x) append "\n"
 
-    val Constant = new ConstantExtractor(reflect)
-
-    3.toExpr match { case Constant(n) => stagedPrintln(n) }
-    '{4} match { case Constant(n) => stagedPrintln(n) }
-    '{"abc"} match { case Constant(n) => stagedPrintln(n) }
-    '{null} match { case Constant(n) => stagedPrintln(n) }
+    3.toExpr match { case Literal(n) => stagedPrintln(n) }
+    '{4} match { case Literal(n) => stagedPrintln(n) }
+    '{"abc"} match { case Literal(n) => stagedPrintln(n) }
+    '{null} match { case Literal(n) => stagedPrintln(n) }
 
-    '{new Object} match { case Constant(n) => println(n); case _ => stagedPrintln("OK") }
+    '{new Object} match { case Literal(n) => println(n); case _ => stagedPrintln("OK") }
 
     '{print(${buff.result().toExpr})}
   }