diff options
| author | Adriaan Moors <adriaan.moors@epfl.ch> | 2009-11-25 17:05:08 +0000 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@epfl.ch> | 2009-11-25 17:05:08 +0000 |
| commit | 84b523c5204b5d959ca92436c88a85c40915dd3c (patch) | |
| tree | 8f98097e890c0fd9fb889b2da6d1c76b0d5b350b | |
| parent | 7463bf92926f42b946c647926308aa32bf18c3eb (diff) | |
| download | scala-84b523c5204b5d959ca92436c88a85c40915dd3c.tar.gz scala-84b523c5204b5d959ca92436c88a85c40915dd3c.tar.bz2 scala-84b523c5204b5d959ca92436c88a85c40915dd3c.zip | |
closed #2485: failing assert on reference to Ja...
closed #2485: failing assert on reference to Java protected methods from
companion object
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala b/src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala index fac10bfd72..ea15b640e9 100644 --- a/src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala +++ b/src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala @@ -432,8 +432,9 @@ abstract class SuperAccessors extends transform.Transform with transform.TypingT || enclPackage(referencingClass) == enclPackage(sym.owner)) { assert(referencingClass.isClass) referencingClass - } else + } else if(referencingClass.owner.enclClass != NoSymbol) hostForAccessorOf(sym, referencingClass.owner.enclClass) + else referencingClass } /** Is 'tpe' the type of a member of an enclosing class? */ |