- Removed class Phase.

- Removed argument descr in constructors of the class Transformer and of
its subclasses.

5 files changed, 32 insertions, 31 deletions

diff --git a/sources/scalac/ast/SubstTransformer.java b/sources/scalac/ast/SubstTransformer.java
index c7802d20d7..cc9ebfa781 100644
--- a/sources/scalac/ast/SubstTransformer.java
+++ b/sources/scalac/ast/SubstTransformer.java
@@ -2,7 +2,6 @@
 **    / __// __ \/ __// __ \/ ____/    SOcos COmpiles Scala             **
 **  __\_ \/ /_/ / /__/ /_/ /\_ \       (c) 2002, LAMP/EPFL              **
 ** /_____/\____/\___/\____/____/                                        **
-**                                                                      **
 \*                                                                      */
 
 // $OldId: SubstTransformer.java,v 1.3 2002/04/19 10:55:15 schinz Exp $
@@ -45,10 +44,8 @@ public class SubstTransformer extends Transformer {
 
     protected final TreeCopyFactory simpleCopy;
 
-    public SubstTransformer(Global global,
-                            PhaseDescriptor descr,
-                            TreeFactory make) {
-        super(global, descr, make, new TCF(make));
+    public SubstTransformer(Global global, TreeFactory make) {
+        super(global, make, new TCF(make));
         this.simpleCopy = new StrictTreeFactory(make);
 
         ((TCF)copy).setTransformer(this);
diff --git a/sources/scalac/ast/Transformer.java b/sources/scalac/ast/Transformer.java
index a5f49a9f48..0efe0cdace 100644
--- a/sources/scalac/ast/Transformer.java
+++ b/sources/scalac/ast/Transformer.java
@@ -2,10 +2,10 @@
 **    / __// __ \/ __// __ \/ ____/    SOcos COmpiles Scala             **
 **  __\_ \/ /_/ / /__/ /_/ /\_ \       (c) 2002, LAMP/EPFL              **
 ** /_____/\____/\___/\____/____/                                        **
-**                                                                      **
-** $Id$
 \*                                                                      */
 
+// $Id$
+
 package scalac.ast;
 
 import java.io.*;
@@ -22,7 +22,12 @@ import Tree.*;
  *  @author     Matthias Zenger
  *  @version    1.0
  */
-public class Transformer extends Phase {
+public class Transformer {
+
+    /** the global environment
+     */
+    public final Global global;
+
     /** the tree factory
      */
     public final TreeFactory make;
@@ -39,32 +44,33 @@ public class Transformer extends Phase {
 
     /** various constructors
      */
-    public Transformer(Global global, PhaseDescriptor descr) {
-        this(global, descr, global.make, new LazyTreeFactory(global.make));
+    public Transformer(Global global) {
+        this(global, global.make, new LazyTreeFactory(global.make));
     }
 
-    public Transformer(Global global,
-                       PhaseDescriptor descr,
-                       TreeFactory make) {
-        this(global, descr, make, new LazyTreeFactory(make));
+    public Transformer(Global global, TreeFactory make) {
+        this(global, make, new LazyTreeFactory(make));
     }
 
-    public Transformer(Global global,
-                       PhaseDescriptor descr,
-                       TreeFactory make,
-                       TreeCopyFactory copy) {
-        super(global, descr);
+    public Transformer(Global global, TreeFactory make, TreeCopyFactory copy) {
+        this.global = global;
         this.make = make;
         this.copy = copy;
         this.gen = global.treeGen;
     }
 
     public void apply() {
-        super.apply();
+        for (int i = 0; i < global.units.length; i++) {
+            apply(global.units[i]);
+        }
+    }
+
+    public void apply_(Unit[] units) {
+        for (int i = 0; i < units.length; i++) apply(units[i]);
     }
 
     public void apply(Unit unit) {
-	global.log("transforming " + unit);
+	unit.global.log("transforming " + unit);
         unit.body = transform(unit.body);
     }
 
diff --git a/sources/scalac/ast/Tree.java b/sources/scalac/ast/Tree.java
index c873aff874..0c28016253 100644
--- a/sources/scalac/ast/Tree.java
+++ b/sources/scalac/ast/Tree.java
@@ -2,10 +2,10 @@
 **    / __// __ \/ __// __ \/ ____/    SOcos COmpiles Scala             **
 **  __\_ \/ /_/ / /__/ /_/ /\_ \       (c) 2002, LAMP/EPFL              **
 ** /_____/\____/\___/\____/____/                                        **
-**                                                                      **
-** $Id$
 \*                                                                      */
 
+// $Id$
+
 package scalac.ast;
 
 import scalac.ast.printer.*;
@@ -903,7 +903,7 @@ public class Tree {
 
     public static Transformer duplicator =
        new Transformer(
-	    Global.instance, null, Global.instance.make,
+	    Global.instance, Global.instance.make,
 	    new StrictTreeFactory(Global.instance.make));
 
     public Tree duplicate() {
diff --git a/sources/scalac/ast/TreeCopier.java b/sources/scalac/ast/TreeCopier.java
index ad03cd6632..092f7960c2 100644
--- a/sources/scalac/ast/TreeCopier.java
+++ b/sources/scalac/ast/TreeCopier.java
@@ -23,10 +23,8 @@ import java.util.*;
  */
 
 public class TreeCopier extends SubstTransformer {
-    public TreeCopier(Global global,
-                      PhaseDescriptor descr,
-                      TreeFactory make) {
-        super(global, descr, make);
+    public TreeCopier(Global global, TreeFactory make) {
+        super(global, make);
     }
 
     private boolean inPattern = false;
diff --git a/sources/scalac/ast/TreeGen.java b/sources/scalac/ast/TreeGen.java
index 97041847f9..76f9e5c71d 100644
--- a/sources/scalac/ast/TreeGen.java
+++ b/sources/scalac/ast/TreeGen.java
@@ -2,10 +2,10 @@
 **    / __// __ \/ __// __ \/ ____/    SOcos COmpiles Scala             **
 **  __\_ \/ /_/ / /__/ /_/ /\_ \       (c) 2002, LAMP/EPFL              **
 ** /_____/\____/\___/\____/____/                                        **
-**                                                                      **
-** $Id$
 \*                                                                      */
 
+// $Id$
+
 package scalac.ast;
 
 import java.io.*;
@@ -528,7 +528,7 @@ public class TreeGen implements Kinds, Modifiers {
     /** Change owner of all defined symbols from `prevOwner' to `newOwner'
      */
     public Tree changeOwner(Tree tree, final Symbol prevOwner, final Symbol newOwner) {
-	Transformer lifter = new Transformer(global, global.currentPhase) {
+	Transformer lifter = new Transformer(global) {
 	    public Tree transform(Tree tree) {
 		if (TreeInfo.isDefinition(tree)) {
 		    Symbol sym = tree.symbol();