Remove peeking from parseTypedef and parseClassOrNamedMixinApplication.

pkg/analyzer/lib/src/fasta/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 209 matching lines @@
       push(ast.enumConstantDeclaration(comment, metadata, identifier));
     } else {
       if (context.isScopeReference) {
         String name = token.lexeme;
         Builder builder = scope.lookup(name, token.charOffset, uri);
         if (builder != null) {
           Element element = elementStore[builder];
           assert(element != null);
           identifier.staticElement = element;
         }
-      } else if (context == IdentifierContext.classDeclaration) {
-        className = identifier.name;
       }
       push(identifier);
     }
   }
 
   void endSend(Token beginToken, Token endToken) {
     debugEvent("Send");
     MethodInvocation arguments = pop();
     TypeArgumentList typeArguments = pop();
     if (arguments != null) {
@@ skipping 1089 matching lines @@
   }
 
   @override
   void endClassBody(int memberCount, Token beginToken, Token endToken) {
     debugEvent("ClassBody");
     push(new _ClassBody(
         beginToken, popList(memberCount) ?? <ClassMember>[], endToken));
   }
 
   @override
+  void beginClassDeclaration(Token beginToken, Token name) {
+    assert(className == null);
+    className = name.lexeme;
+  }
+
+  @override
   void endClassDeclaration(
       int interfacesCount,
       Token beginToken,
       Token classKeyword,
       Token extendsKeyword,
       Token implementsKeyword,
       Token endToken) {
     debugEvent("ClassDeclaration");
     _ClassBody body = pop();
     ImplementsClause implementsClause;
@@ skipping 683 matching lines @@
       } else if (identical('var', s)) {
         finalConstOrVarKeyword = token;
       } else if (identical('covariant', s)) {
         covariantKeyword = token;
       } else {
         internalError('Unhandled modifier: $s');
       }
     }
   }
 }