From 66ca81e66f3b07f457e8f73d627045105e26b265 Mon Sep 17 00:00:00 2001
From: schinz <schinz@epfl.ch>
Date: Wed, 19 Feb 2003 10:00:36 +0000
Subject: - added phases AddInterfaces and ExpandMixins

---
 config/list/compiler.lst            | 8 ++++++++
 sources/scalac/Global.java          | 2 +-
 sources/scalac/PhaseRepository.java | 6 +++---
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/config/list/compiler.lst b/config/list/compiler.lst
index 8bc9ad98de..4f23b73238 100644
--- a/config/list/compiler.lst
+++ b/config/list/compiler.lst
@@ -21,9 +21,12 @@ ast/parser/TokenData.java
 ast/parser/Tokens.java
 ast/AbstractTreeCopyFactory.java
 ast/LazyTreeFactory.java
+ast/StrictTreeFactory.java
+ast/SubstTransformer.java
 ast/Transformer.java
 ast/Traverser.java
 ast/Tree.java
+ast/TreeCopier.java
 ast/TreeCopyFactory.java
 ast/TreeCreator.java
 ast/TreeFactory.java
@@ -56,13 +59,18 @@ symtab/Scope.java
 symtab/SourceCompleter.java
 symtab/SymSet.java
 symtab/Symbol.java
+symtab/SymbolMapApplier.java
 symtab/Type.java
 symtab/TypeTags.java
 
 transformer/AddAccessors.java
 transformer/AddAccessorsPhase.java
+transformer/AddInterfaces.java
+transformer/AddInterfacesPhase.java
 transformer/ExplicitOuterClasses.java
 transformer/ExplicitOuterClassesPhase.java
+transformer/ExpandMixins.java
+transformer/ExpandMixinsPhase.java
 transformer/LambdaLift.java
 transformer/LambdaLiftPhase.java
 transformer/OwnerTransformer.java
diff --git a/sources/scalac/Global.java b/sources/scalac/Global.java
index 455384821d..5024c0853b 100644
--- a/sources/scalac/Global.java
+++ b/sources/scalac/Global.java
@@ -182,9 +182,9 @@ public class  Global {
         //phases.add(PHASE.LAMBDALIFT);
         phases.add(PHASE.EXPLICITOUTER);
         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 ee46ed0323..f2bd41e58e 100644
--- a/sources/scalac/PhaseRepository.java
+++ b/sources/scalac/PhaseRepository.java
@@ -18,9 +18,9 @@ import scalac.transformer.TransMatchPhase;
 import scalac.transformer.LambdaLiftPhase;
 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;
@@ -53,9 +53,9 @@ public class PhaseRepository {
             LAMBDALIFT = new LambdaLiftPhase(),
             EXPLICITOUTER = new ExplicitOuterClassesPhase(),
             ADDACCESSORS = new AddAccessorsPhase(),
-	    /*
             ADDINTERFACES = new AddInterfacesPhase(),
             EXPANDMIXIN = new ExpandMixinsPhase(),
+	    /*
             ERASURE = new ErasurePhase(),
             ADDCONSTRUCTORS = new AddConstructorsPhase(),
             GENMSIL = new GenMSILPhase(),
@@ -81,9 +81,9 @@ public class PhaseRepository {
     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;
-- 
cgit v1.2.3