diff options
| author | Antonio Cunei <antonio.cunei@epfl.ch> | 2011-05-11 13:43:03 +0000 |
|---|---|---|
| committer | Antonio Cunei <antonio.cunei@epfl.ch> | 2011-05-11 13:43:03 +0000 |
| commit | 43d1b7f1f33ca87beb2d83d33d307fad1694a77a (patch) | |
| tree | 1022206cbf4f0385ebcbb2f2ccf7fc5b113a2f7a /src | |
| parent | a86c712925e4319a068e74fef16a958609da40cc (diff) | |
| download | scala-43d1b7f1f33ca87beb2d83d33d307fad1694a77a.tar.gz scala-43d1b7f1f33ca87beb2d83d33d307fad1694a77a.tar.bz2 scala-43d1b7f1f33ca87beb2d83d33d307fad1694a77a.zip | |
Merged revisions 24929 via svnmerge from
https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk
........
r24929 | cunei | 2011-05-11 15:40:55 +0200 (Wed, 11 May 2011) | 2 lines
Reverting r24927
........
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/transform/Mixin.scala | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/compiler/scala/tools/nsc/transform/Mixin.scala b/src/compiler/scala/tools/nsc/transform/Mixin.scala index 943b0e2644..ac4f19f69d 100644 --- a/src/compiler/scala/tools/nsc/transform/Mixin.scala +++ b/src/compiler/scala/tools/nsc/transform/Mixin.scala @@ -892,11 +892,8 @@ abstract class Mixin extends InfoTransform with ast.TreeDSL { case DefDef(mods, name, tp, vp, tpt, rhs) if sym.isModule && (!clazz.isTrait || clazz.isImplClass) && !sym.hasFlag(BRIDGE) => val attrThis = - if (clazz.isImplClass && !isImplementedStatically(sym)) - gen.mkAttributedIdent(vp.head.head.symbol) - //!!! I think this can be replaced by selfRef(tree.pos) - else - gen.mkAttributedThis(clazz) + if (clazz.isImplClass) gen.mkAttributedIdent(vp.head.head.symbol) + else gen.mkAttributedThis(clazz) val rhs1 = mkInnerClassAccessorDoubleChecked(attrThis, rhs) treeCopy.DefDef(stat, mods, name, tp, vp, tpt, typedPos(stat.pos)(rhs1)) case _ => stat |