Merge pull request #3293 from dotty-staging/cleanups

Some small cleanups

Author: liufengyun

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

@@ -18,14 +18,11 @@ object Designators {
     type ThisName <: Name
 
     /** Classifiers and casts, to be overridden in implemetations */
-    def isName: Boolean = false
-    def isSymbol: Boolean = false
-
     def isTerm(implicit ctx: Context) = false
     def isType(implicit ctx: Context) = false
 
-    def asTerm(implicit ctx: Context): TermDesignator = unsupported("asTerm")
-    def asType(implicit ctx: Context): TypeDesignator = unsupported("asType")
+    def asTerm(implicit ctx: Context): TermDesignator
+    def asType(implicit ctx: Context): TypeDesignator
 
     def withNameSpace(space: NameSpace)(implicit ctx: Context): Designator { type ThisName = self.ThisName } =
       if (space == noNameSpace) this

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

@@ -152,7 +152,6 @@ object Names {
     def endsWith(str: String): Boolean = lastPart.endsWith(str)
 
     /** Designator overrides */
-    override def isName = true
     override def isTerm(implicit ctx: Context) = isTermName
     override def isType(implicit ctx: Context) = isTypeName
     override def asTerm(implicit ctx: Context) = asTermName

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

@@ -444,7 +444,6 @@ object Symbols {
       lastDenot.validFor.runId == ctx.runId || ctx.stillValid(lastDenot)
 
     /** Designator overrides */
-    final override def isSymbol = true
     final override def isTerm(implicit ctx: Context): Boolean =
       (if (defRunId == ctx.runId) lastDenot else denot).isTerm
     final override def isType(implicit ctx: Context): Boolean =

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

@@ -3380,6 +3380,8 @@ object Types {
 
   // ------ ClassInfo, Type Bounds ------------------------------------------------------------
 
+  type TypeOrSymbol = AnyRef /* should be: Type | Symbol */
+
   /** Roughly: the info of a class during a period.
    *  @param prefix       The prefix on which parents, decls, and selfType need to be rebased.
    *  @param cls          The class symbol.
@@ -3396,7 +3398,7 @@ object Types {
       cls: ClassSymbol,
       classParents: List[Type],
       decls: Scope,
-      selfInfo: DotClass /* should be: Type | Symbol */) extends CachedGroundType with TypeType {
+      selfInfo: TypeOrSymbol) extends CachedGroundType with TypeType {
 
     private[this] var selfTypeCache: Type = null
     private[this] var appliedRefCache: Type = null
@@ -3444,7 +3446,7 @@ object Types {
       if (prefix eq this.prefix) this
       else ClassInfo(prefix, cls, classParents, decls, selfInfo)
 
-    def derivedClassInfo(prefix: Type = this.prefix, classParents: List[Type] = this.classParents, decls: Scope = this.decls, selfInfo: DotClass = this.selfInfo)(implicit ctx: Context) =
+    def derivedClassInfo(prefix: Type = this.prefix, classParents: List[Type] = this.classParents, decls: Scope = this.decls, selfInfo: TypeOrSymbol = this.selfInfo)(implicit ctx: Context) =
       if ((prefix eq this.prefix) && (classParents eq this.classParents) && (decls eq this.decls) && (selfInfo eq this.selfInfo)) this
       else ClassInfo(prefix, cls, classParents, decls, selfInfo)
 
@@ -3463,11 +3465,11 @@ object Types {
     override def toString = s"ClassInfo($prefix, $cls, $classParents)"
   }
 
-  class CachedClassInfo(prefix: Type, cls: ClassSymbol, classParents: List[Type], decls: Scope, selfInfo: DotClass)
+  class CachedClassInfo(prefix: Type, cls: ClassSymbol, classParents: List[Type], decls: Scope, selfInfo: TypeOrSymbol)
     extends ClassInfo(prefix, cls, classParents, decls, selfInfo)
 
   /** A class for temporary class infos where `parents` are not yet known */
-  final class TempClassInfo(prefix: Type, cls: ClassSymbol, decls: Scope, selfInfo: DotClass)
+  final class TempClassInfo(prefix: Type, cls: ClassSymbol, decls: Scope, selfInfo: TypeOrSymbol)
   extends CachedClassInfo(prefix, cls, Nil, decls, selfInfo) {
 
     /** Install classinfo with known parents in `denot` s */
@@ -3482,7 +3484,7 @@ object Types {
   }
 
   object ClassInfo {
-    def apply(prefix: Type, cls: ClassSymbol, classParents: List[Type], decls: Scope, selfInfo: DotClass = NoType)(implicit ctx: Context) =
+    def apply(prefix: Type, cls: ClassSymbol, classParents: List[Type], decls: Scope, selfInfo: TypeOrSymbol = NoType)(implicit ctx: Context) =
       unique(new CachedClassInfo(prefix, cls, classParents, decls, selfInfo))
   }