diff options
| author | Sean McDirmid <sean.mcdirmid@gmail.com> | 2007-12-24 14:09:25 +0000 |
|---|---|---|
| committer | Sean McDirmid <sean.mcdirmid@gmail.com> | 2007-12-24 14:09:25 +0000 |
| commit | cc4c5f64d1db7a27f9c38bfb1bbf2e85eec0a12c (patch) | |
| tree | 3aa3cbc89dac580e0ad6e6c826f597bdf79477fb | |
| parent | 9a9ab66963521eb9f75a05357c0d36cd9dd395db (diff) | |
| download | scala-cc4c5f64d1db7a27f9c38bfb1bbf2e85eec0a12c.tar.gz scala-cc4c5f64d1db7a27f9c38bfb1bbf2e85eec0a12c.tar.bz2 scala-cc4c5f64d1db7a27f9c38bfb1bbf2e85eec0a12c.zip | |
Fixing my asInstanceOf hack in TypeParser.scala...
Fixing my asInstanceOf hack in TypeParser.scala, hopefully the separate
compilation bug that required the hack has been fixed in 2.6.1
| -rw-r--r-- | src/compiler/scala/tools/nsc/symtab/clr/TypeParser.scala | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/symtab/clr/TypeParser.scala b/src/compiler/scala/tools/nsc/symtab/clr/TypeParser.scala index 26747e58dc..d9e1f10d67 100644 --- a/src/compiler/scala/tools/nsc/symtab/clr/TypeParser.scala +++ b/src/compiler/scala/tools/nsc/symtab/clr/TypeParser.scala @@ -74,7 +74,8 @@ abstract class TypeParser { val a = attrs(0).asInstanceOf[MSILAttribute]; assert (a.getConstructor() == clrTypes.SYMTAB_CONSTR); val symtab = a.getConstructorArguments()(0).asInstanceOf[Array[Byte]] - unpickler.unpickle(symtab, 0, clazz.asInstanceOf, staticModule.asInstanceOf, typ.FullName); + unpickler.unpickle(symtab, 0, clazz.asInstanceOf[unpickler.global.Symbol], + staticModule.asInstanceOf[unpickler.global.Symbol], typ.FullName); val mClass = clrTypes.getType(typ.FullName + "$"); if (mClass != null) { clrTypes.types(statics) = mClass; @@ -90,8 +91,8 @@ abstract class TypeParser { else if (typ.IsInterface()) definitions.ObjectClass.tpe else definitions.AnyClass.tpe; // this is System.Object val parents = superType :: ifaces.map(getCLRType).toList - instanceDefs = newClassScope - staticDefs = newClassScope + instanceDefs = newClassScope(clazz) + staticDefs = newClassScope(staticModule) val classInfo = ClassInfoType(parents, instanceDefs, clazz) val staticInfo = ClassInfoType(List(), staticDefs, statics) |