*** empty log message ***

26 files changed, 48 insertions, 48 deletions

diff --git a/sources/scalac/transformer/AddAccessorsPhase.java b/sources/scalac/transformer/AddAccessorsPhase.java
index c33c405c25..e1a4e4e278 100644
--- a/sources/scalac/transformer/AddAccessorsPhase.java
+++ b/sources/scalac/transformer/AddAccessorsPhase.java
@@ -15,7 +15,7 @@ import java.util.HashMap;
 import scalac.Global;
 import scalac.Phase;
 import scalac.PhaseDescriptor;
-import scalac.Unit;
+import scalac.CompilationUnit;
 import scalac.ast.Transformer;
 import scalac.ast.Tree;
 import scalac.ast.Tree.Template;
@@ -46,7 +46,7 @@ public class AddAccessorsPhase extends Phase {
     // Public Methods
 
     /** Applies this phase to the given compilation units. */
-    public void apply(Unit[] units) {
+    public void apply(CompilationUnit[] units) {
         treeTransformer.apply(units);
     }
 
diff --git a/sources/scalac/transformer/AddConstructorsPhase.java b/sources/scalac/transformer/AddConstructorsPhase.java
index 0e72320509..a60842da9f 100644
--- a/sources/scalac/transformer/AddConstructorsPhase.java
+++ b/sources/scalac/transformer/AddConstructorsPhase.java
@@ -14,7 +14,7 @@ import java.util.HashMap;
 import scalac.Global;
 import scalac.Phase;
 import scalac.PhaseDescriptor;
-import scalac.Unit;
+import scalac.CompilationUnit;
 import scalac.symtab.Symbol;
 import scalac.symtab.Type;
 import scalac.util.Debug;
@@ -55,7 +55,7 @@ public class AddConstructorsPhase extends Phase {
     }
 
     /** Applies this phase to the given compilation units. */
-    public void apply(Unit[] units) {
+    public void apply(CompilationUnit[] units) {
         for (int i = 0; i < units.length; i++)
             new AddConstructors(global, constructors).apply(units[i]);
     }
diff --git a/sources/scalac/transformer/AddInterfacesPhase.java b/sources/scalac/transformer/AddInterfacesPhase.java
index 396d3cf238..9b7ebf6675 100644
--- a/sources/scalac/transformer/AddInterfacesPhase.java
+++ b/sources/scalac/transformer/AddInterfacesPhase.java
@@ -25,7 +25,7 @@ public class AddInterfacesPhase extends Phase {
     }
 
     /** Applies this phase to the given compilation units. */
-    public void apply(Unit[] units) {
+    public void apply(CompilationUnit[] units) {
         for (int i = 0; i < units.length; i++)
             new AddInterfaces(global, this).apply(units[i]);
     }
diff --git a/sources/scalac/transformer/Erasure.java b/sources/scalac/transformer/Erasure.java
index e78de5d343..4189834d1b 100644
--- a/sources/scalac/transformer/Erasure.java
+++ b/sources/scalac/transformer/Erasure.java
@@ -17,7 +17,7 @@ import java.util.HashSet;
 
 import scalac.Global;
 import scalac.Phase;
-import scalac.Unit;
+import scalac.CompilationUnit;
 import scalac.ast.Tree;
 import scalac.ast.Tree.Ident;
 import scalac.ast.Tree.Template;
@@ -82,7 +82,7 @@ public class Erasure extends GenTransformer implements Modifiers {
     private final Primitives primitives;
 
     /** The current unit */
-    private Unit unit;
+    private CompilationUnit unit;
 
     private final boolean forMSIL;
 
@@ -101,7 +101,7 @@ public class Erasure extends GenTransformer implements Modifiers {
     // Public Methods
 
     /** Transforms the given unit. */
-    public void apply(Unit unit) {
+    public void apply(CompilationUnit unit) {
 	this.unit = unit;
 	super.apply(unit);
     }
diff --git a/sources/scalac/transformer/ErasurePhase.java b/sources/scalac/transformer/ErasurePhase.java
index 5fccaf4659..0f114aa771 100644
--- a/sources/scalac/transformer/ErasurePhase.java
+++ b/sources/scalac/transformer/ErasurePhase.java
@@ -12,7 +12,7 @@ package scalac.transformer;
 import scalac.Global;
 import scalac.Phase;
 import scalac.PhaseDescriptor;
-import scalac.Unit;
+import scalac.CompilationUnit;
 import scalac.backend.Primitive;
 import scalac.backend.Primitives;
 import scalac.checkers.Checker;
@@ -48,7 +48,7 @@ public class ErasurePhase extends Phase {
     //########################################################################
     // Public Methods
 
-    public void apply(Unit[] units) {
+    public void apply(CompilationUnit[] units) {
         erasure.apply(units);
     }
 
diff --git a/sources/scalac/transformer/ExpandMixinsPhase.java b/sources/scalac/transformer/ExpandMixinsPhase.java
index 410a19f56a..e43ed7b975 100644
--- a/sources/scalac/transformer/ExpandMixinsPhase.java
+++ b/sources/scalac/transformer/ExpandMixinsPhase.java
@@ -20,7 +20,7 @@ import java.util.LinkedList;
 import scalac.Global;
 import scalac.Phase;
 import scalac.PhaseDescriptor;
-import scalac.Unit;
+import scalac.CompilationUnit;
 import scalac.ast.Tree;
 import scalac.ast.Tree.Template;
 import scalac.ast.TreeGen;
@@ -93,7 +93,7 @@ public class ExpandMixinsPhase extends Phase {
     // Public Methods
 
     /** Applies this phase to the given compilation units. */
-    public void apply(Unit[] units) {
+    public void apply(CompilationUnit[] units) {
         collector.traverse(units);
         expander.apply(units);
     }
@@ -146,7 +146,7 @@ public class ExpandMixinsPhase extends Phase {
         public TreeExpander(Global global) {
             super(global);
         }
-        public void apply(Unit unit) {
+        public void apply(CompilationUnit unit) {
             if (unit.mixinOnly) {
                 assert Debug.log("removing unit " + unit);
                 unit.body = Tree.EMPTY_ARRAY;
diff --git a/sources/scalac/transformer/ExplicitOuterClassesPhase.java b/sources/scalac/transformer/ExplicitOuterClassesPhase.java
index 4f0ed688f5..c79ff1ae29 100644
--- a/sources/scalac/transformer/ExplicitOuterClassesPhase.java
+++ b/sources/scalac/transformer/ExplicitOuterClassesPhase.java
@@ -15,7 +15,7 @@ import java.util.Iterator;
 import scalac.Global;
 import scalac.Phase;
 import scalac.PhaseDescriptor;
-import scalac.Unit;
+import scalac.CompilationUnit;
 import scalac.ast.GenTransformer;
 import scalac.ast.Tree;
 import scalac.ast.Tree.Ident;
@@ -69,7 +69,7 @@ public class ExplicitOuterClassesPhase extends Phase {
     // Public Methods
 
     /** Applies this phase to the given compilation units. */
-    public void apply(Unit[] units) {
+    public void apply(CompilationUnit[] units) {
         treeTransformer.apply(units);
     }
 
diff --git a/sources/scalac/transformer/ICodePhase.java b/sources/scalac/transformer/ICodePhase.java
index d47e518374..cc1e065389 100644
--- a/sources/scalac/transformer/ICodePhase.java
+++ b/sources/scalac/transformer/ICodePhase.java
@@ -11,7 +11,7 @@ package scalac.transformer;
 import scalac.Global;
 import scalac.Phase;
 import scalac.PhaseDescriptor;
-import scalac.Unit;
+import scalac.CompilationUnit;
 import scalac.checkers.TreeChecker;
 import scalac.symtab.Definitions;
 
@@ -46,7 +46,7 @@ public class ICodePhase extends Phase {
     // Public Methods
 
     /** Applies this phase to the given compilation units. */
-    public void apply(Unit[] units) {
+    public void apply(CompilationUnit[] units) {
        	// This java version doesn't make anything
     }
 
diff --git a/sources/scalac/transformer/LambdaLift.java b/sources/scalac/transformer/LambdaLift.java
index ea4080a0ef..f1f0949146 100644
--- a/sources/scalac/transformer/LambdaLift.java
+++ b/sources/scalac/transformer/LambdaLift.java
@@ -38,7 +38,7 @@ public class LambdaLift extends OwnerTransformer
     final Definitions definitions;
     final FreeVars free;
     final LambdaLiftPhase descr;
-    private Unit unit;
+    private CompilationUnit unit;
 
     public LambdaLift(Global global, LambdaLiftPhase descr) {
         super(global);
@@ -48,7 +48,7 @@ public class LambdaLift extends OwnerTransformer
 	this.descr = descr;
     }
 
-    public void apply(Unit unit) {
+    public void apply(CompilationUnit unit) {
 	this.unit = unit;
 	global.log(unit.source.toString());
 	free.initialize(unit);
@@ -108,7 +108,7 @@ public class LambdaLift extends OwnerTransformer
      */
     static class FreeVars extends OwnerTransformer {
 
-	private Unit unit;
+	private CompilationUnit unit;
 
 	public FreeVars(Global global) {
 	    super(global);
@@ -305,7 +305,7 @@ public class LambdaLift extends OwnerTransformer
 	/** Compute a mapping from symbols to their free variables
 	 *  in hashtable `fvs'. Also rename all variables that need it.
 	 */
-	public void initialize(Unit unit) {
+	public void initialize(CompilationUnit unit) {
 	    this.unit = unit;
 	    fvs = new HashMap();
 	    ftvs = new HashMap();
diff --git a/sources/scalac/transformer/LambdaLiftPhase.java b/sources/scalac/transformer/LambdaLiftPhase.java
index a60285dd99..01ee98bbda 100644
--- a/sources/scalac/transformer/LambdaLiftPhase.java
+++ b/sources/scalac/transformer/LambdaLiftPhase.java
@@ -23,7 +23,7 @@ public class LambdaLiftPhase extends Phase implements Kinds, Modifiers {
     }
 
     /** Applies this phase to the given compilation units. */
-    public void apply(Unit[] units) {
+    public void apply(CompilationUnit[] units) {
         for (int i = 0; i < units.length; i++)
             new LambdaLift(global, this).apply(units[i]);
     }
diff --git a/sources/scalac/transformer/MakeBoxingExplicitPhase.java b/sources/scalac/transformer/MakeBoxingExplicitPhase.java
index 4639dd65ea..e4d6f956b1 100644
--- a/sources/scalac/transformer/MakeBoxingExplicitPhase.java
+++ b/sources/scalac/transformer/MakeBoxingExplicitPhase.java
@@ -11,7 +11,7 @@ package scalac.transformer;
 import scalac.Global;
 import scalac.Phase;
 import scalac.PhaseDescriptor;
-import scalac.Unit;
+import scalac.CompilationUnit;
 import scalac.checkers.TreeChecker;
 import scalac.symtab.Definitions;
 
@@ -41,7 +41,7 @@ public class MakeBoxingExplicitPhase extends Phase {
     // Public Methods
 
     /** Applies this phase to the given compilation units. */
-    public void apply(Unit[] units) {
+    public void apply(CompilationUnit[] units) {
         for (int i = 0; i < units.length; i++) {
             assert checker.check(units[i]);
             new scalac.atree.ATreeFromSTree(global.definitions)
diff --git a/sources/scalac/transformer/OwnerTransformer.java b/sources/scalac/transformer/OwnerTransformer.java
index 7a6663f613..e8f0355ffb 100644
--- a/sources/scalac/transformer/OwnerTransformer.java
+++ b/sources/scalac/transformer/OwnerTransformer.java
@@ -30,7 +30,7 @@ public class OwnerTransformer extends Transformer {
         super(global);
     }
 
-    public void apply(Unit unit) {
+    public void apply(CompilationUnit unit) {
 	currentOwner = global.definitions.ROOT_CLASS;
         unit.body = transform(unit.body);
     }
diff --git a/sources/scalac/transformer/TailCallPhase.java b/sources/scalac/transformer/TailCallPhase.java
index 57857bc3c4..667e906112 100644
--- a/sources/scalac/transformer/TailCallPhase.java
+++ b/sources/scalac/transformer/TailCallPhase.java
@@ -11,7 +11,7 @@ package scalac.transformer;
 import scalac.Global;
 import scalac.Phase;
 import scalac.PhaseDescriptor;
-import scalac.Unit;
+import scalac.CompilationUnit;
 import scalac.ast.Tree;
 import scalac.ast.GenTransformer;
 import scalac.symtab.Symbol;
@@ -61,7 +61,7 @@ public class TailCallPhase extends Phase {
     // Public Methods
 
     /** Applies this phase to the given compilation units. */
-    public void apply(Unit[] units) {
+    public void apply(CompilationUnit[] units) {
         treeTransformer.apply(units);
     }
 
diff --git a/sources/scalac/transformer/TypesAsValuesPhase.java b/sources/scalac/transformer/TypesAsValuesPhase.java
index 5f672841f2..d3147ad981 100644
--- a/sources/scalac/transformer/TypesAsValuesPhase.java
+++ b/sources/scalac/transformer/TypesAsValuesPhase.java
@@ -15,7 +15,7 @@ import java.util.Iterator;
 import scalac.Global;
 import scalac.Phase;
 import scalac.PhaseDescriptor;
-import scalac.Unit;
+import scalac.CompilationUnit;
 import scalac.symtab.Definitions;
 import scalac.symtab.Scope;
 import scalac.symtab.Symbol;
@@ -194,7 +194,7 @@ public class TypesAsValuesPhase extends Phase {
         throw new Error();      // TODO
     }
 
-    public void apply(Unit[] units) {
+    public void apply(CompilationUnit[] units) {
         transformer.apply(units);
     }
 
diff --git a/sources/scalac/transformer/UnCurry.java b/sources/scalac/transformer/UnCurry.java
index 9eadc4d85f..cf2cc46afc 100644
--- a/sources/scalac/transformer/UnCurry.java
+++ b/sources/scalac/transformer/UnCurry.java
@@ -35,14 +35,14 @@ public class UnCurry extends OwnerTransformer
                      implements Modifiers {
 
     UnCurryPhase descr;
-    Unit unit;
+    CompilationUnit unit;
 
     public UnCurry(Global global, UnCurryPhase descr) {
         super(global);
 	this.descr = descr;
     }
 
-    public void apply(Unit unit) {
+    public void apply(CompilationUnit unit) {
 	this.unit = unit;
 	super.apply(unit);
     }
diff --git a/sources/scalac/transformer/UnCurryPhase.java b/sources/scalac/transformer/UnCurryPhase.java
index 79b96f0094..44988064de 100644
--- a/sources/scalac/transformer/UnCurryPhase.java
+++ b/sources/scalac/transformer/UnCurryPhase.java
@@ -21,7 +21,7 @@ public class UnCurryPhase extends Phase implements Modifiers {
     }
 
     /** Applies this phase to the given compilation units. */
-    public void apply(Unit[] units) {
+    public void apply(CompilationUnit[] units) {
         for (int i = 0; i < units.length; i++)
             new UnCurry(global, this).apply(units[i]);
     }
diff --git a/sources/scalac/transformer/matching/AlgebraicMatcher.java b/sources/scalac/transformer/matching/AlgebraicMatcher.java
index 044767558c..957d2d3933 100644
--- a/sources/scalac/transformer/matching/AlgebraicMatcher.java
+++ b/sources/scalac/transformer/matching/AlgebraicMatcher.java
@@ -33,7 +33,7 @@ public class AlgebraicMatcher extends PatternMatcher {
 
       /** constructor
        */
-      public AlgebraicMatcher( Unit unit ) {
+      public AlgebraicMatcher( CompilationUnit unit ) {
             super( unit );
 	    this.delegateSequenceMatching = true;
 	    this.optimize = false;
diff --git a/sources/scalac/transformer/matching/BerrySethi.java b/sources/scalac/transformer/matching/BerrySethi.java
index 9e9186e1f8..e56fc548c3 100644
--- a/sources/scalac/transformer/matching/BerrySethi.java
+++ b/sources/scalac/transformer/matching/BerrySethi.java
@@ -2,7 +2,7 @@
 
 package scalac.transformer.matching ;
 
-import scalac.Unit ;
+import scalac.CompilationUnit ;
 import scalac.ApplicationError ;
 import scalac.ast.Tree ;
 import scalac.ast.TreeInfo ;
@@ -20,9 +20,9 @@ import java.util.* ;
 
 class BerrySethi {
 
-    Unit unit;
+    CompilationUnit unit;
 
-    public BerrySethi(Unit unit) {
+    public BerrySethi(CompilationUnit unit) {
         this.unit = unit;
     }
 
diff --git a/sources/scalac/transformer/matching/BindingBerrySethi.java b/sources/scalac/transformer/matching/BindingBerrySethi.java
index e68bef1eaf..69383fcbfa 100644
--- a/sources/scalac/transformer/matching/BindingBerrySethi.java
+++ b/sources/scalac/transformer/matching/BindingBerrySethi.java
@@ -1,6 +1,6 @@
 package scalac.transformer.matching ;
 
-import scalac.Unit;
+import scalac.CompilationUnit;
 import scalac.Global ;
 import scalac.ApplicationError ;
 import scalac.ast.Tree ;
@@ -20,7 +20,7 @@ import java.util.* ;
 
 public class BindingBerrySethi extends BerrySethi {
 
-    public BindingBerrySethi(Unit unit) {
+    public BindingBerrySethi(CompilationUnit unit) {
         super(unit);
     }
 
diff --git a/sources/scalac/transformer/matching/CaseEnv.java b/sources/scalac/transformer/matching/CaseEnv.java
index cfeb1f9b74..cc59ec052b 100644
--- a/sources/scalac/transformer/matching/CaseEnv.java
+++ b/sources/scalac/transformer/matching/CaseEnv.java
@@ -33,7 +33,7 @@ class CaseEnv {
 
     /** constructor
      */
-    CaseEnv( Symbol owner, Unit unit ) {
+    CaseEnv( Symbol owner, CompilationUnit unit ) {
 	this.owner = owner;
 	this.defs = unit.global.definitions;
 	this.gen = unit.global.treeGen;
diff --git a/sources/scalac/transformer/matching/CodeFactory.java b/sources/scalac/transformer/matching/CodeFactory.java
index 0f17b5d2b4..a74d2e50d7 100644
--- a/sources/scalac/transformer/matching/CodeFactory.java
+++ b/sources/scalac/transformer/matching/CodeFactory.java
@@ -21,7 +21,7 @@ class CodeFactory extends PatternTool {
 
     public int pos = Position.FIRSTPOS ;
 
-    public CodeFactory( Unit unit, int pos ) {
+    public CodeFactory( CompilationUnit unit, int pos ) {
 	super( unit );
 	this.pos = pos;
     }
diff --git a/sources/scalac/transformer/matching/PatternMatcher.java b/sources/scalac/transformer/matching/PatternMatcher.java
index f5a0eda18f..4dd59ea4ea 100644
--- a/sources/scalac/transformer/matching/PatternMatcher.java
+++ b/sources/scalac/transformer/matching/PatternMatcher.java
@@ -50,7 +50,7 @@ public class PatternMatcher extends PatternTool {
 
     /** constructor
      */
-    public PatternMatcher(Unit unit, Tree selector,
+    public PatternMatcher(CompilationUnit unit, Tree selector,
                           Symbol owner, Type resultType) {
         super(unit);
         initialize(selector, owner, resultType, true);
@@ -58,7 +58,7 @@ public class PatternMatcher extends PatternTool {
 
     /** constructor, used in subclass AlgebraicMatcher
      */
-    protected PatternMatcher(Unit unit) {
+    protected PatternMatcher(CompilationUnit unit) {
         super(unit);
     }
 
diff --git a/sources/scalac/transformer/matching/PatternNodeCreator.java b/sources/scalac/transformer/matching/PatternNodeCreator.java
index 7d69c8f3e6..a1e6b27da0 100644
--- a/sources/scalac/transformer/matching/PatternNodeCreator.java
+++ b/sources/scalac/transformer/matching/PatternNodeCreator.java
@@ -21,7 +21,7 @@ public class PatternNodeCreator extends PatternTool {
     /** the owner of the variable symbols that might be created */
     Symbol owner;
 
-    public PatternNodeCreator(Unit unit, Symbol owner) {
+    public PatternNodeCreator(CompilationUnit unit, Symbol owner) {
 		super(unit);
 		assert owner != null;
 		this.owner = owner;
diff --git a/sources/scalac/transformer/matching/PatternTool.java b/sources/scalac/transformer/matching/PatternTool.java
index 91772a0332..8673e040dc 100644
--- a/sources/scalac/transformer/matching/PatternTool.java
+++ b/sources/scalac/transformer/matching/PatternTool.java
@@ -9,7 +9,7 @@
 package scalac.transformer.matching;
 
 
-import scalac.Unit;
+import scalac.CompilationUnit;
 import scalac.ast.TreeGen;
 import scalac.util.*;
 import scalac.symtab.*;
@@ -23,7 +23,7 @@ abstract class PatternTool {
 
     /** the current compilation unit
      */
-    final Unit unit;
+    final CompilationUnit unit;
 
     /** the global fresh name creator
      */
@@ -38,7 +38,7 @@ abstract class PatternTool {
     final TreeGen gen;
 
     // constructor
-    public PatternTool( Unit unit ) {
+    public PatternTool( CompilationUnit unit ) {
 	this.unit = unit;
 	this.fresh = unit.fresh;
 	this.gen = unit.global.treeGen;
diff --git a/sources/scalac/transformer/matching/RightTracerInScala.java b/sources/scalac/transformer/matching/RightTracerInScala.java
index b7ac716183..0a8ea356ca 100644
--- a/sources/scalac/transformer/matching/RightTracerInScala.java
+++ b/sources/scalac/transformer/matching/RightTracerInScala.java
@@ -425,7 +425,7 @@ System.out.println("RightTracerInScala - the seqVars"+seqVars);
 
     /* returns statements that do the work of the right-transducer
      */
-    Tree getStms( Tree trace, Unit unit, Tree body ) {
+    Tree getStms( Tree trace, CompilationUnit unit, Tree body ) {
 
         TreeList stms = new TreeList();
         Tree loopbody = code_body_NEW();
diff --git a/sources/scalac/transformer/matching/SequenceMatcher.java b/sources/scalac/transformer/matching/SequenceMatcher.java
index fb8dfd8027..682320dce3 100644
--- a/sources/scalac/transformer/matching/SequenceMatcher.java
+++ b/sources/scalac/transformer/matching/SequenceMatcher.java
@@ -154,7 +154,7 @@ public class SequenceMatcher extends PatternTool {
 
       /** constructor, invoked  by AlgebraicMatcher
        */
-    SequenceMatcher( Unit unit ) {
+    SequenceMatcher( CompilationUnit unit ) {
         super( unit );
     }
 } // class SequenceMatcher