diff options
| author | Martin Odersky <odersky@gmail.com> | 2012-03-21 16:43:47 +0100 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2012-03-21 16:43:52 +0100 |
| commit | bed3304bf86d88e372309063bd247e4cd9171a6f (patch) | |
| tree | 3ca9c94248db1d9cb8e49975c26554285d02a820 /src/compiler | |
| parent | 437c626113711ebb5290c129611ee7f4b0c787f5 (diff) | |
| download | scala-bed3304bf86d88e372309063bd247e4cd9171a6f.tar.gz scala-bed3304bf86d88e372309063bd247e4cd9171a6f.tar.bz2 scala-bed3304bf86d88e372309063bd247e4cd9171a6f.zip | |
Fixed SI-5063.
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Typers.scala | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala index 893941984f..49ce9712df 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala @@ -1158,6 +1158,7 @@ trait Typers extends Modes with Adaptations with PatMatVirtualiser { val qtpe = qual.tpe.widen ( !isPastTyper && qual.isTerm + && !qual.isInstanceOf[Super] && ((qual.symbol eq null) || !qual.symbol.isTerm || qual.symbol.isValue) && !qtpe.isError && !qtpe.typeSymbol.isBottomClass @@ -1173,12 +1174,7 @@ trait Typers extends Modes with Adaptations with PatMatVirtualiser { ) } - def adaptToMember(qual: Tree, searchTemplate: Type): Tree = - adaptToMember(qual, searchTemplate, true, true) - def adaptToMember(qual: Tree, searchTemplate: Type, reportAmbiguous: Boolean): Tree = - adaptToMember(qual, searchTemplate, reportAmbiguous, true) - - def adaptToMember(qual: Tree, searchTemplate: Type, reportAmbiguous: Boolean, saveErrors: Boolean): Tree = { + def adaptToMember(qual: Tree, searchTemplate: Type, reportAmbiguous: Boolean = true, saveErrors: Boolean = true): Tree = { if (isAdaptableWithView(qual)) { qual.tpe.widen.normalize match { case et: ExistentialType => |