diff options
author | paltherr <paltherr@epfl.ch> | 2003-02-21 10:32:09 +0000 |
---|---|---|
committer | paltherr <paltherr@epfl.ch> | 2003-02-21 10:32:09 +0000 |
commit | bde5d217156ae7c494c19f3c11b589cd6fd4150c (patch) | |
tree | 3b310266b2015a36a00dc42f0b37246b0393f67a /sources | |
parent | c00e8c765a48fd5f568c1fbabfd88ab98ec6815c (diff) | |
download | scala-bde5d217156ae7c494c19f3c11b589cd6fd4150c.tar.gz scala-bde5d217156ae7c494c19f3c11b589cd6fd4150c.tar.bz2 scala-bde5d217156ae7c494c19f3c11b589cd6fd4150c.zip |
- Inserted erasure phase
Diffstat (limited to 'sources')
-rw-r--r-- | sources/scalac/Global.java | 2 | ||||
-rw-r--r-- | sources/scalac/PhaseRepository.java | 13 |
2 files changed, 8 insertions, 7 deletions
diff --git a/sources/scalac/Global.java b/sources/scalac/Global.java index 6cfcb77ba5..e4fea8429d 100644 --- a/sources/scalac/Global.java +++ b/sources/scalac/Global.java @@ -184,8 +184,8 @@ public class Global { phases.add(PHASE.ADDACCESSORS); phases.add(PHASE.ADDINTERFACES); phases.add(PHASE.EXPANDMIXIN); - /* phases.add(PHASE.ERASURE); + /* if (target == TARGET_INT || target == TARGET_MSIL || target == TARGET_JVM) { phases.add(PHASE.ADDCONSTRUCTORS); } diff --git a/sources/scalac/PhaseRepository.java b/sources/scalac/PhaseRepository.java index 75dd0068ef..18c08e9d35 100644 --- a/sources/scalac/PhaseRepository.java +++ b/sources/scalac/PhaseRepository.java @@ -18,8 +18,8 @@ import scalac.transformer.ExplicitOuterClassesPhase; import scalac.transformer.AddAccessorsPhase; import scalac.transformer.AddInterfacesPhase; import scalac.transformer.ExpandMixinsPhase; -/* import scalac.transformer.ErasurePhase; +/* import scalac.optimizer.OptimizePhase; import scalac.backend.AddConstructorsPhase; import scalac.backend.msil.GenMSILPhase; @@ -45,16 +45,16 @@ public class PhaseRepository { REFCHECK = new RefCheckPhase(), UNCURRY = new UnCurryPhase(), /* - OPTIMIZE = new OptimizePhase(), */ + OPTIMIZE = new OptimizePhase(), + */ TRANSMATCH = new TransMatchPhase(), - LAMBDALIFT = new LambdaLiftPhase(), EXPLICITOUTER = new ExplicitOuterClassesPhase(), ADDACCESSORS = new AddAccessorsPhase(), ADDINTERFACES = new AddInterfacesPhase(), EXPANDMIXIN = new ExpandMixinsPhase(), - /* ERASURE = new ErasurePhase(), + /* ADDCONSTRUCTORS = new AddConstructorsPhase(), GENMSIL = new GenMSILPhase(), GENJAVA = new GenJavaPhase(), @@ -73,15 +73,16 @@ public class PhaseRepository { public final RefCheckPhase REFCHECK; public final UnCurryPhase UNCURRY; /* - public final OptimizePhase OPTIMIZE; */ + public final OptimizePhase OPTIMIZE; + */ public final TransMatchPhase TRANSMATCH; public final LambdaLiftPhase LAMBDALIFT; public final ExplicitOuterClassesPhase EXPLICITOUTER; public final AddAccessorsPhase ADDACCESSORS; public final AddInterfacesPhase ADDINTERFACES; public final ExpandMixinsPhase EXPANDMIXIN; - /* public final ErasurePhase ERASURE; + /* public final AddConstructorsPhase ADDCONSTRUCTORS; public final GenMSILPhase GENMSIL; public final GenJavaPhase GENJAVA; |