diff options
author | Paul Phillips <paulp@improving.org> | 2012-03-24 20:26:40 -0700 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2012-03-24 22:56:27 -0700 |
commit | a532ba0600444b3564b6b015688ebc4cdf084ba6 (patch) | |
tree | d3e3c190778145f1c020a7e13e9e94bc6e3c4a3d /src/compiler | |
parent | d2b89134041139c9f861806027fbc6d7d9a06a45 (diff) | |
download | scala-a532ba0600444b3564b6b015688ebc4cdf084ba6.tar.gz scala-a532ba0600444b3564b6b015688ebc4cdf084ba6.tar.bz2 scala-a532ba0600444b3564b6b015688ebc4cdf084ba6.zip |
Removing some foolishness.
I swear this change didn't work last time I was in this neighborhood.
Diffstat (limited to 'src/compiler')
-rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/MethodSynthesis.scala | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/MethodSynthesis.scala b/src/compiler/scala/tools/nsc/typechecker/MethodSynthesis.scala index 5287fad3bb..b57f139074 100644 --- a/src/compiler/scala/tools/nsc/typechecker/MethodSynthesis.scala +++ b/src/compiler/scala/tools/nsc/typechecker/MethodSynthesis.scala @@ -205,17 +205,13 @@ trait MethodSynthesis { enterBeans(tree) } def finishGetterSetter(typer: Typer, stat: Tree): List[Tree] = stat match { - case vd @ ValDef(mods, name, tpt, rhs) if !noFinishGetterSetter(vd) => + case vd @ ValDef(mods, name, tpt, rhs) if !noFinishGetterSetter(vd) && !vd.symbol.isLazy => // If we don't save the annotations, they seem to wander off. val annotations = stat.symbol.initialize.annotations - val trees = ( - allValDefDerived(vd) - map (acc => atPos(vd.pos.focus)(acc derive annotations)) - filterNot (_ eq EmptyTree) + ( allValDefDerived(vd) + map (acc => atPos(vd.pos.focus)(acc derive annotations)) + filterNot (_ eq EmptyTree) ) - // log(trees.mkString("Accessor trees:\n ", "\n ", "\n")) - if (vd.symbol.isLazy) List(stat) - else trees case _ => List(stat) } |