diff options
| author | Paul Phillips <paulp@improving.org> | 2012-02-04 21:06:13 -0800 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-02-04 21:06:13 -0800 |
| commit | dcb5fe93162fcf7112d95733ecb78075dbd34f90 (patch) | |
| tree | 44e725aded805e1313f91dfd85410c40a55dbaaf | |
| parent | 156a2c6809ee0e73f9127019eddc912c49ef4785 (diff) | |
| download | scala-dcb5fe93162fcf7112d95733ecb78075dbd34f90.tar.gz scala-dcb5fe93162fcf7112d95733ecb78075dbd34f90.tar.bz2 scala-dcb5fe93162fcf7112d95733ecb78075dbd34f90.zip | |
Utilizing convenience methods martin hasn't discovered yet.
| -rw-r--r-- | src/compiler/scala/reflect/internal/Definitions.scala | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/compiler/scala/reflect/internal/Definitions.scala b/src/compiler/scala/reflect/internal/Definitions.scala index 7bd0c0f919..a06f2d07bf 100644 --- a/src/compiler/scala/reflect/internal/Definitions.scala +++ b/src/compiler/scala/reflect/internal/Definitions.scala @@ -206,11 +206,6 @@ trait Definitions extends reflect.api.StandardDefinitions { case _ => null } - private def fixupAsAnyTrait(clazz: Symbol): Symbol = { - clazz setInfo fixupAsAnyTrait(clazz.info) - clazz - } - private def fixupAsAnyTrait(tpe: Type): Type = tpe match { case ClassInfoType(parents, decls, clazz) => if (parents.head.typeSymbol == AnyClass) tpe @@ -231,7 +226,7 @@ trait Definitions extends reflect.api.StandardDefinitions { lazy val AnyValCompanionClass = getRequiredClass("scala.AnyValCompanion") initFlags (SEALED | ABSTRACT | TRAIT) lazy val AnyValClass = ScalaPackageClass.info member tpnme.AnyVal orElse { - val anyval = enterNewClass(ScalaPackageClass, tpnme.AnyVal, List(AnyClass.tpe, NotNullClass.tpe), 0L) + val anyval = enterNewClass(ScalaPackageClass, tpnme.AnyVal, List(AnyClass.tpe, NotNullClass.tpe), 0L) val av_constr = anyval.newClassConstructor(NoPosition) anyval.info.decls enter av_constr anyval @@ -339,7 +334,7 @@ trait Definitions extends reflect.api.StandardDefinitions { lazy val SingletonClass = enterNewClass(ScalaPackageClass, tpnme.Singleton, anyparam, ABSTRACT | TRAIT | FINAL) lazy val SerializableClass = getRequiredClass("scala.Serializable") lazy val JavaSerializableClass = getClass(sn.JavaSerializable) - lazy val ComparableClass = fixupAsAnyTrait(getRequiredClass("java.lang.Comparable")) + lazy val ComparableClass = getRequiredClass("java.lang.Comparable") modifyInfo fixupAsAnyTrait lazy val JavaCloneableClass = getRequiredClass("java.lang.Cloneable") lazy val RemoteInterfaceClass = getRequiredClass("java.rmi.Remote") lazy val RemoteExceptionClass = getRequiredClass("java.rmi.RemoteException") |