diff options
Diffstat (limited to 'sources/scalac/transformer')
-rw-r--r-- | sources/scalac/transformer/AddAccessors.java | 4 | ||||
-rw-r--r-- | sources/scalac/transformer/AddAccessorsPhase.java | 2 | ||||
-rw-r--r-- | sources/scalac/transformer/AddConstructors.java | 7 | ||||
-rw-r--r-- | sources/scalac/transformer/AddConstructorsPhase.java | 3 | ||||
-rw-r--r-- | sources/scalac/transformer/AddInterfaces.java | 3 | ||||
-rw-r--r-- | sources/scalac/transformer/Erasure.java | 5 | ||||
-rw-r--r-- | sources/scalac/transformer/ErasurePhase.java | 3 | ||||
-rw-r--r-- | sources/scalac/transformer/ExpandMixins.java | 10 | ||||
-rw-r--r-- | sources/scalac/transformer/ExplicitOuterClasses.java | 4 | ||||
-rw-r--r-- | sources/scalac/transformer/ExplicitOuterClassesPhase.java | 2 | ||||
-rw-r--r-- | sources/scalac/transformer/LambdaLift.java | 12 | ||||
-rw-r--r-- | sources/scalac/transformer/OwnerTransformer.java | 8 | ||||
-rw-r--r-- | sources/scalac/transformer/TransMatch.java | 10 | ||||
-rw-r--r-- | sources/scalac/transformer/TransMatchPhase.java | 2 | ||||
-rw-r--r-- | sources/scalac/transformer/UnCurry.java | 6 |
15 files changed, 37 insertions, 44 deletions
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; } |