diff options
author | Martin Odersky <odersky@gmail.com> | 2007-01-30 18:31:55 +0000 |
---|---|---|
committer | Martin Odersky <odersky@gmail.com> | 2007-01-30 18:31:55 +0000 |
commit | eb0969baedaf683eadf237db62385a68d85e8124 (patch) | |
tree | 5b261a910592c6fc43b42d159aad2b6a1261e80c | |
parent | 9e9adeedf0a39b022b8089a5702491e9d5f8c7de (diff) | |
download | scala-eb0969baedaf683eadf237db62385a68d85e8124.tar.gz scala-eb0969baedaf683eadf237db62385a68d85e8124.tar.bz2 scala-eb0969baedaf683eadf237db62385a68d85e8124.zip |
fixed bug920
-rw-r--r-- | src/compiler/scala/tools/nsc/transform/ExplicitOuter.scala | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/transform/ExplicitOuter.scala b/src/compiler/scala/tools/nsc/transform/ExplicitOuter.scala index 010ef4f5ee..910e34cf9d 100644 --- a/src/compiler/scala/tools/nsc/transform/ExplicitOuter.scala +++ b/src/compiler/scala/tools/nsc/transform/ExplicitOuter.scala @@ -380,11 +380,15 @@ abstract class ExplicitOuter extends InfoTransform with TransMatcher with Patter Console.println("cc " + currentClass + ":" + currentClass.info.decls + " at " + phase)//debug assert(outerAcc != NoSymbol) - val path = gen.mkAttributedQualifier(currentClass.thisType.baseType(mixinClass).prefix) + val path = + if (mixinClass.owner.isTerm) gen.mkAttributedThis(mixinClass.owner.enclClass) + else gen.mkAttributedQualifier(currentClass.thisType.baseType(mixinClass).prefix) val rhs = ExplicitOuterTransformer.this.transform(path) localTyper.typed { atPos(currentClass.pos) { - DefDef(outerAcc, {vparamss=>rhs}) + val result = DefDef(outerAcc, {vparamss=>rhs}) + Console.println("==> "+result) + result } } } |