Preparations for changing of class hierarchy

Author: odersky

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

@@ -179,7 +179,9 @@ object Denotations {
   abstract class Denotation(_symbol: SymbolImpl, protected var myInfo: Type) extends PreDenotation with printing.Showable {
     type AsSeenFromResult <: Denotation
 
-    val symbol: Symbol = _symbol.fromSymbolImpl
+    val symbol: Symbol =
+      if _symbol == null then this.asInstanceOf[Symbol]
+      else _symbol.fromSymbolImpl
 
     /** The type info.
      *  The info is an instance of TypeType iff this is a type denotation
@@ -573,7 +575,7 @@ object Denotations {
   abstract class SingleDenotation(_symbol: SymbolImpl, initInfo: Type) extends Denotation(_symbol, initInfo) {
     protected def newLikeThis(symbol: Symbol, info: Type, pre: Type): SingleDenotation
 
-    final def name(using Context): Name = symbol.name
+    def name(using Context): Name = symbol.name
 
     /** If this is not a SymDenotation: The prefix under which the denotation was constructed.
      *  NoPrefix for SymDenotations.
@@ -773,7 +775,7 @@ object Denotations {
           assert(!d.is(Package), s"illegal transformation of package denotation by transformer $transformer")
         case _ =>
 
-      def escapeToNext = nextDefined.ensuring(_.validFor != Nowhere)
+      def escapeToNext = nextDefined.ensuring(_.validFor != Nowhere, name)
 
       def toNewRun =
         util.Stats.record("current.bringForward")

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

@@ -25,7 +25,7 @@ object Names {
   /** A common superclass of Name and Symbol. After bootstrap, this should be
    *  just the type alias Name | Symbol
    */
-  abstract class Designator
+  trait Designator
 
   /** A name if either a term name or a type name. Term names can be simple
    *  or derived. A simple term name is essentially an interned string stored

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

@@ -32,7 +32,7 @@ object SymDenotations {
   /** A sym-denotation represents the contents of a definition
    *  during a period.
    */
-  class SymDenotation private[SymDenotations] (
+  class SymDenotation private[core] (
     _symbol: SymbolImpl,
     final val _maybeOwner: SymbolImpl,
     final val name: Name,
@@ -543,7 +543,7 @@ object SymDenotations {
     final def isRealClass(using Context): Boolean = isClass && !is(Trait)
 
     /** Cast to class denotation */
-    final def asClass: ClassDenotation = asInstanceOf[ClassDenotation]
+    def asClass: ClassDenotation = asInstanceOf[ClassDenotation]
 
     /** is this symbol the result of an erroneous definition? */
     def isError: Boolean = false
@@ -2209,7 +2209,7 @@ object SymDenotations {
 
   /** The contents of a class definition during a period
    */
-  class ClassDenotationImpl private[SymDenotations] (
+  class ClassDenotationImpl private[core] (
     _symbol: SymbolImpl,
     _maybeOwner: SymbolImpl,
     name: Name,
@@ -2382,7 +2382,7 @@ object SymDenotations {
     }
   end PackageClassDenotation
 
-  class PackageClassDenotationImpl private[SymDenotations] (
+  class PackageClassDenotationImpl private[core] (
     _symbol: SymbolImpl,
     _maybeOwner: SymbolImpl,
     name: Name,

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

@@ -36,7 +36,7 @@ import scala.annotation.internal.sharable
 import config.Printers.typr
 import annotation.targetName
 
-object Symbols {
+object Symbols:
 
   opaque type Symbol >: Null <: SymbolDecl = SymbolImpl
   opaque type ClassSymbol >: Null <: Symbol & ClassSymbolDecl = ClassSymbolImpl
@@ -102,19 +102,14 @@ object Symbols {
     def asTerm(using Context): TermSymbol
     def asType(using Context): TypeSymbol
 
-    @targetName("Symbol_isClass")
     def isClass: Boolean
-
-    @targetName("Symbol_asClass")
     def asClass: ClassSymbol
 
     def isPrivate(using Context): Boolean
     def isPatternBound(using Context): Boolean
 
-    @targetName("Symbol_isStatic")
     def isStatic(using Context): Boolean
 
-    @targetName("Symbol_name")
     def name(using Context): ThisName
     def signature(using Context): Signature
 
@@ -305,10 +300,8 @@ object Symbols {
       asInstanceOf[TypeSymbol]
     }
 
-    @targetName("Symbol_isClass")
     final def isClass: Boolean = isInstanceOf[ClassSymbol]
 
-    @targetName("Symbol_asClass")
     final def asClass: ClassSymbol = asInstanceOf[ClassSymbol]
 
     /** Test whether symbol is private. This
@@ -333,7 +326,6 @@ object Symbols {
         Signature.NotAMethod
 
     /** Special cased here, because it may be used on naked symbols in substituters */
-    @targetName("Symbol_isStatic")
     final def isStatic(using Context): Boolean =
       lastDenot != null && lastDenot.initial.isStatic
 
@@ -390,7 +382,6 @@ object Symbols {
     def filter(p: Symbol => Boolean): Symbol = if (p(this)) this else NoSymbol
 
     /** The current name of this symbol */
-    @targetName("Symbol_name")
     final def name(using Context): ThisName = denot.name.asInstanceOf[ThisName]
 
     /** The source or class file from which this class or
@@ -1048,4 +1039,4 @@ object Symbols {
   }
 
   def requiredMethodRef(path: PreName)(using Context): TermRef = requiredMethod(path).termRef
-}
+end Symbols