summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormichelou <michelou@epfl.ch>2006-08-22 12:08:29 +0000
committermichelou <michelou@epfl.ch>2006-08-22 12:08:29 +0000
commitb795edec9259e36caa9a4c4ac7e69becae0be613 (patch)
treee8f71c64fc31bf89bb5691cec9e22f4d29a0c372
parent8e0d30f85cb2ded4a3ebfdd21b5f1b1a0f9f7391 (diff)
downloadscala-b795edec9259e36caa9a4c4ac7e69becae0be613.tar.gz
scala-b795edec9259e36caa9a4c4ac7e69becae0be613.tar.bz2
scala-b795edec9259e36caa9a4c4ac7e69becae0be613.zip
added if-test before debugging info in file Mix...
added if-test before debugging info in file Mixin.scala
-rw-r--r--src/compiler/scala/tools/nsc/transform/Mixin.scala10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/compiler/scala/tools/nsc/transform/Mixin.scala b/src/compiler/scala/tools/nsc/transform/Mixin.scala
index 2dca9c0ea8..a1b9ae7cd9 100644
--- a/src/compiler/scala/tools/nsc/transform/Mixin.scala
+++ b/src/compiler/scala/tools/nsc/transform/Mixin.scala
@@ -41,8 +41,8 @@ abstract class Mixin extends InfoTransform {
private def rebindSuper(base: Symbol, member: Symbol, prevowner: Symbol): Symbol =
atPhase(currentRun.refchecksPhase) {
- var bcs = base.info.baseClasses.dropWhile(prevowner !=).tail;
- assert(!bcs.isEmpty/*, "" + prevowner + " " + base.info.baseClasses*/);//DEBUG
+ var bcs = base.info.baseClasses.dropWhile(prevowner !=).tail
+ assert(!bcs.isEmpty/*, "" + prevowner + " " + base.info.baseClasses*/)//DEBUG
var sym: Symbol = NoSymbol
if (settings.debug.value) log("starting rebindsuper " + base + " " + member + ":" + member.tpe + " " + prevowner + " " + base.info.baseClasses);
while (!bcs.isEmpty && sym == NoSymbol) {
@@ -299,7 +299,8 @@ abstract class Mixin extends InfoTransform {
val sym = stat.symbol
stat match {
case _: DefDef if (sym.isModule && sym.owner.isClass && sym.hasFlag(PRIVATE)) =>
- Console.println("implementing "+sym+sym.locationString)//debug
+ if (settings.debug.value)
+ log("implementing " + sym + sym.locationString)//debug
val vdef = attributedDef(position(sym), gen.mkModuleVarDef(sym))
val adef = attributedDef(
position(sym),
@@ -404,7 +405,8 @@ abstract class Mixin extends InfoTransform {
case Select(Super(_, _), name) =>
tree
case Select(qual, name) if sym.owner.isImplClass && !isStatic(sym) =>
- if (sym.isMethod) Console.println("####"+sym+sym.isImplOnly+" "+flagsToString(sym.flags))
+ if (sym.isMethod)
+ Console.println("####" + sym + sym.isImplOnly + " " + flagsToString(sym.flags))
assert(!sym.isMethod, sym)
val getter = sym.getter(enclInterface)
assert(getter != NoSymbol)