diff options
| -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 73589ee7cc..8db343077f 100644 --- a/config/list/compiler.lst +++ b/config/list/compiler.lst @@ -59,6 +59,8 @@ symtab/Symbol.java symtab/Type.java symtab/TypeTags.java +transformer/ExplicitOuterClasses.java +transformer/ExplicitOuterClassesPhase.java transformer/LambdaLift.java transformer/LambdaLiftPhase.java transformer/OwnerTransformer.java diff --git a/sources/scalac/Global.java b/sources/scalac/Global.java index 3c3d73c0e6..7486d14094 100644 --- a/sources/scalac/Global.java +++ b/sources/scalac/Global.java @@ -180,8 +180,8 @@ public class Global { phases.add(PHASE.TRANSMATCH); */ //phases.add(PHASE.LAMBDALIFT); - /* phases.add(PHASE.EXPLICITOUTER); + /* phases.add(PHASE.ADDACCESSORS); phases.add(PHASE.ADDINTERFACES); phases.add(PHASE.EXPANDMIXIN); diff --git a/sources/scalac/PhaseRepository.java b/sources/scalac/PhaseRepository.java index 4b7e3d4343..5151767cfb 100644 --- a/sources/scalac/PhaseRepository.java +++ b/sources/scalac/PhaseRepository.java @@ -16,8 +16,8 @@ import scalac.transformer.UnCurryPhase; import scalac.transformer.TransMatchPhase; */ import scalac.transformer.LambdaLiftPhase; -/* import scalac.transformer.ExplicitOuterClassesPhase; +/* import scalac.transformer.AddInterfacesPhase; import scalac.transformer.AddAccessorsPhase; import scalac.transformer.ExpandMixinsPhase; @@ -51,8 +51,8 @@ public class PhaseRepository { TRANSMATCH = new TransMatchPhase(), */ LAMBDALIFT = new LambdaLiftPhase(), - /* EXPLICITOUTER = new ExplicitOuterClassesPhase(), + /* ADDACCESSORS = new AddAccessorsPhase(), ADDINTERFACES = new AddInterfacesPhase(), EXPANDMIXIN = new ExpandMixinsPhase(), @@ -79,8 +79,8 @@ public class PhaseRepository { public final TransMatchPhase TRANSMATCH; */ public final LambdaLiftPhase LAMBDALIFT; - /* public final ExplicitOuterClassesPhase EXPLICITOUTER; + /* public final AddAccessorsPhase ADDACCESSORS; public final AddInterfacesPhase ADDINTERFACES; public final ExpandMixinsPhase EXPANDMIXIN; |