- Removed class Phase.

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

30 files changed, 98 insertions, 154 deletions

diff --git a/sources/scalac/Phase.java b/sources/scalac/Phase.java
index bbce46e013..b0a4efe13f 100644
--- a/sources/scalac/Phase.java
+++ b/sources/scalac/Phase.java
@@ -2,44 +2,6 @@
 **    / __// __ \/ __// __ \/ ____/    SOcos COmpiles Scala             **
 **  __\_ \/ /_/ / /__/ /_/ /\_ \       (c) 2002, LAMP/EPFL              **
 ** /_____/\____/\___/\____/____/                                        **
-**                                                                      **
-** $Id$
 \*                                                                      */
 
-package scalac;
-
-/** Representation of a compiler phase. PhaseDescriptors create
- *  phase. Phases operate subsequently on all compilation units.
- *
- *  @author  Matthias Zenger
- *  @version 1.0
- */
-public abstract class Phase {
-
-    /** the global environment
-     */
-    public final Global global;
-
-    /** the descriptor for this phase
-     */
-    public final PhaseDescriptor descr;
-
-    /** constructor
-     */
-    public Phase(Global global, PhaseDescriptor descr) {
-        this.global = global;
-        this.descr = descr;
-    }
-
-    /** apply this phase to all compilation units
-     */
-    public void apply() {
-        for (int i = 0; i < global.units.length; i++) {
-            apply(global.units[i]);
-        }
-    }
-
-    /** apply this phase to the given compilation unit
-     */
-    public abstract void apply(Unit unit);
-}
+// $Id$
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();
diff --git a/sources/scalac/backend/jvm/GenJVM.java b/sources/scalac/backend/jvm/GenJVM.java
index 60e426e410..e76728903f 100644
--- a/sources/scalac/backend/jvm/GenJVM.java
+++ b/sources/scalac/backend/jvm/GenJVM.java
@@ -2,7 +2,6 @@
 **    / __// __ \/ __// __ \/ ____/    SOcos COmpiles Scala             **
 **  __\_ \/ /_/ / /__/ /_/ /\_ \       (c) 2002, LAMP/EPFL              **
 ** /_____/\____/\___/\____/____/                                        **
-**                                                                      **
 \*                                                                      */
 
 // $OldId: GenJVM.java,v 1.29 2003/02/05 09:32:17 schinz Exp $
@@ -37,17 +36,6 @@ import java.io.*;
  * @author Michel Schinz
  */
 
-public class GenJVM extends Phase {
-    public GenJVM(Global global, PhaseDescriptor descr) {
-	super(global, descr);
-    }
-
-    public void apply(Unit unit) {
-        JVMGenerator gen = new JVMGenerator(global);
-        gen.translate(unit);
-    }
-}
-
 class JVMGenerator {
     protected final static String JAVA_LANG_OBJECT = "java.lang.Object";
     protected final static String JAVA_LANG_STRING = "java.lang.String";
diff --git a/sources/scalac/backend/jvm/GenJVMPhase.java b/sources/scalac/backend/jvm/GenJVMPhase.java
index bdfb7bc02f..553853b732 100644
--- a/sources/scalac/backend/jvm/GenJVMPhase.java
+++ b/sources/scalac/backend/jvm/GenJVMPhase.java
@@ -11,7 +11,6 @@ package scalac.backend.jvm;
 
 import scalac.Global;
 import scalac.Unit;
-import scalac.Phase;
 import scalac.PhaseDescriptor;
 import scalac.ApplicationError;
 
@@ -31,7 +30,9 @@ public class GenJVMPhase extends PhaseDescriptor {
     }
 
     public void apply(Global global) {
-        new GenJVM(global, this).apply();
+        for (int i = 0; i < global.units.length; i++) {
+            new JVMGenerator(global).translate(global.units[i]);
+        }
     }
 
 }
