diff options
| author | Martin Odersky <odersky@gmail.com> | 2013-12-25 15:19:38 +0100 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2013-12-25 15:19:54 +0100 |
| commit | 7260b2607a4b0249f63bb75dac6143e902b91c66 (patch) | |
| tree | 1b4d8791107407e75bfff1006c172a9d3ede8509 /src/dotty/tools/dotc/core/Definitions.scala | |
| parent | 9a474a87b86105e0b5b935e8b20dc3fc25338da4 (diff) | |
| download | dotty-7260b2607a4b0249f63bb75dac6143e902b91c66.tar.gz dotty-7260b2607a4b0249f63bb75dac6143e902b91c66.tar.bz2 dotty-7260b2607a4b0249f63bb75dac6143e902b91c66.zip | |
Fix for denotsNamed.
Previously, the filterDisjoint forced the signature computation too eagerly, which led to a stub for AnyRef.
Diffstat (limited to 'src/dotty/tools/dotc/core/Definitions.scala')
| -rw-r--r-- | src/dotty/tools/dotc/core/Definitions.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dotty/tools/dotc/core/Definitions.scala b/src/dotty/tools/dotc/core/Definitions.scala index a24bdd7d8..e3915b861 100644 --- a/src/dotty/tools/dotc/core/Definitions.scala +++ b/src/dotty/tools/dotc/core/Definitions.scala @@ -146,7 +146,7 @@ class Definitions(implicit ctx: Context) { lazy val NothingClass: ClassSymbol = newCompleteClassSymbol( ScalaPackageClass, tpnme.Nothing, AbstractFinal, List(AnyClass.typeRef)) lazy val NullClass: ClassSymbol = newCompleteClassSymbol( - ScalaPackageClass, tpnme.Null, AbstractFinal, List(AnyRefAlias.typeRef)) + ScalaPackageClass, tpnme.Null, AbstractFinal, List(ObjectClass.typeRef)) lazy val PredefModule = requiredModule("scala.Predef") lazy val NilModule = requiredModule("scala.collection.immutable.Nil") @@ -232,7 +232,7 @@ class Definitions(implicit ctx: Context) { // convenient one-parameter method types def methOfAny(tp: Type) = MethodType(List(AnyType), tp) def methOfAnyVal(tp: Type) = MethodType(List(AnyValType), tp) - def methOfAnyRef(tp: Type) = MethodType(List(AnyRefType), tp) + def methOfAnyRef(tp: Type) = MethodType(List(ObjectType), tp) // Derived types def AnyType: Type = AnyClass.typeRef |