Fix a few instances of TypeName in AstBuilder (should be TypeAnnotation).

pkg/front_end/lib/src/fasta/analyzer/ast_builder.dart

 // Copyright (c) 2016, 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 fasta.analyzer.ast_builder;
 
 import 'package:analyzer/analyzer.dart';
 import 'package:analyzer/dart/ast/ast_factory.dart' show AstFactory;
 import 'package:analyzer/dart/ast/standard_ast_factory.dart' as standard;
 import 'package:analyzer/dart/ast/token.dart' as analyzer show Token;
@@ skipping 402 matching lines @@
       internalError("unhandled identifier: ${node.runtimeType}");
     }
     push(variable);
     scope[variable.name.name] = variable.name.staticElement =
         new AnalyzerLocalVariableElemment(variable);
   }
 
   void endVariablesDeclaration(int count, Token endToken) {
     debugEvent("VariablesDeclaration");
     List<VariableDeclaration> variables = popList(count);
-    TypeName type = pop();
+    TypeAnnotation type = pop();
     pop(); // TODO(paulberry): Modifiers.
     push(ast.variableDeclarationStatement(
         ast.variableDeclarationList(null, null, null, type, variables),
         toAnalyzerToken(endToken)));
   }
 
   void handleAssignmentExpression(Token token) {
     debugEvent("AssignmentExpression");
     Expression rhs = pop();
     Expression lhs = pop();
@@ skipping 115 matching lines @@
 
   void handleAsOperator(Token operator, Token endToken) {
     debugEvent("AsOperator");
     TypeAnnotation type = pop();
     Expression expression = pop();
     push(ast.asExpression(expression, toAnalyzerToken(operator), type));
   }
 
   void handleIsOperator(Token operator, Token not, Token endToken) {
     debugEvent("IsOperator");
-    TypeName type = pop();
+    TypeAnnotation type = pop();
     Expression expression = pop();
     push(ast.isExpression(
         expression, toAnalyzerToken(operator), toAnalyzerToken(not), type));
   }
 
   void handleConditionalExpression(Token question, Token colon) {
     debugEvent("ConditionalExpression");
     Expression elseExpression = pop();
     Expression thenExpression = pop();
     Expression condition = pop();
@@ skipping 95 matching lines @@
   }
 
   @override
   void endFunctionTypedFormalParameter(
       Token covariantKeyword, Token thisKeyword, FormalParameterType kind) {
     debugEvent("FunctionTypedFormalParameter");
 
     FormalParameterList formalParameters = pop();
     TypeParameterList typeParameters = pop();
     SimpleIdentifier name = pop();
-    TypeName returnType = pop();
+    TypeAnnotation returnType = pop();
 
     {
       _Modifiers modifiers = pop();
       if (modifiers != null) {
         // TODO(scheglov): Report error.
         internalError('Unexpected modifier. Report an error.');
       }
     }
 
     pop(); // TODO(paulberry): Metadata.
@@ skipping 48 matching lines @@
         toAnalyzerToken(endToken)));
   }
 
   void handleCatchBlock(Token onKeyword, Token catchKeyword) {
     debugEvent("CatchBlock");
     Block body = pop();
     FormalParameterList catchParameters = popIfNotNull(catchKeyword);
     if (catchKeyword != null) {
       exitLocalScope();
     }
-    TypeName type = popIfNotNull(onKeyword);
+    TypeAnnotation type = popIfNotNull(onKeyword);
     SimpleIdentifier exception;
     SimpleIdentifier stackTrace;
     if (catchParameters != null) {
       if (catchParameters.length > 0) {
         exception = catchParameters.parameters[0].identifier;
       }
       if (catchParameters.length > 1) {
         stackTrace = catchParameters.parameters[1].identifier;
       }
     }
@@ skipping 748 matching lines @@
       } else if (identical('static', s)) {
         staticKeyword = token;
       } else if (identical('var', s)) {
         finalConstOrVarKeyword = token;
       } else {
         internalError('Unhandled modifier: $s');
       }
     }
   }
 }