*** empty log message ***

2 files changed, 1 insertions, 30 deletions

diff --git a/sources/scalac/ast/parser/Parser.java b/sources/scalac/ast/parser/Parser.java
index 589d33c31c..de959552dd 100644
--- a/sources/scalac/ast/parser/Parser.java
+++ b/sources/scalac/ast/parser/Parser.java
@@ -616,7 +616,7 @@ public class Parser implements Tokens {
 	    if (s.token == HASH)
 		t = make.SelectFromType(s.skipToken(), t, ident().toTypeName());
 	    else if (s.token == LBRACKET)
-		t = make.AppliedType(pos, t, varTypeArgs());//todo: change to typeArgs
+		t = make.AppliedType(pos, t, typeArgs());
 	    else break;
 	}
 	return t;
@@ -631,30 +631,6 @@ public class Parser implements Tokens {
 	return ts;
     }
 
-    /**  VarTypeArgs ::= `[' VarType {`,' VarType} `]'
-     */
-    Tree[] varTypeArgs() {
-        int pos = accept(LBRACKET);
-        TreeList ts = new TreeList();
-	ts.append(varType());
-        while (s.token == COMMA) {
-	    s.nextToken();
-	    ts.append(varType());
-	}
-	accept(RBRACKET);
-	return ts.toArray();
-    }
-
-    /** VarType ::= [`+'] Type
-     */
-    Tree varType() {
-	int pos = s.pos;
-	if (s.token == IDENTIFIER && s.name == PLUS)
-	    return make.CovariantType(s.skipToken(), type());
- 	else
-	    return type();
-    }
-
 //////// EXPRESSIONS ////////////////////////////////////////////////////////
 
     /** EqualsExpr ::= `=' Expr
diff --git a/sources/scalac/ast/printer/TextTreePrinter.java b/sources/scalac/ast/printer/TextTreePrinter.java
index 54f2764dab..5c6e04ddc9 100644
--- a/sources/scalac/ast/printer/TextTreePrinter.java
+++ b/sources/scalac/ast/printer/TextTreePrinter.java
@@ -527,11 +527,6 @@ public class TextTreePrinter implements TreePrinter {
 	    print(TXT_RIGHT_BRACKET);
             break;
 
-        case CovariantType(Tree tpe):
-	    print(TXT_PLUS);
-	    print(tpe);
-            break;
-
         case Template(Tree[] parents, Tree[] body):
             Debug.abort("unexpected case", tree);
             break;