Move computeType to TypedElement and TypeDeclarationElement.

pkg/compiler/lib/src/typechecker.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.
 
 part of dart2js;
 
 class TypeCheckerTask extends CompilerTask {
   TypeCheckerTask(Compiler compiler) : super(compiler);
   String get name => "Type checker";
 
@@ skipping 108 matching lines @@
  */
 class ResolvedAccess extends ElementAccess {
   final Element element;
 
   ResolvedAccess(Element this.element) {
     assert(element != null);
   }
 
   DartType computeType(Compiler compiler) {
     if (element.isGetter) {
-      FunctionType functionType = element.computeType(compiler);
+      GetterElement getter = element;
+      FunctionType functionType = getter.computeType(compiler);
       return functionType.returnType;
     } else if (element.isSetter) {
-      FunctionType functionType = element.computeType(compiler);
+      SetterElement setter = element;
+      FunctionType functionType = setter.computeType(compiler);
       if (functionType.parameterTypes.length != 1) {
         // TODO(johnniwinther,karlklose): this happens for malformed static
         // setters. Treat them the same as instance members.
         return const DynamicType();
       }
       return functionType.parameterTypes.first;
+    } else if (element.isTypedef || element.isClass) {
+      TypeDeclarationElement typeDeclaration = element;
+      typeDeclaration.computeType(compiler);
+      return typeDeclaration.thisType;
     } else {
-      return element.computeType(compiler);
+      TypedElement typedElement = element;
+      typedElement.computeType(compiler);
+      return typedElement.type;
     }
   }
 
   String toString() => 'ResolvedAccess($element)';
 }
 
 /// An access to a promoted variable.
 class PromotedAccess extends ElementAccess {
   final VariableElement element;
   final DartType type;
@@ skipping 479 matching lines @@
     currentAsyncMarker = previousAsyncMarker;
     return type;
   }
 
   DartType visitIdentifier(Identifier node) {
     if (node.isThis()) {
       return thisType;
     } else if (node.isSuper()) {
       return superType;
     } else {
-      Element element = elements[node];
+      TypedElement element = elements[node];
       assert(invariant(node, element != null,
           message: 'Missing element for identifier'));
       assert(invariant(node, element.isVariable ||
                              element.isParameter ||
                              element.isField,
           message: 'Unexpected context element ${element}'));
       return element.computeType(compiler);
     }
   }
 
@@ skipping 866 matching lines @@
   }
 
   DartType visitLiteralNull(LiteralNull node) {
     return const DynamicType();
   }
 
   DartType visitLiteralSymbol(LiteralSymbol node) {
     return compiler.symbolClass.rawType;
   }
 
-  DartType computeConstructorType(Element constructor, DartType type) {
+  DartType computeConstructorType(ConstructorElement constructor,
+                                  DartType type) {
     if (Elements.isUnresolved(constructor)) return const DynamicType();
     DartType constructorType = constructor.computeType(compiler);
     if (identical(type.kind, TypeKind.INTERFACE)) {
       if (constructor.isSynthesized) {
         // TODO(johnniwinther): Remove this when synthesized constructors handle
         // type variables correctly.
         InterfaceType interfaceType = type;
         ClassElement receiverElement = interfaceType.element;
         while (receiverElement.isMixinApplication) {
           receiverElement = receiverElement.supertype.element;
@@ skipping 325 matching lines @@
 
   visitTypedef(Typedef node) {
     // Do not typecheck [Typedef] nodes.
   }
 
   visitNode(Node node) {
     compiler.internalError(node,
         'Unexpected node ${node.getObjectDescription()} in the type checker.');
   }
 }