diff options
| author | schinz <schinz@epfl.ch> | 2003-02-19 14:21:16 +0000 |
|---|---|---|
| committer | schinz <schinz@epfl.ch> | 2003-02-19 14:21:16 +0000 |
| commit | affdf7ee9c4ad49ffe02cb9092315cd16610ab70 (patch) | |
| tree | 9c85adfddf35968c22f00cacbf2a6cd74e6fddfb | |
| parent | b8509a08f1d8b836f3925bed2cdf781c82fa7c20 (diff) | |
| download | scala-affdf7ee9c4ad49ffe02cb9092315cd16610ab70.tar.gz scala-affdf7ee9c4ad49ffe02cb9092315cd16610ab70.tar.bz2 scala-affdf7ee9c4ad49ffe02cb9092315cd16610ab70.zip | |
- added GenJVM phase
| -rw-r--r-- | config/list/compiler.lst | 2 | ||||
| -rw-r--r-- | sources/scalac/Global.java | 2 | ||||
| -rw-r--r-- | sources/scalac/PhaseRepository.java | 6 |
3 files changed, 6 insertions, 4 deletions
diff --git a/config/list/compiler.lst b/config/list/compiler.lst index 447279a9ad..ef484d069c 100644 --- a/config/list/compiler.lst +++ b/config/list/compiler.lst @@ -39,6 +39,8 @@ ast/printer/TreePrinter.java backend/Primitive.java backend/Primitives.java +backend/jvm/GenJVMPhase.java +backend/jvm/GenJVM.java checkers/CheckOwners.java checkers/CheckSymbols.java diff --git a/sources/scalac/Global.java b/sources/scalac/Global.java index 897f0d16f3..cee6072dc8 100644 --- a/sources/scalac/Global.java +++ b/sources/scalac/Global.java @@ -192,8 +192,8 @@ public class Global { } if (target == TARGET_JAVA) phases.add(PHASE.GENJAVA); if (target == TARGET_MSIL) phases.add(PHASE.GENMSIL); - if (target == TARGET_JVM) phases.add(PHASE.GENJVM); */ + if (target == TARGET_JVM) phases.add(PHASE.GENJVM); phases.add(PHASE.TERMINAL); this.phases = new PhaseDescriptor[phases.size()]; for (int i = 0; i < phases.size(); i++) { diff --git a/sources/scalac/PhaseRepository.java b/sources/scalac/PhaseRepository.java index f2bd41e58e..218decea03 100644 --- a/sources/scalac/PhaseRepository.java +++ b/sources/scalac/PhaseRepository.java @@ -25,9 +25,9 @@ import scalac.transformer.ErasurePhase; import scalac.optimizer.OptimizePhase; import scalac.backend.AddConstructorsPhase; import scalac.backend.msil.GenMSILPhase; -import scalac.backend.jvm.GenJVMPhase; import scalac.jaco.GenJavaPhase; */ +import scalac.backend.jvm.GenJVMPhase; public class PhaseRepository { @@ -60,8 +60,8 @@ public class PhaseRepository { ADDCONSTRUCTORS = new AddConstructorsPhase(), GENMSIL = new GenMSILPhase(), GENJAVA = new GenJavaPhase(), - GENJVM = new GenJVMPhase(), */ + GENJVM = new GenJVMPhase(), TERMINAL = PhaseDescriptor.TERMINAL, }; } @@ -88,8 +88,8 @@ public class PhaseRepository { public final AddConstructorsPhase ADDCONSTRUCTORS; public final GenMSILPhase GENMSIL; public final GenJavaPhase GENJAVA; - public final GenJVMPhase GENJVM; */ + public final GenJVMPhase GENJVM; public final PhaseDescriptor TERMINAL; //######################################################################## |