Move Tasty macro context to Tasty module

Author: nicolasstucki

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

@@ -689,8 +689,8 @@ class Definitions {
   lazy val TastyTastyType = ctx.requiredClassRef("scala.tasty.Tasty")
   def TastyTastyClass(implicit ctx: Context) = TastyTastyType.symbol.asClass
 
-  lazy val TastyTopLevelSpliceModule = ctx.requiredModule("scala.tasty.TopLevelSplice")
-    lazy val TastyTopLevelSplice_tastyContext = TastyTopLevelSpliceModule.requiredMethod("tastyContext")
+  lazy val TastyTastyModule = ctx.requiredModule("scala.tasty.Tasty")
+    lazy val TastyTasty_macroContext = TastyTastyModule.requiredMethod("macroContext")
 
   lazy val EqType = ctx.requiredClassRef("scala.Eq")
   def EqClass(implicit ctx: Context) = EqType.symbol.asClass

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

@@ -237,7 +237,7 @@ class ReifyQuotes extends MacroTransformWithImplicits {
     def levelOK(sym: Symbol)(implicit ctx: Context): Boolean = levelOf.get(sym) match {
       case Some(l) =>
         l == level ||
-        level == -1 && sym == defn.TastyTopLevelSplice_tastyContext
+        level == -1 && sym == defn.TastyTasty_macroContext
       case None =>
         !sym.is(Param) || levelOK(sym.owner)
     }

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

@@ -268,7 +268,7 @@ object Splicer {
       case Literal(Constant(value)) =>
         interpretLiteral(value)
 
-      case _ if tree.symbol == defn.TastyTopLevelSplice_tastyContext =>
+      case _ if tree.symbol == defn.TastyTasty_macroContext =>
         interpretTastyContext()
 
       case StaticMethodCall(fn, args) =>

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

@@ -627,7 +627,7 @@ trait Implicits { self: Typer =>
     }
 
     def synthesizedTastyContext(formal: Type): Tree =
-      if (ctx.inTransparentMethod || enclosingInlineds.nonEmpty) ref(defn.TastyTopLevelSplice_tastyContext)
+      if (ctx.inTransparentMethod || enclosingInlineds.nonEmpty) ref(defn.TastyTasty_macroContext)
       else EmptyTree
 
     /** If `formal` is of the form Eq[T, U], where no `Eq` instance exists for

library/src/scala/tasty/Tasty.scala

@@ -19,3 +19,8 @@ abstract class Tasty
     with TreeOps
     with TypeOrBoundsTreeOps
     with TypeOrBoundsOps
+
+object Tasty {
+  /** Compiler tasty context available in a top level ~ of a transparent macro */
+  def macroContext: Tasty = throw new Exception("Not in transparent macro.")
+}

library/src/scala/tasty/TopLevelSplice.scala

@@ -1,6 +1,5 @@
 import scala.quoted._
 
-import scala.tasty.TopLevelSplice
 import scala.tasty.Tasty
 import scala.tasty.util.{TreeTraverser, Show}
 

tests/run/tasty-custom-show/quoted_1.scala

@@ -5,8 +5,7 @@ import scala.tasty.util.TreeTraverser
 
 object Macros {
 
-  rewrite def testDefinitions(): Unit =
-    ~testDefinitionsImpl(TopLevelSplice.tastyContext) // FIXME infer TopLevelSplice.tastyContext within top level ~
+  rewrite def testDefinitions(): Unit = ~testDefinitionsImpl
 
   def testDefinitionsImpl(implicit tasty: Tasty): Expr[Unit] = {
     import tasty._

tests/run/tasty-definitions-1/quoted_1.scala

@@ -1,6 +1,5 @@
 import scala.quoted._
 
-import scala.tasty.TopLevelSplice
 import scala.tasty.Tasty
 import scala.tasty.util.TreeTraverser
 

tests/run/tasty-extractors-3/quoted_1.scala

@@ -1,5 +1,5 @@
 import scala.quoted._
-import scala.tasty.{Tasty, TopLevelSplice}
+import scala.tasty.Tasty
 
 object SourceFiles {