Merge pull request #4545 from dotty-staging/opt/remove-DotClass

Remove DotClass

Author: smarter

compiler/src/dotty/tools/dotc/Driver.scala

@@ -16,7 +16,7 @@ import fromtasty.TASTYCompiler
  *  process, but in most cases you only need to call [[process]] on the
  *  existing object [[Main]].
  */
-class Driver extends DotClass {
+class Driver {
 
   protected def newCompiler(implicit ctx: Context): Compiler =
     if (ctx.settings.fromTasty.value) new TASTYCompiler

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

@@ -10,7 +10,7 @@ import core.StdNames.nme
 
 /** A base class for things that have positions (currently: modifiers and trees)
  */
-abstract class Positioned extends DotClass with Product {
+abstract class Positioned extends Product {
 
   private[this] var curPos: Position = _
 

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

@@ -853,7 +853,7 @@ object Trees {
 
   // ----- Generic Tree Instances, inherited from `tpt` and `untpd`.
 
-  abstract class Instance[T >: Untyped <: Type] extends DotClass { inst =>
+  abstract class Instance[T >: Untyped <: Type] { inst =>
 
     type Tree = Trees.Tree[T]
     type TypTree = Trees.TypTree[T]

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

@@ -10,7 +10,7 @@ import Properties._
 
 import scala.collection.JavaConverters._
 
-object CompilerCommand extends DotClass {
+object CompilerCommand {
 
   /** The name of the command */
   def cmdName = "dotc"

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

@@ -710,7 +710,7 @@ object Contexts {
       else assert(thread == Thread.currentThread(), "illegal multithreaded access to ContextBase")
   }
 
-  class GADTMap(initBounds: SimpleIdentityMap[Symbol, TypeBounds]) extends util.DotClass {
+  class GADTMap(initBounds: SimpleIdentityMap[Symbol, TypeBounds]) {
     private[this] var myBounds = initBounds
     def setBounds(sym: Symbol, b: TypeBounds): Unit =
       myBounds = myBounds.updated(sym, b)

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

@@ -76,7 +76,7 @@ object Denotations {
   /** A PreDenotation represents a group of single denotations or a single multi-denotation
    *  It is used as an optimization to avoid forming MultiDenotations too eagerly.
    */
-  abstract class PreDenotation extends util.DotClass {
+  abstract class PreDenotation {
 
     /** A denotation in the group exists */
     def exists: Boolean

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

@@ -25,14 +25,14 @@ object NameKinds {
   @sharable private val uniqueNameKinds = new mutable.HashMap[String, UniqueNameKind]
 
   /** A class for the info stored in a derived name */
-  abstract class NameInfo extends DotClass {
+  abstract class NameInfo {
     def kind: NameKind
     def mkString(underlying: TermName): String
     def map(f: SimpleName => SimpleName): NameInfo = this
   }
 
   /** An abstract base class of classes that define the kind of a derived name info */
-  abstract class NameKind(val tag: Int) extends DotClass { self =>
+  abstract class NameKind(val tag: Int) { self =>
 
     /** The info class defined by this kind */
     type ThisInfo <: Info

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

@@ -34,7 +34,7 @@ object Names {
   /** A common superclass of Name and Symbol. After bootstrap, this should be
    *  just the type alias Name | Symbol
    */
-  abstract class Designator extends util.DotClass
+  abstract class 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/Periods.scala

@@ -8,7 +8,7 @@ import dotty.tools.dotc.util.DotClass
  *  run ids represent compiler runs
  *  phase ids represent compiler phases
  */
-abstract class Periods extends DotClass { self: Context =>
+abstract class Periods { self: Context =>
   import Periods._
 
   /** The current phase identifier */

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

@@ -1,4 +1,5 @@
-package dotty.tools.dotc
+package dotty.tools
+package dotc
 package core
 
 import Periods._
@@ -263,7 +264,7 @@ object Phases {
     final def isAfterTyper(phase: Phase): Boolean = phase.id > typerPhase.id
   }
 
-  trait Phase extends DotClass {
+  trait Phase {
 
     /** A name given to the `Phase` that can be used to debug the compiler. For
      *  instance, it is possible to print trees after a given phase using:

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

@@ -3,7 +3,8 @@
  * @author  Martin Odersky
  */
 
-package dotty.tools.dotc
+package dotty.tools
+package dotc
 package core
 
 import Symbols._
@@ -66,7 +67,7 @@ object Scopes {
    *  or to delete them. These methods are provided by subclass
    *  MutableScope.
    */
-  abstract class Scope extends DotClass with printing.Showable {
+  abstract class Scope extends printing.Showable {
 
     /** The last scope-entry from which all others are reachable via `prev` */
     private[dotc] def lastEntry: ScopeEntry

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

@@ -16,7 +16,7 @@ import reporting.trace
 
 /** Provides methods to compare types.
  */
-class TypeComparer(initctx: Context) extends DotClass with ConstraintHandling {
+class TypeComparer(initctx: Context) extends ConstraintHandling {
   import TypeComparer._
   implicit val ctx = initctx
 

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

@@ -343,7 +343,7 @@ import TypeErasure._
  *  @param wildcardOK    Wildcards are acceptable (true when using the erasure
  *                       for computing a signature name).
  */
-class TypeErasure(isJava: Boolean, semiEraseVCs: Boolean, isConstructor: Boolean, wildcardOK: Boolean) extends DotClass {
+class TypeErasure(isJava: Boolean, semiEraseVCs: Boolean, isConstructor: Boolean, wildcardOK: Boolean) {
 
   /**  The erasure |T| of a type T. This is:
    *

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

@@ -84,7 +84,7 @@ object Types {
    *
    *  Note: please keep in sync with copy in `docs/docs/internals/type-system.md`.
    */
-  abstract class Type extends DotClass with Hashable with printing.Showable {
+  abstract class Type extends Hashable with printing.Showable {
 
 // ----- Tests -----------------------------------------------------
 

compiler/src/dotty/tools/dotc/parsing/Parsers.scala

@@ -64,7 +64,7 @@ object Parsers {
     if (source.isSelfContained) new ScriptParser(source)
     else new Parser(source)
 
-  abstract class ParserCommon(val source: SourceFile)(implicit ctx: Context) extends DotClass {
+  abstract class ParserCommon(val source: SourceFile)(implicit ctx: Context) {
 
     val in: ScannerCommon
 

compiler/src/dotty/tools/dotc/transform/TransformByNameApply.scala

@@ -1,4 +1,5 @@
-package dotty.tools.dotc
+package dotty.tools
+package dotc
 package transform
 
 import MegaPhase._

compiler/src/dotty/tools/dotc/typer/Namer.scala

@@ -102,7 +102,7 @@ trait NamerContextOps { this: Context =>
   }
 
   /** A new context for the interior of a class */
-  def inClassContext(selfInfo: DotClass /* Should be Type | Symbol*/): Context = {
+  def inClassContext(selfInfo: AnyRef /* Should be Type | Symbol*/): Context = {
     val localCtx: Context = ctx.fresh.setNewScope
     selfInfo match {
       case sym: Symbol if sym.exists && sym.name != nme.WILDCARD => localCtx.scope.openForMutations.enter(sym)

compiler/src/dotty/tools/dotc/typer/RefChecks.scala

@@ -843,7 +843,7 @@ object RefChecks {
 
   type LevelAndIndex = immutable.Map[Symbol, (LevelInfo, Int)]
 
-  class OptLevelInfo extends DotClass {
+  class OptLevelInfo {
     def levelAndIndex: LevelAndIndex = Map()
     def enterReference(sym: Symbol, pos: Position): Unit = ()
   }

compiler/src/dotty/tools/dotc/util/DotClass.scala

@@ -5,8 +5,4 @@ package dotty.tools.dotc.util
  */
 class DotClass {
 
-  /** Throws an `UnsupportedOperationException` with the given method name. */
-  def unsupported(methodName: String): Nothing =
-    throw new UnsupportedOperationException(s"$getClass.$methodName")
-
 }

compiler/src/dotty/tools/package.scala

@@ -20,4 +20,8 @@ package object tools {
       }
     case _ => ys.isEmpty
   }
+
+  /** Throws an `UnsupportedOperationException` with the given method name. */
+  def unsupported(methodName: String): Nothing =
+    throw new UnsupportedOperationException(methodName)
 }