Address the remaining review comments on http://chromiumcodereview.appspot.com/9431029.

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 1087 matching lines @@
                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(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 InterfaceType(element.name, element);
+        if (cls.typeParameters.length == 0) {
+          // Return the canonical type if it has no type parameters.
+          type = element.computeType(compiler);
+        } else {
+          type = new InterfaceType(cls, arguments.toLink());
+        }
+      } else if (element.isTypedef() || element.isTypeVariable()) {
+        type = element.computeType(compiler);
       } else {
-        type = element.computeType(compiler);
+        compiler.cancel("unexpected element kind ${element.kind}",
+                        node: node);
       }
     }
     return useType(node, type);
   }
 
   visitModifiers(Modifiers node) {
     // TODO(ngeoffray): Implement this.
     unimplemented(node, 'modifiers');
   }
 
@@ skipping 272 matching lines @@
     } else if (supertype !== null) {
       error(node.superclass, MessageKind.TYPE_NAME_EXPECTED);
     }
     if (classElement.name != Types.OBJECT && classElement.supertype === null) {
       ClassElement objectElement = context.lookup(Types.OBJECT);
       if (objectElement !== null && !objectElement.isResolved) {
         compiler.resolver.toResolve.add(objectElement);
       } else if (objectElement === null){
         error(node, MessageKind.CANNOT_RESOLVE_TYPE, [Types.OBJECT]);
       }
-      classElement.supertype = new InterfaceType(Types.OBJECT, objectElement);
+      classElement.supertype = new InterfaceType(objectElement);
     }
     if (node.defaultClause !== null) {
       classElement.defaultClass = visit(node.defaultClause);
     }
     for (Link<Node> link = node.interfaces.nodes;
          !link.isEmpty();
          link = link.tail) {
       Type interfaceType = visit(link.head);
       if (interfaceType !== null && interfaceType.element.isExtendable()) {
         classElement.interfaces =
@@ skipping 314 matching lines @@
 
   // TODO(ahe): This is temporary.
   void resolveExpression(Node node) {
     if (node == null) return;
     node.accept(new ResolverVisitor(compiler, enclosingElement));
   }
 
   // TODO(ahe): This is temporary.
   void resolveType(Node node) {
     if (node == null) return;
-    // Find the correct member context to perform the lookup in.
-    Element outer = enclosingElement;
-    Element context = outer;
-    while (outer !== null) {
-      if (outer.isMember()) {
-        context = outer;
-        break;
-      }
-      outer = outer.enclosingElement;
-    }
-    node.accept(new ResolverVisitor(compiler, context));
+    node.accept(new ResolverVisitor(compiler, enclosingElement));
   }
 
   // TODO(ahe): This is temporary.
   ClassElement get currentClass() {
     return enclosingElement.isMember()
       ? enclosingElement.enclosingElement : null;
   }
 }
 
 class ConstructorResolver extends CommonResolverVisitor<Element> {
@@ skipping 148 matching lines @@
 
   TopScope(LibraryElement library) : super(null, library);
   Element lookup(SourceString name) {
     return library.find(name);
   }
 
   Element add(Element newElement) {
     throw "Cannot add an element in the top scope";
   }
 }