diff options
| -rw-r--r-- | src/dotty/tools/dotc/printing/PlainPrinter.scala | 13 | ||||
| -rw-r--r-- | src/dotty/tools/dotc/printing/RefinedPrinter.scala | 6 |
2 files changed, 13 insertions, 6 deletions
diff --git a/src/dotty/tools/dotc/printing/PlainPrinter.scala b/src/dotty/tools/dotc/printing/PlainPrinter.scala index 0bd1d4499..0fd862afb 100644 --- a/src/dotty/tools/dotc/printing/PlainPrinter.scala +++ b/src/dotty/tools/dotc/printing/PlainPrinter.scala @@ -33,6 +33,14 @@ class PlainPrinter(_ctx: Context) extends Printer { ctx.warning("Exceeded recursion depth attempting to print.") (new Throwable).printStackTrace } + + /** If true, tweak output so it is the same before and after pickling */ + protected def homogenizedView: Boolean = ctx.settings.YtestPickler.value + + def homogenize(tp: Type): Type = tp match { + case tp: TypeVar if homogenizedView && tp.isInstantiated => homogenize(tp.instanceOpt) + case _ => tp + } /** Render elements alternating with `sep` string */ protected def toText(elems: Traversable[Showable], sep: String) = @@ -91,7 +99,7 @@ class PlainPrinter(_ctx: Context) extends Printer { }) def toText(tp: Type): Text = controlled { - tp match { + homogenize(tp) match { case tp: TypeType => toTextRHS(tp) case tp: TermRef if !tp.denotationIsCurrent || tp.symbol.is(Module) => @@ -141,8 +149,7 @@ class PlainPrinter(_ctx: Context) extends Printer { toTextLocal(tpe) ~ " " ~ toText(annot) case tp: TypeVar => if (tp.isInstantiated) - if (ctx.settings.YtestPickler.value) toText(tp.instanceOpt) - else toTextLocal(tp.instanceOpt) // debug for now, so that we can see where the TypeVars are. + toTextLocal(tp.instanceOpt) ~ "'" // debug for now, so that we can see where the TypeVars are. else { val constr = ctx.typerState.constraint val bounds = diff --git a/src/dotty/tools/dotc/printing/RefinedPrinter.scala b/src/dotty/tools/dotc/printing/RefinedPrinter.scala index fa2ba6586..bbe958241 100644 --- a/src/dotty/tools/dotc/printing/RefinedPrinter.scala +++ b/src/dotty/tools/dotc/printing/RefinedPrinter.scala @@ -104,7 +104,7 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) { toTextTuple(args.init) argStr ~ " => " ~ toText(args.last) } - tp match { + homogenize(tp) match { case tp: RefinedType => val args = tp.argInfos(interpolate = false) if (args.nonEmpty) { @@ -137,7 +137,7 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) { return "?{ " ~ toText(tp.name) ~ ": " ~ toText(tp.memberProto) ~ " }" case tp: ViewProto => return toText(tp.argType) ~ " ?=>? " ~ toText(tp.resultType) - case FunProto(args, resultType, _) => + case tp @ FunProto(args, resultType, _) => val argsText = args match { case dummyTreeOfType(tp) :: Nil if !(tp isRef defn.NullClass) => "null: " ~ toText(tp) case _ => toTextGlobal(args, ", ") @@ -252,7 +252,7 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) { } var txt: Text = tree match { - case id: Trees.BackquotedIdent[_] => + case id: Trees.BackquotedIdent[_] if !homogenizedView => "`" ~ toText(id.name) ~ "`" case Ident(name) => tree.typeOpt match { |