diff options
| author | mihaylov <mihaylov@epfl.ch> | 2007-02-13 08:07:04 +0000 |
|---|---|---|
| committer | mihaylov <mihaylov@epfl.ch> | 2007-02-13 08:07:04 +0000 |
| commit | 78ac90b85a976a58fc5afad78be33493138fb8fe (patch) | |
| tree | 9ff6a917aff6ce0bfb3619eb8eaa6e692c905420 | |
| parent | 41fefebc73be06f2c06820f5310774d3fb2f9e75 (diff) | |
| download | scala-78ac90b85a976a58fc5afad78be33493138fb8fe.tar.gz scala-78ac90b85a976a58fc5afad78be33493138fb8fe.tar.bz2 scala-78ac90b85a976a58fc5afad78be33493138fb8fe.zip | |
Fixed transformer/CleanUp crash with -target:msil
| -rw-r--r-- | src/compiler/scala/tools/nsc/transform/CleanUp.scala | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/compiler/scala/tools/nsc/transform/CleanUp.scala b/src/compiler/scala/tools/nsc/transform/CleanUp.scala index 499ff83e12..101fea6f23 100644 --- a/src/compiler/scala/tools/nsc/transform/CleanUp.scala +++ b/src/compiler/scala/tools/nsc/transform/CleanUp.scala @@ -31,15 +31,17 @@ abstract class CleanUp extends Transform { // of the modules of the Java box classes private val javaBoxClassModule = new HashMap[Symbol, Symbol] - javaBoxClassModule(UnitClass) = getModule("java.lang.Void") - javaBoxClassModule(BooleanClass) = getModule("java.lang.Boolean") - javaBoxClassModule(ByteClass) = getModule("java.lang.Byte") - javaBoxClassModule(ShortClass) = getModule("java.lang.Short") - javaBoxClassModule(IntClass) = getModule("java.lang.Integer") - javaBoxClassModule(CharClass) = getModule("java.lang.Character") - javaBoxClassModule(LongClass) = getModule("java.lang.Long") - javaBoxClassModule(FloatClass) = getModule("java.lang.Float") - javaBoxClassModule(DoubleClass) = getModule("java.lang.Double") + if (!forMSIL) { + javaBoxClassModule(UnitClass) = getModule("java.lang.Void") + javaBoxClassModule(BooleanClass) = getModule("java.lang.Boolean") + javaBoxClassModule(ByteClass) = getModule("java.lang.Byte") + javaBoxClassModule(ShortClass) = getModule("java.lang.Short") + javaBoxClassModule(IntClass) = getModule("java.lang.Integer") + javaBoxClassModule(CharClass) = getModule("java.lang.Character") + javaBoxClassModule(LongClass) = getModule("java.lang.Long") + javaBoxClassModule(FloatClass) = getModule("java.lang.Float") + javaBoxClassModule(DoubleClass) = getModule("java.lang.Double") + } private var localTyper: analyzer.Typer = null; |