Revert "Add support for generic function type syntax, part 1" (TBR)

pkg/dev_compiler/lib/src/compiler/ast_builder.dart

 // Copyright (c) 2015, 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.
 
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/standard_ast_factory.dart';
 import 'package:analyzer/dart/ast/token.dart';
 import 'package:analyzer/src/dart/ast/token.dart';
 import 'package:analyzer/src/generated/utilities_dart.dart';
 import 'package:logging/logging.dart' as logger;
@@ skipping 17 matching lines @@
 
   static TypeParameter typeParameter(SimpleIdentifier name,
       [TypeName bound = null]) {
     return RawAstBuilder.typeParameter(name, bound);
   }
 
   static TypeParameterList typeParameterList(List<TypeParameter> params) {
     return RawAstBuilder.typeParameterList(params);
   }
 
-  static TypeArgumentList typeArgumentList(List<TypeAnnotation> args) {
+  static TypeArgumentList typeArgumentList(List<TypeName> args) {
     return RawAstBuilder.typeArgumentList(args);
   }
 
   static ArgumentList argumentList(List<Expression> args) {
     return RawAstBuilder.argumentList(args);
   }
 
-  static TypeName typeName(Identifier id, List<TypeAnnotation> args) {
+  static TypeName typeName(Identifier id, List<TypeName> args) {
     TypeArgumentList argList = null;
     if (args != null && args.length > 0) argList = typeArgumentList(args);
     return RawAstBuilder.typeName(id, argList);
   }
 
   static FunctionTypeAlias functionTypeAlias(
       TypeName ret,
       SimpleIdentifier name,
       List<TypeParameter> tParams,
       List<FormalParameter> params) {
@@ skipping 347 matching lines @@
         (bound == null) ? null : new KeywordToken(Keyword.EXTENDS, 0);
     return astFactory.typeParameter(null, null, name, keyword, bound);
   }
 
   static TypeParameterList typeParameterList(List<TypeParameter> params) {
     Token lb = new Token(TokenType.LT, 0);
     Token rb = new Token(TokenType.GT, 0);
     return astFactory.typeParameterList(lb, params, rb);
   }
 
-  static TypeArgumentList typeArgumentList(List<TypeAnnotation> args) {
+  static TypeArgumentList typeArgumentList(List<TypeName> args) {
     Token lb = new Token(TokenType.LT, 0);
     Token rb = new Token(TokenType.GT, 0);
     return astFactory.typeArgumentList(lb, args, rb);
   }
 
   static ArgumentList argumentList(List<Expression> args) {
     Token lp = new BeginToken(TokenType.OPEN_PAREN, 0);
     Token rp = new Token(TokenType.CLOSE_PAREN, 0);
     return astFactory.argumentList(lp, args, rp);
   }
@@ skipping 170 matching lines @@
     Label l = astFactory.label(s, new Token(TokenType.COLON, 0));
     return astFactory.namedExpression(l, e);
   }
 
   static VariableDeclarationStatement variableDeclarationStatement(
       VariableDeclarationList varDecl) {
     var semi = new Token(TokenType.SEMICOLON, 0);
     return astFactory.variableDeclarationStatement(varDecl, semi);
   }
 }