diff options
| author | Lukas Rytz <lukas.rytz@typesafe.com> | 2016-09-14 15:12:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-14 15:12:25 +0100 |
| commit | 81effdb9a2cd9e94b88f18181b8405a32f883f71 (patch) | |
| tree | a3e5dad2e6f3aa81217e2c236af86428bbad172a /src/compiler | |
| parent | 05016d9035ab9b1c866bd9f12fdd0491f1ea0cbb (diff) | |
| parent | 90314b36d121755c52c00a57088623eba734a123 (diff) | |
| download | scala-81effdb9a2cd9e94b88f18181b8405a32f883f71.tar.gz scala-81effdb9a2cd9e94b88f18181b8405a32f883f71.tar.bz2 scala-81effdb9a2cd9e94b88f18181b8405a32f883f71.zip | |
Merge pull request #5392 from adriaanm/t9918
SI-9918 object in trait mixed into package object
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/scala/tools/nsc/transform/Fields.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/transform/Fields.scala b/src/compiler/scala/tools/nsc/transform/Fields.scala index a383b65192..10494f33d1 100644 --- a/src/compiler/scala/tools/nsc/transform/Fields.scala +++ b/src/compiler/scala/tools/nsc/transform/Fields.scala @@ -721,7 +721,7 @@ abstract class Fields extends InfoTransform with ast.TreeDSL with TypingTransfor override def transformStats(stats: List[Tree], exprOwner: Symbol): List[Tree] = { val addedStats = - if (!currentOwner.isClass) Nil // TODO: || currentOwner.isPackageClass + if (!currentOwner.isClass || currentOwner.isPackageClass) Nil else afterOwnPhase { fieldsAndAccessors(currentOwner) } val inRealClass = currentOwner.isClass && !(currentOwner.isPackageClass || currentOwner.isTrait) |