diff options
author | Martin Odersky <odersky@gmail.com> | 2016-02-10 08:39:46 +0100 |
---|---|---|
committer | Martin Odersky <odersky@gmail.com> | 2016-02-19 16:57:36 +0100 |
commit | 97e261d17bb260cd0db4708199118d7039e442fa (patch) | |
tree | 2f223d4f698b4151bfb04c9cbfefd596ba262ca2 /src/dotty/tools/dotc/typer | |
parent | 5969e02b59b0cae07eab6bf8065331708f4b2480 (diff) | |
download | dotty-97e261d17bb260cd0db4708199118d7039e442fa.tar.gz dotty-97e261d17bb260cd0db4708199118d7039e442fa.tar.bz2 dotty-97e261d17bb260cd0db4708199118d7039e442fa.zip |
Merge parentsWithArgs and instantiatedParents
Diffstat (limited to 'src/dotty/tools/dotc/typer')
-rw-r--r-- | src/dotty/tools/dotc/typer/Checking.scala | 2 | ||||
-rw-r--r-- | src/dotty/tools/dotc/typer/TypeAssigner.scala | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/dotty/tools/dotc/typer/Checking.scala b/src/dotty/tools/dotc/typer/Checking.scala index 64aac7d3b..beb8fc931 100644 --- a/src/dotty/tools/dotc/typer/Checking.scala +++ b/src/dotty/tools/dotc/typer/Checking.scala @@ -342,7 +342,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) } diff --git a/src/dotty/tools/dotc/typer/TypeAssigner.scala b/src/dotty/tools/dotc/typer/TypeAssigner.scala index ac46ee723..07cc3c8d6 100644 --- a/src/dotty/tools/dotc/typer/TypeAssigner.scala +++ b/src/dotty/tools/dotc/typer/TypeAssigner.scala @@ -69,7 +69,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) @@ -287,7 +287,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)) |