Merge pull request #4818 from dotty-staging/clean-quote-tests

Clean quote implementation

Author: nicolasstucki

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

@@ -683,7 +683,7 @@ class Definitions {
   def Unpickler_unpickleType = ctx.requiredMethod("scala.runtime.quoted.Unpickler.unpickleType")
 
   lazy val TastyTopLevelSpliceModule = ctx.requiredModule("scala.tasty.TopLevelSplice")
-    lazy val TastyTopLevelSplice_compilationTopLevelSplice = TastyTopLevelSpliceModule.requiredMethod("tastyContext")
+    lazy val TastyTopLevelSplice_tastyContext = TastyTopLevelSpliceModule.requiredMethod("tastyContext")
 
   lazy val EqType = ctx.requiredClassRef("scala.Eq")
   def EqClass(implicit ctx: Context) = EqType.symbol.asClass

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

@@ -146,10 +146,10 @@ class ReifyQuotes extends MacroTransformWithImplicits with InfoTransformer {
     }
 
     /** We are in a `~(...)` context that is not shadowed by a nested `'(...)` */
-    def inSplice = outer != null && !inQuote
+    def inSplice: Boolean = outer != null && !inQuote
 
     /** We are not in a `~(...)` or a `'(...)` */
-    def isRoot = outer == null
+    def isRoot: Boolean = outer == null
 
     /** A map from type ref T to expressions of type `quoted.Type[T]`".
      *  These will be turned into splices using `addTags` and represent type variables
@@ -516,9 +516,9 @@ class ReifyQuotes extends MacroTransformWithImplicits with InfoTransformer {
       outer.enteredSyms.foreach(registerCapturer)
 
       if (ctx.owner.owner.is(Macro)) {
-        registerCapturer(defn.TastyTopLevelSplice_compilationTopLevelSplice)
+        registerCapturer(defn.TastyTopLevelSplice_tastyContext)
         // Force a macro to have the context in first position
-        forceCapture(defn.TastyTopLevelSplice_compilationTopLevelSplice)
+        forceCapture(defn.TastyTopLevelSplice_tastyContext)
         // Force all parameters of the macro to be created in the definition order
         outer.enteredSyms.reverse.foreach(forceCapture)
       }
@@ -652,7 +652,7 @@ class ReifyQuotes extends MacroTransformWithImplicits with InfoTransformer {
 
     private def isStage0Value(sym: Symbol)(implicit ctx: Context): Boolean =
       (sym.is(Inline) && sym.owner.is(Macro) && !defn.isFunctionType(sym.info)) ||
-      sym == defn.TastyTopLevelSplice_compilationTopLevelSplice // intrinsic value at stage 0
+      sym == defn.TastyTopLevelSplice_tastyContext // intrinsic value at stage 0
 
     private def liftList(list: List[Tree], tpe: Type)(implicit ctx: Context): Tree = {
       list.foldRight[Tree](ref(defn.NilModule)) { (x, acc) =>

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

@@ -92,7 +92,7 @@ object Splicer {
           s"""Failed to evaluate inlined quote.
              |  Caused by ${ex.getClass}: ${if (ex.getMessage == null) "" else ex.getMessage}
              |    ${ex.getStackTrace.takeWhile(_.getClassName != "dotty.tools.dotc.transform.Splicer$").init.mkString("\n    ")}
-         """.stripMargin
+           """.stripMargin
         ctx.error(msg, pos)
         EmptyTree
     }

library/src/scala/quoted/Type.scala

@@ -31,7 +31,7 @@ object Type {
 object Types {
   /** A Type backed by a pickled TASTY tree */
   final class TastyType[T](val tasty: Pickled, val args: Seq[Any]) extends Type[T] {
-    override def toString(): String = s"Type(<pickled>)"
+    override def toString(): String = s"Type(<pickled tasty>)"
   }
 
   /** An Type backed by a value */
@@ -41,6 +41,6 @@ object Types {
 
   /** An Type backed by a tree */
   final class TreeType[Tree](val typeTree: Tree) extends quoted.Type[Any] {
-    override def toString: String = s"Type(<raw>)"
+    override def toString: String = s"Type(<tasty tree>)"
   }
 }

tests/pos/quote-0.scala

@@ -2,11 +2,10 @@ import scala.quoted._
 
 import dotty.tools.dotc.quoted.Toolbox._
 
-
 object Macros {
 
   inline def assert(expr: => Boolean): Unit =
-    ~ assertImpl('(expr))
+    ~assertImpl('(expr))
 
   def assertImpl(expr: Expr[Boolean]) =
     '{ if !(~expr) then throw new AssertionError(s"failed assertion: ${~showExpr(expr)}") }

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

@@ -1,5 +1,4 @@
 import scala.quoted._
-import dotty.tools.dotc.quoted.Toolbox._
 
 import scala.tasty.TopLevelSplice
 import scala.tasty.Tasty

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

@@ -1,5 +1,4 @@
 import scala.quoted._
-import dotty.tools.dotc.quoted.Toolbox._
 
 import scala.tasty._
 

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

@@ -1,5 +1,4 @@
 import scala.quoted._
-import dotty.tools.dotc.quoted.Toolbox._
 
 import scala.tasty._
 

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

@@ -1,5 +1,4 @@
 import scala.quoted._
-import dotty.tools.dotc.quoted.Toolbox._
 
 import scala.tasty.TopLevelSplice
 import scala.tasty.Tasty

tests/run/tasty-extractors-constants-1/quoted_1.scala

@@ -1,5 +1,4 @@
 import scala.quoted._
-import dotty.tools.dotc.quoted.Toolbox._
 
 import scala.tasty._
 import scala.tasty.util._