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

This reverts commit c289af3.

BUG=

Review-Url: https://codereview.chromium.org/2710973002 .

Author: floitschG

.packages

@@ -34,7 +34,6 @@ dart_style:third_party/pkg_tested/dart_style/lib
 dartdoc:third_party/pkg/dartdoc/lib
 dev_compiler:pkg/dev_compiler/lib
 expect:pkg/expect/lib
-fasta:pkg/fasta/lib
 fixnum:third_party/pkg/fixnum/lib
 front_end:pkg/front_end/lib
 func:third_party/pkg/func/lib

pkg/compiler/lib/src/diagnostics/messages.dart

@@ -275,7 +275,6 @@ enum MessageKind {
   INVALID_RECEIVER_IN_INITIALIZER,
   INVALID_SOURCE_FILE_LOCATION,
   INVALID_SYMBOL,
-  INVALID_INLINE_FUNCTION_TYPE,
   INVALID_SYNC_MODIFIER,
   INVALID_TYPE_VARIABLE_BOUND,
   INVALID_UNNAMED_CONSTRUCTOR_NAME,
@@ -3320,16 +3319,6 @@ Please include the following information:
           " require a preamble file located in:\n"
           "  <sdk>/lib/_internal/js_runtime/lib/preambles."),
 
-      MessageKind.INVALID_INLINE_FUNCTION_TYPE: const MessageTemplate(
-          MessageKind.INVALID_INLINE_FUNCTION_TYPE,
-          "Invalid inline function type.",
-          howToFix: "Try changing the inline function type (as in 'int f()') to"
-             " a prefixed function type using the `Function` keyword (as in "
-             "'int Function() f').",
-          examples:
-              const ["typedef F = Function(int f(String x)); main() { F f; }"],
-      ),
-
       MessageKind.INVALID_SYNC_MODIFIER: const MessageTemplate(
           MessageKind.INVALID_SYNC_MODIFIER, "Invalid modifier 'sync'.",
           howToFix: "Try replacing 'sync' with 'sync*'.",

pkg/compiler/lib/src/elements/elements.dart

@@ -1208,9 +1208,6 @@ abstract class FormalElement extends Element
   FunctionTypedElement get functionDeclaration;
 
   VariableDefinitions get node;
-
-  /// Whether the parameter is unnamed in a function type.
-  bool get isUnnamed;
 }
 
 /// A formal parameter of a function or constructor.

pkg/compiler/lib/src/elements/modelx.dart

@@ -1334,7 +1334,7 @@ class TypedefElementX extends ElementX
   ResolutionTypedefType computeType(Resolution resolution) {
     if (thisTypeCache != null) return thisTypeCache;
     Typedef node = parseNode(resolution.parsingContext);
-    setThisAndRawTypes(createTypeVariables(node.templateParameters));
+    setThisAndRawTypes(createTypeVariables(node.typeParameters));
     ensureResolved(resolution);
     return thisTypeCache;
   }
@@ -1732,15 +1732,6 @@ class FormalElementX extends ElementX
       : this.identifier = identifier,
         super(identifier.source, elementKind, enclosingElement);
 
-  FormalElementX.unnamed(ElementKind elementKind,
-      FunctionTypedElement enclosingElement,
-      this.definitions)
-      : this.identifier = null,
-        super("<unnamed>", elementKind, enclosingElement);
-
-  /// Whether this is an unnamed parameter in a Function type.
-  bool get isUnnamed => identifier == null;
-
   FunctionTypedElement get functionDeclaration => enclosingElement;
 
   Modifiers get modifiers => definitions.modifiers;

pkg/compiler/lib/src/elements/resolution_types.dart

@@ -642,16 +642,6 @@ class ResolutionFunctionType extends ResolutionDartType
         optionalParameterTypes, namedParameters, namedParameterTypes);
   }
 
