summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2005-11-09 16:52:43 +0000
committerMartin Odersky <odersky@gmail.com>2005-11-09 16:52:43 +0000
commit3ee9201e2f7bd32eeb7566a6fc37dc2ee171e098 (patch)
treeb4c09be2f99d53892f6e971070adf44e230047ab
parent8a426ccf5f56f2d21ab6bad7d02ec2b1b2532346 (diff)
downloadscala-3ee9201e2f7bd32eeb7566a6fc37dc2ee171e098.tar.gz
scala-3ee9201e2f7bd32eeb7566a6fc37dc2ee171e098.tar.bz2
scala-3ee9201e2f7bd32eeb7566a6fc37dc2ee171e098.zip
*** empty log message ***
-rwxr-xr-xsources/scala/tools/nsc/transform/Mixin.scala4
1 files changed, 2 insertions, 2 deletions
diff --git a/sources/scala/tools/nsc/transform/Mixin.scala b/sources/scala/tools/nsc/transform/Mixin.scala
index 4f04201bf9..30df09f8b7 100755
--- a/sources/scala/tools/nsc/transform/Mixin.scala
+++ b/sources/scala/tools/nsc/transform/Mixin.scala
@@ -21,7 +21,8 @@ abstract class Mixin extends InfoTransform {
override def phaseNewFlags: long = lateMODULE | notABSTRACT;
private def isForwarded(sym: Symbol) =
- sym.owner.isImplClass && sym.isMethod && !(sym hasFlag (ACCESSOR | SUPERACCESSOR));
+ sym.owner.isImplClass && sym.isMethod &&
+ !sym.isModule && !(sym hasFlag (ACCESSOR | SUPERACCESSOR));
private def isStatic(sym: Symbol) = isForwarded(sym) && (sym.hasFlag(PRIVATE) || sym.isConstructor);
@@ -81,7 +82,6 @@ abstract class Mixin extends InfoTransform {
}
} else if ((member hasFlag (LIFTED | BRIDGE)) && !(member hasFlag PRIVATE)) {
member.expandName(clazz);
- if (settings.debug.value) log("adding " + member + " to " + clazz);
addMember(clazz, member.cloneSymbol(clazz));
}
}