diff options
Diffstat (limited to 'src/compiler/scala/tools/nsc/symtab/clr/TypeParser.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/symtab/clr/TypeParser.scala | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/compiler/scala/tools/nsc/symtab/clr/TypeParser.scala b/src/compiler/scala/tools/nsc/symtab/clr/TypeParser.scala index 7cea294ec8..4d9c0ffc92 100644 --- a/src/compiler/scala/tools/nsc/symtab/clr/TypeParser.scala +++ b/src/compiler/scala/tools/nsc/symtab/clr/TypeParser.scala @@ -13,7 +13,6 @@ import java.io.IOException import ch.epfl.lamp.compiler.msil.{Type => MSILType, Attribute => MSILAttribute, _} import scala.collection.mutable.{HashMap, HashSet} -import scala.tools.nsc.util.{Position, NoPosition} import classfile.UnPickler /** @@ -43,7 +42,7 @@ abstract class TypeParser { def parse(typ: MSILType, root: Symbol) { - def handleError(e: Exception) = { + def handleError(e: Throwable) = { if (settings.debug.value) e.printStackTrace() //debug throw new IOException("type '" + typ.FullName + "' is broken\n(" + e.getMessage() + ")") } @@ -51,11 +50,11 @@ abstract class TypeParser { busy = true if (root.isModule) { - this.clazz = root.linkedClassOfModule + this.clazz = root.companionClass this.staticModule = root } else { this.clazz = root - this.staticModule = root.linkedModuleOfClass + this.staticModule = root.companionModule } try { parseClass(typ) @@ -120,8 +119,8 @@ abstract class TypeParser { staticDefs.enter(nclazz) staticDefs.enter(nmodule) - assert(nclazz.linkedModuleOfClass == nmodule, nmodule) - assert(nmodule.linkedClassOfModule == nclazz, nclazz) + assert(nclazz.companionModule == nmodule, nmodule) + assert(nmodule.companionClass == nclazz, nclazz) } val fields = typ.getFields() |