diff options
author | Martin Odersky <odersky@gmail.com> | 2012-02-07 18:56:16 +0100 |
---|---|---|
committer | Martin Odersky <odersky@gmail.com> | 2012-02-07 18:56:16 +0100 |
commit | 5f02cf9f4035a90225e77a978354ee7c0504e601 (patch) | |
tree | 2187b9c49f8207d2549b3c4ac61fd67d02c5be27 /src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala | |
parent | aa7ca3599c51702c3c03b27384d25d54ec76afab (diff) | |
download | scala-5f02cf9f4035a90225e77a978354ee7c0504e601.tar.gz scala-5f02cf9f4035a90225e77a978354ee7c0504e601.tar.bz2 scala-5f02cf9f4035a90225e77a978354ee7c0504e601.zip |
Rename isValueClass -> isPrimitiveValueClass
Diffstat (limited to 'src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala')
-rw-r--r-- | src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala b/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala index c1265b39d7..a49d0bcce2 100644 --- a/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala +++ b/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala @@ -69,7 +69,7 @@ abstract class SpecializeTypes extends InfoTransform with TypingTransformers { import definitions.{ RootClass, BooleanClass, UnitClass, ArrayClass, - ScalaValueClasses, isValueClass, isScalaValueType, + ScalaValueClasses, isPrimitiveValueClass, isScalaValueType, SpecializedClass, RepeatedParamClass, JavaRepeatedParamClass, AnyRefClass, ObjectClass, Predef_AnyRef, uncheckedVarianceClass @@ -115,12 +115,12 @@ abstract class SpecializeTypes extends InfoTransform with TypingTransformers { // for similar reasons? Does `sym.isAbstractType` make a difference? private def isSpecializedAnyRefSubtype(tp: Type, sym: Symbol) = ( specializedOn(sym).exists(_.symbol == Predef_AnyRef) // specialized on AnyRef - && !isValueClass(tp.typeSymbol) + && !isPrimitiveValueClass(tp.typeSymbol) && isBoundedGeneric(tp) ) private def isBoundedGeneric(tp: Type) = tp match { case TypeRef(_, sym, _) if sym.isAbstractType => (tp <:< AnyRefClass.tpe) - case TypeRef(_, sym, _) => !isValueClass(sym) + case TypeRef(_, sym, _) => !isPrimitiveValueClass(sym) case _ => false } @@ -960,7 +960,7 @@ abstract class SpecializeTypes extends InfoTransform with TypingTransformers { private def unify(tp1: Type, tp2: Type, env: TypeEnv, strict: Boolean): TypeEnv = (tp1, tp2) match { case (TypeRef(_, sym1, _), _) if isSpecialized(sym1) => debuglog("Unify - basic case: " + tp1 + ", " + tp2) - if (isValueClass(tp2.typeSymbol) || isSpecializedAnyRefSubtype(tp2, sym1)) + if (isPrimitiveValueClass(tp2.typeSymbol) || isSpecializedAnyRefSubtype(tp2, sym1)) env + ((sym1, tp2)) else if (strict) throw UnifyError else env @@ -1305,7 +1305,7 @@ abstract class SpecializeTypes extends InfoTransform with TypingTransformers { val env = typeEnv(specMember) val residualTargs = symbol.info.typeParams zip targs collect { - case (tvar, targ) if !env.contains(tvar) || !isValueClass(env(tvar).typeSymbol) => targ + case (tvar, targ) if !env.contains(tvar) || !isPrimitiveValueClass(env(tvar).typeSymbol) => targ } ifDebug(assert(residualTargs.length == specMember.info.typeParams.length, |