Create QuotePrinter

Author: nicolasstucki

compiler/src/dotty/tools/dotc/decompiler/DecompilationPrinter.scala

@@ -1,8 +1,6 @@
 package dotty.tools.dotc
 package decompiler
 
-import java.io.PrintStream
-
 import dotty.tools.dotc.core.Contexts._
 import dotty.tools.dotc.core.Phases.Phase
 import dotty.tools.dotc.core.tasty.TastyPrinter
@@ -11,7 +9,7 @@ import dotty.tools.dotc.core.tasty.TastyPrinter
  *
  *  @author Nicolas Stucki
  */
-class DecompilationPrinter(out: PrintStream, codeOnly: Boolean) extends Phase {
+class DecompilationPrinter extends Phase {
 
   override def phaseName: String = "decompilationPrinter"
 
@@ -23,21 +21,16 @@ class DecompilationPrinter(out: PrintStream, codeOnly: Boolean) extends Phase {
     val doubleLine = "=" * pageWidth
     val line = "-" * pageWidth
 
-    if (!codeOnly) {
-      out.println(doubleLine)
-      out.println(unit.source)
-      out.println(line)
-    }
+    println(doubleLine)
+    println(unit.source)
+    println(line)
 
-    out.print(unit.tpdTree.show)
+    println(unit.tpdTree.show)
+    println(line)
 
-    if (!codeOnly) {
-      out.println()
-      out.println(line)
-      if (ctx.settings.printTasty.value) {
-        new TastyPrinter(unit.pickled.head._2).printContents()
-        out.println(line)
-      }
+    if (ctx.settings.printTasty.value) {
+      new TastyPrinter(unit.pickled.head._2).printContents()
+      println(line)
     }
   }
 }

compiler/src/dotty/tools/dotc/decompiler/TASTYDecompiler.scala

@@ -13,6 +13,6 @@ import dotty.tools.dotc.core.Phases.Phase
 class TASTYDecompiler(out: PrintStream) extends TASTYCompiler {
   override def phases: List[List[Phase]] = List(
     List(new ReadTastyTreesFromClasses), // Load classes from tasty
-    List(new DecompilationPrinter(out, codeOnly = false)) // Print all loaded classes
+    List(new DecompilationPrinter) // Print all loaded classes
   )
 }

compiler/src/dotty/tools/dotc/quoted/ExprDecompiler.scala

@@ -3,11 +3,10 @@ package dotty.tools.dotc.quoted
 import java.io.PrintStream
 
 import dotty.tools.dotc.core.Phases.Phase
-import dotty.tools.dotc.decompiler.DecompilationPrinter
 
 class ExprDecompiler(out: PrintStream) extends ExprCompiler(null) {
   override def phases: List[List[Phase]] = List(
     List(new ExprFrontend(putInClass = false)), // Create class from Expr
-    List(new DecompilationPrinter(out, codeOnly = true)) // Print all loaded classes
+    List(new QuotePrinter(out)) // Print all loaded classes
   )
 }

compiler/src/dotty/tools/dotc/quoted/QuotePrinter.scala

@@ -0,0 +1,16 @@
+package dotty.tools.dotc.quoted
+
+import java.io.PrintStream
+
+import dotty.tools.dotc.core.Contexts._
+import dotty.tools.dotc.core.Phases.Phase
+
+class QuotePrinter(out: PrintStream) extends Phase {
+
+  override def phaseName: String = "quotePrinter"
+
+  override def run(implicit ctx: Context): Unit = {
+    val unit = ctx.compilationUnit
+    out.print(unit.tpdTree.show)
+  }
+}