diff options
| author | Lukas Rytz <lukas.rytz@epfl.ch> | 2008-05-21 12:33:42 +0000 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@epfl.ch> | 2008-05-21 12:33:42 +0000 |
| commit | f9340a7c068db439d14c5039355f9f3f60ccd49d (patch) | |
| tree | b606292577f64ad6f6a2348eec70c8c29c49b0e6 /src/compiler/scala/tools/nsc/Global.scala | |
| parent | e72ace00e66364b43a272f46b8cb2ebd24739f50 (diff) | |
| download | scala-f9340a7c068db439d14c5039355f9f3f60ccd49d.tar.gz scala-f9340a7c068db439d14c5039355f9f3f60ccd49d.tar.bz2 scala-f9340a7c068db439d14c5039355f9f3f60ccd49d.zip | |
Inner classes are now kept as such when compili...
Inner classes are now kept as such when compiling to .NET.
Diffstat (limited to 'src/compiler/scala/tools/nsc/Global.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/Global.scala | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/compiler/scala/tools/nsc/Global.scala b/src/compiler/scala/tools/nsc/Global.scala index 454be7a667..4d00907934 100644 --- a/src/compiler/scala/tools/nsc/Global.scala +++ b/src/compiler/scala/tools/nsc/Global.scala @@ -397,9 +397,9 @@ class Global(var settings: Settings, var reporter: Reporter) extends SymbolTable analyzer.typerFactory: SubComponent, // consistency check after refchecks would fail. superAccessors, // add super accessors pickler, // serialize symbol tables - refchecks // perform reference and override checking, translate nested objects + refchecks // perform reference and override checking, translate nested objects ) ::: ( - if (forJVM) List(liftcode) else List() // generate reified trees + if (forJVM) List(liftcode) else List() // generate reified trees ) ::: List( uncurry, // uncurry, translate function values to anonymous classes tailCalls, // replace tail calls by jumps @@ -409,8 +409,10 @@ class Global(var settings: Settings, var reporter: Reporter) extends SymbolTable lazyVals, lambdaLift, // move nested functions to top level // detach, - constructors, // move field definitions into constructors - flatten, // get rid of inner classes + constructors // move field definitions into constructors + ) ::: ( + if (forMSIL) List() else List(flatten) // get rid of inner classes + ) ::: List( mixer, // do mixin composition cleanup, // some platform-specific cleanups |