summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/compiler/scala/tools/nsc/ast/parser/Parsers.scala12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
index f7401c813a..97c264fa4b 100644
--- a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
+++ b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
@@ -2764,13 +2764,11 @@ self =>
Template(parents0, self, body)
}
else {
- val parents = (
- if (parents0.isEmpty) List(scalaAnyRefConstr)
- /*if (!isInterface(mods, body) && !isScalaArray(name))
- parents0 /* :+ scalaScalaObjectConstr*/
- else*/
- else parents0
- ) ++ caseParents()
+ val casePs = caseParents()
+ val parents = parents0 match {
+ case Nil if casePs.isEmpty => List(scalaAnyRefConstr)
+ case _ => parents0 ++ casePs
+ }
Template(parents, self, constrMods, vparamss, argss, body, o2p(tstart))
}
}