diff options
| author | Martin Odersky <odersky@gmail.com> | 2011-02-10 12:36:18 +0000 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2011-02-10 12:36:18 +0000 |
| commit | 1789df38157b00f6cb960f17e38c5db913b8d860 (patch) | |
| tree | d110265418e67584aaea5bafc976596a2997af76 /src | |
| parent | 5749084921c4868836d888bf6b0c3b28b094b09d (diff) | |
| download | scala-1789df38157b00f6cb960f17e38c5db913b8d860.tar.gz scala-1789df38157b00f6cb960f17e38c5db913b8d860.tar.bz2 scala-1789df38157b00f6cb960f17e38c5db913b8d860.zip | |
Removed unspecced condition for delayedInit.
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/transform/Constructors.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/transform/Constructors.scala b/src/compiler/scala/tools/nsc/transform/Constructors.scala index e106ee04be..cc9990e0de 100644 --- a/src/compiler/scala/tools/nsc/transform/Constructors.scala +++ b/src/compiler/scala/tools/nsc/transform/Constructors.scala @@ -403,12 +403,12 @@ abstract class Constructors extends Transform with ast.TreeDSL { } } else stats } - +/* def isInitDef(stat: Tree) = stat match { case dd: DefDef => dd.symbol == delayedInitMethod case _ => false } - +*/ def delayedInitClosure(stats: List[Tree]) = localTyper.typed { atPos(impl.pos) { @@ -494,7 +494,7 @@ abstract class Constructors extends Transform with ast.TreeDSL { var (uptoSuperStats, remainingConstrStats) = splitAtSuper(constrStatBuf.toList) val needsDelayedInit = - (clazz isSubClass DelayedInitClass) && !(defBuf exists isInitDef) && remainingConstrStats.nonEmpty + (clazz isSubClass DelayedInitClass) /*&& !(defBuf exists isInitDef)*/ && remainingConstrStats.nonEmpty if (needsDelayedInit) { val dicl = new ConstructorTransformer(unit) transform delayedInitClosure(remainingConstrStats) |