Homogenize package ids and literals

The unpickled term in a package id is different from the original but the
type is the same.

In a literal prefer constants in the types over thsoe in the terms.

With this change, we get identical typed tree output also for core/pickled.

Author: odersky

src/dotty/tools/dotc/printing/RefinedPrinter.scala

@@ -252,6 +252,10 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
       prefix ~ (" extends" provided !ofNew) ~~ parentsText ~~ bodyText
     }
 
+    def toTextPackageId(pid: Tree): Text = 
+      if (homogenizedView) toTextLocal(pid.tpe)
+      else toTextLocal(pid)
+
     var txt: Text = tree match {
       case id: Trees.BackquotedIdent[_] if !homogenizedView =>
         "`" ~ toText(id.name) ~ "`"
@@ -282,7 +286,10 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
       case TypeApply(fun, args) =>
         toTextLocal(fun) ~ "[" ~ toTextGlobal(args, ", ") ~ "]"
       case Literal(c) =>
-        toText(c)
+        tree.typeOpt match {
+          case ConstantType(tc) => toText(tc)
+          case _ => toText(c)
+        }
       case New(tpt) =>
         "new " ~ {
           tpt match {
@@ -404,7 +411,7 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
         }
         val bodyText =
           if (currentPrecedence == TopLevelPrec) "\n" ~ statsText else " {" ~ statsText ~ "}"
-        "package " ~ toTextLocal(pid) ~ bodyText
+        "package " ~ toTextPackageId(pid) ~ bodyText
       case tree: Template => 
         toTextTemplate(tree)
       case Annotated(annot, arg) =>
@@ -509,7 +516,7 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
 
   def optText[T >: Untyped](tree: List[Tree[T]])(encl: Text => Text): Text =
     if (tree.exists(!_.isEmpty)) encl(blockText(tree)) else ""
-
+      
   override protected def polyParamName(name: TypeName): TypeName =
     name.unexpandedName
 

test/dotc/tests.scala

@@ -22,7 +22,7 @@ class tests extends CompilerTest {
   val doEmitBytecode = List("-Ystop-before:terminal")
   val failedbyName = List("-Ystop-before:collectEntryPoints") // #288
   val failedUnderscore = List("-Ystop-before:collectEntryPoints") // #289
-  val testPickling = List("-Ytest-pickler", "-Ystop-after:pickler")
+  val testPickling = List("-Xprint-types", "-Ytest-pickler", "-Ystop-after:pickler")
 
   val failedOther = List("-Ystop-before:collectEntryPoints") // some non-obvious reason. need to look deeper
   val twice = List("#runs", "2", "-YnoDoubleBindings")
@@ -35,8 +35,8 @@ class tests extends CompilerTest {
   val newDir = "./tests/new/"
   val dotcDir = "./src/dotty/"
 
-  @Test def pickle_pickleOK = compileDir(posDir + "pickleOK/", "-Xprint-types" :: testPickling)
-  @Test def pickle_pickling = compileDir(dotcDir + "tools/dotc/core/pickling", testPickling)
+  @Test def pickle_pickleOK = compileDir(posDir + "pickleOK/", testPickling)
+  @Test def pickle_pickling = compileDir(dotcDir + "tools/dotc/core/pickling/", testPickling)
 
   @Test def pos_t2168_pat = compileFile(posDir, "t2168")
   @Test def pos_erasure = compileFile(posDir, "erasure")