diff options
| author | mihaylov <mihaylov@epfl.ch> | 2003-04-16 15:42:08 +0000 |
|---|---|---|
| committer | mihaylov <mihaylov@epfl.ch> | 2003-04-16 15:42:08 +0000 |
| commit | f7308846bb35fd6afc0191a5eacb7f2c4b8c8164 (patch) | |
| tree | 9dd88775fc36b7708fa140d880755c03e78651a7 | |
| parent | e1cdc3fe30e6904fceeaf34d4189171266d810f8 (diff) | |
| download | scala-f7308846bb35fd6afc0191a5eacb7f2c4b8c8164.tar.gz scala-f7308846bb35fd6afc0191a5eacb7f2c4b8c8164.tar.bz2 scala-f7308846bb35fd6afc0191a5eacb7f2c4b8c8164.zip | |
- added GenMSIL phase
- removed all references (albeit commented out) to the obsoleted GenJava
phase
| -rw-r--r-- | sources/scalac/Global.java | 3 | ||||
| -rw-r--r-- | sources/scalac/PhaseRepository.java | 13 |
2 files changed, 3 insertions, 13 deletions
diff --git a/sources/scalac/Global.java b/sources/scalac/Global.java index 512b803493..0df78993cb 100644 --- a/sources/scalac/Global.java +++ b/sources/scalac/Global.java @@ -193,10 +193,7 @@ public class Global { if (target == TARGET_INT || target == TARGET_MSIL || target == TARGET_JVM) { phases.add(PHASE.ADDCONSTRUCTORS); } - /* - if (target == TARGET_JAVA) phases.add(PHASE.GENJAVA); if (target == TARGET_MSIL) phases.add(PHASE.GENMSIL); - */ if (target == TARGET_JVM) phases.add(PHASE.GENJVM); phases.add(PHASE.TERMINAL); this.phases = new PhaseDescriptor[phases.size()]; diff --git a/sources/scalac/PhaseRepository.java b/sources/scalac/PhaseRepository.java index 4568d20bd7..3544193a9c 100644 --- a/sources/scalac/PhaseRepository.java +++ b/sources/scalac/PhaseRepository.java @@ -22,10 +22,9 @@ import scalac.transformer.ErasurePhase; import scalac.transformer.AddConstructorsPhase; /* import scalac.optimizer.OptimizePhase; -import scalac.backend.msil.GenMSILPhase; -import scalac.jaco.GenJavaPhase; */ import scalac.backend.jvm.GenJVMPhase; +import scalac.backend.msil.GenMSILPhase; public class PhaseRepository { @@ -55,11 +54,8 @@ public class PhaseRepository { EXPANDMIXIN = new ExpandMixinsPhase(), ERASURE = new ErasurePhase(), ADDCONSTRUCTORS = new AddConstructorsPhase(), - /* - GENMSIL = new GenMSILPhase(), - GENJAVA = new GenJavaPhase(), - */ GENJVM = new GenJVMPhase(), + GENMSIL = new GenMSILPhase(), TERMINAL = PhaseDescriptor.TERMINAL, }; } @@ -83,11 +79,8 @@ public class PhaseRepository { public final ExpandMixinsPhase EXPANDMIXIN; public final ErasurePhase ERASURE; public final AddConstructorsPhase ADDCONSTRUCTORS; - /* - public final GenMSILPhase GENMSIL; - public final GenJavaPhase GENJAVA; - */ public final GenJVMPhase GENJVM; + public final GenMSILPhase GENMSIL; public final PhaseDescriptor TERMINAL; //######################################################################## |