aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2015-06-19 10:47:07 +0200
committerMartin Odersky <odersky@gmail.com>2015-06-19 12:11:18 +0200
commite4db53a62f3484717098f04cabb0f477401e2940 (patch)
tree6fad6133e469e39837d104c442297532d40890bb
parentb8628c13a56db5335249a79ccd7772c3245999db (diff)
downloaddotty-e4db53a62f3484717098f04cabb0f477401e2940.tar.gz
dotty-e4db53a62f3484717098f04cabb0f477401e2940.tar.bz2
dotty-e4db53a62f3484717098f04cabb0f477401e2940.zip
Fixed typo introduced by merge
-rw-r--r--src/dotty/tools/dotc/transform/Mixin.scala3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/dotty/tools/dotc/transform/Mixin.scala b/src/dotty/tools/dotc/transform/Mixin.scala
index 7319d10cd..b4fa10383 100644
--- a/src/dotty/tools/dotc/transform/Mixin.scala
+++ b/src/dotty/tools/dotc/transform/Mixin.scala
@@ -204,7 +204,7 @@ class Mixin extends MiniPhaseTransform with SymTransformer { thisTransform =>
else transformFollowing(superRef(initializer(getter)).appliedToNone)
// transformFollowing call is needed to make memoize & lazy vals run
transformFollowing(
- DefDef(implementation(getter.asTerm),
+ DefDef(implementation(getter.asTerm),
if (isScala2x) {
if (getter.is(Flags.Lazy)) { // lazy vals need to have a rhs that will be the lazy initializer
val sym = mixin.implClass.info.nonPrivateDecl(getter.name).suchThat(_.info.paramTypess match {
@@ -216,6 +216,7 @@ class Mixin extends MiniPhaseTransform with SymTransformer { thisTransform =>
else default
} else initial)
)
+ }
else if (isScala2x) EmptyTree
else initial
}