diff options
author | Martin Odersky <odersky@gmail.com> | 2016-06-29 20:07:51 +0200 |
---|---|---|
committer | Martin Odersky <odersky@gmail.com> | 2016-07-11 13:35:03 +0200 |
commit | 02ce995f44c2252f7f7c0f07aa2a86f045b51ac2 (patch) | |
tree | 70768b1bf1aeec2e1f56acc6d0c390d9e9538cb5 /src/dotty/tools/dotc/core/SymDenotations.scala | |
parent | 73dd03944cdfbc2588e9e41f407e0ad3a48abe96 (diff) | |
download | dotty-02ce995f44c2252f7f7c0f07aa2a86f045b51ac2.tar.gz dotty-02ce995f44c2252f7f7c0f07aa2a86f045b51ac2.tar.bz2 dotty-02ce995f44c2252f7f7c0f07aa2a86f045b51ac2.zip |
Refactoring of PolyType and TypeLambda
Make them each inherit from common BaseType GenericType.
That way we avoid inheriting accidentally stuff from PolyType in TypeLambda.
Also, Fix adaptation of type lambdas. Don't confuse them with PolyTypes.
Diffstat (limited to 'src/dotty/tools/dotc/core/SymDenotations.scala')
-rw-r--r-- | src/dotty/tools/dotc/core/SymDenotations.scala | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/dotty/tools/dotc/core/SymDenotations.scala b/src/dotty/tools/dotc/core/SymDenotations.scala index 2692f57a2..46d93b753 100644 --- a/src/dotty/tools/dotc/core/SymDenotations.scala +++ b/src/dotty/tools/dotc/core/SymDenotations.scala @@ -1127,7 +1127,7 @@ object SymDenotations { case tp: NamedType => hasSkolems(tp.prefix) case tp: RefinedType => hasSkolems(tp.parent) || hasSkolems(tp.refinedInfo) case tp: RecType => hasSkolems(tp.parent) - case tp: PolyType => tp.paramBounds.exists(hasSkolems) || hasSkolems(tp.resType) + case tp: GenericType => tp.paramBounds.exists(hasSkolems) || hasSkolems(tp.resType) case tp: MethodType => tp.paramTypes.exists(hasSkolems) || hasSkolems(tp.resType) case tp: ExprType => hasSkolems(tp.resType) case tp: HKApply => hasSkolems(tp.tycon) || tp.args.exists(hasSkolems) @@ -1658,6 +1658,8 @@ object SymDenotations { case _ => baseTypeRefOf(tp.underlying) } + case tp: HKApply => + baseTypeRefOf(tp.upperBound) // TODO drop? case tp: TypeProxy => baseTypeRefOf(tp.underlying) case AndType(tp1, tp2) => |