diff options
author | Martin Odersky <odersky@gmail.com> | 2015-07-19 13:04:39 +0200 |
---|---|---|
committer | Martin Odersky <odersky@gmail.com> | 2015-09-18 18:09:55 +0200 |
commit | 965e7e368bcf7346b28ef19f694be502e76a1ca3 (patch) | |
tree | 68882c4bb01b98b484061cab6c35de2915e14a8b /src/dotty/tools/dotc/core/TypeApplications.scala | |
parent | 83ae926dad0caf945a8633b39b557567415b2bbe (diff) | |
download | dotty-965e7e368bcf7346b28ef19f694be502e76a1ca3.tar.gz dotty-965e7e368bcf7346b28ef19f694be502e76a1ca3.tar.bz2 dotty-965e7e368bcf7346b28ef19f694be502e76a1ca3.zip |
Project all high-kinded types with #Apply
Used to be just instantiated lambdas. With the new scheme
every type with a kind higher than * needs to be projected
with #Apply.
Diffstat (limited to 'src/dotty/tools/dotc/core/TypeApplications.scala')
-rw-r--r-- | src/dotty/tools/dotc/core/TypeApplications.scala | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/dotty/tools/dotc/core/TypeApplications.scala b/src/dotty/tools/dotc/core/TypeApplications.scala index dca56e812..12b540cf4 100644 --- a/src/dotty/tools/dotc/core/TypeApplications.scala +++ b/src/dotty/tools/dotc/core/TypeApplications.scala @@ -206,11 +206,20 @@ class TypeApplications(val self: Type) extends AnyVal { tp } + def isHK(tp: Type): Boolean = tp match { + case tp: TypeRef => + val sym = tp.symbol + if (sym.isClass) sym.isLambdaTrait + else !sym.isAliasType || isHK(tp.info) + case tp: TypeProxy => isHK(tp.underlying) + case _ => false + } + if (args.isEmpty || ctx.erasedTypes) self else { val res = instantiate(self, self) - if (res.isInstantiatedLambda) - // Note: isInstantiatedLambda needs to be conservative, using isSafeLambda + if (isHK(res)) + // Note: isHK needs to be conservative, using isSafeLambda // in order to avoid cyclic reference errors. But this means that some fully // instantiated types will remain unprojected, which essentially means // that they stay as higher-kinded types. checkNonCyclic checks the type again @@ -218,7 +227,7 @@ class TypeApplications(val self: Type) extends AnyVal { // that fall through the hole. Not adding an #Apply typically manifests itself // with a <:< failure of two types that "look the same". An example is #779, // where compiling scala.immutable.Map gives a bounds violation. - res.select(tpnme.Apply) + TypeRef(res, tpnme.Apply) else res } } |