diff options
author | Martin Odersky <odersky@gmail.com> | 2017-03-18 11:26:59 +0100 |
---|---|---|
committer | Martin Odersky <odersky@gmail.com> | 2017-04-06 13:15:28 +0200 |
commit | db4f7a19c9329d59da09a4de6b8476b4b6988cdf (patch) | |
tree | e70a1cf2d4af3a9e3e4b3999d5000b4466627143 /compiler/src/dotty/tools/dotc/core/OrderingConstraint.scala | |
parent | 26497bb3c654e294a48db2098978bc77b11f2889 (diff) | |
download | dotty-db4f7a19c9329d59da09a4de6b8476b4b6988cdf.tar.gz dotty-db4f7a19c9329d59da09a4de6b8476b4b6988cdf.tar.bz2 dotty-db4f7a19c9329d59da09a4de6b8476b4b6988cdf.zip |
Further refactorings
- Use TypeLambda instead of PolyType.
- Further harmonize factory operations
Diffstat (limited to 'compiler/src/dotty/tools/dotc/core/OrderingConstraint.scala')
-rw-r--r-- | compiler/src/dotty/tools/dotc/core/OrderingConstraint.scala | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/compiler/src/dotty/tools/dotc/core/OrderingConstraint.scala b/compiler/src/dotty/tools/dotc/core/OrderingConstraint.scala index 2dff39c37..84b0bfc6d 100644 --- a/compiler/src/dotty/tools/dotc/core/OrderingConstraint.scala +++ b/compiler/src/dotty/tools/dotc/core/OrderingConstraint.scala @@ -112,17 +112,17 @@ import OrderingConstraint._ * @param boundsMap a map from TypeLambda to arrays. * Each array contains twice the number of entries as there a type parameters * in the TypeLambda. The first half of the array contains the type bounds that constrain the - * polytype's type parameters. The second half might contain type variables that + * lambda's type parameters. The second half might contain type variables that * track the corresponding parameters, or is left empty (filled with nulls). * An instantiated type parameter is represented by having its instance type in * the corresponding array entry. The dual use of arrays for poly params * and typevars is to save space and hopefully gain some speed. * * @param lowerMap a map from TypeLambdas to arrays. Each array entry corresponds - * to a parameter P of the polytype; it contains all constrained parameters + * to a parameter P of the type lambda; it contains all constrained parameters * Q that are known to be smaller than P, i.e. Q <: P. * @param upperMap a map from TypeLambdas to arrays. Each array entry corresponds - * to a parameter P of the polytype; it contains all constrained parameters + * to a parameter P of the type lambda; it contains all constrained parameters * Q that are known to be greater than P, i.e. P <: Q. */ class OrderingConstraint(private val boundsMap: ParamBounds, @@ -456,7 +456,7 @@ class OrderingConstraint(private val boundsMap: ParamBounds, // ---------- Exploration -------------------------------------------------------- - def domainPolys: List[TypeLambda] = boundsMap.keys + def domainLambdas: List[TypeLambda] = boundsMap.keys def domainParams: List[TypeParamRef] = for { @@ -584,7 +584,7 @@ class OrderingConstraint(private val boundsMap: ParamBounds, val uninstVarsText = " uninstVars = " ~ Text(uninstVars map (_.toText(printer)), ", ") ~ ";" val constrainedText = - " constrained types = " ~ Text(domainPolys map (_.toText(printer)), ", ") + " constrained types = " ~ Text(domainLambdas map (_.toText(printer)), ", ") val boundsText = " bounds = " ~ { val assocs = @@ -614,8 +614,8 @@ class OrderingConstraint(private val boundsMap: ParamBounds, case _ =>" := " + tp } val constrainedText = - " constrained types = " + domainPolys.mkString("\n") - val boundsText = + " constrained types = " + domainLambdas.mkString("\n") + val boundsText = domainLambdas " bounds = " + { val assocs = for (param <- domainParams) |