From 32c0135b59fe02a70ed0b1a693251a0028d479c8 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Thu, 30 Jun 2016 14:27:43 +0200 Subject: Refactorings of GenericTypes and underlying/upperbound 1. Make genericType a trait instead of a class. 2. Make TypeLambda a type proxy 3. Split underlying in TypeProxy into underlying and superType 4. Cleanups in many other places --- src/dotty/tools/dotc/core/SymDenotations.scala | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/dotty/tools/dotc/core/SymDenotations.scala') diff --git a/src/dotty/tools/dotc/core/SymDenotations.scala b/src/dotty/tools/dotc/core/SymDenotations.scala index dbde4d6f2..e3cbf6669 100644 --- a/src/dotty/tools/dotc/core/SymDenotations.scala +++ b/src/dotty/tools/dotc/core/SymDenotations.scala @@ -1661,12 +1661,10 @@ object SymDenotations { if (cdenot.superClassBits contains symbol.superId) foldGlb(NoType, tp.parents) else NoType case _ => - baseTypeRefOf(tp.underlying) + baseTypeRefOf(tp.superType) } - case tp: HKApply => - baseTypeRefOf(tp.upperBound) // TODO drop? case tp: TypeProxy => - baseTypeRefOf(tp.underlying) + baseTypeRefOf(tp.superType) case AndType(tp1, tp2) => baseTypeRefOf(tp1) & baseTypeRefOf(tp2) case OrType(tp1, tp2) => -- cgit v1.2.3