Revert "Skeleton typedef type implementation"

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 326 matching lines @@
           compiler, node.parameters, node.returnType, element));
     });
   }
 
   FunctionSignature resolveFunctionExpression(Element element,
                                               FunctionExpression node) {
     return measure(() => SignatureResolver.analyze(
       compiler, node.parameters, node.returnType, element));
   }
 
-  void resolveTypedef(TypedefElement element) {
+  FunctionSignature resolveTypedef(TypedefElement element) {
     return compiler.withCurrentElement(element, () {
-      measure(() {
-        Typedef node =
+      Typedef node =
           compiler.parser.measure(() => element.parseNode(compiler));
-        TypedefResolverVisitor visitor =
-          new TypedefResolverVisitor(compiler, element);
-        visitor.visit(node);
-      });
+      return measure(() => SignatureResolver.analyze(
+          compiler, node.formals, node.returnType, element));
     });
   }
 
   FunctionType computeFunctionType(Element element,
                                    FunctionSignature signature) {
     LinkBuilder<Type> parameterTypes = new LinkBuilder<Type>();
     for (Link<Element> link = signature.requiredParameters;
          !link.isEmpty();
          link = link.tail) {
        parameterTypes.addLast(link.head.computeType(compiler));
@@ skipping 399 matching lines @@
     if (element === null) {
       onFailure(node, MessageKind.CANNOT_RESOLVE_TYPE, [node.typeName]);
     } else if (!element.impliesType()) {
       onFailure(node, MessageKind.NOT_A_TYPE, [node.typeName]);
     } else {
       if (element === compiler.types.voidType.element ||
           element === compiler.types.dynamicType.element) {
         type = element.computeType(compiler);
       } else if (element.isClass()) {
         ClassElement cls = element;
-        // TODO(ahe): Should be [ensureResolved].
-        compiler.resolver.toResolve.add(cls);
-        cls.computeType(compiler);
+        if (!cls.isResolved) compiler.resolveClass(cls);
         Link<Type> arguments =
             resolveTypeArguments(node, cls.typeVariables, scope,
                                  onFailure, whenResolved);
         if (cls.typeVariables.isEmpty() && arguments.isEmpty()) {
           // Use the canonical type if it has no type parameters.
           type = cls.computeType(compiler);
         } else {
           type = new InterfaceType(cls, arguments);
         }
       } else if (element.isTypedef()) {
-        TypedefElement typdef = element;
-        // TODO(ahe): Should be [ensureResolved].
-        typdef.computeType(compiler);
-        Link<Type> arguments = resolveTypeArguments(
-            node, typdef.typeVariables,
-            scope, onFailure, whenResolved);
-        if (typdef.typeVariables.isEmpty() && arguments.isEmpty()) {
-          // Return the canonical type if it has no type parameters.
-          type = typdef.computeType(compiler);
-        } else {
-          type = new TypedefType(typdef, arguments);
-        }
+        type = element.computeType(compiler);
       } else if (element.isTypeVariable()) {
         type = element.computeType(compiler);
       } else {
         compiler.cancel("unexpected element kind ${element.kind}",
                         node: node);
       }
     }
     whenResolved(node, type);
     return type;
   }
@@ skipping 908 matching lines @@
       } else {
         variableElement.bound = compiler.objectClass.computeType(compiler);
       }
       nodeLink = nodeLink.tail;
       typeLink = typeLink.tail;
     }
     assert(typeLink.isEmpty());
   }
 }
 
-class TypedefResolverVisitor extends TypeDefinitionVisitor {
-  TypedefElement get element() => super.element;
-
-  TypedefResolverVisitor(Compiler compiler, TypedefElement typedefElement)
-      : super(compiler, typedefElement);
-
-  visitTypedef(Typedef node) {
-    TypedefType type = element.computeType(compiler);
-    scope = new TypeDeclarationScope(scope, element);
-    resolveTypeVariableBounds(node.typeParameters);
-
-    element.functionSignature = SignatureResolver.analyze(
-        compiler, node.formals, node.returnType, element);
-
-    element.alias = compiler.computeFunctionType(
-        element, element.functionSignature);
-
-    // TODO(johnniwinther): Check for cyclic references in the typedef alias.
-  }
-}
-
 class ClassResolverVisitor extends TypeDefinitionVisitor {
   ClassElement get element() => super.element;
 
   ClassResolverVisitor(Compiler compiler, ClassElement classElement)
     : super(compiler, classElement);
 
-  visitClassNode(ClassNode node) {
+  Type visitClassNode(ClassNode node) {
     compiler.ensure(element !== null);
     compiler.ensure(!element.isResolved);
 
     InterfaceType type = element.computeType(compiler);
     scope = new TypeDeclarationScope(scope, element);
     // TODO(ahe): It is not safe to call resolveTypeVariableBounds yet.
     // As a side-effect, this may get us back here trying to
     // resolve this class again.
     resolveTypeVariableBounds(node.typeParameters);
 
@@ skipping 572 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";
   }
   String toString() => '$element';
 }