summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2006-03-09 17:50:10 +0000
committerMartin Odersky <odersky@gmail.com>2006-03-09 17:50:10 +0000
commit0bef86d8e8b7ea7ebb790ebcec7fedcb9a24f5a8 (patch)
treea85a3276240467ad4994ae8f78174371e2a30ad1 /src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala
parentc0c963afaf40b85914eff3497e116763268e6aa7 (diff)
downloadscala-0bef86d8e8b7ea7ebb790ebcec7fedcb9a24f5a8.tar.gz
scala-0bef86d8e8b7ea7ebb790ebcec7fedcb9a24f5a8.tar.bz2
scala-0bef86d8e8b7ea7ebb790ebcec7fedcb9a24f5a8.zip
performed some renamings in the compiler & library
All -> Bottom AllRef -> Null mixin class -> trait
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala')
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala b/src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala
index 7e0562d633..4eb38f349b 100644
--- a/src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala
@@ -46,7 +46,7 @@ abstract class SuperAccessors extends transform.Transform {
case Select(sup @ Super(_, mix), name) =>
val clazz = sup.symbol;
if (tree.isTerm && mix == nme.EMPTY.toTypeName &&
- (clazz.isMixin || clazz != currentOwner.enclClass || !validCurrentOwner)) {
+ (clazz.isTrait || clazz != currentOwner.enclClass || !validCurrentOwner)) {
val supername = nme.superName(tree.symbol.name);
var superAcc = clazz.info.decl(supername).suchThat(.alias.==(tree.symbol));
if (superAcc == NoSymbol) {