From 84b523c5204b5d959ca92436c88a85c40915dd3c Mon Sep 17 00:00:00 2001 From: Adriaan Moors Date: Wed, 25 Nov 2009 17:05:08 +0000 Subject: closed #2485: failing assert on reference to Ja... closed #2485: failing assert on reference to Java protected methods from companion object --- src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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? */ -- cgit v1.2.3