diff options
| author | Martin Odersky <odersky@gmail.com> | 2015-07-20 11:35:52 +0200 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2015-09-18 18:10:39 +0200 |
| commit | 31048ad571b8c917a4c67f48899babae0703cae2 (patch) | |
| tree | 24d3f0d320ba96aaa7db40bb79bb29bfdae8fc1a /src/dotty/tools/dotc/core/Types.scala | |
| parent | 845a5d65796365454ceaaba48603afa07792f7e7 (diff) | |
| download | dotty-31048ad571b8c917a4c67f48899babae0703cae2.tar.gz dotty-31048ad571b8c917a4c67f48899babae0703cae2.tar.bz2 dotty-31048ad571b8c917a4c67f48899babae0703cae2.zip | |
Rename of hk args HK$x -> hk$x
These are not user-accessible types, so no need to follow
type convention and write in upper case.
Also, rename occurrences of lambda to Lambda, to make clear
we mean a type lambda.
Diffstat (limited to 'src/dotty/tools/dotc/core/Types.scala')
| -rw-r--r-- | src/dotty/tools/dotc/core/Types.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/dotty/tools/dotc/core/Types.scala b/src/dotty/tools/dotc/core/Types.scala index 20b259db4..4656b0629 100644 --- a/src/dotty/tools/dotc/core/Types.scala +++ b/src/dotty/tools/dotc/core/Types.scala @@ -1865,8 +1865,8 @@ object Types { case refinedInfo: TypeBounds if refinedInfo.variance != 0 && refinedName.isLambdaArgName => val cls = parent.LambdaClass(forcing = false) if (cls.exists) - assert(refinedInfo.variance == cls.typeParams.apply(refinedName.lambdaArgIndex).variance, - s"variance mismatch for $this, $cls, ${cls.typeParams}, ${cls.typeParams.apply(refinedName.lambdaArgIndex).variance}, ${refinedInfo.variance}") + assert(refinedInfo.variance == cls.typeParams.apply(refinedName.LambdaArgIndex).variance, + s"variance mismatch for $this, $cls, ${cls.typeParams}, ${cls.typeParams.apply(refinedName.LambdaArgIndex).variance}, ${refinedInfo.variance}") case _ => } this @@ -1882,7 +1882,7 @@ object Types { this else if ( refinedName.isLambdaArgName //&& { println(s"deriving $refinedName $parent $underlyingTypeParams"); true } - && refinedName.lambdaArgIndex < underlyingTypeParams.length + && refinedName.LambdaArgIndex < underlyingTypeParams.length && !parent.isLambda) derivedRefinedType(parent.EtaExpand, refinedName, refinedInfo) else |