diff options
| author | Paul Phillips <paulp@improving.org> | 2012-02-04 22:18:17 -0800 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-02-04 22:18:17 -0800 |
| commit | fe901382384ded9b75ab5dbd981dde9255856715 (patch) | |
| tree | 7cc58b1b1d3a2186d5b9c639ca65478404ad7225 | |
| parent | 7eb35ada3bf59054583ff457d7304fc6efa565bf (diff) | |
| download | scala-fe901382384ded9b75ab5dbd981dde9255856715.tar.gz scala-fe901382384ded9b75ab5dbd981dde9255856715.tar.bz2 scala-fe901382384ded9b75ab5dbd981dde9255856715.zip | |
A little msil I missed un-reverting.
| -rw-r--r-- | src/compiler/scala/tools/nsc/Global.scala | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/compiler/scala/tools/nsc/Global.scala b/src/compiler/scala/tools/nsc/Global.scala index 31269829bf..8e5ca2156a 100644 --- a/src/compiler/scala/tools/nsc/Global.scala +++ b/src/compiler/scala/tools/nsc/Global.scala @@ -27,8 +27,7 @@ import typechecker._ import transform._ import backend.icode.{ ICodes, GenICode, ICodeCheckers } -// import backend.{ ScalaPrimitives, Platform, MSILPlatform, JavaPlatform } -import backend.{ ScalaPrimitives, Platform, JavaPlatform } +import backend.{ ScalaPrimitives, Platform, MSILPlatform, JavaPlatform } import backend.jvm.GenJVM import backend.opt.{ Inliners, InlineExceptionHandlers, ClosureElimination, DeadCodeElimination } import backend.icode.analysis._ @@ -66,9 +65,9 @@ class Global(var currentSettings: Settings, var reporter: Reporter) extends Symb type ThisPlatform = Platform { val global: Global.this.type } - lazy val platform: ThisPlatform = new { val global: Global.this.type = Global.this } with JavaPlatform - // if (forMSIL) new { val global: Global.this.type = Global.this } with MSILPlatform - // else new { val global: Global.this.type = Global.this } with JavaPlatform + lazy val platform: ThisPlatform = + if (forMSIL) new { val global: Global.this.type = Global.this } with MSILPlatform + else new { val global: Global.this.type = Global.this } with JavaPlatform def classPath: ClassPath[platform.BinaryRepr] = platform.classPath def rootLoader: LazyType = platform.rootLoader |