Refactor scala.quoted.matching

nicolasstucki · nicolasstucki · commit cde14640b7af · 2020-03-09T09:54:04.000+01:00
Importing `scala.quoted._` should give access to all the basic functionalities, but currently some half of them need the extra import for `scala.quoted.matching._`.

* Move `scala.quoted.matching.summonExpr` to `scala.quoted.Expr.summon`
* Move basic quote extractors from `scala.quoted.matching` to `scala.quoted`
diff --git a/library/src-bootstrapped/dotty/internal/StringContextMacro.scala b/library/src-bootstrapped/dotty/internal/StringContextMacro.scala
@@ -3,8 +3,6 @@
 package dotty.internal
 
 import scala.quoted._
-import scala.quoted.matching._
-import reflect._
 
 object StringContextMacro {
 
diff --git a/library/src-non-bootstrapped/dotty/internal/StringContextMacro.scala b/library/src-non-bootstrapped/dotty/internal/StringContextMacro.scala
@@ -3,8 +3,6 @@
 package dotty.internal
 
 import scala.quoted._
-import scala.quoted.matching._
-import reflect._
 
 object StringContextMacro {
 
diff --git a/library/src/scala/quoted/Const.scala b/library/src/scala/quoted/Const.scala
@@ -1,5 +1,4 @@
 package scala.quoted
-package matching
 
 /** Matches expressions containing literal constant values and extracts the value.
  *  It may match expressions of type Boolean, Byte, Short, Int, Long,
diff --git a/library/src/scala/quoted/ConstSeq.scala b/library/src/scala/quoted/ConstSeq.scala
@@ -1,5 +1,4 @@
 package scala.quoted
-package matching
 
 /** Literal sequence of literal constant value expressions */
 object ConstSeq {
diff --git a/library/src/scala/quoted/Expr.scala b/library/src/scala/quoted/Expr.scala
@@ -100,7 +100,7 @@ object Expr {
   }
 
   /** Lift a value into an expression containing the construction of that value */
-  def apply[T: Liftable](x: T)(using qctx: QuoteContext): Expr[T] = summon[Liftable[T]].toExpr(x)
+  def apply[T](x: T)(using qctx: QuoteContext, lift: Liftable[T]): Expr[T] = lift.toExpr(x)
 
   /** Lifts this sequence of expressions into an expression of a sequence
    *
@@ -197,4 +197,20 @@ object Expr {
     ofTuple(elems).cast[Tuple.InverseMap[T, Expr]]
   }
 
+  /** Find an implicit of type `T` in the current scope given by `qctx`.
+   *  Return `Some` containing the expression of the implicit or
+   * `None` if implicit resolution failed.
+   *
+   *  @tparam T type of the implicit parameter
+   *  @param tpe quoted type of the implicit parameter
+   *  @param qctx current context
+   */
+  def summon[T](using tpe: Type[T])(using qctx: QuoteContext): Option[Expr[T]] = {
+    import qctx.tasty.{_, given _}
+    searchImplicit(tpe.unseal.tpe) match {
+      case iss: ImplicitSearchSuccess => Some(iss.tree.seal.asInstanceOf[Expr[T]])
+      case isf: ImplicitSearchFailure => None
+    }
+  }
+
 }
diff --git a/library/src/scala/quoted/ExprSeq.scala b/library/src/scala/quoted/ExprSeq.scala
@@ -1,5 +1,4 @@
 package scala.quoted
-package matching
 
 /** Literal sequence of expressions */
 object ExprSeq {
diff --git a/library/src/scala/quoted/Lambda.scala b/library/src/scala/quoted/Lambda.scala
@@ -1,5 +1,4 @@
 package scala.quoted
-package matching
 
 /** Lambda expression extractor */
 object Lambda {
diff --git a/library/src/scala/quoted/Value.scala b/library/src/scala/quoted/Value.scala
@@ -1,5 +1,4 @@
 package scala.quoted
-package matching
 
 /** Value expressions */
 object Value {
diff --git a/library/src/scala/quoted/ValueOfExpr.scala b/library/src/scala/quoted/ValueOfExpr.scala
@@ -1,7 +1,5 @@
 package scala.quoted
 
-import scala.quoted.matching._
-
 /** A typeclass for types that can be turned from a `quoted.Expr[T]` to a `T` */
 trait ValueOfExpr[T] {
 
@@ -29,7 +27,7 @@ object ValueOfExpr {
 
   private class PrimitiveValueOfExpr[T <: Unit | Null | Int | Boolean | Byte | Short | Int | Long | Float | Double | Char | String] extends ValueOfExpr[T] {
     /** Lift a quoted primitive value `'{ n }` into `n` */
-    def apply(x: Expr[T])(using qctx: QuoteContext): Option[T] = matching.Const.unapply(x)
+    def apply(x: Expr[T])(using qctx: QuoteContext): Option[T] = Const.unapply(x)
   }
 
   given Option_delegate[T](using Type[T], ValueOfExpr[T]) as ValueOfExpr[Option[T]] = new {
diff --git a/library/src/scala/quoted/ValueSeq.scala b/library/src/scala/quoted/ValueSeq.scala
@@ -1,5 +1,4 @@
 package scala.quoted
-package matching
 
 /** Value sequence of value expressions */
 object ValueSeq {
diff --git a/library/src/scala/quoted/matching/package.scala b/library/src/scala/quoted/matching/package.scala
@@ -10,12 +10,29 @@ package object matching {
    *  @param tpe quoted type of the implicit parameter
    *  @param qctx current context
    */
-  def summonExpr[T](using tpe: Type[T])(using qctx: QuoteContext): Option[Expr[T]] = {
-    import qctx.tasty.{_, given _}
-    searchImplicit(tpe.unseal.tpe) match {
-      case iss: ImplicitSearchSuccess => Some(iss.tree.seal.asInstanceOf[Expr[T]])
-      case isf: ImplicitSearchFailure => None
-    }
-  }
+  @deprecated("use scala.quoted.Expr.summon[T] instead", "0.23.0")
+  def summonExpr[T](using tpe: Type[T])(using qctx: QuoteContext): Option[Expr[T]] =
+    Expr.summon[T]
+
+  @deprecated("use scala.quoted.Const instead", "0.23.0")
+  val Const: quoted.Const.type = quoted.Const
+
+  @deprecated("use scala.quoted.ConstSeq instead", "0.23.0")
+  val ConstSeq: quoted.ConstSeq.type = quoted.ConstSeq
+
+  @deprecated("use scala.quoted.ExprSeq instead", "0.23.0")
+  val ExprSeq: quoted.ExprSeq.type = quoted.ExprSeq
+
+  @deprecated("use scala.quoted.Lambda instead", "0.23.0")
+  val Lambda: quoted.Lambda.type = quoted.Lambda
+
+  @deprecated("use scala.quoted.Value instead", "0.23.0")
+  val Value: quoted.Value.type = quoted.Value
+
+  @deprecated("use scala.quoted.ValueOfExpr instead", "0.23.0")
+  val ValueOfExpr: quoted.ValueOfExpr.type = quoted.ValueOfExpr
+
+  @deprecated("use scala.quoted.ValueSeq instead", "0.23.0")
+  val ValueSeq: quoted.ValueSeq.type = quoted.ValueSeq
 
 }
diff --git a/tests/neg-macros/GenericNumLits/Even_1.scala b/tests/neg-macros/GenericNumLits/Even_1.scala
@@ -1,6 +1,6 @@
 import scala.util.FromDigits
 import scala.quoted._
-import scala.quoted.matching._
+
 
 case class Even(n: Int)
 object Even {
diff --git a/tests/neg-macros/delegate-match-1/Macro_1.scala b/tests/neg-macros/delegate-match-1/Macro_1.scala
@@ -1,5 +1,5 @@
 import scala.quoted._
-import scala.quoted.matching._
+
 
 inline def f: Any = ${ fImpl }
 
diff --git a/tests/neg-macros/delegate-match-2/Macro_1.scala b/tests/neg-macros/delegate-match-2/Macro_1.scala
@@ -1,5 +1,5 @@
 import scala.quoted._
-import scala.quoted.matching._
+
 
 inline def f: Any = ${ fImpl }
 
diff --git a/tests/neg-macros/delegate-match-3/Macro_1.scala b/tests/neg-macros/delegate-match-3/Macro_1.scala
@@ -1,5 +1,5 @@
 import scala.quoted._
-import scala.quoted.matching._
+
 
 inline def f: Any = ${ fImpl }
 
diff --git a/tests/neg-macros/i6432/Macro_1.scala b/tests/neg-macros/i6432/Macro_1.scala
@@ -1,7 +1,7 @@
 
 import scala.quoted._
 import scala.quoted.autolift.{given _}
-import scala.quoted.matching._
+
 
 object Macro {
   inline def (sc: => StringContext).foo(args: String*): Unit = ${ impl('sc) }
diff --git a/tests/neg-macros/i6432b/Macro_1.scala b/tests/neg-macros/i6432b/Macro_1.scala
@@ -1,7 +1,7 @@
 
 import scala.quoted._
 import scala.quoted.autolift.{given _}
-import scala.quoted.matching._
+
 
 object Macro {
   inline def (sc: => StringContext).foo(args: String*): Unit = ${ impl('sc) }
diff --git a/tests/neg-macros/inline-macro-staged-interpreter/Macro_1.scala b/tests/neg-macros/inline-macro-staged-interpreter/Macro_1.scala
@@ -1,7 +1,7 @@
 
 import scala.quoted._
 import scala.quoted.autolift.{given _}
-import scala.quoted.matching._
+
 
 object E {
 
diff --git a/tests/neg-with-compiler/GenericNumLits/Even_1.scala b/tests/neg-with-compiler/GenericNumLits/Even_1.scala
@@ -1,6 +1,6 @@
 import scala.util.FromDigits
 import scala.quoted._
-import scala.quoted.matching._
+
 
 case class Even(n: Int)
 object Even {
diff --git a/tests/neg/BigFloat/BigFloat_1.scala b/tests/neg/BigFloat/BigFloat_1.scala
@@ -1,7 +1,7 @@
 package test
 import scala.util.FromDigits
 import scala.quoted._
-import scala.quoted.matching._
+
 
 case class BigFloat(mantissa: BigInt, exponent: Int) {
   override def toString = s"${mantissa}e${exponent}"
diff --git a/tests/neg/i6325.scala b/tests/neg/i6325.scala
@@ -1,4 +1,3 @@
-//import scala.quoted.matching.Bind
 object Test {
   def res(x: quoted.Expr[Int])(using tasty.Reflection): quoted.Expr[Int] = x match {
     case '{ 1 + (${Bind(b)}: Int) } => ??? // error: Not found: Bind
diff --git a/tests/neg/i6436.scala b/tests/neg/i6436.scala
@@ -1,5 +1,5 @@
 import scala.quoted._
-import scala.quoted.matching._
+
 def f(sc: quoted.Expr[StringContext]): Unit = {
   sc match {
     case '{ StringContext(${ExprSeq(parts)}: _*) } => // error
diff --git a/tests/neg/i8052.scala b/tests/neg/i8052.scala
@@ -1,6 +1,6 @@
 import scala.deriving._
 import scala.quoted._
-import scala.quoted.matching._
+
 
 object Macro2 {
   trait TC[T] {
diff --git a/tests/pos-macros/i7853/SummonJsonEncoderTest_2.scala b/tests/pos-macros/i7853/SummonJsonEncoderTest_2.scala
@@ -1,6 +1,6 @@
 import scala.deriving._
 import scala.quoted._
-import scala.quoted.matching._
+
 import scala.compiletime.{erasedValue, summonFrom}
 import JsonEncoder.{given _, _}
 
@@ -11,7 +11,7 @@ object SummonJsonEncoderTest {
   def encodeAndMessAroundTypeImpl[T: Type](value: Expr[T])(using qctx: QuoteContext): Expr[String] = {
     import qctx.tasty._
 
-    val mirrorExpr = summonExpr[Mirror.Of[T]] match {
+    val mirrorExpr = Expr.summon[Mirror.Of[T]] match {
       case Some(mirror) => mirror
     }
 
diff --git a/tests/pos-macros/i8325/Macro_1.scala b/tests/pos-macros/i8325/Macro_1.scala
@@ -1,7 +1,7 @@
 package a
 
 import scala.quoted._
-import scala.quoted.matching._
+
 
 object A:
 
diff --git a/tests/pos-macros/i8325b/Macro_1.scala b/tests/pos-macros/i8325b/Macro_1.scala
@@ -1,7 +1,7 @@
 package a
 
 import scala.quoted._
-import scala.quoted.matching._
+
 
 object A:
 
diff --git a/tests/pos/i6435.scala b/tests/pos/i6435.scala
@@ -1,6 +1,6 @@
 class Foo {
   import scala.quoted._
-  import scala.quoted.matching._
+
   def f(sc: quoted.Expr[StringContext])(using QuoteContext): Unit = {
 
     val '{ StringContext(${parts}: _*) } = sc
diff --git a/tests/pos/i8052.scala b/tests/pos/i8052.scala
@@ -1,6 +1,6 @@
 import scala.deriving._
 import scala.quoted._
-import scala.quoted.matching._
+
 
 object Macro2 {
   trait TC[T] {
diff --git a/tests/run-macros/BigFloat/BigFloat_1.scala b/tests/run-macros/BigFloat/BigFloat_1.scala
@@ -1,7 +1,7 @@
 package test
 import scala.util.FromDigits
 import scala.quoted._
-import scala.quoted.matching._
+
 
 case class BigFloat(mantissa: BigInt, exponent: Int) {
   override def toString = s"${mantissa}e${exponent}"
diff --git a/tests/run-macros/expr-map-1/Macro_1.scala b/tests/run-macros/expr-map-1/Macro_1.scala
@@ -1,5 +1,5 @@
 import scala.quoted._
-import scala.quoted.matching._
+
 
 inline def rewrite[T](inline x: Any): Any = ${ stringRewriter('x) }
 
diff --git a/tests/run-macros/expr-map-2/Macro_1.scala b/tests/run-macros/expr-map-2/Macro_1.scala
@@ -1,5 +1,5 @@
 import scala.quoted._
-import scala.quoted.matching._
+
 
 inline def rewrite[T](inline x: Any): Any = ${ stringRewriter('x) }
 
diff --git a/tests/run-macros/f-interpolator-neg/Macros_1.scala b/tests/run-macros/f-interpolator-neg/Macros_1.scala
@@ -1,6 +1,6 @@
 import scala.quoted._
 import scala.quoted.autolift.{given _}
-import scala.quoted.matching._
+
 
 import scala.language.implicitConversions
 
diff --git a/tests/run-macros/flops-rewrite-2/Macro_1.scala b/tests/run-macros/flops-rewrite-2/Macro_1.scala
@@ -1,5 +1,5 @@
 import scala.quoted._
-import scala.quoted.matching._
+
 
 inline def rewrite[T](inline x: T): T = ${ rewriteMacro('x) }
 
diff --git a/tests/run-macros/flops-rewrite-3/Macro_1.scala b/tests/run-macros/flops-rewrite-3/Macro_1.scala
@@ -1,5 +1,5 @@
 import scala.quoted._
-import scala.quoted.matching._
+
 
 inline def rewrite[T](inline x: T): T = ${ rewriteMacro('x) }
 
diff --git a/tests/run-macros/i6253-b/quoted_1.scala b/tests/run-macros/i6253-b/quoted_1.scala
@@ -1,5 +1,5 @@
 import scala.quoted._
-import scala.quoted.matching._
+
 
 object Macros {
 
diff --git a/tests/run-macros/i6253/quoted_1.scala b/tests/run-macros/i6253/quoted_1.scala
@@ -1,5 +1,5 @@
 import scala.quoted._
-import scala.quoted.matching._
+
 
 object Macros {
 
diff --git a/tests/run-macros/i7987/Macros_1.scala b/tests/run-macros/i7987/Macros_1.scala
@@ -1,12 +1,12 @@
 import scala.quoted._
 import scala.deriving._
-import scala.quoted.matching._
+
 
 object Macros {
   inline def m(): String = ${ macroImpl() }
 
   def macroImpl[T]()(using qctx: QuoteContext): Expr[String] = {
-    summonExpr[Mirror.Of[Some[Int]]] match
+    Expr.summon[Mirror.Of[Some[Int]]] match
       case Some('{ $_ : $t }) => Expr(t.show)
   }
 }
diff --git a/tests/run-macros/i8007/Macro_1.scala b/tests/run-macros/i8007/Macro_1.scala
@@ -1,6 +1,6 @@
 import scala.deriving._
 import scala.quoted._
-import scala.quoted.matching._
+
 
 object Macro1 {
 
@@ -21,7 +21,7 @@ object Macro1 {
 
     val mirrorTpe = '[Mirror.Of[T]]
 
-    summonExpr(using mirrorTpe).get match {
+    Expr.summon(using mirrorTpe).get match {
       case '{ $m: Mirror.ProductOf[T]{ type MirroredElemLabels = $t } } => {
         Expr(mirrorFields(t))
       }
diff --git a/tests/run-macros/i8007/Macro_2.scala b/tests/run-macros/i8007/Macro_2.scala
@@ -1,6 +1,6 @@
 import scala.deriving._
 import scala.quoted._
-import scala.quoted.matching._
+
 
 object Macro2 {
 
@@ -46,7 +46,7 @@ object Macro2 {
     import qctx.tasty._
 
     val mirrorTpe = '[Mirror.Of[T]]
-    val mirrorExpr = summonExpr(using mirrorTpe).get
+    val mirrorExpr = Expr.summon(using mirrorTpe).get
     val derivedInstance = JsonEncoder.derived(mirrorExpr)
 
     '{
diff --git a/tests/run-macros/i8007/Macro_3.scala b/tests/run-macros/i8007/Macro_3.scala
diff --git a/tests/run-macros/inline-macro-staged-interpreter/Macro_1.scala b/tests/run-macros/inline-macro-staged-interpreter/Macro_1.scala
diff --git a/tests/run-macros/lambda-extractor-1/Macro_1.scala b/tests/run-macros/lambda-extractor-1/Macro_1.scala
diff --git a/tests/run-macros/lambda-extractor-2/Macro_1.scala b/tests/run-macros/lambda-extractor-2/Macro_1.scala
diff --git a/tests/run-macros/quote-implicitMatch/Macro_1.scala b/tests/run-macros/quote-implicitMatch/Macro_1.scala
diff --git a/tests/run-macros/quote-matcher-power/Macro_1.scala b/tests/run-macros/quote-matcher-power/Macro_1.scala
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
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
diff --git a/tests/run-macros/quote-matcher-string-interpolator/quoted_1.scala b/tests/run-macros/quote-matcher-string-interpolator/quoted_1.scala
diff --git a/tests/run-macros/quote-matcher-symantics-1/quoted_1.scala b/tests/run-macros/quote-matcher-symantics-1/quoted_1.scala
diff --git a/tests/run-macros/quote-matcher-symantics-2/quoted_1.scala b/tests/run-macros/quote-matcher-symantics-2/quoted_1.scala
diff --git a/tests/run-macros/quote-matcher-symantics-3/quoted_1.scala b/tests/run-macros/quote-matcher-symantics-3/quoted_1.scala
diff --git a/tests/run-macros/quote-matcher-type-bind/Macro_1.scala b/tests/run-macros/quote-matcher-type-bind/Macro_1.scala
diff --git a/tests/run-macros/quoted-matching-docs-2/Macro_1.scala b/tests/run-macros/quoted-matching-docs-2/Macro_1.scala
diff --git a/tests/run-macros/quoted-matching-docs/Macro_1.scala b/tests/run-macros/quoted-matching-docs/Macro_1.scala
diff --git a/tests/run-macros/string-context-implicits/Macro_1.scala b/tests/run-macros/string-context-implicits/Macro_1.scala
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

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`package scala.quoted`
`2`		`-package matching`
`3`	`2`
`4`	`3`	`/** Matches expressions containing literal constant values and extracts the value.`
`5`	`4`	`* It may match expressions of type Boolean, Byte, Short, Int, Long,`