aboutsummaryrefslogtreecommitdiff
path: root/src/dotty/tools/dotc/core/SymDenotations.scala
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2016-06-30 14:27:43 +0200
committerMartin Odersky <odersky@gmail.com>2016-07-11 13:35:07 +0200
commit32c0135b59fe02a70ed0b1a693251a0028d479c8 (patch)
tree289c07464da953f9709bf69a1e9658d430575e71 /src/dotty/tools/dotc/core/SymDenotations.scala
parentb6a8bc77fe3af4f6f722fdbaed8a0f7c8c6774ac (diff)
downloaddotty-32c0135b59fe02a70ed0b1a693251a0028d479c8.tar.gz
dotty-32c0135b59fe02a70ed0b1a693251a0028d479c8.tar.bz2
dotty-32c0135b59fe02a70ed0b1a693251a0028d479c8.zip
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
Diffstat (limited to 'src/dotty/tools/dotc/core/SymDenotations.scala')
-rw-r--r--src/dotty/tools/dotc/core/SymDenotations.scala6
1 files changed, 2 insertions, 4 deletions
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) =>