Merge branch 'master' into tasty-scalatest-assert

Author: Blaisorblade

compiler/src/dotty/tools/dotc/tasty/TastyImpl.scala

@@ -13,6 +13,7 @@ import dotty.tools.dotc.util.SourcePosition
 
 import scala.quoted
 import scala.reflect.ClassTag
+import scala.tasty.util.{Show, ShowExtractors}
 
 object TastyImpl extends scala.tasty.Tasty {
 
@@ -26,6 +27,15 @@ object TastyImpl extends scala.tasty.Tasty {
     def toTasty(implicit ctx: Context): TypeTree = PickledQuotes.quotedTypeToTree(x)
   }
 
+  // ===== Show =====================================================
+
+  def defaultShow: Show[this.type] = showExtractors
+
+  def showExtractors: Show[this.type] = new ShowExtractors(this)
+
+  // TODO
+  // def showSourceCode: Show[this.type] = ???
+
   // ===== Contexts =================================================
 
   type Context = Contexts.Context
@@ -55,8 +65,9 @@ object TastyImpl extends scala.tasty.Tasty {
 
   type Tree = tpd.Tree
 
-  def TreeDeco(t: Tree): AbstractTree = new AbstractTree {
-    def pos(implicit ctx: Context): Position = t.pos
+  def TreeDeco(tree: Tree): AbstractTree = new AbstractTree {
+    def show(implicit ctx: Context, s: Show[TastyImpl.this.type]): String = s.showTree(tree)
+    def pos(implicit ctx: Context): Position = tree.pos
   }
 
   type PackageClause = tpd.PackageDef
@@ -482,8 +493,9 @@ object TastyImpl extends scala.tasty.Tasty {
 
   type TypeOrBoundsTree = tpd.Tree
 
-  def TypeOrBoundsTreeDeco(x: TypeOrBoundsTree): AbstractTypeOrBoundsTree = new AbstractTypeOrBoundsTree {
-    def tpe(implicit ctx: Context): Type = x.tpe.stripTypeVar
+  def TypeOrBoundsTreeDeco(tpt: TypeOrBoundsTree): AbstractTypeOrBoundsTree = new AbstractTypeOrBoundsTree {
+    def show(implicit ctx: Context, s: Show[TastyImpl.this.type]): String = s.showTypeOrBoundsTree(tpt)
+    def tpe(implicit ctx: Context): Type = tpt.tpe.stripTypeVar
   }
 
   // ----- TypeTrees ------------------------------------------------
@@ -592,6 +604,10 @@ object TastyImpl extends scala.tasty.Tasty {
 
   type TypeOrBounds = Types.Type
 
+  def TypeOrBoundsDeco(tpe: Types.Type): AbstractTypeOrBounds = new AbstractTypeOrBounds {
+    def show(implicit ctx: Context, s: Show[TastyImpl.this.type]): String = s.showTypeOrBounds(tpe)
+  }
+
   // ----- Types ----------------------------------------------------
 
   type Type = Types.Type
@@ -789,8 +805,9 @@ object TastyImpl extends scala.tasty.Tasty {
 
   type Constant = Constants.Constant
 
-  def ConstantDeco(x: Constant): AbstractConstant = new AbstractConstant {
-    def value: Any = x.value
+  def ConstantDeco(const: Constant): AbstractConstant = new AbstractConstant {
+    def show(implicit ctx: Context, s: Show[TastyImpl.this.type]): String = s.showConstant(const)
+    def value: Any = const.value
   }
 
   def constantClassTag: ClassTag[Constant] = implicitly[ClassTag[Constant]]

library/src/scala/tasty/Tasty.scala

@@ -1,8 +1,9 @@
 package scala.tasty
 
 import scala.reflect.ClassTag
+import scala.tasty.util.Show
 
-abstract class Tasty {
+abstract class Tasty { tasty =>
 
   // ===== Quotes ===================================================
 
@@ -16,14 +17,23 @@ abstract class Tasty {
   }
   implicit def QuotedTypeDeco[T](x: quoted.Type[T]): AbstractQuotedType
 
+  // ===== Show =====================================================
+
+  implicit def defaultShow: Show[tasty.type]
+
+  def showExtractors: Show[tasty.type]
+
+  // TODO
+  // def showSourceCode: Show[tasty.type]
+
   // ===== Contexts =================================================
 
   type Context
 
   trait AbstractContext {
     def owner: Definition
   }
-  implicit def ContextDeco(x: Context): AbstractContext
+  implicit def ContextDeco(ctx: Context): AbstractContext
 
   // ===== Id =======================================================
 
@@ -43,8 +53,10 @@ abstract class Tasty {
 
   type Tree
 
-  trait AbstractTree extends Positioned
-  implicit def TreeDeco(t: Tree): AbstractTree
+  trait AbstractTree extends Positioned {
+    def show(implicit ctx: Context, s: Show[tasty.type]): String
+  }
+  implicit def TreeDeco(tree: Tree): AbstractTree
 
   type PackageClause <: Tree
 
@@ -337,9 +349,10 @@ abstract class Tasty {
   type TypeOrBoundsTree
 
   trait AbstractTypeOrBoundsTree {
+    def show(implicit ctx: Context, s: Show[tasty.type]): String
     def tpe(implicit ctx: Context): TypeOrBounds
   }
-  implicit def TypeOrBoundsTreeDeco(x: TypeOrBoundsTree): AbstractTypeOrBoundsTree
+  implicit def TypeOrBoundsTreeDeco(tpt: TypeOrBoundsTree): AbstractTypeOrBoundsTree
 
 
   // ----- TypeTrees ------------------------------------------------
@@ -432,6 +445,11 @@ abstract class Tasty {
     def tpe(implicit ctx: Context): Type
   }
 
+  trait AbstractTypeOrBounds {
+    def show(implicit ctx: Context, s: Show[tasty.type]): String
+  }
+  implicit def TypeOrBoundsDeco(tpe: TypeOrBounds): AbstractTypeOrBounds
+
   // ----- Types ----------------------------------------------------
 
   type Type <: TypeOrBounds
@@ -578,9 +596,10 @@ abstract class Tasty {
 
   type Constant
   trait AbstractConstant {
+    def show(implicit ctx: Context, s: Show[tasty.type]): String
     def value: Any
   }
-  implicit def ConstantDeco(x: Constant): AbstractConstant
+  implicit def ConstantDeco(const: Constant): AbstractConstant
 
   implicit def constantClassTag: ClassTag[Constant]
 

library/src/scala/tasty/Universe.scala

@@ -1,7 +1,7 @@
 package scala.tasty
 
 trait Universe {
-  implicit val tasty: Tasty
+  val tasty: Tasty
   implicit val context: tasty.Context
 }
 

library/src/scala/tasty/util/Show.scala

@@ -0,0 +1,15 @@
+package scala.tasty.util
+
+import scala.tasty.Tasty
+
+abstract class Show[T <: Tasty with Singleton](val tasty: T) {
+
+  def showTree(tree: tasty.Tree)(implicit ctx: tasty.Context): String
+
+  def showTypeOrBoundsTree(tpt: tasty.TypeOrBoundsTree)(implicit ctx: tasty.Context): String
+
+  def showTypeOrBounds(tpe: tasty.TypeOrBounds)(implicit ctx: tasty.Context): String
+
+  def showConstant(const: tasty.Constant)(implicit ctx: tasty.Context): String
+
+}