Make ClassDenotation a trait (reverted from commit 7c88a80)

Author: odersky

compiler/src/dotty/tools/dotc/core/SymDenotations.scala

@@ -39,8 +39,8 @@ trait SymDenotations { this: Context =>
     initPrivateWithin: Symbol = NoSymbol)(implicit ctx: Context): SymDenotation = {
     val result =
       if (symbol.isClass)
-        if (initFlags is Package) new SymDenotation(symbol, owner, name, initFlags, initInfo, initPrivateWithin) with PackageClassDenotation
-        else new SymDenotation(symbol, owner, name, initFlags, initInfo, initPrivateWithin) with ClassDenotation
+        if (initFlags is Package) new PackageClassDenotation(symbol, owner, name, initFlags, initInfo, initPrivateWithin)
+        else new ClassDenotation(symbol, owner, name, initFlags, initInfo, initPrivateWithin)
       else new SymDenotation(symbol, owner, name, initFlags, initInfo, initPrivateWithin)
     result.validFor = stablePeriod
     result
@@ -1282,7 +1282,14 @@ object SymDenotations {
 
   /** The contents of a class definition during a period
    */
-  trait ClassDenotation extends SymDenotation {
+  class ClassDenotation private[SymDenotations] (
+    symbol: Symbol,
+    maybeOwner: Symbol,
+    name: Name,
+    initFlags: FlagSet,
+    initInfo: Type,
+    initPrivateWithin: Symbol)
+    extends SymDenotation(symbol, maybeOwner, name, initFlags, initInfo, initPrivateWithin) {
 
     import util.LRUCache
 
@@ -1350,8 +1357,8 @@ object SymDenotations {
 
     // ----- denotation fields and accessors ------------------------------
 
-    //if (initFlags is (Module, butNot = Package))
-    //  assert(name.is(ModuleClassName), s"module naming inconsistency: ${name.debugString}")
+    if (initFlags is (Module, butNot = Package))
+      assert(name.is(ModuleClassName), s"module naming inconsistency: ${name.debugString}")
 
     /** The symbol asserted to have type ClassSymbol */
     def classSymbol: ClassSymbol = symbol.asInstanceOf[ClassSymbol]
@@ -1803,7 +1810,14 @@ object SymDenotations {
   /** The denotation of a package class.
    *  It overrides ClassDenotation to take account of package objects when looking for members
    */
-  trait PackageClassDenotation extends ClassDenotation {
+  final class PackageClassDenotation private[SymDenotations] (
+    symbol: Symbol,
+    ownerIfExists: Symbol,
+    name: Name,
+    initFlags: FlagSet,
+    initInfo: Type,
+    initPrivateWithin: Symbol)
+    extends ClassDenotation(symbol, ownerIfExists, name, initFlags, initInfo, initPrivateWithin) {
 
     private[this] var packageObjCache: SymDenotation = _
     private[this] var packageObjRunId: RunId = NoRunId