- Removed fields CaseEnv.make

- Removed argument pos from CaseEnv.newBoundVar

3 files changed, 9 insertions, 19 deletions

diff --git a/sources/scalac/transformer/matching/AlgebraicMatcher.java b/sources/scalac/transformer/matching/AlgebraicMatcher.java
index 269ecc2e7e..3b278db34d 100644
--- a/sources/scalac/transformer/matching/AlgebraicMatcher.java
+++ b/sources/scalac/transformer/matching/AlgebraicMatcher.java
@@ -193,7 +193,7 @@ public class AlgebraicMatcher extends PatternMatcher {
                 theType = getConstrType( tpe.type );
                 assert (env != null ) : "env is null";
                 if (/*(env != null) &&*/ (name != Names.WILDCARD))
-                      env.newBoundVar(tree.pos,
+                      env.newBoundVar(
                                       ((Tree.Typed)tree).expr.symbol(),
                                       theType,
                                       selector);
@@ -204,7 +204,7 @@ public class AlgebraicMatcher extends PatternMatcher {
                       return mk.ConstrPat( tree.pos, theType );
           case Bind(Name name, Ident(Name id)): // x @ _
                 if( id == Names.WILDCARD ) {
-                      env.newBoundVar(tree.pos,
+                      env.newBoundVar(
                                       tree.symbol(),
                                       theType,
                                       selector);
@@ -217,7 +217,7 @@ public class AlgebraicMatcher extends PatternMatcher {
                 else if (name.isVariable()) {
                       assert (env != null ) : "env is null";
                       if (/*(env != null) &&*/ (name != Names.WILDCARD))
-                            env.newBoundVar(tree.pos,
+                            env.newBoundVar(
                                             tree.symbol(),
                                             theType,
                                             selector);
diff --git a/sources/scalac/transformer/matching/CaseEnv.java b/sources/scalac/transformer/matching/CaseEnv.java
index a0d661a6c7..20a77776f8 100644
--- a/sources/scalac/transformer/matching/CaseEnv.java
+++ b/sources/scalac/transformer/matching/CaseEnv.java
@@ -31,23 +31,18 @@ class CaseEnv {
      */
     TreeGen gen;
 
-    /** the global tree factory
-     */
-    TreeFactory make;
-
     /** constructor
      */
     CaseEnv( Symbol owner, Unit unit ) {
 	this.owner = owner;
 	this.defs = unit.global.definitions;
 	this.gen = unit.global.treeGen;
-	this.make = unit.global.make;
     }
 
     protected ValDef[] boundVars = new ValDef[4];
     protected int numVars = 0;
 
-    public void newBoundVar(int pos, Symbol sym, Type type, Tree init) {
+    public void newBoundVar(Symbol sym, Type type, Tree init) {
 	sym.setOwner( owner ); // FIXME should be corrected earlier
 	if (numVars == boundVars.length) {
 	    ValDef[] newVars = new ValDef[numVars * 2];
@@ -55,11 +50,7 @@ class CaseEnv {
 	    boundVars = newVars;
 	}
 	sym.setType(type);
-	boundVars[numVars++] = (ValDef)make.ValDef(pos,
-						   0,
-						   sym.name,
-						   gen.mkType( pos, type ),
-						   init.duplicate()).setType( defs.UNIT_TYPE ).setSymbol(sym);
+	boundVars[numVars++] = gen.ValDef(sym, init.duplicate());
     }
 
     public ValDef[] boundVars() {
diff --git a/sources/scalac/transformer/matching/PatternMatcher.java b/sources/scalac/transformer/matching/PatternMatcher.java
index d26e83ef29..8130f71dc1 100644
--- a/sources/scalac/transformer/matching/PatternMatcher.java
+++ b/sources/scalac/transformer/matching/PatternMatcher.java
@@ -274,8 +274,7 @@ public class PatternMatcher extends PatternTool {
             case Bind(Name name, Tree pat):
             	PatternNode node = patternNode(pat, header, env);
             	if ((env != null) && (name != Names.WILDCARD))
-					env.newBoundVar(tree.pos,
-									tree.symbol(),
+					env.newBoundVar(		tree.symbol(),
 									tree.type,
 									header.selector);
 				return node;
@@ -294,7 +293,7 @@ public class PatternMatcher extends PatternTool {
 				if ((env != null) && (name != Names.WILDCARD))
 					switch (node) {
 						case ConstrPat(Symbol casted):
-							env.newBoundVar(tree.pos,
+							env.newBoundVar(
 											((Tree.Typed)tree).expr.symbol(),
 											tpe.type,
 											make.Ident(tree.pos, casted.name).
@@ -302,7 +301,7 @@ public class PatternMatcher extends PatternTool {
 											setSymbol(casted));
 							break;
 						default:
-							env.newBoundVar(tree.pos,
+							env.newBoundVar(
 											((Tree.Typed)tree).expr.symbol(),
 											tpe.type,
 											header.selector);
@@ -315,7 +314,7 @@ public class PatternMatcher extends PatternTool {
 					return mk.ConstrPat(tree.pos, tree.type);
 				else if (name.isVariable()) {
 					if (env != null)
-						env.newBoundVar(tree.pos,
+						env.newBoundVar(
 										tree.symbol(),
 										tree.type,
 										header.selector);