Remove the need for functionSignature.

pkg/analyzer2dart/lib/src/modely.dart

 // Copyright (c) 2014, 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 analyzer2dart.element_converter;
 
 
 /// Base [dart2js.Element] implementation for converted analyzer elements.
 class ElementY extends dart2js.Element {
   final ElementConverter converter;
@@ skipping 332 matching lines @@
   // TODO(johnniwinther): Ensure the correct semantics of this.
   @override
   bool get isAbstract => false;
 }
 
 class TopLevelFunctionElementY extends ElementY
     with AnalyzableElementY, AstElementY, TopLevelElementMixin
     implements dart2js.FunctionElement {
   analyzer.FunctionElement get element => super.element;
 
-  dart2js.FunctionSignature _functionSignature;
-
-  // TODO(johnniwinther): Avoid the need for these.
-  @override
-  dart2js.FunctionSignature get functionSignature {
-    if (_functionSignature == null) {
-      util.LinkBuilder<dart2js.Element> parameterBuilder =
-          new util.LinkBuilder<dart2js.Element>();
-      List<dart2js.DartType> parameterTypes = <dart2js.DartType>[];
-      element.parameters.forEach((analyzer.ParameterElement parameter) {
-        if (parameter.parameterKind.isOptional) {
-          unsupported('Optional parameter.');
-        } else {
-          dart2js.ParameterElement convertedParameter =
-              converter.convertElement(parameter);
-          parameterBuilder.addLast(convertedParameter);
-          parameterTypes.add(convertedParameter.type);
-        }
-      });
-      // TODO(johnniwinther): Convert parameter and return types.
-      util.Link<dart2js.Element> parameters = parameterBuilder.toLink();
-      _functionSignature = new modelx.FunctionSignatureX(
-            parameters,
-            const util.Link<dart2js.Element>(),
-            parameterBuilder.length, 0, false,
-            parameters.toList(),
-            new dart2js.FunctionType.synthesized(
-                converter.convertType(element.returnType),
-                parameterTypes));
-    }
-    return _functionSignature;
-  }
-
-  @override
-  bool get hasFunctionSignature => true;
-
   @override
   dart2js.ElementKind get kind => dart2js.ElementKind.FUNCTION;
 
+  @override
+  dart2js.FunctionType get type => converter.convertType(element.type);
+
   TopLevelFunctionElementY(ElementConverter converter,
                            analyzer.FunctionElement element)
       : super(converter, element);
 
   @override
   get abstractField => unsupported('abstractField');
 
   @override
   computeSignature(_) => unsupported('computeSignature');
 
   @override
   get memberContext => unsupported('memberContext');
 
   @override
-  dart2js.FunctionType get type => functionSignature.type;
+  get functionSignature => unsupported('functionSignature');
+
+  @override
+  bool get hasFunctionSignature => unsupported('hasFunctionSignature');
 }
 
 class ParameterElementY extends ElementY
     with AnalyzableElementY, AstElementY
     implements dart2js.ParameterElement {
 
   analyzer.ParameterElement get element => super.element;
 
   @override
   dart2js.ElementKind get kind => dart2js.ElementKind.PARAMETER;
 
   @override
   dart2js.DartType get type => converter.convertType(element.type);
 
-  // TODO(johnniwinther): Avoid the need for this.
-  @override
-  dart2js.FunctionSignature get functionSignature => null;
-
   @override
   bool get isLocal => true;
 
   @override
   bool get isStatic => false;
 
   @override
   bool get isConst => false;
 
   ParameterElementY(ElementConverter converter,
                     analyzer.ParameterElement element)
       : super(converter, element) {
     assert(!element.isInitializingFormal);
   }
 
   @override
   get executableContext => unsupported('executableContext');
 
   @override
   get functionDeclaration => unsupported('functionDeclaration');
 
   @override
   get initializer => unsupported('initializer');
 
   @override
   get memberContext => unsupported('memberContext');
+
+  @override
+  get functionSignature => unsupported('functionSignature');
 }
 
 class TypeDeclarationElementY extends ElementY
     with AnalyzableElementY, AstElementY
     implements dart2js.TypeDeclarationElement {
 
   TypeDeclarationElementY(ElementConverter converter,
                           analyzer.Element element)
       : super(converter, element);
 
@@ skipping 221 matching lines @@
 
   @override
   get initializer => unsupported('initializer');
 
   @override
   get memberContext => unsupported('memberContext');
 
   @override
   get nestedClosures => unsupported('nestedClosures');
 }