- Removed all instances of Infer

8 files changed, 20 insertions, 38 deletions

diff --git a/sources/scalac/transformer/TransMatch.java b/sources/scalac/transformer/TransMatch.java
index 94f3ec3b31..814a52ac19 100644
--- a/sources/scalac/transformer/TransMatch.java
+++ b/sources/scalac/transformer/TransMatch.java
@@ -13,7 +13,6 @@ import java.util.*;
 import scalac.*;
 import scalac.ast.*;
 import scalac.symtab.*;
-import scalac.typechecker.*;
 import scalac.util.*;       // Names
 import Tree.*;
 
@@ -78,17 +77,12 @@ public class TransMatch extends OwnerTransformer {
 
     Unit unit;
 
-    /** type inference engine
-     */
-    Infer infer;
-
     public TransMatch(Global global) {
         super(global);
     }
 
     public void apply(Unit unit) {
         this.unit = unit;
-        this.infer = new Infer(this);
         super.apply(unit);
     }
 
@@ -98,12 +92,12 @@ public class TransMatch extends OwnerTransformer {
         while(!containsReg && (i < cases.length))
             containsReg = TestRegTraverser.apply(cases[i++]);
         if (containsReg) {
-        	AlgebraicMatcher am = new AlgebraicMatcher( unit, infer );
+        	AlgebraicMatcher am = new AlgebraicMatcher( unit );
             Matcher matcher = new Matcher( currentOwner, root, restpe );
             am.construct( matcher, cases );
             return matcher.tree;
         } else {
-            PatternMatcher pm = new PatternMatcher(unit, infer, root,
+            PatternMatcher pm = new PatternMatcher(unit, root,
                                                    currentOwner, restpe);
             pm.enter(cases);
             if (global.log()) {
diff --git a/sources/scalac/transformer/matching/AlgebraicMatcher.java b/sources/scalac/transformer/matching/AlgebraicMatcher.java
index 0914cb7f15..e3f81e6ab1 100644
--- a/sources/scalac/transformer/matching/AlgebraicMatcher.java
+++ b/sources/scalac/transformer/matching/AlgebraicMatcher.java
@@ -11,7 +11,6 @@ package scalac.transformer.matching;
 import scalac.*;
 import scalac.ast.*;
 import scalac.symtab.*;
-import scalac.typechecker.*;
 
 import PatternNode.*;
 import Tree.*;
@@ -36,8 +35,8 @@ public class AlgebraicMatcher extends PatternMatcher {
 
       /** constructor
        */
-      public AlgebraicMatcher( Unit unit, Infer infer ) {
-            super( unit, infer );
+      public AlgebraicMatcher( Unit unit ) {
+            super( unit );
       }
 
       /** constructs an algebraic pattern matcher from cases
@@ -485,7 +484,7 @@ public class AlgebraicMatcher extends PatternMatcher {
 
 	  Tree defaultCase = toTree( defaultNode, selector );
 
-	  SequenceMatcher wordRec = new SequenceMatcher(unit, infer);
+	  SequenceMatcher wordRec = new SequenceMatcher(unit);
 
 	  Matcher m = new Matcher( _m.owner,
 				   selector,
diff --git a/sources/scalac/transformer/matching/Autom2Scala.java b/sources/scalac/transformer/matching/Autom2Scala.java
index e250fa5231..cf836229c6 100644
--- a/sources/scalac/transformer/matching/Autom2Scala.java
+++ b/sources/scalac/transformer/matching/Autom2Scala.java
@@ -1,7 +1,6 @@
 package scalac.transformer.matching ;
 
 import scalac.* ;
-import scalac.typechecker.* ;
 import scalac.symtab.Symbol ;
 import scalac.symtab.Type ;
 import scalac.symtab.TermSymbol ;
@@ -138,7 +137,7 @@ public class Autom2Scala  {
             this.owner = owner;
             this.pos = Position.FIRSTPOS;
             this.cf = cf;
-            this.am = new AlgebraicMatcher( cf.unit, cf.infer );
+            this.am = new AlgebraicMatcher( cf.unit );
             //this.mdefs = new Vector();
 
             //this.freeVars = new Vector();
diff --git a/sources/scalac/transformer/matching/CodeFactory.java b/sources/scalac/transformer/matching/CodeFactory.java
index fdf944ca94..bbdb42658d 100644
--- a/sources/scalac/transformer/matching/CodeFactory.java
+++ b/sources/scalac/transformer/matching/CodeFactory.java
@@ -14,7 +14,6 @@ import scalac.*;
 import scalac.ast.*;
 import scalac.util.*;
 import scalac.symtab.*;
-import scalac.typechecker.*;
 import PatternNode.*;
 import Tree.*;
 
@@ -132,8 +131,8 @@ class CodeFactory extends PatternTool {
     }
 
 
-    public CodeFactory( Unit unit, Infer infer, int pos ) {
-	super( unit, infer );
+    public CodeFactory( Unit 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 8b1bbdb5c1..6e01a34373 100644
--- a/sources/scalac/transformer/matching/PatternMatcher.java
+++ b/sources/scalac/transformer/matching/PatternMatcher.java
@@ -13,7 +13,6 @@ import scalac.*;
 import scalac.ast.*;
 import scalac.util.*;
 import scalac.symtab.*;
-import scalac.typechecker.*;
 import PatternNode.*;
 import Tree.*;
 
@@ -48,23 +47,23 @@ public class PatternMatcher extends PatternTool {
 
     /** constructor
      */
-    public PatternMatcher(Unit unit, Infer infer, Tree selector,
+    public PatternMatcher(Unit unit, Tree selector,
                           Symbol owner, Type resultType) {
-        super(unit, infer);
+        super(unit);
 		initialize(selector, owner, resultType);
     }
 
     /** constructor, used in subclass ALgebraicMatcher
      */
-    protected PatternMatcher(Unit unit, Infer infer) {
-		super(unit, infer);
+    protected PatternMatcher(Unit unit) {
+		super(unit);
     }
 
     /** init method, also needed in subclass AlgebraicMatcher
      */
     protected void initialize(Tree selector, Symbol owner, Type resultType) {
-        this.mk = new PatternNodeCreator(unit, infer, owner);
-        this.cf = new CodeFactory(unit, infer, selector.pos);
+        this.mk = new PatternNodeCreator(unit, owner);
+        this.cf = new CodeFactory(unit, selector.pos);
         this.root = mk.ConstrPat(selector.pos, selector.type.widen());
         this.root.and = mk.Header(selector.pos,
                                   selector.type.widen(),
diff --git a/sources/scalac/transformer/matching/PatternNodeCreator.java b/sources/scalac/transformer/matching/PatternNodeCreator.java
index 909f44a7ee..16574d625b 100644
--- a/sources/scalac/transformer/matching/PatternNodeCreator.java
+++ b/sources/scalac/transformer/matching/PatternNodeCreator.java
@@ -6,7 +6,6 @@ import scalac.*;
 import scalac.ast.*;
 import scalac.util.*;
 import scalac.symtab.*;
-import scalac.typechecker.*;
 import PatternNode.*;
 import Tree.*;
 
@@ -84,8 +83,8 @@ public class PatternNodeCreator extends PatternTool {
     /** the owner of the variable symbols that might be created */
     Symbol owner;
 
-    public PatternNodeCreator( Unit unit, Infer infer, Symbol owner ) {
-	super( unit, infer );
+    public PatternNodeCreator( Unit 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 8a58a0e8bc..89082c0947 100644
--- a/sources/scalac/transformer/matching/PatternTool.java
+++ b/sources/scalac/transformer/matching/PatternTool.java
@@ -13,7 +13,6 @@ import scalac.*;
 import scalac.ast.*;
 import scalac.util.*;
 import scalac.symtab.*;
-import scalac.typechecker.*;
 import PatternNode.*;
 import Tree.*;
 
@@ -51,10 +50,6 @@ abstract class PatternTool {
      */
     TreeGen gen;
 
-    /** type inference engine
-     */
-    Infer infer;
-
     /** the statics of class Boolean
      */
     Symbol statics; // REMOVE
@@ -69,9 +64,8 @@ abstract class PatternTool {
     Symbol notSym;
 
     // constructor
-    public PatternTool( Unit unit, Infer infer ) {
+    public PatternTool( Unit unit ) {
 	this.unit = unit;
-	this.infer = infer;
 	this.fresh = unit.global.freshNameCreator;
 	this.gen = unit.global.treeGen;
 	this.defs = unit.global.definitions;
diff --git a/sources/scalac/transformer/matching/SequenceMatcher.java b/sources/scalac/transformer/matching/SequenceMatcher.java
index 8d64d602e5..95994c2e60 100644
--- a/sources/scalac/transformer/matching/SequenceMatcher.java
+++ b/sources/scalac/transformer/matching/SequenceMatcher.java
@@ -2,7 +2,6 @@ package scalac.transformer.matching ;
 
 import scalac.*;
 import scalac.ast.Tree;
-import scalac.typechecker.*;
 import Tree.*;
 
 //import scala.compiler.printer.TextTreePrinter ; // DEBUGGING\
@@ -152,7 +151,7 @@ public class SequenceMatcher extends PatternTool {
             assert body.length == pat.length;
             this._m = _m;
 
-            this.cf = new CodeFactory( unit, infer, _m.pos );
+            this.cf = new CodeFactory( unit, _m.pos );
 
             Type seqType = pat[ 0 ].type();
 
@@ -201,8 +200,8 @@ public class SequenceMatcher extends PatternTool {
 
       /** constructor, invoked  by AlgebraicMatcher
        */
-      SequenceMatcher( Unit unit, Infer infer ) {
-            super( unit, infer );
+      SequenceMatcher( Unit unit ) {
+            super( unit );
             //Symbol predefSym = defs.getModule( defs.SCALA, Names.Predef );
             //Scope predefScope = predefSym.members();
       }