diff options
author | Martin Odersky <odersky@gmail.com> | 2015-11-07 23:38:04 +0100 |
---|---|---|
committer | Martin Odersky <odersky@gmail.com> | 2015-11-09 15:45:39 +0100 |
commit | 2d7a05fa46016ea54e10a80735e04b33fd0938d1 (patch) | |
tree | 90393a4961046c9a999336a63de6652ff588eb7f /src/dotty/tools/dotc/core/Definitions.scala | |
parent | af6ffc319cb23c5ade01251a93810f7a33429e58 (diff) | |
download | dotty-2d7a05fa46016ea54e10a80735e04b33fd0938d1.tar.gz dotty-2d7a05fa46016ea54e10a80735e04b33fd0938d1.tar.bz2 dotty-2d7a05fa46016ea54e10a80735e04b33fd0938d1.zip |
Fix dotty compilation problem in Definitions
Diffstat (limited to 'src/dotty/tools/dotc/core/Definitions.scala')
-rw-r--r-- | src/dotty/tools/dotc/core/Definitions.scala | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/dotty/tools/dotc/core/Definitions.scala b/src/dotty/tools/dotc/core/Definitions.scala index 40b759018..bec558d76 100644 --- a/src/dotty/tools/dotc/core/Definitions.scala +++ b/src/dotty/tools/dotc/core/Definitions.scala @@ -683,13 +683,13 @@ class Definitions { private lazy val ScalaNumericValueTypes: collection.Set[TypeRef] = ScalaNumericValueTypeList.toSet private lazy val ScalaValueTypes: collection.Set[TypeRef] = ScalaNumericValueTypes + UnitType + BooleanType - private lazy val ScalaBoxedTypes = ScalaValueTypes map (t => boxedType(t.name)) + private lazy val ScalaBoxedTypes = ScalaValueTypes map (t => boxedTypes(t.name)) val ScalaNumericValueClasses = new SymbolsPerRun(implicit ctx => ScalaNumericValueTypes.map(_.symbol)) val ScalaValueClasses = new SymbolsPerRun(implicit ctx => ScalaValueTypes.map(_.symbol)) val ScalaBoxedClasses = new SymbolsPerRun(implicit ctx => ScalaBoxedTypes.map(_.symbol)) - private val boxedType = mutable.Map[TypeName, TypeRef]() + private val boxedTypes = mutable.Map[TypeName, TypeRef]() private val valueTypeEnc = mutable.Map[TypeName, PrimitiveClassEnc]() // private val unboxedTypeRef = mutable.Map[TypeName, TypeRef]() @@ -698,7 +698,7 @@ class Definitions { private def valueTypeRef(name: String, boxed: TypeRef, jtype: Class[_], enc: Int): TypeRef = { val vcls = ctx.requiredClassRef(name) - boxedType(vcls.name) = boxed + boxedTypes(vcls.name) = boxed valueTypeEnc(vcls.name) = enc // unboxedTypeRef(boxed.name) = vcls // javaTypeToValueTypeRef(jtype) = vcls @@ -707,7 +707,7 @@ class Definitions { } /** The type of the boxed class corresponding to primitive value type `tp`. */ - def boxedType(tp: Type)(implicit ctx: Context): TypeRef = boxedType(scalaClassName(tp)) + def boxedType(tp: Type)(implicit ctx: Context): TypeRef = boxedTypes(scalaClassName(tp)) def wrapArrayMethodName(elemtp: Type): TermName = { val cls = elemtp.classSymbol |