Check number of type arguments.

lib/compiler/implementation/resolver.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 interface TreeElements {
   Element operator[](Node node);
   Selector getSelector(Send send);
   Type getType(TypeAnnotation annotation);
 }
 
@@ skipping 193 matching lines @@
   }
 
   TreeElements resolveParameter(Element element) {
     Node tree = element.parseNode(compiler);
     ResolverVisitor visitor =
         new ResolverVisitor(compiler, element.enclosingElement);
     initializerDo(tree, visitor.visit);
     return visitor.mapping;
   }
 
-  Type resolveType(ClassElement element) {
-    if (element.isResolved) return element.type;
-    return measure(() {
+  void resolveClass(ClassElement element) {
+    if (element.isResolved) return;
+    measure(() {
       ClassNode tree = element.parseNode(compiler);
       ClassResolverVisitor visitor =
         new ClassResolverVisitor(compiler, element.getLibrary(), element);
       visitor.visit(tree);
       element.isResolved = true;
-      return element.type;
     });
   }
 
   FunctionParameters resolveSignature(FunctionElement element) {
     return measure(() => SignatureResolver.analyze(compiler, element));
   }
 
   error(Node node, MessageKind kind, [arguments = const []]) {
     ResolutionError message = new ResolutionError(kind, arguments);
     compiler.reportError(node, message);
@@ skipping 814 matching lines @@
   }
 
   Type resolveTypeRequired(TypeAnnotation node) {
     bool old = typeRequired;
     typeRequired = true;
     Type result = resolveTypeAnnotation(node);
     typeRequired = old;
     return result;
   }
 
-  Element resolveTypeName(node) {
+  Element resolveTypeName(TypeAnnotation node) {
     Identifier typeName = node.typeName.asIdentifier();
     Send send = node.typeName.asSend();
     if (send !== null) {
       typeName = send.selector;
     }
     if (typeName.source == Types.VOID) return compiler.types.voidType.element;
     if (typeName.source == Types.DYNAMIC ||
         typeName.source.stringValue == "var") {
       return compiler.types.dynamicType.element;
     }
     if (send !== null) {
       Element e = context.lookup(send.receiver.asIdentifier().source);
       if (e !== null && e.kind === ElementKind.PREFIX) {
         // The receiver is a prefix. Lookup in the imported members.
         PrefixElement prefix = e;
         return prefix.lookupLocalMember(typeName.source);
       } else if (e !== null && e.kind === ElementKind.CLASS) {
         // The receiver is the class part of a named constructor.
         return e;
       } else {
-        error(send.receiver, MessageKind.CANNOT_RESOLVE);
+        return null;
       }
     } else {
       return context.lookup(typeName.source);
     }
   }
 
   Type resolveTypeAnnotation(TypeAnnotation node) {
+    Function report = typeRequired ? error : warning;
     Element element = resolveTypeName(node);
     Type type;
     if (element === null) {
-      if (typeRequired) {
-        error(node, MessageKind.CANNOT_RESOLVE_TYPE, [node.typeName]);
-      } else {
-        warning(node, MessageKind.CANNOT_RESOLVE_TYPE, [node.typeName]);
-      }
+      report(node, MessageKind.CANNOT_RESOLVE_TYPE, [node.typeName]);
     } else if (!element.impliesType()) {
-      if (typeRequired) {
-        error(node, MessageKind.NOT_A_TYPE, [node.typeName]);
-      } else {
-        warning(node, MessageKind.NOT_A_TYPE, [node.typeName]);
-      }
+      report(node, MessageKind.NOT_A_TYPE, [node.typeName]);
     } else {
-      if (element == compiler.types.voidType.element) {
-        type = compiler.types.voidType;
-      } else if (element == compiler.types.dynamicType.element) {
-        type = compiler.types.dynamicType;
+      if (element === compiler.types.voidType.element ||
+          element === compiler.types.dynamicType.element) {
+        type = element.computeType(compiler);
       } else if (element.isClass()) {
-        // TODO(ngeoffray): Should we also resolve typedef?
         ClassElement cls = element;
-        compiler.resolver.toResolve.add(cls);
+        if (!cls.isResolved) compiler.resolveClass(cls);
         LinkBuilder<Type> arguments = new LinkBuilder<Type>();
         if (node.typeArguments !== null) {
+          int index = 0;
           for (Link<Node> typeArguments = node.typeArguments.nodes;
                !typeArguments.isEmpty();
                typeArguments = typeArguments.tail) {
+            if (++index > cls.typeParameters.length) {
+              report(typeArguments.head, MessageKind.ADDITIONAL_TYPE_ARGUMENT);
+            }
             arguments.addLast(resolveTypeAnnotation(typeArguments.head));
           }
+          if (index < cls.typeParameters.length) {
+            report(node.typeArguments, MessageKind.MISSING_TYPE_ARGUMENT);
+          }
         }
-        type = new InterfaceType(element.name, element, arguments.toLink());
+        type = new InterfaceType(cls.name, cls, arguments.toLink());
       } else if (element.isTypedef()) {
         // TODO(karlklose): implement typedefs. We return a fake type that the
         // code generator can use to detect typedefs in is-checks.
         type = new SimpleType(element.name, element);
       } else {
         type = element.computeType(compiler);
       }
     }
     return useType(node, type);
   }
@@ skipping 791 matching lines @@
 
   TopScope(LibraryElement library) : super(null, library);
   Element lookup(SourceString name) {
     return library.find(name);
   }
 
   Element add(Element element) {
     throw "Cannot add an element in the top scope";
   }
 }