diff options
| author | Eugene Burmako <xeno.by@gmail.com> | 2013-02-05 11:25:56 +0100 |
|---|---|---|
| committer | Eugene Burmako <xeno.by@gmail.com> | 2013-02-05 11:25:56 +0100 |
| commit | c7205317e1fa59430d2372c27c4d0858b05ffdfc (patch) | |
| tree | cb7762a2994c4173d2c95bbafc3833ed1b6c0499 /src/compiler/scala/tools/nsc/ast/parser/Parsers.scala | |
| parent | 4d7982b592fc2d4f75eb56b4a810c5d002d25866 (diff) | |
| download | scala-c7205317e1fa59430d2372c27c4d0858b05ffdfc.tar.gz scala-c7205317e1fa59430d2372c27c4d0858b05ffdfc.tar.bz2 scala-c7205317e1fa59430d2372c27c4d0858b05ffdfc.zip | |
[nomaster] Revert "DummyTree => CannotHaveAttrs"
This reverts commit 838cbe623c142b7005446793948097f679219fe3.
Conflicts:
src/reflect/scala/reflect/api/Trees.scala
Diffstat (limited to 'src/compiler/scala/tools/nsc/ast/parser/Parsers.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/ast/parser/Parsers.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala index 4b8136f725..915a8bc49b 100644 --- a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala +++ b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala @@ -2764,7 +2764,7 @@ self => if (in.token == LBRACE) { // @S: pre template body cannot stub like post body can! val (self, body) = templateBody(isPre = true) - if (in.token == WITH && (self eq emptyValDef)) { + if (in.token == WITH && self.isEmpty) { val earlyDefs: List[Tree] = body flatMap { case vdef @ ValDef(mods, _, _, _) if !mods.isDeferred => List(copyValDef(vdef)(mods = mods | Flags.PRESUPER)) |