diff options
| author | Martin Odersky <odersky@gmail.com> | 2015-07-17 12:32:57 +0200 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2015-09-18 18:07:27 +0200 |
| commit | e2aa258c3781fa9ee62fa47dd3b1206b09588c17 (patch) | |
| tree | 70ebd91374c44c4768b648e751d700f8ca36d56d | |
| parent | eb0b2886f642ec00b2e7f2db569c25f0e1e34757 (diff) | |
| download | dotty-e2aa258c3781fa9ee62fa47dd3b1206b09588c17.tar.gz dotty-e2aa258c3781fa9ee62fa47dd3b1206b09588c17.tar.bz2 dotty-e2aa258c3781fa9ee62fa47dd3b1206b09588c17.zip | |
Drop parameterizeWith
parameterizeWith picked between simple hk types and lambda abstraction.
No longer needed because now we always lambda abstract.
| -rw-r--r-- | src/dotty/tools/dotc/core/TypeApplications.scala | 4 | ||||
| -rw-r--r-- | src/dotty/tools/dotc/typer/Namer.scala | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/dotty/tools/dotc/core/TypeApplications.scala b/src/dotty/tools/dotc/core/TypeApplications.scala index ca5d93a02..893bedeba 100644 --- a/src/dotty/tools/dotc/core/TypeApplications.scala +++ b/src/dotty/tools/dotc/core/TypeApplications.scala @@ -437,7 +437,7 @@ class TypeApplications(val self: Type) extends AnyVal { } recur(self) } - +/* /** Given a type alias * * type T[boundSyms] = p.C[targs] @@ -500,7 +500,7 @@ class TypeApplications(val self: Type) extends AnyVal { if (cls.isClass) matchParams(boundSyms, cls.typeParams, argInfos, Map()) else LambdaAbstract(boundSyms) } - +*/ /** The typed lambda abstraction of this type `T` relative to `boundSyms`. * This is: * diff --git a/src/dotty/tools/dotc/typer/Namer.scala b/src/dotty/tools/dotc/typer/Namer.scala index 7e7d4f802..224ced0ce 100644 --- a/src/dotty/tools/dotc/typer/Namer.scala +++ b/src/dotty/tools/dotc/typer/Namer.scala @@ -780,11 +780,11 @@ class Namer { typer: Typer => completeParams(tdef.tparams) val tparamSyms = tdef.tparams map symbolOfTree val isDerived = tdef.rhs.isInstanceOf[untpd.DerivedTypeTree] - val toParameterize = tparamSyms.nonEmpty && !isDerived - val needsLambda = sym.allOverriddenSymbols.exists(_ is HigherKinded) && !isDerived + //val toParameterize = tparamSyms.nonEmpty && !isDerived + //val needsLambda = sym.allOverriddenSymbols.exists(_ is HigherKinded) && !isDerived def abstracted(tp: Type): Type = - if (needsLambda) tp.LambdaAbstract(tparamSyms) - else if (toParameterize) tp.parameterizeWith(tparamSyms) + if (tparamSyms.nonEmpty) tp.LambdaAbstract(tparamSyms) + //else if (toParameterize) tp.parameterizeWith(tparamSyms) else tp sym.info = abstracted(TypeBounds.empty) // Temporarily set info of defined type T to ` >: Nothing <: Any. |