Merge GenericType, TypeLambda and PolyType

1 files changed, 4 insertions, 12 deletions

diff --git a/src/dotty/tools/dotc/printing/PlainPrinter.scala b/src/dotty/tools/dotc/printing/PlainPrinter.scala
index a92095d9b..564ef21ef 100644
--- a/src/dotty/tools/dotc/printing/PlainPrinter.scala
+++ b/src/dotty/tools/dotc/printing/PlainPrinter.scala
@@ -114,7 +114,7 @@ class PlainPrinter(_ctx: Context) extends Printer {
     case _ => toTextGlobal(arg)
   }
 
-  /** The text for a TypeLambda
+  /** The text for a PolyType
    *
    *     [v_1 p_1: B_1, ..., v_n p_n: B_n] -> T
    *
@@ -124,7 +124,7 @@ class PlainPrinter(_ctx: Context) extends Printer {
    *  @param  argBoundss  = B_1, ..., B_n
    *  @param  body        = T
    */
-  protected def typeLambdaText(paramNames: List[String], variances: List[Int], argBoundss: List[TypeBounds], body: Type): Text = {
+  protected def polyTypeText(paramNames: List[String], variances: List[Int], argBoundss: List[TypeBounds], body: Type): Text = {
     def lambdaParamText(variance: Int, name: String, bounds: TypeBounds): Text =
       varianceString(variance) ~ name ~ toText(bounds)
     changePrec(GlobalPrec) {
@@ -185,16 +185,8 @@ class PlainPrinter(_ctx: Context) extends Printer {
         }
       case tp: ExprType =>
         changePrec(GlobalPrec) { "=> " ~ toText(tp.resultType) }
-      case tp: TypeLambda =>
-        typeLambdaText(tp.paramNames.map(_.toString), tp.variances, tp.paramBounds, tp.resultType)
       case tp: PolyType =>
-        def paramText(name: TypeName, bounds: TypeBounds): Text =
-          polyParamNameString(name) ~ polyHash(tp) ~ toText(bounds)
-        changePrec(GlobalPrec) {
-          "[" ~
-            Text((tp.paramNames, tp.paramBounds).zipped map paramText, ", ") ~
-          "]" ~ toText(tp.resultType)
-        }
+        polyTypeText(tp.paramNames.map(_.toString), tp.variances, tp.paramBounds, tp.resultType)
       case tp: PolyParam =>
         polyParamNameString(tp) ~ polyHash(tp.binder)
       case AnnotatedType(tpe, annot) =>
@@ -229,7 +221,7 @@ class PlainPrinter(_ctx: Context) extends Printer {
   protected def simpleNameString(sym: Symbol): String = nameString(sym.name)
 
   /** If -uniqid is set, the hashcode of the polytype, after a # */
-  protected def polyHash(pt: GenericType): Text =
+  protected def polyHash(pt: PolyType): Text =
     if (ctx.settings.uniqid.value) "#" + pt.hashCode else ""
 
   /** If -uniqid is set, the unique id of symbol, after a # */