Merge parentsWithArgs and instantiatedParents

Author: odersky

src/dotty/tools/dotc/core/Types.scala

@@ -1010,7 +1010,7 @@ object Types {
 
     /** The full parent types, including all type arguments */
     def parentsWithArgs(implicit ctx: Context): List[Type] = this match {
-      case tp: TypeProxy => tp.underlying.parents
+      case tp: TypeProxy => tp.underlying.parentsWithArgs
       case _ => List()
     }
 
@@ -2771,11 +2771,8 @@ object Types {
       parentsCache
     }
 
-    override def parentsWithArgs(implicit ctx: Context): List[Type] =
-      parents.map(p => typeRef.baseTypeWithArgs(p.symbol))
-
     /** The parent types with all type arguments */
-    def instantiatedParents(implicit ctx: Context): List[Type] =
+    override def parentsWithArgs(implicit ctx: Context): List[Type] =
       parents mapConserve { pref =>
         ((pref: Type) /: pref.classSymbol.typeParams) { (parent, tparam) =>
           val targSym = decls.lookup(tparam.name)

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

@@ -160,7 +160,7 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
       case ErasedValueType(clazz, underlying) =>
         return "ErasedValueType(" ~ toText(clazz.typeRef) ~ ", " ~ toText(underlying) ~ ")"
       case tp: ClassInfo =>
-        return toTextParents(tp.instantiatedParents) ~ "{...}"
+        return toTextParents(tp.parentsWithArgs) ~ "{...}"
       case JavaArrayType(elemtp) =>
         return toText(elemtp) ~ "[]"
       case tp: SelectionProto =>

src/dotty/tools/dotc/typer/Checking.scala

@@ -326,7 +326,7 @@ object Checking {
             else errors1
           } else errors1
         case tp: ClassInfo =>
-          (apply(errors, tp.prefix) /: tp.typeRef.parentsWithArgs)(apply)
+          (apply(errors, tp.prefix) /: tp.parentsWithArgs)(apply)
         case _ =>
           foldOver(errors, tp)
       }

src/dotty/tools/dotc/typer/TypeAssigner.scala

@@ -64,7 +64,7 @@ trait TypeAssigner {
                 if (tp1.typeSymbol.exists)
                   return tp1
               }
-              val parentType = info.instantiatedParents.reduceLeft(ctx.typeComparer.andType(_, _))
+              val parentType = info.parentsWithArgs.reduceLeft(ctx.typeComparer.andType(_, _))
               def addRefinement(parent: Type, decl: Symbol) = {
                 val inherited =
                   parentType.findMember(decl.name, info.cls.thisType, Private)
@@ -282,7 +282,7 @@ trait TypeAssigner {
       else if (!mix.isEmpty) findMixinSuper(cls.info)
       else if (inConstrCall || ctx.erasedTypes) cls.info.firstParent
       else {
-        val ps = cls.classInfo.instantiatedParents
+        val ps = cls.classInfo.parentsWithArgs
         if (ps.isEmpty) defn.AnyType else ps.reduceLeft((x: Type, y: Type) => x & y)
       }
     tree.withType(SuperType(cls.thisType, owntype))