*** empty log message ***

12 files changed, 77 insertions, 95 deletions

diff --git a/sources/scalac/ast/LazyTreeFactory.java b/sources/scalac/ast/LazyTreeFactory.java
index 26f5f9a98f..4f81a103f8 100644
--- a/sources/scalac/ast/LazyTreeFactory.java
+++ b/sources/scalac/ast/LazyTreeFactory.java
@@ -123,15 +123,13 @@ public class LazyTreeFactory extends AbstractTreeCopyFactory {
     public Tree TypeDef(Tree tree,
                         int mods,
                         Name name,
-			TypeDef[] tparams,
                         Tree rhs) {
         TypeDef t = (TypeDef)tree;
         if ((t.mods == mods) &&
             (t.name == name) &&
-	    (t.tparams == tparams) &&
             (t.rhs == rhs))
             return t;
-        tree = make.TypeDef(t.pos, mods, name, tparams, rhs);
+        tree = make.TypeDef(t.pos, mods, name, rhs);
         attribute(tree, t);
         return tree;
     }
@@ -351,6 +349,10 @@ public class LazyTreeFactory extends AbstractTreeCopyFactory {
         return tree;
     }
 
+    public Tree TypeTerm(Tree tree) {
+	return tree;
+    }
+
     public Tree SingletonType(Tree tree,
 			      Tree ref) {
 	SingletonType t = (SingletonType)tree;
diff --git a/sources/scalac/ast/StrictTreeFactory.java b/sources/scalac/ast/StrictTreeFactory.java
index c68453424e..e047ca7265 100644
--- a/sources/scalac/ast/StrictTreeFactory.java
+++ b/sources/scalac/ast/StrictTreeFactory.java
@@ -94,10 +94,9 @@ public class StrictTreeFactory extends AbstractTreeCopyFactory {
     public Tree TypeDef(Tree tree,
                         int mods,
                         Name name,
-                        TypeDef[] tparams,
                         Tree rhs) {
         TypeDef t = (TypeDef)tree;
-        tree = make.TypeDef(t.pos, mods, name, tparams, rhs);
+        tree = make.TypeDef(t.pos, mods, name, rhs);
         attribute(tree, t);
         return tree;
     }
@@ -266,6 +265,13 @@ public class StrictTreeFactory extends AbstractTreeCopyFactory {
         return tree;
     }
 
+    public Tree TypeTerm(Tree tree) {
+	TypeTerm t = (TypeTerm) tree;
+	tree = make.TypeTerm(t.pos);
+	attribute(tree, t);
+	return tree;
+    }
+
     public Tree SingletonType(Tree tree, Tree ref) {
 	SingletonType t = (SingletonType)tree;
 	tree = make.SingletonType(t.pos, ref);
diff --git a/sources/scalac/ast/Transformer.java b/sources/scalac/ast/Transformer.java
index 5425f2ebf3..aa2135f5be 100644
--- a/sources/scalac/ast/Transformer.java
+++ b/sources/scalac/ast/Transformer.java
@@ -222,12 +222,10 @@ public class Transformer extends Phase {
 			       transform(rhs));
 	case TypeDef(int mods,
 		     Name name,
-		     TypeDef[] tparams,
 		     Tree rhs):
 	    return copy.TypeDef(tree,
 				mods,
 				name,
-				transform(tparams),
 				transform(rhs));
 	case Import(Tree expr, Name[] selectors):
 	    return copy.Import(tree,
@@ -297,6 +295,8 @@ public class Transformer extends Phase {
 	    return copy.Ident(tree, name);
 	case Literal(Object value):
 	    return copy.Literal(tree, value);
+	case TypeTerm():
+	    return copy.TypeTerm(tree);
 	case SingletonType(Tree ref):
 	    return copy.SingletonType(tree,
 				      transform(ref));
@@ -340,7 +340,7 @@ public class Transformer extends Phase {
 	case DefDef(int mods, Name name, TypeDef[] tparams, ValDef[][] vparams,
 	            Tree tpe, Tree rhs):
 
-	case TypeDef(int mods, Name name, TypeDef[] tparams, Tree rhs):
+	case TypeDef(int mods, Name name, Tree rhs):
 
 	case Import(Tree expr):
 
@@ -378,6 +378,8 @@ public class Transformer extends Phase {
 
 	case Literal(int kind, Object value):
 
+	case TypeTerm():
+
 	case SingletonType(Tree ref):
 
 	case SelectFromType(Tree qualifier, Name selector):
diff --git a/sources/scalac/ast/Traverser.java b/sources/scalac/ast/Traverser.java
index ad40be1f06..d79f1804e4 100644
--- a/sources/scalac/ast/Traverser.java
+++ b/sources/scalac/ast/Traverser.java
@@ -83,8 +83,7 @@ public class Traverser {
             traverse(rhs);
             return;
 
-        case TypeDef(int mods, Name name, TypeDef[] tparams, Tree rhs):
-	    traverse(tparams);
+        case TypeDef(int mods, Name name, Tree rhs):
             traverse(rhs);
             return;
 
@@ -167,6 +166,9 @@ public class Traverser {
             traverse(qualifier);
             return;
 
+	case TypeTerm():
+	    return;
+
 	case SingletonType(Tree ref):
 	    traverse(ref);
 	    return;
diff --git a/sources/scalac/ast/Tree.java b/sources/scalac/ast/Tree.java
index 700aca2fd1..da3bcacc84 100644
--- a/sources/scalac/ast/Tree.java
+++ b/sources/scalac/ast/Tree.java
@@ -136,7 +136,6 @@ public class Tree {
      */
     public case TypeDef(int mods,
                         Name name,
-			TypeDef[] tparams,
                         Tree rhs) {
 	assert name.isTypeName();
 	if (!rhs.isType())
@@ -361,9 +360,16 @@ public class Tree {
     public case Literal(Object value);
 
     /**
+     * TypeTerm
+     * - introduced by: Analyzer
+     * - eliminated by: -
+     */
+    public case TypeTerm();
+
+    /**
      * Singleton type
      * - introduced by: parser
-     * - eliminated by: !!! ? (could be done by analyzer ?)
+     * - eliminated by: Analyzer
      */
     public case SingletonType(Tree ref) {
 	if (!ref.isTerm())
@@ -373,7 +379,7 @@ public class Tree {
     /**
      * Type selection
      * - introduced by: parser
-     * - eliminated by: !!! ? (could be done by analyzer ?)
+     * - eliminated by: Analyzer
      */
     public case SelectFromType(Tree qualifier,
 			       Name selector) {
@@ -385,7 +391,7 @@ public class Tree {
     /**
      * Function type
      * - introduced by: parser
-     * - eliminated by: !!! ? (could be done by analyzer ?)
+     * - eliminated by: Analyzer
      */
     public case FunType(Tree[] argtpes,
                         Tree restpe) {
@@ -399,7 +405,7 @@ public class Tree {
     /**
      * Object type (~ Template)
      * - introduced by: parser
-     * - eliminated by: !!! ? (could be done by analyzer ?)
+     * - eliminated by: Analyzer
      */
     public case CompoundType(Tree[] parents,
                              Tree[] refinements) {
@@ -415,7 +421,7 @@ public class Tree {
     /**
      * Applied type
      * - introduced by: parser
-     * - eliminated by: !!! ? (could be done by analyzer ?)
+     * - eliminated by: Analyzer
      */
     public case AppliedType(Tree tpe, Tree[] args) {
 	assert tpe.isType() : this;
@@ -468,6 +474,7 @@ public class Tree {
 	switch(this) {
         case Bad():
 	case Empty:
+	case TypeTerm():
 	case SingletonType(_):
 	case SelectFromType(_, _):
 	case CompoundType(_, _):
@@ -723,9 +730,9 @@ public class Tree {
 
 	public static final TypeDef[] EMPTY_ARRAY = new TypeDef[0];
 
-        public ExtTypeDef(int mods, Name name, TypeDef[] tparams, Tree rhs)
+        public ExtTypeDef(int mods, Name name, Tree rhs)
         {
-            super(mods, name, tparams, rhs);
+            super(mods, name, rhs);
         }
 
         public boolean hasSymbol() {
diff --git a/sources/scalac/ast/TreeCopyFactory.java b/sources/scalac/ast/TreeCopyFactory.java
index 76294fd583..69f82aa6ca 100644
--- a/sources/scalac/ast/TreeCopyFactory.java
+++ b/sources/scalac/ast/TreeCopyFactory.java
@@ -64,7 +64,6 @@ public interface TreeCopyFactory {
     public Tree TypeDef(Tree tree,
                         int mods,
                         Name name,
-			TypeDef[] tparams,
                         Tree rhs);
 
     public Tree Import(Tree tree,
@@ -137,6 +136,8 @@ public interface TreeCopyFactory {
     public Tree Literal(Tree tree,
                         Object value);
 
+    public Tree TypeTerm(Tree tree);
+
     public Tree SingletonType(Tree tree,
 			      Tree ref);
 
diff --git a/sources/scalac/ast/TreeCreator.java b/sources/scalac/ast/TreeCreator.java
index e9bb124465..60d40f6d63 100644
--- a/sources/scalac/ast/TreeCreator.java
+++ b/sources/scalac/ast/TreeCreator.java
@@ -85,9 +85,8 @@ public class TreeCreator implements TreeFactory {
     public Tree TypeDef(int pos,
                         int mods,
                         Name name,
-			TypeDef[] tparams,
                         Tree rhs) {
-        Tree t = new ExtTypeDef(mods, name, tparams, rhs);
+        Tree t = new ExtTypeDef(mods, name, rhs);
         t.pos = pos;
         return t;
     }
@@ -239,6 +238,12 @@ public class TreeCreator implements TreeFactory {
     }
 
 
+    public Tree TypeTerm(int pos) {
+	Tree t = new TypeTerm();
+	t.pos = pos;
+	return t;
+    }
+
     public Tree SingletonType(int pos, Tree ref) {
         Tree t = new SingletonType(ref);
         t.pos = pos;
diff --git a/sources/scalac/ast/TreeFactory.java b/sources/scalac/ast/TreeFactory.java
index a5d6b914bc..23c40a3004 100644
--- a/sources/scalac/ast/TreeFactory.java
+++ b/sources/scalac/ast/TreeFactory.java
@@ -55,7 +55,6 @@ public interface TreeFactory {
     public Tree TypeDef(int pos,
                         int mods,
                         Name name,
-			TypeDef[] tparams,
                         Tree rhs);
 
     public Tree Import(int pos,
@@ -128,6 +127,8 @@ public interface TreeFactory {
     public Tree Literal(int pos,
                         Object value);
 
+    public Tree TypeTerm(int pos);
+
     public Tree SingletonType(int pos,
 			      Tree ref);
 
diff --git a/sources/scalac/ast/TreeGen.java b/sources/scalac/ast/TreeGen.java
index 1eb59ca0e0..4154710822 100644
--- a/sources/scalac/ast/TreeGen.java
+++ b/sources/scalac/ast/TreeGen.java
@@ -86,68 +86,25 @@ public class TreeGen implements Kinds, Modifiers {
     /** Build and attribute tree corresponding to given type.
      */
     public Tree mkType(int pos, Type type) {
-	Tree tree = mkTycon(pos, type);
-	switch (type) {
-	case TypeRef(Type pre, Symbol sym, Type[] args):
-	    if (args.length != 0)
-		return make.AppliedType(pos, tree, mkType(pos, args))
-		    .setType(type);
-	}
-	return tree;
-    }
-
-    /** Build and attribute tree corresponding to given type constructor.
-     */
-    public Tree mkTycon(int pos, Type type) {
-	//System.out.println("making type " + type);//DEBUG
-        switch (type) {
-
-        case NoType:
-	    return Tree.Empty;
-
-	case ErrorType:
-	case AnyType:
-	    return make.Bad(pos).setSymbol(Symbol.ERROR).setType(type);
-
-	case ThisType(_):
-	case SingleType(_, _):
-	    return make.SingletonType(pos, mkStableId(pos, type)).setType(type);
-
-        case TypeRef(Type pre, Symbol sym, Type[] args):
-	    return mkRef(pos, pre, sym);
-
-	case CompoundType(Type[] parents, Scope members):
-	    if (parents.length == 1 && members.elems == Scope.Entry.NONE)
-		return mkType(pos, parents[0]);
-	    else
-		return make.CompoundType(
-		    pos, mkType(pos, parents), mkDefs(pos, members.elements()))
-		    .setType(type);
-
-	case CovarType(Type tp):
-	    return make.CovariantType(pos, mkType(pos, tp))
-		.setType(type);
-
-	case UnboxedType(_):
-	case UnboxedArrayType(_):
-	    return make.Ident(pos, Name.fromString(type.toString()).toTypeName())
-		.setType(type);
-
-	default:
-	    throw new ApplicationError("illegal type", type);
-        }
+	return TypeTerm(pos, type);
     }
 
     /** Build and attribute tree array corresponding to given type array.
      */
-    public Tree[] mkType(int pos, Type[] types) {
+    public Tree[] mkTypes(int pos, Type[] types) {
         Tree[] res = new Tree[types.length];
         for (int i = 0; i < types.length; i++) {
-	    res[i] = mkType(pos, types[i]);
+          res[i] = mkType(pos, types[i]);
         }
         return res;
     }
 
+    /** Build and attribute tree corresponding to given type.
+     */
+    public Tree TypeTerm(int pos, Type type) {
+	return make.TypeTerm(pos).setType(type);
+    }
+
     /** Build and attribute tree corresponding to symbol's declaration.
      */
     public Tree mkDef(int pos, Symbol sym) {
@@ -181,7 +138,7 @@ public class TreeGen implements Kinds, Modifiers {
 	case TypeRef(Type pre, Symbol sym, Type[] args):
 	    Tree ref = mkRef(pos, pre, sym.constructor());
 	    Tree constr = (args.length == 0) ? ref
-		: TypeApply(ref, mkType(sym.pos, args));
+		: TypeApply(ref, mkTypes(sym.pos, args));
 	    switch (parentType) {
 	    case MethodType(Symbol[] params, Type restpe):
 		assert params.length == 0 : parentType;
@@ -255,8 +212,7 @@ public class TreeGen implements Kinds, Modifiers {
 	    pos,
 	    sym.flags & SOURCEFLAGS,
 	    sym.name,
-	    mkTypeParams(pos, sym.typeParams()),
-	    mkType(pos, symtype))
+	    TypeTerm(pos, symtype))
 	    .setSymbol(sym).setType(definitions.UNIT_TYPE);
     }
 
@@ -301,7 +257,7 @@ public class TreeGen implements Kinds, Modifiers {
     }
 
     public Tree Typed(Tree tree, Type tp) {
-	return make.Typed(tree.pos, tree, mkType(tree.pos, tp)).setType(tp);
+	return make.Typed(tree.pos, tree, TypeTerm(tree.pos, tp)).setType(tp);
     }
 
     /** Build and attribute the assignment lhs = rhs
@@ -329,7 +285,8 @@ public class TreeGen implements Kinds, Modifiers {
     public Tree New(int pos, Type pre, Symbol clazz,
 		    Type[] targs, Tree[] args) {
 	Tree constr = mkRef(pos, pre, clazz.constructor());
-	if (targs.length != 0) constr = TypeApply(constr, mkType(pos, targs));
+	if (targs.length != 0)
+	    constr = TypeApply(constr, mkTypes(pos, targs));
 	Tree base = Apply(constr, args);
 	return New(base);
     }
@@ -435,7 +392,7 @@ public class TreeGen implements Kinds, Modifiers {
     /** Build and attribute super node with given type.
      */
     public Tree Super(int pos, Type type) {
-        return make.Super(pos, mkType(pos, type)).setType(type);
+        return make.Super(pos, TypeTerm(pos, type)).setType(type);
     }
 
     /** Build and attribute value/variable/let definition node whose signature
@@ -448,7 +405,7 @@ public class TreeGen implements Kinds, Modifiers {
 	return make.ValDef(pos,
 			   sym.flags & SOURCEFLAGS,
 			   sym.name,
-			   mkType(pos, symtype),
+			   TypeTerm(pos, symtype),
 			   rhs)
 	    .setSymbol(sym).setType(definitions.UNIT_TYPE);
     }
@@ -469,7 +426,7 @@ public class TreeGen implements Kinds, Modifiers {
                            sym.name,
                            mkTypeParams(pos, symtype.typeParams()),
                            mkParams(pos, symtype),
-                           mkType(pos, symtype.resultType()),
+                           TypeTerm(pos, symtype.resultType()),
                            body)
             .setSymbol(sym).setType(definitions.UNIT_TYPE);
     }
diff --git a/sources/scalac/ast/TreeInfo.java b/sources/scalac/ast/TreeInfo.java
index 75d6dfa863..e75c1c063c 100644
--- a/sources/scalac/ast/TreeInfo.java
+++ b/sources/scalac/ast/TreeInfo.java
@@ -44,7 +44,7 @@ public class TreeInfo {
 	case ModuleDef(_, _, _, _):
 	case DefDef(_, _, _, _, _, _):
 	case ValDef(_, _, _, _):
-	case TypeDef(_, _, _, _):
+	case TypeDef(_, _, _):
 	case Import(_, _):
 	    return true;
 	default:
@@ -58,7 +58,7 @@ public class TreeInfo {
 	    return rhs == Tree.Empty;
 	case ValDef(_, _, _, Tree rhs):
 	    return rhs == Tree.Empty;
-	case TypeDef(_, _, _, _):
+	case TypeDef(_, _, _):
 	    return true;
 	default:
 	    return false;
@@ -72,7 +72,7 @@ public class TreeInfo {
 	case ClassDef(_, _, _, _, _, _):
 	case ModuleDef(_, _, _, _):
 	case DefDef(_, _, _, _, _, _):
-	case TypeDef(_, _, _, _):
+	case TypeDef(_, _, _):
 	case Import(_, _):
 	    return true;
 	case ValDef(int mods, _, _, Tree rhs):
diff --git a/sources/scalac/ast/parser/Parser.java b/sources/scalac/ast/parser/Parser.java
index 8243d73411..fa2769f8d9 100644
--- a/sources/scalac/ast/parser/Parser.java
+++ b/sources/scalac/ast/parser/Parser.java
@@ -1176,8 +1176,7 @@ public class Parser implements Tokens {
 	} else {
 	    tp = scalaDot(pos, Names.Any.toTypeName());
 	}
-	return make.TypeDef(pos, Modifiers.PARAM, name.toTypeName(),
-			    Tree.ExtTypeDef.EMPTY_ARRAY, tp);
+	return make.TypeDef(pos, Modifiers.PARAM, name.toTypeName(), tp);
     }
 
 //////// DEFS ////////////////////////////////////////////////////////////////
@@ -1454,16 +1453,14 @@ public class Parser implements Tokens {
         Name name = ident().toTypeName();
 	if (s.token == SUBTYPE) {
 	    s.nextToken();
-	    return make.TypeDef(pos, mods | Modifiers.DEFERRED, name,
-				Tree.ExtTypeDef.EMPTY_ARRAY, type());
+	    return make.TypeDef(pos, mods | Modifiers.DEFERRED, name, type());
 	} else if (s.token == EQUALS) {
 	    s.nextToken();
-            return make.TypeDef(pos, mods, name,
-				Tree.ExtTypeDef.EMPTY_ARRAY, type());
+            return make.TypeDef(pos, mods, name, type());
 	} else if (s.token == SEMI || s.token == COMMA) {
 	    return make.TypeDef(
 		pos, mods | Modifiers.DEFERRED, name,
-		Tree.ExtTypeDef.EMPTY_ARRAY, scalaDot(pos, Names.Any.toTypeName()));
+		scalaDot(pos, Names.Any.toTypeName()));
 	} else {
 	    return syntaxError("`=' or `<:' expected", true);
 	}
diff --git a/sources/scalac/ast/printer/TextTreePrinter.java b/sources/scalac/ast/printer/TextTreePrinter.java
index 5836e24f0e..26dadcc679 100644
--- a/sources/scalac/ast/printer/TextTreePrinter.java
+++ b/sources/scalac/ast/printer/TextTreePrinter.java
@@ -308,13 +308,11 @@ public class TextTreePrinter implements TreePrinter {
 
         case TypeDef(int mods,
                      Name name,
-		     Tree.TypeDef[] tparams,
                      Tree rhs):
             printModifiers(mods);
             print(KW_TYPE);
             print(Text.Space);
             printSymbolDefinition(tree.symbol(), name);
-	    printParams(tparams);
 	    if ((mods & (Modifiers.DEFERRED | Modifiers.PARAM)) != 0) printOpt(TXT_SUBTYPE, rhs, true);
             else printOpt(TXT_EQUAL, rhs, true);
             break;
@@ -471,6 +469,10 @@ public class TextTreePrinter implements TreePrinter {
             printType(tree);
             break;
 
+	case TypeTerm():
+	    print(tree.type.toString());
+	    break;
+
 	case SingletonType(Tree ref):
 	    print(ref);
 	    print(TXT_DOT); print(KW_TYPE);
@@ -662,7 +664,7 @@ public class TextTreePrinter implements TreePrinter {
 
     protected void printParam(Tree tree) {
 	switch (tree) {
-	case TypeDef(int mods, Name name, _, Tree bound):
+	case TypeDef(int mods, Name name, Tree bound):
             printModifiers(mods);
             printSymbolDefinition(tree.symbol(), name);
             printOpt(TXT_SUBTYPE, bound, true);