From b7ff021e0870d51efc150954c959b70bef539285 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Tue, 23 May 2006 13:19:12 +0000 Subject: Cleanup bug 605 --- src/compiler/scala/tools/nsc/transform/Mixin.scala | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/compiler/scala/tools/nsc/transform/Mixin.scala b/src/compiler/scala/tools/nsc/transform/Mixin.scala index 0a3e6e5982..1baba07e32 100644 --- a/src/compiler/scala/tools/nsc/transform/Mixin.scala +++ b/src/compiler/scala/tools/nsc/transform/Mixin.scala @@ -67,10 +67,8 @@ abstract class Mixin extends InfoTransform { def addLateInterfaceMembers(clazz: Symbol): unit = if (!(clazz hasFlag MIXEDIN)) { clazz setFlag MIXEDIN; -/* for (val bc <- clazz.info.baseClasses.reverse) if (bc.hasFlag(lateINTERFACE)) addLateInterfaceMembers(bc) -*/ def newGetter(field: Symbol): Symbol = clazz.newMethod(field.pos, nme.getterName(field.name)) .setFlag(field.flags & ~(PRIVATE | LOCAL) | ACCESSOR | DEFERRED | SYNTHETIC) @@ -117,10 +115,9 @@ abstract class Mixin extends InfoTransform { if (mixinClass.isImplClass) { addLateInterfaceMembers(mixinClass.toInterface); for (val member <- mixinClass.info.decls.toList) { - //System.out.println("adding forwarded method " + member + " " + mmap(member) + member.locationString + " to " + clazz + " " + atPhase(currentRun.explicitOuterPhase)(clazz.info.member(member.name).alternatives));//DEBUG + //System.out.println("adding forwarded method " + member + " " + mmap(member) + member.locationString + " to " + clazz + " " + (clazz.info.member(member.name).alternatives));//DEBUG if (isForwarded(member) && !isStatic(member) && - (atPhase(currentRun.explicitOuterPhase)( - clazz.info.findMember(member.name, 0, 0).alternatives) contains mmap(member))) { + (clazz.info.findMember(member.name, 0, 0).alternatives contains mmap(member))) { val member1 = addMember( clazz, member.cloneSymbol(clazz) setPos clazz.pos resetFlag (DEFERRED | lateDEFERRED)); -- cgit v1.2.3