summaryrefslogtreecommitdiff
path: root/src/compiler
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@epfl.ch>2010-01-04 14:08:25 +0000
committerLukas Rytz <lukas.rytz@epfl.ch>2010-01-04 14:08:25 +0000
commite5d37b199df4d04eda46ddc0cf4b33f9503bfbc0 (patch)
tree1825023affcb3d6e7498d460f0cf000f11736b88 /src/compiler
parent210a9552b51c31ed7e98dd0bdf6edfc3d804e963 (diff)
downloadscala-e5d37b199df4d04eda46ddc0cf4b33f9503bfbc0.tar.gz
scala-e5d37b199df4d04eda46ddc0cf4b33f9503bfbc0.tar.bz2
scala-e5d37b199df4d04eda46ddc0cf4b33f9503bfbc0.zip
fix parsing of .net types with inner classes
Diffstat (limited to 'src/compiler')
-rw-r--r--src/compiler/scala/tools/nsc/symtab/SymbolLoaders.scala8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/compiler/scala/tools/nsc/symtab/SymbolLoaders.scala b/src/compiler/scala/tools/nsc/symtab/SymbolLoaders.scala
index 7e4693c7a1..57245a4023 100644
--- a/src/compiler/scala/tools/nsc/symtab/SymbolLoaders.scala
+++ b/src/compiler/scala/tools/nsc/symtab/SymbolLoaders.scala
@@ -248,6 +248,10 @@ abstract class SymbolLoaders {
}
class MSILTypeLoader(typ: MSILType) extends SymbolLoader {
+ private object typeParser extends clr.TypeParser {
+ val global: SymbolLoaders.this.global.type = SymbolLoaders.this.global
+ }
+
protected def description = "MSILType "+ typ.FullName + ", assembly "+ typ.Assembly.FullName
protected def doComplete(root: Symbol) { typeParser.parse(typ, root) }
}
@@ -263,10 +267,6 @@ abstract class SymbolLoaders {
protected def doComplete(root: Symbol) { root.sourceModule.initialize }
}
- private object typeParser extends clr.TypeParser {
- val global: SymbolLoaders.this.global.type = SymbolLoaders.this.global
- }
-
object clrTypes extends clr.CLRTypes {
val global: SymbolLoaders.this.global.type = SymbolLoaders.this.global
if (global.forMSIL) init()