-  factory ResolutionFunctionType.generalized(
-      ResolutionDartType returnType,
-      List<ResolutionDartType> parameterTypes,
-      List<ResolutionDartType> optionalParameterTypes,
-      List<String> namedParameters,
-      List<ResolutionDartType> namedParameterTypes) {
-    return new ResolutionFunctionType.internal(null, returnType, parameterTypes,
-        optionalParameterTypes, namedParameters, namedParameterTypes);
-  }
-
   ResolutionFunctionType.internal(FunctionTypedElement this.element,
       [ResolutionDartType returnType = const ResolutionDynamicType(),
       List<ResolutionDartType> parameterTypes = const <ResolutionDartType>[],

pkg/compiler/lib/src/js_backend/no_such_method_registry.dart

@@ -219,8 +219,7 @@ class NoSuchMethodRegistry {
     }
     if (expr is Send && expr.isTypeCast) {
       Send sendExpr = expr;
-      var typeAnnotation = sendExpr.typeAnnotationFromIsCheckOrCast;
-      var typeName = typeAnnotation.asNominalTypeAnnotation()?.typeName;
+      var typeName = sendExpr.typeAnnotationFromIsCheckOrCast.typeName;
       if (typeName is Identifier && typeName.source == "dynamic") {
         expr = sendExpr.receiver;
       }

pkg/compiler/lib/src/kernel/kernel_visitor.dart

@@ -105,7 +105,6 @@ import '../tree/tree.dart'
         ForIn,
         FunctionDeclaration,
         FunctionExpression,
-        FunctionTypeAnnotation,
         Identifier,
         If,
         Label,
@@ -124,7 +123,6 @@ import '../tree/tree.dart'
         NewExpression,
         Node,
         NodeList,
-        NominalTypeAnnotation,
         Operator,
         ParenthesizedExpression,
         RedirectingFactoryBody,
@@ -1123,28 +1121,14 @@ class KernelVisitor extends Object
 
   @override
   visitTypeAnnotation(TypeAnnotation node) {
-    // Shouldn't be called, as the resolver has already resolved types and
+    // Shouldn't be called, as the resolver have already resolved types and
     // created [DartType] objects.
     return internalError(node, "TypeAnnotation");
   }
 
-  @override
-  visitNominalTypeAnnotation(NominalTypeAnnotation node) {
-    // Shouldn't be called, as the resolver has already resolved types and
-    // created [DartType] objects.
-    return internalError(node, "NominalTypeAnnotation");
-  }
-
-  @override
-  visitFunctionTypeAnnotation(FunctionTypeAnnotation node) {
-    // Shouldn't be called, as the resolver has already resolved types and
-    // created [DartType] objects.
-    return internalError(node, "FunctionTypeAnnotation");
-  }
-
   @override
   visitTypeVariable(TypeVariable node) {
-    // Shouldn't be called, as the resolver has already resolved types and
+    // Shouldn't be called, as the resolver have already resolved types and
     // created [DartType] objects.
     return internalError(node, "TypeVariable");
   }

pkg/compiler/lib/src/native/behavior.dart

@@ -262,7 +262,7 @@ class NativeBehavior {
   ///    Each tag kind (including the 'type-tag's) can only occur once in the
   ///    sequence.
   ///
-  /// [specString] is the specification string, [lookupType] resolves named
+  /// [specString] is the specification string, [resolveType] resolves named
   /// types into type values, [typesReturned] and [typesInstantiated] collects
   /// the types defined by the specification string, and [objectType] and
   /// [nullType] define the types for `Object` and `Null`, respectively. The

pkg/compiler/lib/src/parser/diet_parser_task.dart

@@ -17,9 +17,7 @@ import 'package:front_end/src/fasta/parser.dart'
 class PartialParser extends TopLevelParser {
   PartialParser(Listener listener) : super(listener);
 
-  Token parseFormalParameters(Token token, {bool inFunctionType: false}) {
-    return skipFormalParameters(token);
-  }
+  Token parseFormalParameters(Token token) => skipFormalParameters(token);
 }
 
 class DietParserTask extends CompilerTask {

pkg/compiler/lib/src/parser/element_listener.dart

@@ -287,18 +287,10 @@ class ElementListener extends Listener {
   }
 
   @override
-  void endFunctionTypeAlias(
-      Token typedefKeyword, Token equals, Token endToken) {
-    Identifier name;
-    if (equals == null) {
-      popNode(); // TODO(karlklose): do not throw away typeVariables.
-      name = popNode();
-      popNode(); // returnType
-    } else {
-      popNode();  // Function type.
-      popNode();  // TODO(karlklose): do not throw away typeVariables.
-      name = popNode();
-    }
+  void endFunctionTypeAlias(Token typedefKeyword, Token endToken) {
+    popNode(); // TODO(karlklose): do not throw away typeVariables.
+    Identifier name = popNode();
+    popNode(); // returnType
     pushElement(new PartialTypedefElement(
         name.source, compilationUnitElement, typedefKeyword, endToken));
     rejectBuiltInIdentifier(name);
@@ -332,13 +324,13 @@ class ElementListener extends Listener {
   @override
   void endMixinApplication() {
     NodeList mixins = popNode();
-    NominalTypeAnnotation superclass = popNode();
+    TypeAnnotation superclass = popNode();
     pushNode(new MixinApplication(superclass, mixins));
   }
 
   @override
   void handleVoidKeyword(Token token) {
-    pushNode(new NominalTypeAnnotation(new Identifier(token), null));
+    pushNode(new TypeAnnotation(new Identifier(token), null));
   }
 
   @override
@@ -411,7 +403,7 @@ class ElementListener extends Listener {
 
   @override
   void endTypeVariable(Token token, Token extendsOrSuper) {
-    NominalTypeAnnotation bound = popNode();
+    TypeAnnotation bound = popNode();
     Identifier name = popNode();
     pushNode(new TypeVariable(name, extendsOrSuper, bound));
     rejectBuiltInIdentifier(name);
@@ -438,21 +430,10 @@ class ElementListener extends Listener {
   }
 
   @override
-  void handleType(Token beginToken, Token endToken) {
+  void endType(Token beginToken, Token endToken) {
     NodeList typeArguments = popNode();
     Expression typeName = popNode();
-    pushNode(new NominalTypeAnnotation(typeName, typeArguments));
-  }
-
-  void handleNoName(Token token) {
-    pushNode(null);
-  }
-
-  @override
-  void handleFunctionType(Token functionToken, Token endToken) {
-    popNode();  // Type parameters.
-    popNode();  // Return type.
-    pushNode(null);
+    pushNode(new TypeAnnotation(typeName, typeArguments));
   }
 
   @override
@@ -651,10 +632,6 @@ class ElementListener extends Listener {
         errorCode = MessageKind.BAD_INPUT_CHARACTER;
         break;
 
-      case ErrorKind.InvalidInlineFunctionType:
-        errorCode = MessageKind.INVALID_INLINE_FUNCTION_TYPE;
-        break;
-
       case ErrorKind.InvalidSyncModifier:
         errorCode = MessageKind.INVALID_SYNC_MODIFIER;
         break;

pkg/compiler/lib/src/parser/node_listener.dart

@@ -126,60 +126,13 @@ class NodeListener extends ElementListener {
   }
 
   @override
-  void endFunctionTypeAlias(
-      Token typedefKeyword, Token equals, Token endToken) {
-    bool isGeneralizedTypeAlias;
-    NodeList templateParameters;
-    TypeAnnotation returnType;
-    Identifier name;
-    NodeList typeParameters;
-    NodeList formals;
-    if (equals == null) {
-      isGeneralizedTypeAlias = false;
-      formals = popNode();
-      templateParameters = popNode();
-      name = popNode();
-      returnType = popNode();
-    } else {
-      // TODO(floitsch): keep using the `FunctionTypeAnnotation' node.
-      isGeneralizedTypeAlias = true;
-      Node type = popNode();
-      if (type.asFunctionTypeAnnotation() == null) {
-        // TODO(floitsch): The parser should diagnose this problem, not
-        // this listener.
-        // However, this problem goes away, when we allow aliases for
-        // non-function types too.
-        reportFatalError(type, 'Expected a function type.');
-      }
-      FunctionTypeAnnotation functionType = type;
-      templateParameters = popNode();
-      name = popNode();
-      returnType = functionType.returnType;
-      typeParameters = functionType.typeParameters;
-      formals = functionType.formals;
-    }
-    pushNode(new Typedef(
-        isGeneralizedTypeAlias,
-        templateParameters,
-        returnType,
-        name,
-        typeParameters,
-        formals,
-        typedefKeyword,
-        endToken));
-  }
-
-  void handleNoName(Token token) {
-    pushNode(null);
-  }
-
-  @override
-  void handleFunctionType(Token functionToken, Token endToken) {
+  void endFunctionTypeAlias(Token typedefKeyword, Token endToken) {
     NodeList formals = popNode();
     NodeList typeParameters = popNode();
+    Identifier name = popNode();
     TypeAnnotation returnType = popNode();
-    pushNode(new FunctionTypeAnnotation(
-        returnType, functionToken, typeParameters, formals));
+    pushNode(new Typedef(
+        returnType, name, typeParameters, formals, typedefKeyword, endToken));
   }
 
   @override
@@ -276,7 +229,7 @@ class NodeListener extends ElementListener {
     NodeList typeArguments = popNode();
     Node classReference = popNode();
     if (typeArguments != null) {
-      classReference = new NominalTypeAnnotation(classReference, typeArguments);
+      classReference = new TypeAnnotation(classReference, typeArguments);
     } else {
       Identifier identifier = classReference.asIdentifier();
       Send send = classReference.asSend();
@@ -914,7 +867,7 @@ class NodeListener extends ElementListener {
       NodeList typeArguments = popNode();
       Node receiver = popNode();
       if (typeArguments != null) {
-        receiver = new NominalTypeAnnotation(receiver, typeArguments);
+        receiver = new TypeAnnotation(receiver, typeArguments);
         recoverableError(typeArguments, 'Type arguments are not allowed here.');
       } else {
         Identifier identifier = receiver.asIdentifier();

pkg/compiler/lib/src/parser/partial_elements.dart

@@ -42,9 +42,7 @@ import 'node_listener.dart' show NodeListener;
 class ClassElementParser extends ClassMemberParser {
   ClassElementParser(Listener listener) : super(listener);
 
-  Token parseFormalParameters(Token token, {bool inFunctionType: false}) {
-    return skipFormalParameters(token);
-  }
+  Token parseFormalParameters(Token token) => skipFormalParameters(token);
 }
 
 abstract class PartialElement implements DeclarationSite {