diff options
author | schinz <schinz@epfl.ch> | 2003-03-24 15:16:24 +0000 |
---|---|---|
committer | schinz <schinz@epfl.ch> | 2003-03-24 15:16:24 +0000 |
commit | e0cfd0011b1694618890baa4dd5fb51a07ebef8b (patch) | |
tree | 2555c961d0c6d7ed552c6c6be208d667c1fd6e40 | |
parent | 51627d9425193af3319e637215c857c7e37e24f7 (diff) | |
download | scala-e0cfd0011b1694618890baa4dd5fb51a07ebef8b.tar.gz scala-e0cfd0011b1694618890baa4dd5fb51a07ebef8b.tar.bz2 scala-e0cfd0011b1694618890baa4dd5fb51a07ebef8b.zip |
- bug fix: moved outerMap to the phase (descrip...
- bug fix: moved outerMap to the phase (descriptor) so that it is
preserved during recompilations
-rw-r--r-- | sources/scalac/transformer/ExplicitOuterClasses.java | 3 | ||||
-rw-r--r-- | sources/scalac/transformer/ExplicitOuterClassesPhase.java | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/sources/scalac/transformer/ExplicitOuterClasses.java b/sources/scalac/transformer/ExplicitOuterClasses.java index aa6a0a4c08..283da9d24c 100644 --- a/sources/scalac/transformer/ExplicitOuterClasses.java +++ b/sources/scalac/transformer/ExplicitOuterClasses.java @@ -28,10 +28,11 @@ import Tree.*; public class ExplicitOuterClasses extends Transformer { // Mapping from class constructor symbols to owner field symbols. - protected HashMap/*<Symbol,Symbol>*/ outerMap = new HashMap(); + protected HashMap/*<Symbol,Symbol>*/ outerMap; public ExplicitOuterClasses(Global global) { super(global); + outerMap = global.PHASE.EXPLICITOUTER.outerMap; } protected Type addValueParam(Type oldType, Symbol newValueParam) { diff --git a/sources/scalac/transformer/ExplicitOuterClassesPhase.java b/sources/scalac/transformer/ExplicitOuterClassesPhase.java index bca4b9a277..c7db77f0ff 100644 --- a/sources/scalac/transformer/ExplicitOuterClassesPhase.java +++ b/sources/scalac/transformer/ExplicitOuterClassesPhase.java @@ -11,8 +11,12 @@ package scalac.transformer; import scalac.*; import scalac.checkers.*; +import java.util.HashMap; public class ExplicitOuterClassesPhase extends PhaseDescriptor { + // Mapping from class constructor symbols to owner field symbols. + public HashMap/*<Symbol,Symbol>*/ outerMap = new HashMap(); + public String name () { return "explicitouterclasses"; } |