Generalize UniqueNamedTypes

Author: odersky

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

@@ -1502,7 +1502,7 @@ object Types {
     private[this] var myName: ThisName = _
     private[this] var mySig: Signature = null
 
-    def designatorName: Name = designator.asInstanceOf[Name] // ### todo: remove 
+    def designatorName: Name = designator.asInstanceOf[Name] // ### todo: remove
 
     private[dotc] def init()(implicit ctx: Context): this.type = {
       (designator: Designator) match { // dotty shortcoming: need the upcast
@@ -1513,6 +1513,7 @@ object Types {
         case designator: Name =>
           myName = designator.asInstanceOf[ThisName]
         case designator: Symbol =>
+          assert(designator.exists)
           myName = designator.name.asInstanceOf[ThisName]
           uncheckedSetSym(designator)
       }
@@ -2029,13 +2030,13 @@ object Types {
     override def computeHash = unsupported("computeHash")
   }
 
-  final class CachedTermRef(prefix: Type, designator: TermName, hc: Int) extends TermRef(prefix, designator) {
+  final class CachedTermRef(prefix: Type, designator: TermDesignator, hc: Int) extends TermRef(prefix, designator) {
     assert(prefix ne NoPrefix)
     myHash = hc
     override def computeHash = unsupported("computeHash")
   }
 
-  final class CachedTypeRef(prefix: Type, designator: TypeName, hc: Int) extends TypeRef(prefix, designator) {
+  final class CachedTypeRef(prefix: Type, designator: TypeDesignator, hc: Int) extends TypeRef(prefix, designator) {
     assert(prefix ne NoPrefix)
     myHash = hc
     override def computeHash = unsupported("computeHash")

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

@@ -1,7 +1,7 @@
 package dotty.tools.dotc
 package core
 
-import Types._, Symbols._, Contexts._, util.Stats._, Hashable._, Names._
+import Types._, Symbols._, Contexts._, util.Stats._, Hashable._, Names._, Designators._
 import config.Config
 import util.HashSet
 
@@ -43,7 +43,7 @@ object Uniques {
   final class NamedTypeUniques extends HashSet[NamedType](Config.initialUniquesCapacity) with Hashable {
     override def hash(x: NamedType): Int = x.hash
 
-    private def findPrevious(h: Int, prefix: Type, designator: Name): NamedType = {
+    private def findPrevious(h: Int, prefix: Type, designator: Designator): NamedType = {
       var e = findEntryByHash(h)
       while (e != null) {
         if ((e.prefix eq prefix) && (e.designator eq designator)) return e
@@ -52,12 +52,12 @@ object Uniques {
       e
     }
 
-    def enterIfNew(prefix: Type, designator: Name)(implicit ctx: Context): NamedType = {
+    def enterIfNew(prefix: Type, designator: Designator)(implicit ctx: Context): NamedType = {
       val h = doHash(designator, prefix)
       if (monitored) recordCaching(h, classOf[NamedType])
       def newType = {
-        if (designator.isTypeName) new CachedTypeRef(prefix, designator.asTypeName, h)
-        else new CachedTermRef(prefix, designator.asTermName, h)
+        if (designator.isType) new CachedTypeRef(prefix, designator.asType, h)
+        else new CachedTermRef(prefix, designator.asTerm, h)
       }.init()
       if (h == NotCached) newType
       else {