diff options
author | Paul Phillips <paulp@improving.org> | 2013-01-09 11:52:30 -0800 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2013-01-09 12:11:15 -0800 |
commit | 03caf40523cc768c87080e141993ccfe5df7f57f (patch) | |
tree | 2c67927cb88517d7cd89edf44a219f9bc48b881b /src | |
parent | 31f073c0eb616d3dffa31572352442a5d913bba3 (diff) | |
download | scala-03caf40523cc768c87080e141993ccfe5df7f57f.tar.gz scala-03caf40523cc768c87080e141993ccfe5df7f57f.tar.bz2 scala-03caf40523cc768c87080e141993ccfe5df7f57f.zip |
Renamed isTrackingVariance to trackVariance.
Diffstat (limited to 'src')
-rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Typers.scala | 2 | ||||
-rw-r--r-- | src/reflect/scala/reflect/internal/Types.scala | 20 | ||||
-rw-r--r-- | src/reflect/scala/reflect/internal/Variances.scala | 2 |
3 files changed, 12 insertions, 12 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala index d30f912a50..acbd71bc31 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala @@ -945,7 +945,7 @@ trait Typers extends Modes with Adaptations with Tags { .setOriginal(tree) val skolems = new mutable.ListBuffer[TypeSymbol] - object variantToSkolem extends TypeMap(isTrackingVariance = true) { + object variantToSkolem extends TypeMap(trackVariance = true) { def apply(tp: Type) = mapOver(tp) match { // !!! FIXME - skipping this when variance.isInvariant allows unsoundness, see SI-5189 case TypeRef(NoPrefix, tpSym, Nil) if !variance.isInvariant && tpSym.isTypeParameterOrSkolem && tpSym.owner.isTerm => diff --git a/src/reflect/scala/reflect/internal/Types.scala b/src/reflect/scala/reflect/internal/Types.scala index c88f2c8616..9d0d38913c 100644 --- a/src/reflect/scala/reflect/internal/Types.scala +++ b/src/reflect/scala/reflect/internal/Types.scala @@ -3931,13 +3931,13 @@ trait Types extends api.Types { self: SymbolTable => /** A prototype for mapping a function over all possible types */ - abstract class TypeMap(isTrackingVariance: Boolean) extends (Type => Type) { - def this() = this(isTrackingVariance = false) + abstract class TypeMap(trackVariance: Boolean) extends (Type => Type) { + def this() = this(trackVariance = false) def apply(tp: Type): Type - private[this] var _variance: Variance = if (isTrackingVariance) Covariant else Invariant + private[this] var _variance: Variance = if (trackVariance) Covariant else Invariant - def variance_=(x: Variance) = { assert(isTrackingVariance, this) ; _variance = x } + def variance_=(x: Variance) = { assert(trackVariance, this) ; _variance = x } def variance = _variance /** Map this function over given type */ @@ -3945,7 +3945,7 @@ trait Types extends api.Types { self: SymbolTable => case tr @ TypeRef(pre, sym, args) => val pre1 = this(pre) val args1 = ( - if (isTrackingVariance && args.nonEmpty && !variance.isInvariant && sym.typeParams.nonEmpty) + if (trackVariance && args.nonEmpty && !variance.isInvariant && sym.typeParams.nonEmpty) mapOverArgs(args, sym.typeParams) else args mapConserve this @@ -4038,12 +4038,12 @@ trait Types extends api.Types { self: SymbolTable => try body finally variance = saved } @inline final def flipped[T](body: => T): T = { - if (isTrackingVariance) variance = variance.flip + if (trackVariance) variance = variance.flip try body - finally if (isTrackingVariance) variance = variance.flip + finally if (trackVariance) variance = variance.flip } protected def mapOverArgs(args: List[Type], tparams: List[Symbol]): List[Type] = ( - if (isTrackingVariance) + if (trackVariance) map2Conserve(args, tparams)((arg, tparam) => withVariance(variance * tparam.variance)(this(arg))) else args mapConserve this @@ -4052,7 +4052,7 @@ trait Types extends api.Types { self: SymbolTable => * if necessary when the symbol is an alias. */ private def applyToSymbolInfo(sym: Symbol): Type = { - if (isTrackingVariance && !variance.isInvariant && sym.isAliasType) + if (trackVariance && !variance.isInvariant && sym.isAliasType) withVariance(Invariant)(this(sym.info)) else this(sym.info) @@ -4218,7 +4218,7 @@ trait Types extends api.Types { self: SymbolTable => /** Used by existentialAbstraction. */ - class ExistentialExtrapolation(tparams: List[Symbol]) extends TypeMap(isTrackingVariance = true) { + class ExistentialExtrapolation(tparams: List[Symbol]) extends TypeMap(trackVariance = true) { private val occurCount = mutable.HashMap[Symbol, Int]() private def countOccs(tp: Type) = { tp foreach { diff --git a/src/reflect/scala/reflect/internal/Variances.scala b/src/reflect/scala/reflect/internal/Variances.scala index 739dd69992..716e49b303 100644 --- a/src/reflect/scala/reflect/internal/Variances.scala +++ b/src/reflect/scala/reflect/internal/Variances.scala @@ -57,7 +57,7 @@ trait Variances { && !escapedLocals(sym) ) - private object ValidateVarianceMap extends TypeMap(isTrackingVariance = true) { + private object ValidateVarianceMap extends TypeMap(trackVariance = true) { private var base: Symbol = _ /** The variance of a symbol occurrence of `tvar` seen at the level of the definition of `base`. |