- check that TypeRefs are applied with enough a...

- check that TypeRefs are applied with enough arguments

1 files changed, 19 insertions, 1 deletions

diff --git a/sources/scalac/checkers/CheckTypes.java b/sources/scalac/checkers/CheckTypes.java
index cfe2bd656d..1f22084144 100644
--- a/sources/scalac/checkers/CheckTypes.java
+++ b/sources/scalac/checkers/CheckTypes.java
@@ -11,11 +11,15 @@ package scalac.checkers;
 import scalac.ast.Tree;
 import scalac.util.Name;
 import scalac.symtab.Type;
+import scalac.symtab.Symbol;
+import scalac.symtab.Kinds;
 import scalac.Global;
 import scalac.util.Debug;
 
 /**
- * Check that all tree nodes have a type.
+ * Check the following properties:
+ *   1. all tree nodes have a type,
+ *   2. TypeRefs supply the correct number of arguments.
  *
  * @author Michel Schinz
  * @version 1.0
@@ -26,5 +30,19 @@ public class CheckTypes extends Checker {
 
     public void check(Tree tree) {
 	verify(tree, tree.type != null, "non-null type", "type of tree is not null");
+
+        if (tree.type != null) {
+            switch (tree.type) {
+            case TypeRef(Type pre, Symbol sym, Type[] args):
+                if (sym.kind == Kinds.CLASS)
+                    verify(tree,
+                           sym.typeParams().length == args.length,
+                           "enough arguments for TypeRefs",
+                           "Type " + Debug.show(sym)
+                           + " expects " + sym.typeParams().length + " type arguments"
+                           + " but is given " + args.length);
+                break;
+            }
+        }
     }
 }