aboutsummaryrefslogtreecommitdiff
path: root/src/dotty/tools/dotc/core/Definitions.scala
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2015-07-20 11:35:52 +0200
committerMartin Odersky <odersky@gmail.com>2015-09-18 18:10:39 +0200
commit31048ad571b8c917a4c67f48899babae0703cae2 (patch)
tree24d3f0d320ba96aaa7db40bb79bb29bfdae8fc1a /src/dotty/tools/dotc/core/Definitions.scala
parent845a5d65796365454ceaaba48603afa07792f7e7 (diff)
downloaddotty-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/Definitions.scala')
-rw-r--r--src/dotty/tools/dotc/core/Definitions.scala12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/dotty/tools/dotc/core/Definitions.scala b/src/dotty/tools/dotc/core/Definitions.scala
index 03be776a0..a503a2d23 100644
--- a/src/dotty/tools/dotc/core/Definitions.scala
+++ b/src/dotty/tools/dotc/core/Definitions.scala
@@ -494,7 +494,7 @@ class Definitions {
/** The set of HigherKindedXYZ traits encountered so far */
def lambdaTraits: Set[Symbol] = myLambdaTraits
- private var lambdaTraitForVariances = mutable.Map[List[Int], ClassSymbol]()
+ private var LambdaTraitForVariances = mutable.Map[List[Int], ClassSymbol]()
/** The HigherKinded trait corresponding to symbols `boundSyms` (which are assumed
* to be the type parameters of a higher-kided type). This is a class symbol that
@@ -513,7 +513,7 @@ class Definitions {
* - for each positive or negative variance v_i there is a parent trait Pj which
* is the same as LambdaXYZ except that it has `I` in i-th position.
*/
- def lambdaTrait(vcs: List[Int]): ClassSymbol = {
+ def LambdaTrait(vcs: List[Int]): ClassSymbol = {
assert(vcs.nonEmpty)
def varianceFlags(v: Int) = v match {
@@ -527,17 +527,17 @@ class Definitions {
val cls = denot.asClass.classSymbol
val paramDecls = newScope
for (i <- 0 until vcs.length)
- newTypeParam(cls, tpnme.lambdaArgName(i), varianceFlags(vcs(i)), paramDecls)
+ newTypeParam(cls, tpnme.LambdaArgName(i), varianceFlags(vcs(i)), paramDecls)
newTypeField(cls, tpnme.hkApply, Covariant, paramDecls)
val parentTraitRefs =
for (i <- 0 until vcs.length if vcs(i) != 0)
- yield lambdaTrait(vcs.updated(i, 0)).typeRef
+ yield LambdaTrait(vcs.updated(i, 0)).typeRef
denot.info = ClassInfo(
ScalaPackageClass.thisType, cls, ObjectClass.typeRef :: parentTraitRefs.toList, paramDecls)
}
}
- val traitName = tpnme.lambdaTraitName(vcs)
+ val traitName = tpnme.LambdaTraitName(vcs)
def createTrait = {
val cls = newClassSymbol(
@@ -549,7 +549,7 @@ class Definitions {
cls
}
- lambdaTraitForVariances.getOrElseUpdate(vcs, createTrait)
+ LambdaTraitForVariances.getOrElseUpdate(vcs, createTrait)
}
// ----- primitive value class machinery ------------------------------------------