Drop all code under !newScheme

Author: odersky

compiler/src/dotty/tools/dotc/ast/tpd.scala

@@ -709,8 +709,7 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo {
       val tp =
         if (sym.isType) {
           assert(!sym.is(TypeParam))
-          if (config.Config.newScheme) TypeRef.withSym(tree.tpe, sym.asType)
-          else TypeRef(tree.tpe, sym.name.asTypeName)
+          TypeRef(tree.tpe, sym.asType)
         }
         else
           TermRef(tree.tpe, sym.name.asTermName, sym.denot.asSeenFrom(tree.tpe))
@@ -719,10 +718,7 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo {
 
     /** A select node with the given selector name and signature and a computed type */
     def selectWithSig(name: Name, sig: Signature)(implicit ctx: Context): Tree =
-      untpd.SelectWithSig(tree, name, sig)
-        .withType(
-          if (config.Config.newScheme) tree.tpe.select(name.asTermName, sig)
-          else TermRef(tree.tpe, name.asTermName.withSig(sig)))
+      untpd.SelectWithSig(tree, name, sig).withType(tree.tpe.select(name.asTermName, sig))
 
     /** A select node with selector name and signature taken from `sym`.
      *  Note: Use this method instead of select(sym) if the referenced symbol

compiler/src/dotty/tools/dotc/config/Config.scala

@@ -179,6 +179,4 @@ object Config {
 
   /** When in IDE, turn StaleSymbol errors into warnings instead of crashing */
   final val ignoreStaleInIDE = true
-
-  val newScheme = true
 }

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

@@ -9,7 +9,6 @@ import Texts.Text
 import Decorators._
 import Contexts.Context
 import StdNames.str
-import Designators._
 import util.Chars.isIdentifierStart
 import collection.IndexedSeqOptimized
 import collection.immutable
@@ -30,6 +29,11 @@ object Names {
 
   implicit def eqName: Eq[Name, Name] = Eq
 
+  /** A common superclass of Name and Symbol. After bootstrap, this should be
+   *  just the type alias Name | Symbol
+   */
+  abstract class Designator extends util.DotClass
+
   /** 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
    *  in a name table. A derived term name adds a tag, and possibly a number
@@ -151,12 +155,6 @@ object Names {
     /** Does (the last part of) this name end with `str`? */
     def endsWith(str: String): Boolean = lastPart.endsWith(str)
 
-    /** Designator overrides */
-    override def isTerm(implicit ctx: Context) = isTermName
-    override def isType(implicit ctx: Context) = isTypeName
-    override def asTerm(implicit ctx: Context) = asTermName
-    override def asType(implicit ctx: Context) = asTypeName
-
     override def hashCode = System.identityHashCode(this)
     override def equals(that: Any) = this eq that.asInstanceOf[AnyRef]
   }

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

@@ -1134,12 +1134,10 @@ object SymDenotations {
     def thisType(implicit ctx: Context): Type = NoPrefix
 
     override def typeRef(implicit ctx: Context): TypeRef =
-      if (Config.newScheme) TypeRef.withSym(owner.thisType, symbol.asType)
-      else TypeRef(owner.thisType, name.asTypeName, this)
+      TypeRef(owner.thisType, symbol)
 
     override def termRef(implicit ctx: Context): TermRef =
-      if (Config.newScheme) TermRef.withSym(owner.thisType, symbol.asTerm)
-      else TermRef(owner.thisType, name.asTermName, this)
+      TermRef(owner.thisType, symbol)
 
     /** The variance of this type parameter or type member as an Int, with
      *  +1 = Covariant, -1 = Contravariant, 0 = Nonvariant, or not a type parameter
@@ -1440,10 +1438,9 @@ object SymDenotations {
       if (classParents.isEmpty && !emptyParentsExpected)
         onBehalf.signalProvisional()
       val builder = new BaseDataBuilder
-      for (p <- classParents) {
-        assert(p.typeSymbol.isClass, s"$this has $p")
+      for (p <- classParents)
         builder.addAll(p.typeSymbol.asClass.baseClasses)
-      }
+
       (classSymbol :: builder.baseClasses, builder.baseClassSet)
     }
 
@@ -1849,8 +1846,7 @@ object SymDenotations {
       if (entry != null) {
         if (entry.sym == sym) return false
         mscope.unlink(entry)
-        if (sym.owner == defn.ScalaShadowingPackageClass)
-        if (sym.name == nme.PACKAGE) packageObjRunId = NoRunId
+        if (sym.name == nme.PACKAGE) packageObjRunId = NoRunId // ### check if needed
       }
       true
     }

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

@@ -10,7 +10,6 @@ import java.lang.AssertionError
 import Decorators._
 import Symbols._
 import Contexts._
-import Designators._
 import SymDenotations._
 import printing.Texts._
 import printing.Printer
@@ -158,9 +157,7 @@ trait Symbols { this: Context =>
         infoFn(module, modcls), privateWithin)
     val mdenot = SymDenotation(
         module, owner, name, modFlags | ModuleValCreationFlags,
-        if (cdenot.isCompleted)
-          if (config.Config.newScheme) TypeRef.withSym(owner.thisType, modcls)
-          else TypeRef.withSymOLD(owner.thisType, modcls, modclsName)
+        if (cdenot.isCompleted) TypeRef(owner.thisType, modcls)
         else new ModuleCompleter(modcls))
     module.denot = mdenot
     modcls.denot = cdenot
@@ -185,9 +182,7 @@ trait Symbols { this: Context =>
     newModuleSymbol(
         owner, name, modFlags, clsFlags,
         (module, modcls) => ClassInfo(
-          owner.thisType, modcls, parents, decls,
-          if (config.Config.newScheme) TermRef.withSym(owner.thisType, module)
-          else TermRef.withSymOLD(owner.thisType, module, name)),
+          owner.thisType, modcls, parents, decls, TermRef(owner.thisType, module)),
         privateWithin, coord, assocFile)
 
   val companionMethodFlags = Flags.Synthetic | Flags.Private | Flags.Method
@@ -295,10 +290,7 @@ trait Symbols { this: Context =>
     for (name <- names) {
       val tparam = newNakedSymbol[TypeName](NoCoord)
       tparamBuf += tparam
-      trefBuf += (
-        if (config.Config.newScheme) TypeRef.withSym(owner.thisType, tparam)
-        else TypeRef.withSymOLD(owner.thisType, tparam, name)
-      )
+      trefBuf += TypeRef(owner.thisType, tparam)
     }
     val tparams = tparamBuf.toList
     val bounds = boundsFn(trefBuf.toList)
@@ -463,16 +455,15 @@ object Symbols {
         // denotations pointing to the new symbol, so the validity periods check out OK.
         // But once a package member is overridden it is not longerr valid.
 
-    /** Designator overrides */
-    final override def isTerm(implicit ctx: Context): Boolean =
+    final def isTerm(implicit ctx: Context): Boolean =
       (if (defRunId == ctx.runId) lastDenot else denot).isTerm
-    final override def isType(implicit ctx: Context): Boolean =
+    final def isType(implicit ctx: Context): Boolean =
       (if (defRunId == ctx.runId) lastDenot else denot).isType
-    final override def asTerm(implicit ctx: Context): TermSymbol = {
+    final def asTerm(implicit ctx: Context): TermSymbol = {
       assert(isTerm, s"asTerm called on not-a-Term $this" );
       asInstanceOf[TermSymbol]
     }
-    final override def asType(implicit ctx: Context): TypeSymbol = {
+    final def asType(implicit ctx: Context): TypeSymbol = {
       assert(isType, s"isType called on not-a-Type $this");
       asInstanceOf[TypeSymbol]
     }