Tighten type of module to ModuleSymbol

scala · Oct 28, 2016 · 5c7b8ed · 5c7b8ed
1 parent 47050ee
commit 5c7b8ed
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/compiler/scala/tools/nsc/symtab/SymbolLoaders.scala b/src/compiler/scala/tools/nsc/symtab/SymbolLoaders.scala
@@ -65,7 +65,7 @@ abstract class SymbolLoaders {
     enterIfNew(owner, clazz, completer)
   }
 
-  def newModule(owner: Symbol, name: String): Symbol = owner.newModule(newTermName(name))
+  def newModule(owner: Symbol, name: String): ModuleSymbol = owner.newModule(newTermName(name))
 
   /** Enter module with given `name` into scope of `root`
    *  and give them `completer` as type.
@@ -121,7 +121,7 @@ abstract class SymbolLoaders {
   /** Enter class and module with given `name` into scope of `root`
    *  and give them `completer` as type.
    */
-  def enterClassAndModule(root: Symbol, name: String, getCompleter: (Symbol, Symbol) => SymbolLoader) {
+  def enterClassAndModule(root: Symbol, name: String, getCompleter: (Symbol, ModuleSymbol) => SymbolLoader) {
     val clazz = newClass(root, name)
     val module = newModule(root, name)
     val completer = getCompleter(clazz, module)
@@ -281,7 +281,7 @@ abstract class SymbolLoaders {
     }
   }
 
-  class ClassfileLoader(val classfile: AbstractFile, clazz: Symbol, module: Symbol) extends SymbolLoader with FlagAssigningCompleter {
+  class ClassfileLoader(val classfile: AbstractFile, clazz: Symbol, module: ModuleSymbol) extends SymbolLoader with FlagAssigningCompleter {
     private object classfileParser extends {
       val symbolTable: SymbolLoaders.this.symbolTable.type = SymbolLoaders.this.symbolTable
     } with ClassfileParser {

diff --git a/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala b/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala
@@ -56,7 +56,7 @@ abstract class ClassfileParser {
   protected var file: AbstractFile     = _  // the class file
   protected var in: AbstractFileReader = _  // the class file reader
   protected var clazz: Symbol = _           // the class symbol containing dynamic members
-  protected var staticModule: Symbol = _    // the module symbol containing static members
+  protected var staticModule: ModuleSymbol = _ // the module symbol containing static members
   protected var instanceScope: Scope = _    // the scope of all instance definitions
   protected var staticScope: Scope = _      // the scope of all static definitions
   protected var pool: ThisConstantPool = _  // the classfile's constant pool
@@ -132,7 +132,7 @@ abstract class ClassfileParser {
     finally loaders.parentsLevel -= 1
   }
 
-  def parse(file: AbstractFile, clazz: Symbol, module: Symbol): Unit = {
+  def parse(file: AbstractFile, clazz: Symbol, module: ModuleSymbol): Unit = {
     this.file = file
     pushBusy(clazz) {
       this.in           = new AbstractFileReader(file)