diff --git a/sources/scalac/backend/msil/GenMSIL.java b/sources/scalac/backend/msil/GenMSIL.java
index e126b72216..5d405641d2 100644
--- a/sources/scalac/backend/msil/GenMSIL.java
+++ b/sources/scalac/backend/msil/GenMSIL.java
@@ -2,17 +2,14 @@
 **    / __// __ \/ __// __ \/ ____/    SOcos COmpiles Scala             **
 **  __\_ \/ /_/ / /__/ /_/ /\_ \       (c) 2002, LAMP/EPFL              **
 ** /_____/\____/\___/\____/____/                                        **
-**                                                                      **
-** $Id$
 \*                                                                      */
 
+// $Id$
 
 package scalac.backend.msil;
 
 import scalac.Global;
 import scalac.Unit;
-import scalac.Phase;
-import scalac.PhaseDescriptor;
 import scalac.ApplicationError;
 
 import scalac.util.Debug;
@@ -50,7 +47,7 @@ import java.io.IOException;
  * @author Nikolay Mihaylov
  */
 
-public class GenMSIL extends Phase /*implements Modifiers */ {
+public class GenMSIL /*implements Modifiers */ {
 
     final Map assemblies;
 
@@ -62,6 +59,7 @@ public class GenMSIL extends Phase /*implements Modifiers */ {
 
     ILGenerator code;
 
+    final Global global;
     final TypeCreator tc;
     final Definitions defs;
     final Primitives primitives;
@@ -104,12 +102,12 @@ public class GenMSIL extends Phase /*implements Modifiers */ {
     /**
      */
     public GenMSIL(Global global, GenMSILPhase phase) {
-	super(global, phase);
+        this.global = global;
 	defs = global.definitions;
 	primitives = global.primitives;
 	assemblies = phase.assemblies;
 
-	tc = new TypeCreator(this);
+	tc = new TypeCreator(this, phase);
 	items = new ItemFactory(this);
 
 	currentPackage = defs.ROOT_CLASS; /// ???
@@ -158,7 +156,9 @@ public class GenMSIL extends Phase /*implements Modifiers */ {
 	    tc.traverse(global.units);
 
 	    try {
-		super.apply(); // this invokes apply(Unit) for each Unit
+                for (int i = 0; i < global.units.length; i++) {
+                    apply(global.units[i]);
+                }
 	    } catch (Throwable e) {
 		//log("params: " + params);
 		//log("locals: " + locals);
diff --git a/sources/scalac/backend/msil/GenMSILPhase.java b/sources/scalac/backend/msil/GenMSILPhase.java
index 3156db748d..aa931a693b 100644
--- a/sources/scalac/backend/msil/GenMSILPhase.java
+++ b/sources/scalac/backend/msil/GenMSILPhase.java
@@ -10,7 +10,6 @@ package scalac.backend.msil;
 
 import scalac.Global;
 import scalac.Unit;
-import scalac.Phase;
 import scalac.PhaseDescriptor;
 
 import java.util.HashMap;
diff --git a/sources/scalac/backend/msil/TypeCreator.java b/sources/scalac/backend/msil/TypeCreator.java
index aff49c99fc..e89bff38de 100644
--- a/sources/scalac/backend/msil/TypeCreator.java
+++ b/sources/scalac/backend/msil/TypeCreator.java
@@ -2,10 +2,10 @@
 **    / __// __ \/ __// __ \/ ____/    SOcos COmpiles Scala             **
 **  __\_ \/ /_/ / /__/ /_/ /\_ \       (c) 2002, LAMP/EPFL              **
 ** /_____/\____/\___/\____/____/                                        **
-**                                                                      **
-** $Id$
 \*                                                                      */
 
+// $Id$
+
 package scalac.backend.msil;
 
 import scalac.Global;
@@ -98,12 +98,11 @@ public final class TypeCreator
 	    throw Debug.abort(e); }
     }
 
-    TypeCreator(GenMSIL _gen) {
+    TypeCreator(GenMSIL _gen, GenMSILPhase phase) {
 	gen = _gen;
 	global = gen.global;
 	defs = global.definitions;
 
-	GenMSILPhase phase = (GenMSILPhase) gen.descr;
 	types2symbols = phase.types2symbols;
 	symbols2types = phase.symbols2types;
 	symbols2fields = phase.symbols2fields;
diff --git a/sources/scalac/transformer/AddAccessors.java b/sources/scalac/transformer/AddAccessors.java
index 92d07f4048..54ebc5ab21 100644
--- a/sources/scalac/transformer/AddAccessors.java
+++ b/sources/scalac/transformer/AddAccessors.java
@@ -27,8 +27,8 @@ import java.util.*;
  */
 
 public class AddAccessors extends Transformer {
-    public AddAccessors(Global global, PhaseDescriptor descr) {
-        super(global, descr);
+    public AddAccessors(Global global) {
+        super(global);
     }
 
     protected Name valName(Symbol sym) {
diff --git a/sources/scalac/transformer/AddAccessorsPhase.java b/sources/scalac/transformer/AddAccessorsPhase.java
index 1fdd55a963..646b2c5216 100644
--- a/sources/scalac/transformer/AddAccessorsPhase.java
+++ b/sources/scalac/transformer/AddAccessorsPhase.java
@@ -28,7 +28,7 @@ public class AddAccessorsPhase extends PhaseDescriptor {
     }
 
     public void apply(Global global) {
-        new AddAccessors(global, this).apply();
+        new AddAccessors(global).apply();
     }
 
     public Checker[] postCheckers(Global global) {
diff --git a/sources/scalac/transformer/AddConstructors.java b/sources/scalac/transformer/AddConstructors.java
index 24d248a200..6e69d191c3 100644
--- a/sources/scalac/transformer/AddConstructors.java
+++ b/sources/scalac/transformer/AddConstructors.java
@@ -2,7 +2,6 @@
 **    / __// __ \/ __// __ \/ ____/    SOcos COmpiles Scala             **
 **  __\_ \/ /_/ / /__/ /_/ /\_ \       (c) 2002, LAMP/EPFL              **
 ** /_____/\____/\___/\____/____/                                        **
-**                                                                      **
 \*                                                                      */
 
 // $Id$
@@ -59,10 +58,8 @@ public class AddConstructors extends Transformer {
 
     final HashMap constructors;
 
-    public AddConstructors(Global global,
-			   AddConstructorsPhase descr,
-			   HashMap constructors) {
-	super(global, descr);
+    public AddConstructors(Global global, HashMap constructors) {
+	super(global);
         this.constructors = constructors;
         this.forINT = global.target == global.TARGET_INT;
         this.forJVM = global.target == global.TARGET_JVM;
diff --git a/sources/scalac/transformer/AddConstructorsPhase.java b/sources/scalac/transformer/AddConstructorsPhase.java
index 73f8f652fd..cdec3707d0 100644
--- a/sources/scalac/transformer/AddConstructorsPhase.java
+++ b/sources/scalac/transformer/AddConstructorsPhase.java
@@ -13,7 +13,6 @@ import java.util.HashMap;
 
 import scalac.checkers.*;
 import scalac.Global;
-import scalac.Phase;
 import scalac.PhaseDescriptor;
 
 public class AddConstructorsPhase extends PhaseDescriptor {
@@ -35,7 +34,7 @@ public class AddConstructorsPhase extends PhaseDescriptor {
     }
 
     public void apply(Global global) {
-	new AddConstructors(global, this, constructors).apply();
+	new AddConstructors(global, constructors).apply();
     }
 
     public Checker[] postCheckers(Global global) {
diff --git a/sources/scalac/transformer/AddInterfaces.java b/sources/scalac/transformer/AddInterfaces.java
index 699bf8d5f2..16b06bdf3e 100644
--- a/sources/scalac/transformer/AddInterfaces.java
+++ b/sources/scalac/transformer/AddInterfaces.java
@@ -2,7 +2,6 @@
 **    / __// __ \/ __// __ \/ ____/    SOcos COmpiles Scala             **
 **  __\_ \/ /_/ / /__/ /_/ /\_ \       (c) 2002, LAMP/EPFL              **
 ** /_____/\____/\___/\____/____/                                        **
-**                                                                      **
 \*                                                                      */
 
 // $OldId: AddInterfaces.java,v 1.40 2002/11/08 11:56:47 schinz Exp $
@@ -55,7 +54,7 @@ class AddInterfaces extends SubstTransformer {
     protected final Set/*<Symbol>*/ createdIFaces = new HashSet();
 
     public AddInterfaces(Global global, AddInterfacesPhase descr) {
-        super(global, descr, global.make);
+        super(global, global.make);
         classToInterface = descr.classToInterface;
         ifaceToClass = descr.interfaceToClass;
         ifaceMemberToClass = descr.ifaceMemberToClass;
diff --git a/sources/scalac/transformer/Erasure.java b/sources/scalac/transformer/Erasure.java
index ff85abd395..57af173e9b 100644
--- a/sources/scalac/transformer/Erasure.java
+++ b/sources/scalac/transformer/Erasure.java
@@ -12,7 +12,6 @@ package scalac.transformer;
 import java.util.HashMap;
 
 import scalac.Global;
-import scalac.PhaseDescriptor;
 import scalac.Unit;
 import scalac.ast.Tree;
 import scalac.ast.Tree.Template;
@@ -54,8 +53,8 @@ public class Erasure extends Transformer implements Modifiers {
 
     private Unit unit;
 
-    public Erasure(Global global, PhaseDescriptor descr) {
-        super(global, descr);
+    public Erasure(Global global) {
+        super(global);
 	this.global = global;
 	this.definitions = global.definitions;
         this.primitives = global.primitives;
diff --git a/sources/scalac/transformer/ErasurePhase.java b/sources/scalac/transformer/ErasurePhase.java
index 20d641c994..02a4da8d8e 100644
--- a/sources/scalac/transformer/ErasurePhase.java
+++ b/sources/scalac/transformer/ErasurePhase.java
@@ -13,7 +13,6 @@ package scalac.transformer;
 //import scala.compiler.typechecker.*;
 
 import scalac.Global;
-import scalac.Phase;
 import scalac.PhaseDescriptor;
 import scalac.checkers.Checker;
 import scalac.checkers.CheckOwners;
@@ -45,7 +44,7 @@ public class ErasurePhase extends PhaseDescriptor {
 
     public void apply(Global global) {
 	this.definitions = global.definitions;
-        new Erasure(global, this).apply();
+        new Erasure(global).apply();
     }
 
     private Type eraseParams(Type tp) {
diff --git a/sources/scalac/transformer/ExpandMixins.java b/sources/scalac/transformer/ExpandMixins.java
index 27886f8d68..19984b4b61 100644
--- a/sources/scalac/transformer/ExpandMixins.java
+++ b/sources/scalac/transformer/ExpandMixins.java
@@ -43,7 +43,7 @@ public class ExpandMixins extends Transformer {
     protected final Definitions defs;
 
     public ExpandMixins(Global global, ExpandMixinsPhase descr) {
-        super(global, descr);
+        super(global);
         defs = global.definitions;
 
         classToInterface = global.PHASE.ADDINTERFACES.classToInterface;
@@ -53,7 +53,7 @@ public class ExpandMixins extends Transformer {
 
         freshNameCreator = global.freshNameCreator;
 
-        treeCopier = new TreeCopier(global, descr, global.make) {
+        treeCopier = new TreeCopier(global, global.make) {
                 // Substitute symbols refering to this class only.
                 public boolean mustSubstituteSymbol(Tree tree) {
                     switch (tree) {
@@ -304,7 +304,7 @@ public class ExpandMixins extends Transformer {
 	}
 
         // Use correct symbols for mixed-in members.
-        SymbolFixer symbolFixer = new SymbolFixer(global, descr, mixedInSymbols);
+        SymbolFixer symbolFixer = new SymbolFixer(global, mixedInSymbols);
         Tree[] fixedBody =
             symbolFixer.transform((Tree[])newBody.toArray(new Tree[newBody.size()]));
         Template newTree = make.Template(tree.pos, newBaseClasses, fixedBody);
@@ -395,8 +395,8 @@ public class ExpandMixins extends Transformer {
     protected static class SymbolFixer extends Transformer {
         protected final Map/*<Symbol,Symbol>*/ mixedInSymbols;
 
-        public SymbolFixer(Global global, PhaseDescriptor descr, Map mixedInSymbols) {
-            super(global, descr);
+        public SymbolFixer(Global global, Map mixedInSymbols) {
+            super(global);
             this.mixedInSymbols = mixedInSymbols;
         }
 
diff --git a/sources/scalac/transformer/ExplicitOuterClasses.java b/sources/scalac/transformer/ExplicitOuterClasses.java
index fd2622ba72..aa6a0a4c08 100644
--- a/sources/scalac/transformer/ExplicitOuterClasses.java
+++ b/sources/scalac/transformer/ExplicitOuterClasses.java
@@ -30,8 +30,8 @@ public class ExplicitOuterClasses extends Transformer {
     // Mapping from class constructor symbols to owner field symbols.
     protected HashMap/*<Symbol,Symbol>*/ outerMap = new HashMap();
 
-    public ExplicitOuterClasses(Global global, PhaseDescriptor descr) {
-        super(global, descr);
+    public ExplicitOuterClasses(Global global) {
+        super(global);
     }
 
     protected Type addValueParam(Type oldType, Symbol newValueParam) {
diff --git a/sources/scalac/transformer/ExplicitOuterClassesPhase.java b/sources/scalac/transformer/ExplicitOuterClassesPhase.java
index 4f6692c33e..bca4b9a277 100644
--- a/sources/scalac/transformer/ExplicitOuterClassesPhase.java
+++ b/sources/scalac/transformer/ExplicitOuterClassesPhase.java
@@ -26,7 +26,7 @@ public class ExplicitOuterClassesPhase extends PhaseDescriptor {
     }
 
     public void apply(Global global) {
-        new ExplicitOuterClasses(global, this).apply();
+        new ExplicitOuterClasses(global).apply();
     }
 
     public Checker[] postCheckers(Global global) {
diff --git a/sources/scalac/transformer/LambdaLift.java b/sources/scalac/transformer/LambdaLift.java
index 48f1edf66a..ad1940bb99 100644
--- a/sources/scalac/transformer/LambdaLift.java
+++ b/sources/scalac/transformer/LambdaLift.java
@@ -2,10 +2,10 @@
 **    / __// __ \/ __// __ \/ ____/    SOcos COmpiles Scala             **
 **  __\_ \/ /_/ / /__/ /_/ /\_ \       (c) 2002, LAMP/EPFL              **
 ** /_____/\____/\___/\____/____/                                        **
-**                                                                      **
-** $Id$
 \*                                                                      */
 
+// $Id$
+
 package scalac.transformer;
 
 import java.io.*;
@@ -40,10 +40,10 @@ public class LambdaLift extends OwnerTransformer
     final LambdaLiftPhase descr;
 
     public LambdaLift(Global global, LambdaLiftPhase descr) {
-        super(global, descr);
+        super(global);
 	this.global = global;
 	this.definitions = global.definitions;
-	this.free = new FreeVars(global, descr);
+	this.free = new FreeVars(global);
 	this.descr = descr;
     }
 
@@ -84,8 +84,8 @@ public class LambdaLift extends OwnerTransformer
 
 	private Unit unit;
 
-	public FreeVars(Global global, PhaseDescriptor descr) {
-	    super(global, descr);
+	public FreeVars(Global global) {
+	    super(global);
 	}
 
 	/** A hashtable storing free variables of functions and class constructors.
diff --git a/sources/scalac/transformer/OwnerTransformer.java b/sources/scalac/transformer/OwnerTransformer.java
index d54bf12544..0ac1c2abac 100644
--- a/sources/scalac/transformer/OwnerTransformer.java
+++ b/sources/scalac/transformer/OwnerTransformer.java
@@ -2,10 +2,10 @@
 **    / __// __ \/ __// __ \/ ____/    SOcos COmpiles Scala             **
 **  __\_ \/ /_/ / /__/ /_/ /\_ \       (c) 2002, LAMP/EPFL              **
 ** /_____/\____/\___/\____/____/                                        **
-**                                                                      **
-** $Id$
 \*                                                                      */
 
+// $Id$
+
 package scalac.transformer;
 
 import java.io.*;
@@ -26,8 +26,8 @@ public class OwnerTransformer extends Transformer {
 
     protected Symbol currentOwner;
 
-    public OwnerTransformer(Global global, PhaseDescriptor descr) {
-        super(global, descr);
+    public OwnerTransformer(Global global) {
+        super(global);
     }
 
     public void apply(Unit unit) {
diff --git a/sources/scalac/transformer/TransMatch.java b/sources/scalac/transformer/TransMatch.java
index 5f8f005c2e..d986ffaf4f 100644
--- a/sources/scalac/transformer/TransMatch.java
+++ b/sources/scalac/transformer/TransMatch.java
@@ -2,10 +2,10 @@
 **    / __// __ \/ __// __ \/ ____/    SOcos COmpiles Scala             **
 **  __\_ \/ /_/ / /__/ /_/ /\_ \       (c) 2002, LAMP/EPFL              **
 ** /_____/\____/\___/\____/____/                                        **
-**                                                                      **
-** $Id$
 \*                                                                      */
 
+// $Id$
+
 package scalac.transformer;
 
 import java.io.*;
@@ -34,8 +34,8 @@ public class TransMatch extends OwnerTransformer {
      */
     Infer infer;
 
-    public TransMatch(Global global, PhaseDescriptor descr) {
-        super(global, descr);
+    public TransMatch(Global global) {
+        super(global);
     }
 
     public void apply(Unit unit) {
@@ -49,7 +49,7 @@ public class TransMatch extends OwnerTransformer {
         for (int i = 0; i < cases.length; i++)
             pm.enter(cases[i]);
         if (global.log()) {
-            System.out.println("[log " + descr.name() + "] internal pattern matching structure");
+            global.log("internal pattern matching structure");
             pm.print();
         }
         return pm.toTree();
diff --git a/sources/scalac/transformer/TransMatchPhase.java b/sources/scalac/transformer/TransMatchPhase.java
index d5be21b9fe..f599033efb 100644
--- a/sources/scalac/transformer/TransMatchPhase.java
+++ b/sources/scalac/transformer/TransMatchPhase.java
@@ -26,7 +26,7 @@ public class TransMatchPhase extends PhaseDescriptor {
     }
 
     public void apply(Global global) {
-        new TransMatch(global, this).apply();
+        new TransMatch(global).apply();
     }
 
     public Checker[] postCheckers(Global global) {
diff --git a/sources/scalac/transformer/UnCurry.java b/sources/scalac/transformer/UnCurry.java
index 4995a82286..aba9ef8966 100644
--- a/sources/scalac/transformer/UnCurry.java
+++ b/sources/scalac/transformer/UnCurry.java
@@ -2,10 +2,10 @@
 **    / __// __ \/ __// __ \/ ____/    SOcos COmpiles Scala             **
 **  __\_ \/ /_/ / /__/ /_/ /\_ \       (c) 2002, LAMP/EPFL              **
 ** /_____/\____/\___/\____/____/                                        **
-**                                                                      **
-** $Id$
 \*                                                                      */
 
+// $Id$
+
 package scalac.transformer;
 
 import java.io.*;
@@ -24,7 +24,7 @@ public class UnCurry extends OwnerTransformer
     UnCurryPhase descr;
 
     public UnCurry(Global global, UnCurryPhase descr) {
-        super(global, descr);
+        super(global);
 	this.descr = descr;
     }
 
diff --git a/sources/scalac/typechecker/Analyzer.java b/sources/scalac/typechecker/Analyzer.java
index 0c24bd31b5..7acd13a988 100644
--- a/sources/scalac/typechecker/Analyzer.java
+++ b/sources/scalac/typechecker/Analyzer.java
@@ -2,10 +2,10 @@
 **    / __// __ \/ __// __ \/ ____/    SOcos COmpiles Scala             **
 **  __\_ \/ /_/ / /__/ /_/ /\_ \       (c) 2002, LAMP/EPFL              **
 ** /_____/\____/\___/\____/____/                                        **
-**
-** $Id$
 \*                                                                      */
 
+// $Id$
+
 // todo: (0) propagate target type in cast.
 // todo: (1) check that only stable defs override stable defs
 // todo: eliminate Typed nodes.
@@ -28,7 +28,7 @@ public class Analyzer extends Transformer implements Modifiers, Kinds {
     final Infer infer;
 
     public Analyzer(Global global, AnalyzerPhase descr) {
-        super(global, descr);
+        super(global);
         this.definitions = global.definitions;
 	this.descr = descr;
 	this.infer = new Infer(this);
diff --git a/sources/scalac/typechecker/Infer.java b/sources/scalac/typechecker/Infer.java
index 8c550c9687..10cd793f3e 100644
--- a/sources/scalac/typechecker/Infer.java
+++ b/sources/scalac/typechecker/Infer.java
@@ -2,10 +2,10 @@
 **    / __// __ \/ __// __ \/ ____/    SOcos COmpiles Scala             **
 **  __\_ \/ /_/ / /__/ /_/ /\_ \       (c) 2002, LAMP/EPFL              **
 ** /_____/\____/\___/\____/____/                                        **
-**
-** $Id$
 \*                                                                      */
 
+// $Id$
+
 package scalac.typechecker;
 
 import scalac.Global;
@@ -28,7 +28,7 @@ public class Infer implements Modifiers, Kinds {
 	this.definitions = global.definitions;
 	this.gen = trans.gen;
 	this.make = trans.make;
-	this.substituter = new Substituter(global, trans.descr, gen);
+	this.substituter = new Substituter(global, gen);
     }
 
 // Error messages -------------------------------------------------------------
@@ -87,8 +87,8 @@ public class Infer implements Modifiers, Kinds {
 	TreeGen gen;
 	Type.SubstTypeMap typeSubstituter;
 
-	public Substituter(Global global, PhaseDescriptor descr, TreeGen gen) {
-	    super(global, descr);
+	public Substituter(Global global, TreeGen gen) {
+	    super(global);
 	    this.gen = gen;
 	}
 
diff --git a/sources/scalac/typechecker/RefCheck.java b/sources/scalac/typechecker/RefCheck.java
index e2bcf4e027..af02095030 100644
--- a/sources/scalac/typechecker/RefCheck.java
+++ b/sources/scalac/typechecker/RefCheck.java
@@ -2,9 +2,10 @@
 **    / __// __ \/ __// __ \/ ____/    SOcos COmpiles Scala             **
 **  __\_ \/ /_/ / /__/ /_/ /\_ \       (c) 2002, LAMP/EPFL              **
 ** /_____/\____/\___/\____/____/                                        **
-**
-** $Id$
 \*                                                                      */
+
+// $Id$
+
 // todo: Any cannot be inherited.
 // todo: check that only stable defs override stable defs
 // todo: admit vardefs w/o rhs
@@ -25,8 +26,8 @@ import Tree.*;
  */
 public class RefCheck extends Transformer implements Modifiers, Kinds {
 
-    public RefCheck(Global global, RefCheckPhase descr) {
-        super(global, descr);
+    public RefCheck(Global global) {
+        super(global);
     }
 
     private Unit unit;
diff --git a/sources/scalac/typechecker/RefCheckPhase.java b/sources/scalac/typechecker/RefCheckPhase.java
index 90179e719c..d1d93501e9 100644
--- a/sources/scalac/typechecker/RefCheckPhase.java
+++ b/sources/scalac/typechecker/RefCheckPhase.java
@@ -27,7 +27,7 @@ public class RefCheckPhase extends PhaseDescriptor {
     }
 
     public void apply(Global global) {
-	new RefCheck(global, this).apply();
+	new RefCheck(global).apply();
     }
 
     public Checker[] postCheckers(Global global) {