- Removed TreeGen.Select__

5 files changed, 7 insertions, 12 deletions

diff --git a/sources/scalac/transformer/LambdaLift.java b/sources/scalac/transformer/LambdaLift.java
index f3d19647c6..c12b7c8a79 100644
--- a/sources/scalac/transformer/LambdaLift.java
+++ b/sources/scalac/transformer/LambdaLift.java
@@ -446,7 +446,7 @@ public class LambdaLift extends OwnerTransformer
 		if (tree1 instanceof Ident) ((Ident)tree1).name = sym.name;
 		else ((Select)tree1).selector = sym.name;
 	    }
-	    if ((sym.flags & CAPTURED) != 0) return gen.Select__(tree1, Names.elem);
+	    if ((sym.flags & CAPTURED) != 0) return gen.Select(tree1, definitions.REF_ELEM());
 	    else return tree1;
 
 	default:
diff --git a/sources/scalac/transformer/LambdaLiftPhase.java b/sources/scalac/transformer/LambdaLiftPhase.java
index c4834e79cb..efe623a727 100644
--- a/sources/scalac/transformer/LambdaLiftPhase.java
+++ b/sources/scalac/transformer/LambdaLiftPhase.java
@@ -154,9 +154,7 @@ public class LambdaLiftPhase extends Phase implements Kinds, Modifiers {
     /** The type scala.Ref[tp]
      */
     Type refType(Type tp) {
-        Symbol refClass = global.definitions.getClass(Names.scala_Ref);
-        assert refClass.kind == Kinds.CLASS;
-        return Type.TypeRef(global.definitions.SCALA_TYPE, refClass, new Type[]{tp});
+        return Type.appliedType(global.definitions.REF_TYPE, new Type[]{tp});
     }
 
     public Checker[] postCheckers(Global global) {
diff --git a/sources/scalac/transformer/UnCurry.java b/sources/scalac/transformer/UnCurry.java
index 02df321e64..eb2ae2c0ce 100644
--- a/sources/scalac/transformer/UnCurry.java
+++ b/sources/scalac/transformer/UnCurry.java
@@ -147,7 +147,7 @@ public class UnCurry extends OwnerTransformer
 		if (tree1.symbol().isDefParameter()) {
 		    tree1.type = global.definitions.functionType(
 			Type.EMPTY_ARRAY, tree1.type.widen());
-		    return gen.Apply(gen.Select__(tree1, Names.apply), new Tree[0]);
+		    return gen.Apply(gen.Select(tree1, global.definitions.FUNCTION_APPLY(0)));
 		} else {
 		    return tree1;
 		}
diff --git a/sources/scalac/transformer/matching/CodeFactory.java b/sources/scalac/transformer/matching/CodeFactory.java
index 9800ff4eb1..0406f13567 100644
--- a/sources/scalac/transformer/matching/CodeFactory.java
+++ b/sources/scalac/transformer/matching/CodeFactory.java
@@ -67,7 +67,7 @@ class CodeFactory extends PatternTool {
     }
 
     Symbol seqNilSym() {
-	return defs.getType( Names.scala_Nil ).symbol(); // no need for TypeApply anymore!x
+	return defs.getType( Names.scala_Nil ).symbol().module(); // no need for TypeApply anymore!x
     }
 
     Symbol seqIterSym() {
@@ -281,7 +281,7 @@ class CodeFactory extends PatternTool {
       }
 
     Tree newSeqNil( Type tpe ) {
-	return gen.Select__(gen.Ident(pos, defs.SCALA), Names.Nil/*seqNilSym()*/);
+	return gen.Select(gen.Ident(pos, defs.SCALA), seqNilSym());
     }
 
     // EXPERIMENTAL
@@ -438,10 +438,7 @@ class CodeFactory extends PatternTool {
        case Literal(Object value):
        return gen.mkBooleanLit(tree.pos, !((Boolean)value).booleanValue());
        }
-       return make.Apply(
-       tree.pos,
-       gen.Select__(tree, NOT_N),
-       Tree.EMPTY_ARRAY).setType(defs.BOOLEAN_TYPE);
+       return gen.Apply(tree.pos, gen.Select(tree, notSym));
        }
 
     protected Tree And(Tree left, Tree right) {
diff --git a/sources/scalac/transformer/matching/PatternMatcher.java b/sources/scalac/transformer/matching/PatternMatcher.java
index 6548ce619e..b82ff72aea 100644
--- a/sources/scalac/transformer/matching/PatternMatcher.java
+++ b/sources/scalac/transformer/matching/PatternMatcher.java
@@ -911,7 +911,7 @@ public class PatternMatcher extends PatternTool {
 			cases = cases.next;
 		}
 		return cf.Switch(
-			gen.Apply(gen.Select__(selector.duplicate(), Names.tag), new Tree[0]),
+			gen.Apply(gen.Select(selector.duplicate(), defs.OBJECT_TAG())),
 			tags,
 			bodies,
 			(defaultCase == null) ? gen.mkBooleanLit(selector.pos, false)