diff options
| author | Martin Odersky <odersky@gmail.com> | 2005-05-17 15:39:54 +0000 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2005-05-17 15:39:54 +0000 |
| commit | 860077ec57d0ca5412c4448203e5028f3a783193 (patch) | |
| tree | 216ee6f7f681247e34d8160c40c32b9c1d18ab69 /sources/scala/tools/nsc/typechecker/Contexts.scala | |
| parent | ea94e149516fcf20b1478f17b8c7d4fd6390f8ac (diff) | |
| download | scala-860077ec57d0ca5412c4448203e5028f3a783193.tar.gz scala-860077ec57d0ca5412c4448203e5028f3a783193.tar.bz2 scala-860077ec57d0ca5412c4448203e5028f3a783193.zip | |
*** empty log message ***
Diffstat (limited to 'sources/scala/tools/nsc/typechecker/Contexts.scala')
| -rwxr-xr-x | sources/scala/tools/nsc/typechecker/Contexts.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sources/scala/tools/nsc/typechecker/Contexts.scala b/sources/scala/tools/nsc/typechecker/Contexts.scala index 2ab5457fa9..85bc6e9d74 100755 --- a/sources/scala/tools/nsc/typechecker/Contexts.scala +++ b/sources/scala/tools/nsc/typechecker/Contexts.scala @@ -157,7 +157,7 @@ class Contexts: Analyzer { if (c.outer.enclClass == null) assert(false, "accessWithin(" + owner + ") " + c);//debug c = c.outer.enclClass; } - c != NoContext; + c != NoContext } /** Is `clazz' a subclass of an enclosing class? */ @@ -171,7 +171,7 @@ class Contexts: Analyzer { || (!sym.hasFlag(PRIVATE | PROTECTED)) || - accessWithin(sym.owner) && (!sym.hasFlag(LOCAL) || pre.isInstanceOf[ThisType]) + accessWithin(sym.owner) && (!sym.hasFlag(LOCAL) || pre =:= sym.owner.thisType) || (!sym.hasFlag(PRIVATE) && (superAccess || |