Skip to content

Commit e216e0e

Browse files
committed
Remove unnecessary abstraction
Added in ced7214, no longer needed since ICodeReader is gone.
1 parent c8b0e1d commit e216e0e

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

src/compiler/scala/tools/nsc/symtab/SymbolLoaders.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -290,8 +290,6 @@ abstract class SymbolLoaders {
290290
private object classfileParser extends {
291291
val symbolTable: SymbolLoaders.this.symbolTable.type = SymbolLoaders.this.symbolTable
292292
} with ClassfileParser {
293-
override protected type ThisConstantPool = ConstantPool
294-
override protected def newConstantPool: ThisConstantPool = new ConstantPool
295293
override protected def lookupMemberAtTyperPhaseIfPossible(sym: Symbol, name: Name): Symbol =
296294
SymbolLoaders.this.lookupMemberAtTyperPhaseIfPossible(sym, name)
297295
/*

src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,13 @@ abstract class ClassfileParser {
5252
import scala.reflect.internal.ClassfileConstants._
5353
import Flags._
5454

55-
protected type ThisConstantPool <: ConstantPool
56-
protected def newConstantPool: ThisConstantPool
57-
5855
protected var file: AbstractFile = _ // the class file
5956
protected var in: AbstractFileReader = _ // the class file reader
6057
protected var clazz: ClassSymbol = _ // the class symbol containing dynamic members
6158
protected var staticModule: ModuleSymbol = _ // the module symbol containing static members
6259
protected var instanceScope: Scope = _ // the scope of all instance definitions
6360
protected var staticScope: Scope = _ // the scope of all static definitions
64-
protected var pool: ThisConstantPool = _ // the classfile's constant pool
61+
protected var pool: ConstantPool = _ // the classfile's constant pool
6562
protected var isScala: Boolean = _ // does class file describe a scala class?
6663
protected var isScalaAnnot: Boolean = _ // does class file describe a scala class with its pickled info in an annotation?
6764
protected var isScalaRaw: Boolean = _ // this class file is a scala class with no pickled info
@@ -152,7 +149,7 @@ abstract class ClassfileParser {
152149
this.isScala = false
153150

154151
parseHeader()
155-
this.pool = newConstantPool
152+
this.pool = new ConstantPool
156153
parseClass()
157154
}
158155
}

0 commit comments

Comments
 (0)