summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/Global.scala
diff options
context:
space:
mode:
authorIulian Dragos <jaguarul@gmail.com>2006-05-31 10:43:12 +0000
committerIulian Dragos <jaguarul@gmail.com>2006-05-31 10:43:12 +0000
commit213addb673ea0003ea13cb5ec7c402254b29dfc7 (patch)
tree10cf95921ba6b8bc21e7b8f02d42f0d70367eba7 /src/compiler/scala/tools/nsc/Global.scala
parent23904f63552d7cb98865d5a07101e2e9795d2ad1 (diff)
downloadscala-213addb673ea0003ea13cb5ec7c402254b29dfc7.tar.gz
scala-213addb673ea0003ea13cb5ec7c402254b29dfc7.tar.bz2
scala-213addb673ea0003ea13cb5ec7c402254b29dfc7.zip
Diffstat (limited to 'src/compiler/scala/tools/nsc/Global.scala')
-rw-r--r--src/compiler/scala/tools/nsc/Global.scala17
1 files changed, 11 insertions, 6 deletions
diff --git a/src/compiler/scala/tools/nsc/Global.scala b/src/compiler/scala/tools/nsc/Global.scala
index 7ab7d5872a..12c1a80f02 100644
--- a/src/compiler/scala/tools/nsc/Global.scala
+++ b/src/compiler/scala/tools/nsc/Global.scala
@@ -26,7 +26,7 @@ import transform._
import backend.icode.{ICodes, GenICode, Checkers}
import backend.ScalaPrimitives
import backend.jvm.GenJVM
-import backend.opt.{Inliners, ClosureElimination}
+import backend.opt.{Inliners, ClosureElimination, DeadCodeElimination}
import backend.icode.analysis._
class Global(val settings: Settings, val reporter: Reporter) extends SymbolTable
@@ -99,7 +99,7 @@ class Global(val settings: Settings, val reporter: Reporter) extends SymbolTable
def inform(msg: String) = System.err.println(msg)
def inform[T](msg: String, value: T): T = { inform(msg+value); value }
- //reporter.info(null, msg, true);
+ //reporter.info(null, msg, true);
def informProgress(msg: String) =
if (settings.verbose.value) inform("[" + msg + "]")
@@ -311,7 +311,11 @@ class Global(val settings: Settings, val reporter: Reporter) extends SymbolTable
val global: Global.this.type = Global.this
}
- object closser extends ClosureElimination {
+ object closureElimination extends ClosureElimination {
+ val global: Global.this.type = Global.this
+ }
+
+ object deadCode extends DeadCodeElimination {
val global: Global.this.type = Global.this
}
@@ -344,7 +348,8 @@ class Global(val settings: Settings, val reporter: Reporter) extends SymbolTable
cleanup,
genicode,
inliner,
- closser,
+ closureElimination,
+ deadCode,
genJVM,
sampleTransform);
@@ -416,10 +421,10 @@ class Global(val settings: Settings, val reporter: Reporter) extends SymbolTable
override val terminalPhase : Phase =
if (onlyPresentation) typerPhase.next.next
- else new GlobalPhase(p) {
+ else /* new GlobalPhase(p) {
def name = "terminal"
def apply(unit: CompilationUnit): unit = {}
- }
+ }*/ p;
private def addUnit(unit: CompilationUnit): unit = {
unitbuf += unit