diff options
| author | Martin Odersky <odersky@gmail.com> | 2006-03-09 17:50:10 +0000 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2006-03-09 17:50:10 +0000 |
| commit | 0bef86d8e8b7ea7ebb790ebcec7fedcb9a24f5a8 (patch) | |
| tree | a85a3276240467ad4994ae8f78174371e2a30ad1 /src/compiler/scala/tools/nsc/transform/ExplicitOuter.scala | |
| parent | c0c963afaf40b85914eff3497e116763268e6aa7 (diff) | |
| download | scala-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/transform/ExplicitOuter.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/transform/ExplicitOuter.scala | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/compiler/scala/tools/nsc/transform/ExplicitOuter.scala b/src/compiler/scala/tools/nsc/transform/ExplicitOuter.scala index bb9b34d177..4f71be7b62 100644 --- a/src/compiler/scala/tools/nsc/transform/ExplicitOuter.scala +++ b/src/compiler/scala/tools/nsc/transform/ExplicitOuter.scala @@ -39,9 +39,9 @@ abstract class ExplicitOuter extends InfoTransform { def transformInfo(sym: Symbol, tp: Type): Type = tp match { case MethodType(formals, restpe) => //todo: needed? - if (sym.owner.isMixin && (sym hasFlag SUPERACCESSOR)) + if (sym.owner.isTrait && (sym hasFlag SUPERACCESSOR)) sym.makeNotPrivate(sym.owner); - if (sym.owner.isMixin && (sym hasFlag PROTECTED)) sym setFlag notPROTECTED; + if (sym.owner.isTrait && (sym hasFlag PROTECTED)) sym setFlag notPROTECTED; if (sym.isConstructor && !isStatic(sym.owner)) MethodType(formals ::: List(outerClass(sym.owner).toInterface.thisType), restpe) else tp; @@ -51,7 +51,7 @@ abstract class ExplicitOuter extends InfoTransform { if (!isStatic(clazz)) { decls1 = new Scope(decls1.toList); val outerAcc = clazz.newMethod(clazz.pos, nme.OUTER); - if (clazz.isMixin || (decls.toList exists (.isClass))) + if (clazz.isTrait || (decls.toList exists (.isClass))) outerAcc.expandName(clazz); decls1 enter ( outerAcc setFlag (PARAMACCESSOR | ACCESSOR | STABLE) @@ -60,7 +60,7 @@ abstract class ExplicitOuter extends InfoTransform { setFlag (LOCAL | PRIVATE | PARAMACCESSOR | (outerAcc getFlag EXPANDEDNAME)) setInfo outerClass(clazz).thisType); } - if (clazz.isMixin) { + if (clazz.isTrait) { decls1 = new Scope(decls1.toList); decls1 enter makeMixinConstructor(clazz); } @@ -258,7 +258,7 @@ abstract class ExplicitOuter extends InfoTransform { if (!(currentOwner hasFlag INTERFACE) || (currentOwner hasFlag lateINTERFACE)) { if (!isStatic(currentOwner)) decls1 = decls1 ::: outerDefs(currentOwner); // (1) - if (currentOwner.isMixin) + if (currentOwner.isTrait) decls1 = decls1 ::: List(mixinConstructorDef(currentOwner)) // (2) } localTyper = savedLocalTyper; @@ -327,7 +327,7 @@ abstract class ExplicitOuter extends InfoTransform { val tree1 = super.transform(tree); tree1 match { case DefDef(_, _, _, _, _, _) => - if (sym.owner.isMixin && (sym hasFlag (ACCESSOR | SUPERACCESSOR))) + if (sym.owner.isTrait && (sym hasFlag (ACCESSOR | SUPERACCESSOR))) sym.makeNotPrivate(sym.owner); //(2) tree1 case Select(qual, name) => |