Revert "Add support for the new function-type syntax."

pkg/compiler/lib/src/resolution/signatures.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.
 
 library dart2js.resolution.signatures;
 
 import '../common.dart';
 import '../common/resolution.dart';
 import '../elements/resolution_types.dart';
 import '../elements/elements.dart';
@@ skipping 75 matching lines @@
       reporter.reportErrorMessage(node, MessageKind.FORMAL_DECLARED_CONST);
     }
     if (node.modifiers.isStatic) {
       reporter.reportErrorMessage(node, MessageKind.FORMAL_DECLARED_STATIC);
     }
 
     if (currentDefinitions != null) {
       reporter.internalError(node, 'function type parameters not supported');
     }
     currentDefinitions = node;
-    FormalElementX element = definition == null
-        ? createUnnamedParameter()  // This happens in function types.
-        : definition.accept(this);
+    FormalElementX element = definition.accept(this);
     if (currentDefinitions.metadata != null) {
       element.metadataInternal =
           resolution.resolver.resolveMetadata(element, node);
     }
     currentDefinitions = null;
     return element;
   }
 
   void validateName(Identifier node) {
     if (isOptionalParameter &&
         optionalParametersAreNamed &&
         Name.isPrivateName(node.source)) {
       reporter.reportErrorMessage(node, MessageKind.PRIVATE_NAMED_PARAMETER);
     }
   }
 
   void computeParameterType(FormalElementX element,
       [VariableElement fieldElement]) {
-    // Function-type as in `foo(int bar(String x))`
-    void computeInlineFunctionType(FunctionExpression functionExpression) {
+    void computeFunctionType(FunctionExpression functionExpression) {
       FunctionSignature functionSignature = SignatureResolver.analyze(
           resolution,
           scope,
           functionExpression.typeVariables,
           functionExpression.parameters,
           functionExpression.returnType,
           element,
           registry,
           defaultValuesError: MessageKind.FUNCTION_TYPE_FORMAL_WITH_DEFAULT);
       element.functionSignature = functionSignature;
     }
 
     if (currentDefinitions.type != null) {
       element.typeCache = resolveTypeAnnotation(currentDefinitions.type);
     } else {
       // Is node.definitions exactly one FunctionExpression?
       Link<Node> link = currentDefinitions.definitions.nodes;
       assert(invariant(currentDefinitions, !link.isEmpty));
       assert(invariant(currentDefinitions, link.tail.isEmpty));
       if (link.head.asFunctionExpression() != null) {
         // Inline function typed parameter, like `void m(int f(String s))`.
-        computeInlineFunctionType(link.head);
+        computeFunctionType(link.head);
       } else if (link.head.asSend() != null &&
           link.head.asSend().selector.asFunctionExpression() != null) {
         // Inline function typed initializing formal or
         // parameter with default value, like `C(int this.f(String s))` or
         // `void m([int f(String s) = null])`.
-        computeInlineFunctionType(
-            link.head.asSend().selector.asFunctionExpression());
+        computeFunctionType(link.head.asSend().selector.asFunctionExpression());
       } else {
         assert(invariant(currentDefinitions,
             link.head.asIdentifier() != null || link.head.asSend() != null));
         if (fieldElement != null) {
           element.typeCache = fieldElement.computeType(resolution);
         } else {
           element.typeCache = const ResolutionDynamicType();
         }
       }
     }
@@ skipping 36 matching lines @@
           enclosingElement, currentDefinitions, name, initializer,
           isOptional: isOptionalParameter, isNamed: optionalParametersAreNamed);
     } else {
       parameter = new FormalElementX(
           ElementKind.PARAMETER, enclosingElement, currentDefinitions, name);
     }
     computeParameterType(parameter);
     return parameter;
   }
 
-  FormalElementX createUnnamedParameter() {
-    FormalElementX parameter;
-    assert(!createRealParameters);
-    parameter = new FormalElementX.unnamed(
-          ElementKind.PARAMETER, enclosingElement, currentDefinitions);
-    computeParameterType(parameter);
-    return parameter;
-  }
-
   InitializingFormalElementX createFieldParameter(
       Send node, Expression initializer) {
     InitializingFormalElementX element;
     Identifier receiver = node.receiver.asIdentifier();
     if (receiver == null || !receiver.isThis()) {
       reporter.reportErrorMessage(node, MessageKind.INVALID_PARAMETER);
       return new ErroneousInitializingFormalElementX(
           getParameterName(node), enclosingElement);
     } else {
       if (!enclosingElement.isGenerativeConstructor) {
@@ skipping 209 matching lines @@
     for (FormalElement parameter in parameters) {
       parameterTypes.addLast(parameter.type);
     }
     List<ResolutionDartType> optionalParameterTypes =
         const <ResolutionDartType>[];
     List<String> namedParameters = const <String>[];
     List<ResolutionDartType> namedParameterTypes = const <ResolutionDartType>[];
     List<Element> orderedOptionalParameters =
         visitor.optionalParameters.toList();
     if (visitor.optionalParametersAreNamed) {
-      // TODO(karlklose); replace when [visitor.optionalParameters] is a [List].
+      // TODO(karlklose); replace when [visitor.optinalParameters] is a [List].
       orderedOptionalParameters.sort((Element a, Element b) {
         return a.name.compareTo(b.name);
       });
       LinkBuilder<String> namedParametersBuilder = new LinkBuilder<String>();
       LinkBuilder<ResolutionDartType> namedParameterTypesBuilder =
           new LinkBuilder<ResolutionDartType>();
       for (FormalElement parameter in orderedOptionalParameters) {
         namedParametersBuilder.addLast(parameter.name);
         namedParameterTypesBuilder.addLast(parameter.type);
       }
       namedParameters = namedParametersBuilder.toLink().toList(growable: false);
       namedParameterTypes =
           namedParameterTypesBuilder.toLink().toList(growable: false);
     } else {
-      // TODO(karlklose); replace when [visitor.optionalParameters] is a [List].
+      // TODO(karlklose); replace when [visitor.optinalParameters] is a [List].
       LinkBuilder<ResolutionDartType> optionalParameterTypesBuilder =
           new LinkBuilder<ResolutionDartType>();
       for (FormalElement parameter in visitor.optionalParameters) {
         optionalParameterTypesBuilder.addLast(parameter.type);
       }
       optionalParameterTypes =
           optionalParameterTypesBuilder.toLink().toList(growable: false);
     }
     ResolutionFunctionType type = new ResolutionFunctionType(
         element.declaration,
@@ skipping 35 matching lines @@
 /// variables of the function signature itself when its signature is analyzed.
 class FunctionSignatureBuildingScope extends TypeVariablesScope {
   @override
   final List<ResolutionDartType> typeVariables;
 
   FunctionSignatureBuildingScope(Scope parent, this.typeVariables)
       : super(parent);
 
   String toString() => 'FunctionSignatureBuildingScope($typeVariables)';
 }