diff options
author | Martin Odersky <odersky@gmail.com> | 2013-08-06 12:48:28 +0200 |
---|---|---|
committer | Martin Odersky <odersky@gmail.com> | 2013-08-06 12:48:28 +0200 |
commit | 2985d1806b66d4bf59807f35a6427b81ef66961e (patch) | |
tree | 7564a183711cd993eff378469e37a3ac28c61513 /src/dotty/tools/dotc/core/Definitions.scala | |
parent | 71e59bb45db6f9f8abd8d42041583d56c88fe289 (diff) | |
download | dotty-2985d1806b66d4bf59807f35a6427b81ef66961e.tar.gz dotty-2985d1806b66d4bf59807f35a6427b81ef66961e.tar.bz2 dotty-2985d1806b66d4bf59807f35a6427b81ef66961e.zip |
Refined treatment of unapply
Diffstat (limited to 'src/dotty/tools/dotc/core/Definitions.scala')
-rw-r--r-- | src/dotty/tools/dotc/core/Definitions.scala | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/dotty/tools/dotc/core/Definitions.scala b/src/dotty/tools/dotc/core/Definitions.scala index bde325897..df0173467 100644 --- a/src/dotty/tools/dotc/core/Definitions.scala +++ b/src/dotty/tools/dotc/core/Definitions.scala @@ -142,7 +142,7 @@ class Definitions(implicit ctx: Context) { ScalaPackageClass, tpnme.Null, AbstractFinal, List(AnyRefAlias.typeConstructor)).entered lazy val PredefModule = requiredModule("scala.Predef") - lazy val NilModule = requiredModule("scala.collection.immutable.Nil") + lazy val NilModule = requiredModule("scala.collection.immutable.Nil") // lazy val FunctionClass: ClassSymbol = requiredClass("scala.Function") lazy val SingletonClass: ClassSymbol = @@ -330,7 +330,7 @@ class Definitions(implicit ctx: Context) { * - v_i are the variances of the bound symbols (i.e. +, -, or empty). * - _$hk$i are hgiher-kinded parameter names, which are special treated in type application. */ - def hkTrait(variances: List[Int]) = { + def hkTrait(vcs: List[Int]) = { def varianceSuffix(v: Int) = v match { case -1 => "N" @@ -348,14 +348,14 @@ class Definitions(implicit ctx: Context) { def complete(denot: SymDenotation): Unit = { val cls = denot.asClass.classSymbol val paramDecls = newScope - for ((v, i) <- variances.zipWithIndex) + for ((v, i) <- vcs.zipWithIndex) newTypeParam(cls, tpnme.higherKindedParamName(i), varianceFlags(v), paramDecls) denot.info = ClassInfo(ScalaPackageClass.thisType, cls, List(ObjectClass.typeConstructor), paramDecls) } } val traitName = - tpnme.higherKindedTraitName(variances.length) ++ (variances map varianceSuffix).mkString + tpnme.higherKindedTraitName(vcs.length) ++ (vcs map varianceSuffix).mkString def createTrait = { val cls = ctx.newClassSymbol( @@ -367,7 +367,7 @@ class Definitions(implicit ctx: Context) { cls } - hkTraitOfArity.getOrElseUpdate(variances, createTrait) + hkTraitOfArity.getOrElseUpdate(vcs, createTrait) } |