Move tasty.Reflection in QuoteContext

Author: nicolasstucki

compiler/src/dotty/tools/dotc/core/Definitions.scala

@@ -762,6 +762,12 @@ class Definitions {
   @threadUnsafe lazy val QuotedExprType: TypeRef = ctx.requiredClassRef("scala.quoted.Expr")
   def QuotedExprClass(implicit ctx: Context): ClassSymbol = QuotedExprType.symbol.asClass
 
+  @threadUnsafe lazy val QuoteContextType: TypeRef = ctx.requiredClassRef("scala.quoted.QuoteContext")
+  def QuoteContextClass(implicit ctx: Context): ClassSymbol = QuoteContextType.symbol.asClass
+
+  @threadUnsafe lazy val QuoteContextModule: TermSymbol = ctx.requiredModule("scala.quoted.QuoteContext")
+    @threadUnsafe lazy val QuoteContext_macroContext: TermSymbol = QuoteContextModule.requiredMethod("macroContext")
+
   @threadUnsafe lazy val InternalQuotedModuleRef: TermRef = ctx.requiredModuleRef("scala.internal.Quoted")
   def InternalQuotedModule: Symbol = InternalQuotedModuleRef.symbol
     @threadUnsafe lazy val InternalQuoted_exprQuoteR: TermRef = InternalQuotedModule.requiredMethodRef("exprQuote")

compiler/src/dotty/tools/dotc/transform/PCPCheckAndHeal.scala

@@ -166,6 +166,7 @@ class PCPCheckAndHeal(@constructorOnly ictx: Context) extends TreeMapWithStages(
       l == level ||
         level == -1 && (
           sym == defn.TastyReflection_macroContext ||
+          sym == defn.QuoteContext_macroContext ||
             // here we assume that Splicer.canBeSpliced was true before going to level -1,
             // this implies that all non-inline arguments are quoted and that the following two cases are checked
             // on inline parameters or type parameters.

compiler/src/dotty/tools/dotc/transform/Splicer.scala

@@ -114,6 +114,8 @@ object Splicer {
       args.toSeq
 
     protected def interpretTastyContext()(implicit env: Env): Object = ReflectionImpl(ctx, pos)
+    protected def interpretQuoteContext()(implicit env: Env): Object =
+      new scala.quoted.QuoteContext(ReflectionImpl(ctx, pos))
 
     protected def interpretStaticMethodCall(moduleClass: Symbol, fn: Symbol, args: => List[Object])(implicit env: Env): Object = {
       val (inst, clazz) =
@@ -308,6 +310,7 @@ object Splicer {
     protected def interpretLiteral(value: Any)(implicit env: Env): Result
     protected def interpretVarargs(args: List[Result])(implicit env: Env): Result
     protected def interpretTastyContext()(implicit env: Env): Result
+    protected def interpretQuoteContext()(implicit env: Env): Result
     protected def interpretStaticMethodCall(module: Symbol, fn: Symbol, args: => List[Result])(implicit env: Env): Result
     protected def interpretModuleAccess(fn: Symbol)(implicit env: Env): Result
     protected def interpretNew(fn: Symbol, args: => List[Result])(implicit env: Env): Result
@@ -333,6 +336,9 @@ object Splicer {
       case _ if tree.symbol == defn.TastyReflection_macroContext =>
         interpretTastyContext()
 
+      case _ if tree.symbol == defn.QuoteContext_macroContext =>
+        interpretQuoteContext()
+
       case Call(fn, args) =>
         if (fn.symbol.isConstructor && fn.symbol.owner.owner.is(Package)) {
           interpretNew(fn.symbol, args.map(interpretTree))

compiler/src/dotty/tools/dotc/typer/Implicits.scala

@@ -707,6 +707,11 @@ trait Implicits { self: Typer =>
       if (ctx.inInlineMethod || enclosingInlineds.nonEmpty) ref(defn.TastyReflection_macroContext)
       else EmptyTree
 
+  lazy val synthesizedQuoteContext: SpecialHandler =
+    (formal, span) => implicit ctx =>
+      if (ctx.inInlineMethod || enclosingInlineds.nonEmpty) ref(defn.QuoteContext_macroContext)
+      else EmptyTree
+
   lazy val synthesizedTupleFunction: SpecialHandler =
     (formal, span) => implicit ctx => formal match {
       case AppliedType(_, funArgs @ fun :: tupled :: Nil) =>
@@ -1033,9 +1038,10 @@ trait Implicits { self: Typer =>
       mySpecialHandlers = List(
         defn.ClassTagClass        -> synthesizedClassTag,
         defn.QuotedTypeClass      -> synthesizedTypeTag,
+        defn.QuoteContextClass    -> synthesizedQuoteContext,
         defn.TastyReflectionClass -> synthesizedTastyContext,
         defn.EqlClass             -> synthesizedEq,
-        defn.TupledFunctionClass -> synthesizedTupleFunction,
+        defn.TupledFunctionClass  -> synthesizedTupleFunction,
         defn.ValueOfClass         -> synthesizedValueOf,
         defn.Mirror_ProductClass  -> synthesizedProductMirror,
         defn.Mirror_SumClass      -> synthesizedSumMirror,

compiler/src/dotty/tools/dotc/typer/Typer.scala

@@ -1982,7 +1982,7 @@ class Typer extends Namer
             fun = ref(defn.InternalQuotedMatcher_unapplyR).appliedToType(patType),
             implicits =
               ref(defn.InternalQuoted_exprQuoteR).appliedToType(shape.tpe).appliedTo(shape) ::
-              implicitArgTree(defn.TastyReflectionType, tree.span) :: Nil,
+              implicitArgTree(defn.QuoteContextType, tree.span) :: Nil,
             patterns = splicePat :: Nil,
             proto = pt)
         }

docs/docs/reference/metaprogramming/tasty-inspect.md

@@ -18,7 +18,7 @@ the following way.
 ```scala
 class Consumer extends TastyConsumer {
   final def apply(reflect: Reflection)(root: reflect.Tree): Unit = {
-    import reflect._
+    import qctx.tasty._
     // Do something with the tree
   }
 }

docs/docs/reference/metaprogramming/tasty-reflect.md

@@ -29,23 +29,23 @@ import scala.tasty._
 
 inline def natConst(x: => Int): Int = ${natConstImpl('{x})}
 
-def natConstImpl(x: Expr[Int])(implicit reflection: Reflection): Expr[Int] = {
-  import reflection._
+def natConstImpl(x: Expr[Int]) given (qctx: QuoteContext): Expr[Int] = {
+  import qctx.tasty._
   ...
 }
 ```
 
 ### Sealing and Unsealing
 
-`import reflection._` will provide an `unseal` extension method on `quoted.Expr`
+`import qctx.tasty._` will provide an `unseal` extension method on `quoted.Expr`
 and `quoted.Type` which returns a `reflection.Term` that represents the tree of
 the expression and `reflection.TypeTree` that represents the tree of the type
 respectively. It will also import all extractors and methods on TASTy Reflect
 trees. For example the `Literal(_)` extractor used below.
 
 ```scala
-def natConstImpl(x: Expr[Int])(implicit reflection: Reflection): Expr[Int] = {
-  import reflection._
+def natConstImpl(x: Expr[Int]) given (qctx: QuoteContext): Expr[Int] = {
+  import qctx.tasty._
   val xTree: Term = x.unseal
   xTree match {
     case Term.Literal(Constant.Int(n)) =>
@@ -77,8 +77,8 @@ operation expression passed while calling the `macro` below.
 ```scala
 inline def macro(param: => Boolean): Unit = ${ macroImpl('param) }
 
-def macroImpl(param: Expr[Boolean])(implicit refl: Reflection): Expr[Unit] = {
-  import refl._
+def macroImpl(param: Expr[Boolean]) given (qctx: QuoteContext): Expr[Unit] = {
+  import qctx.tasty._
   import util._
 
   param.unseal.underlyingArgument match {

library/src-3.x/scala/internal/quoted/Matcher.scala

@@ -4,7 +4,6 @@ import scala.annotation.internal.sharable
 
 import scala.quoted._
 import scala.quoted.matching.Bind
-import scala.tasty._
 
 object Matcher {
 
@@ -27,12 +26,11 @@ object Matcher {
    *
    *  @param scrutineeExpr `Expr[_]` on which we are pattern matching
    *  @param patternExpr `Expr[_]` containing the pattern tree
-   *  @param reflection instance of the reflection API (implicitly provided by the macro)
+   *  @param qctx the current QuoteContext
    *  @return None if it did not match, `Some(tup)` if it matched where `tup` contains `Expr[Ti]``
    */
-  def unapply[Tup <: Tuple](scrutineeExpr: Expr[_])(implicit patternExpr: Expr[_], reflection: Reflection): Option[Tup] = {
-    // TODO improve performance
-    import reflection.{Bind => BindPattern, _}
+  def unapply[Tup <: Tuple](scrutineeExpr: Expr[_])(implicit patternExpr: Expr[_], qctx: QuoteContext): Option[Tup] = {
+    import qctx.tasty.{Bind => BindPattern, _}
     import Matching._
 
     type Env = Set[(Symbol, Symbol)]

library/src-3.x/scala/quoted/matching/Bind.scala

@@ -1,8 +1,6 @@
 package scala.quoted
 package matching
 
-import scala.tasty.Reflection // TODO do not depend on reflection directly
-
 /** Bind of an Expr[T] used to know if some Expr[T] is a reference to the binding
  *
  *  @param name string name of this binding
@@ -21,8 +19,8 @@ class Bind[T <: AnyKind] private[scala](val name: String, private[Bind] val id:
 
 object Bind {
 
-  def unapply[T](expr: Expr[T])(implicit reflect: Reflection): Option[Bind[T]] = {
-    import reflect.{Bind => BindPattern, _}
+  def unapply[T](expr: Expr[T]) given (qctx: QuoteContext): Option[Bind[T]] = {
+    import qctx.tasty.{Bind => BindPattern, _}
     expr.unseal match {
       case IsIdent(ref) =>
         val sym = ref.symbol

library/src-3.x/scala/quoted/matching/Const.scala

@@ -1,8 +1,5 @@
-package scala.quoted.matching
-
-import scala.quoted.Expr
-
-import scala.tasty.Reflection // TODO do not depend on reflection directly
+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,
@@ -17,8 +14,8 @@ import scala.tasty.Reflection // TODO do not depend on reflection directly
  */
 object Const {
 
-  def unapply[T](expr: Expr[T])(implicit reflect: Reflection): Option[T] = {
-    import reflect._
+  def unapply[T](expr: Expr[T]) given (qctx: QuoteContext): Option[T] = {
+    import qctx.tasty._
     def rec(tree: Term): Option[T] = tree match {
       case Literal(c) => Some(c.value.asInstanceOf[T])
       case Block(Nil, e) => rec(e)

library/src-3.x/scala/quoted/matching/ConstSeq.scala

@@ -1,14 +1,11 @@
-package scala.quoted.matching
-
-import scala.quoted.Expr
-
-import scala.tasty.Reflection // TODO do not depend on reflection directly
+package scala.quoted
+package matching
 
 /** Literal sequence of literal constant value expressions */
 object ConstSeq {
 
   /** Matches literal sequence of literal constant value expressions */
-  def unapply[T](expr: Expr[Seq[T]]) given Reflection: Option[Seq[T]] = expr match {
+  def unapply[T](expr: Expr[Seq[T]]) given (qctx: QuoteContext): Option[Seq[T]] = expr match {
     case ExprSeq(elems) =>
       elems.foldRight(Option(List.empty[T])) { (elem, acc) =>
         (elem, acc) match {

library/src-3.x/scala/quoted/matching/ExprSeq.scala

@@ -1,15 +1,12 @@
-package scala.quoted.matching
-
-import scala.quoted.Expr
-
-import scala.tasty.Reflection // TODO do not depend on reflection directly
+package scala.quoted
+package matching
 
 /** Literal sequence of expressions */
 object ExprSeq {
 
   /** Matches a literal sequence of expressions */
-  def unapply[T](expr: Expr[Seq[T]])(implicit reflect: Reflection): Option[Seq[Expr[T]]] = {
-    import reflect._
+  def unapply[T](expr: Expr[Seq[T]]) given (qctx: QuoteContext): Option[Seq[Expr[T]]] = {
+    import qctx.tasty._
     def rec(tree: Term): Option[Seq[Expr[T]]] = tree match {
       case Typed(Repeated(elems, _), _) => Some(elems.map(x => x.seal.asInstanceOf[Expr[T]]))
       case Block(Nil, e) => rec(e)

library/src-3.x/dotty/internal/StringContextMacro.scala renamed to library/src-bootstrapped/dotty/internal/StringContextMacro.scala

@@ -1,8 +1,9 @@
+// ALWAYS KEEP THIS FILE IN src-bootstrapped, DO NOT MOVE TO src
+
 package dotty.internal
 
 import scala.quoted._
 import scala.quoted.matching._
-import scala.tasty.Reflection
 import reflect._
 
 object StringContextMacro {
@@ -58,7 +59,7 @@ object StringContextMacro {
    *  @return the String contained in the given Expr
    *  quotes an error if the given Expr does not contain a String
    */
-  private def literalToString(expression : Expr[String])(implicit reflect: Reflection) : String = expression match {
+  private def literalToString(expression : Expr[String]) given (ctx: QuoteContext) : String = expression match {
     case Const(string : String) => string
     case _ => QuoteError("Expected statically known literal", expression)
   }
@@ -69,8 +70,7 @@ object StringContextMacro {
    *  @return a list of Expr containing Strings, each corresponding to one parts of the given StringContext
    *  quotes an error if the given Expr does not correspond to a StringContext
    */
-  def getPartsExprs(strCtxExpr : Expr[scala.StringContext])(implicit reflect : Reflection): List[Expr[String]] = {
-    import reflect._
+  def getPartsExprs(strCtxExpr : Expr[scala.StringContext]) given QuoteContext: List[Expr[String]] = {
     strCtxExpr match {
       case '{ StringContext(${ExprSeq(parts)}: _*) } => parts.toList
       case '{ new StringContext(${ExprSeq(parts)}: _*) } => parts.toList
@@ -84,8 +84,8 @@ object StringContextMacro {
    *  @return a list of Expr containing arguments
    *  quotes an error if the given Expr does not contain a list of arguments
    */
-  def getArgsExprs(argsExpr: Expr[Seq[Any]])(implicit reflect: Reflection): List[Expr[Any]] = {
-    import reflect._
+  def getArgsExprs(argsExpr: Expr[Seq[Any]]) given (qctx: QuoteContext): List[Expr[Any]] = {
+    import qctx.tasty._
     argsExpr.unseal.underlyingArgument match {
       case Typed(Repeated(args, _), _) => args.map(_.seal)
       case tree => QuoteError("Expected statically known argument list", argsExpr)
@@ -98,8 +98,8 @@ object StringContextMacro {
    *  @param args the Expr that holds the sequence of arguments to interpolate to the String in the correct format
    *  @return the Expr containing the formatted and interpolated String or an error/warning if the parameters are not correct
    */
-  private def interpolate(strCtxExpr: Expr[StringContext], argsExpr: Expr[Seq[Any]])(implicit reflect: Reflection): Expr[String] = {
-    import reflect._
+  private def interpolate(strCtxExpr: Expr[StringContext], argsExpr: Expr[Seq[Any]]) given (qctx: QuoteContext): Expr[String] = {
+    import qctx.tasty._
     val sourceFile = strCtxExpr.unseal.pos.sourceFile
 
     val partsExpr = getPartsExprs(strCtxExpr)
@@ -111,27 +111,27 @@ object StringContextMacro {
       def partError(message : String, index : Int, offset : Int) : Unit = {
         reported = true
         val positionStart = partsExpr(index).unseal.pos.start + offset
-        reflect.error(message, sourceFile, positionStart, positionStart)
+        error(message, sourceFile, positionStart, positionStart)
       }
       def partWarning(message : String, index : Int, offset : Int) : Unit = {
         reported = true
         val positionStart = partsExpr(index).unseal.pos.start + offset
-        reflect.warning(message, sourceFile, positionStart, positionStart)
+        warning(message, sourceFile, positionStart, positionStart)
       }
 
       def argError(message : String, index : Int) : Unit = {
         reported = true
-        reflect.error(message, args(index).unseal.pos)
+        error(message, args(index).unseal.pos)
       }
 
       def strCtxError(message : String) : Unit = {
         reported = true
         val positionStart = strCtxExpr.unseal.pos.start
-        reflect.error(message, sourceFile, positionStart, positionStart)
+        error(message, sourceFile, positionStart, positionStart)
       }
       def argsError(message : String) : Unit = {
         reported = true
-        reflect.error(message, argsExpr.unseal.pos)
+        error(message, argsExpr.unseal.pos)
       }
 
       def hasReported() : Boolean = {
@@ -158,8 +158,8 @@ object StringContextMacro {
    *  @param reporter the reporter to return any error/warning when a problem is encountered
    *  @return the Expr containing the formatted and interpolated String or an error/warning report if the parameters are not correct
    */
-  def interpolate(partsExpr : List[Expr[String]], args : List[Expr[Any]], argsExpr: Expr[Seq[Any]], reporter : Reporter)(implicit reflect: Reflection) : Expr[String] = {
-    import reflect._
+  def interpolate(partsExpr : List[Expr[String]], args : List[Expr[Any]], argsExpr: Expr[Seq[Any]], reporter : Reporter) given (qctx: QuoteContext) : Expr[String] = {
+    import qctx.tasty._
 
     /** Checks if the number of arguments are the same as the number of formatting strings
      *

library/src-bootstrapped/scala/testing/typeChecks.scala

@@ -0,0 +1,10 @@
+package scala.testing
+
+import scala.quoted._
+
+inline def typeChecks(inline code: String): Boolean = ${ typeChecksImpl(code) }
+
+  private def typeChecksImpl(code: String) given (qctx: QuoteContext): Expr[Boolean] = {
+  import qctx.tasty._
+  typing.typeChecks(code).toExpr
+}

library/src-non-bootstrapped/dotty/internal/StringContextMacro.scala

@@ -0,0 +1,16 @@
+// ALWAYS KEEP THIS FILE IN src-non-bootstrapped
+
+package dotty.internal
+
+import scala.quoted._
+import scala.quoted.matching._
+import scala.tasty.Reflection
+import reflect._
+
+object StringContextMacro {
+
+  /** Implementation of scala.StringContext.f used in Dotty */
+  inline def f(sc: => StringContext)(args: Any*): String =
+    scala.compiletime.error("Cannot expand f interpolator while bootstrapping the compiler")
+
+}

library/src-3.x/scala/testing/typeChecks.scala renamed to library/src-non-bootstrapped/scala/testing/typeChecks.scala

@@ -9,4 +9,3 @@ private def typeChecksImpl(code: String)(implicit reflect: Reflection): Expr[Boo
   import reflect._
   typing.typeChecks(code).toExpr
 }
-

library/src/scala/quoted/QuoteContext.scala

@@ -2,16 +2,20 @@ package scala.quoted
 
 import scala.quoted.show.SyntaxHighlight
 
-class QuoteContext(reflection: tasty.Reflection) {
+class QuoteContext(val tasty: scala.tasty.Reflection) {
 
   def show[T](expr: Expr[T], syntaxHighlight: SyntaxHighlight): String = {
-    import reflection._
+    import tasty._
     expr.unseal.show(syntaxHighlight)
   }
 
   def show[T](tpe: Type[T], syntaxHighlight: SyntaxHighlight): String = {
-    import reflection._
+    import tasty._
     tpe.unseal.show(syntaxHighlight)
   }
 
 }
+
+object QuoteContext {
+  def macroContext: QuoteContext = throw new Exception("Not in inline macro.")
+}