Pass 'classKeyword' to endClassDeclaratio() and endNamedMixinApplication().

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:front_end/src/fasta/scanner/token.dart'
     show BeginGroupToken, Token;
 
 import 'package:analyzer/analyzer.dart';
@@ skipping 787 matching lines @@
 
   @override
   void endClassBody(int memberCount, Token beginToken, Token endToken) {
     debugEvent("ClassBody");
     push(new _ClassBody(
         beginToken, popList(memberCount) ?? <ClassMember>[], endToken));
   }
 
   @override
   void endClassDeclaration(int interfacesCount, Token beginToken,
-      Token extendsKeyword, Token implementsKeyword, Token endToken) {
+      Token classKeyword, Token extendsKeyword, Token implementsKeyword,
+      Token endToken) {
     debugEvent("ClassDeclaration");
     _ClassBody body = pop();
     ImplementsClause implementsClause;
     if (implementsKeyword != null) {
       List<TypeName> interfaces = popList(interfacesCount);
       implementsClause =
           ast.implementsClause(toAnalyzerToken(implementsKeyword), interfaces);
     }
     ExtendsClause extendsClause;
     WithClause withClause;
     var supertype = pop();
     if (supertype == null) {
       // No extends clause
     } else if (supertype is TypeName) {
       extendsClause =
           ast.extendsClause(toAnalyzerToken(extendsKeyword), supertype);
     } else if (supertype is _MixinApplication) {
       extendsClause = ast.extendsClause(
           toAnalyzerToken(extendsKeyword), supertype.supertype);
       withClause = ast.withClause(
           toAnalyzerToken(supertype.withKeyword), supertype.mixinTypes);
     } else {
       internalError('Unexpected kind of supertype ${supertype.runtimeType}');
     }
     TypeParameterList typeParameters = pop();
     SimpleIdentifier name = pop();
-    Token classKeyword;
-    // TODO(paulberry,ahe): This is a hack.  The parser should give us the class
-    // keyword.
-    if (optional('abstract', beginToken)) {
-      classKeyword = beginToken.next;
-    } else {
-      classKeyword = beginToken;
-    }
     var modifiers = pop();
     assert(modifiers == null); // TODO(paulberry)
     analyzer.Token abstractKeyword;
     List<Annotation> metadata = pop();
     // TODO(paulberry): capture doc comments.  See dartbug.com/28851.
     Comment comment = null;
     push(ast.classDeclaration(
         comment,
         metadata,
         abstractKeyword,
@@ skipping 14 matching lines @@
     List<TypeName> mixinTypes = pop();
     // TODO(paulberry,ahe): the parser doesn't give us enough information to
     // locate the "with" keyword.
     Token withKeyword;
     TypeName supertype = pop();
     push(new _MixinApplication(supertype, withKeyword, mixinTypes));
   }
 
   @override
   void endNamedMixinApplication(
-      Token beginToken, Token equalsToken, Token implementsKeyword, Token endToken) {
+      Token beginToken, Token classKeyword, Token equalsToken,
+      Token implementsKeyword, Token endToken) {
     debugEvent("NamedMixinApplication");
     ImplementsClause implementsClause;
     if (implementsKeyword != null) {
       List<TypeName> interfaces = pop();
       implementsClause =
           ast.implementsClause(toAnalyzerToken(implementsKeyword), interfaces);
     }
     _MixinApplication mixinApplication = pop();
     var superclass = mixinApplication.supertype;
     var withClause = ast.withClause(
         toAnalyzerToken(mixinApplication.withKeyword),
         mixinApplication.mixinTypes);
     analyzer.Token equals = toAnalyzerToken(equalsToken);
     TypeParameterList typeParameters = pop();
     SimpleIdentifier name = pop();
-    Token classKeyword;
-    // TODO(paulberry,ahe): This is a hack.  The parser should give us the class
-    // keyword.
-    if (identical(beginToken.value, 'abstract')) {
-      classKeyword = beginToken.next;
-    } else {
-      classKeyword = beginToken;
-    }
     var modifiers = pop();
     assert(modifiers == null); // TODO(paulberry)
     analyzer.Token abstractKeyword;
     List<Annotation> metadata = pop();
     // TODO(paulberry): capture doc comments.  See dartbug.com/28851.
     Comment comment = null;
     push(ast.classTypeAlias(
         comment,
         metadata,
         toAnalyzerToken(classKeyword),
@@ skipping 248 matching lines @@
 /// [ClassDeclaration] or [ClassTypeAlias] object.
 class _MixinApplication {
   final TypeName supertype;
 
   final Token withKeyword;
 
   final List<TypeName> mixinTypes;
 
   _MixinApplication(this.supertype, this.withKeyword, this.mixinTypes);
 }