Switch dart2js 'typedef name = mixinApplication' to 'class name = mixinApplication'.

sdk/lib/_internal/compiler/implementation/scanner/parser.dart

 // Copyright (c) 2012, 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.
 
 part of scanner;
 
 class FormalParameterType {
   final String type;
   const FormalParameterType(this.type);
   bool get isRequired => this == REQUIRED;
@@ skipping 43 matching lines @@
     }
     listener.endCompilationUnit(count, token);
     return token;
   }
 
   Token parseTopLevelDeclaration(Token token) {
     token = parseMetadataStar(token);
     final String value = token.stringValue;
     if ((identical(value, 'abstract') && optional('class', token.next))
         || identical(value, 'class')) {
-      return parseClass(token);
+      return parseClassOrNamedMixinApplication(token);
     } else if (identical(value, 'typedef')) {
       return parseTypedef(token);
     } else if (identical(value, 'library')) {
       return parseLibraryName(token);
     } else if (identical(value, 'import')) {
       return parseImport(token);
     } else if (identical(value, 'export')) {
       return parseExport(token);
     } else if (identical(value, 'part')) {
       return parsePartOrPartOf(token);
@@ skipping 164 matching lines @@
       token = parseIdentifier(token.next);
     }
     token = parseArgumentsOpt(token);
     listener.endMetadata(atToken, period, token);
     return token;
   }
 
   Token parseTypedef(Token token) {
     Token typedefKeyword = token;
     if (optional('=', peekAfterType(token.next))) {
+      // TODO(aprelev@gmail.com): Remove deprecated 'typedef' mixin application,
+      // remove corresponding diagnostic from members.dart.
       listener.beginNamedMixinApplication(token);
       token = parseIdentifier(token.next);
       token = parseTypeVariablesOpt(token);
       token = expect('=', token);
       token = parseModifiers(token);
       token = parseMixinApplication(token);
       Token implementsKeyword = null;
       if (optional('implements', token)) {
         implementsKeyword = token;
         token = parseTypeList(token.next);
@@ skipping 187 matching lines @@
     BeginGroupToken beginGroupToken = token;
     Token endGroup = beginGroupToken.endGroup;
     if (endGroup == null) {
       return listener.unmatched(beginGroupToken);
     } else if (!identical(endGroup.kind, $CLOSE_CURLY_BRACKET)) {
       return listener.unmatched(beginGroupToken);
     }
     return beginGroupToken.endGroup;
   }
 
-  Token parseClass(Token token) {
+  Token parseClassOrNamedMixinApplication(Token token) {
     Token begin = token;
-    listener.beginClassDeclaration(token);
-    int modifierCount = 0;
+    Token abstractKeyword;
     if (optional('abstract', token)) {
-      listener.handleModifier(token);
-      modifierCount++;
+      abstractKeyword = token;
       token = token.next;
     }
+    Token classKeyword = token;
+    var isMixinApplication = optional('=', peekAfterType(token.next));
+    if (isMixinApplication) {
+      listener.beginNamedMixinApplication(begin);
+      token = parseIdentifier(token.next);
+      token = parseTypeVariablesOpt(token);
+      token = expect('=', token);
+    } else {
+      listener.beginClassDeclaration(begin);
+    }
+
+    // TODO(aprelev@gmail.com): Once 'typedef' named mixin application is
+    // removed, move modifiers for named mixin application to the bottom of
+    // listener stack. This is so stacks for class declaration and named
+    // mixin application look similar.
+    int modifierCount = 0;
+    if (abstractKeyword != null) {
+      parseModifier(abstractKeyword);
+      modifierCount++;
+    }
     listener.handleModifiers(modifierCount);
-    token = parseIdentifier(token.next);
+
+    if (isMixinApplication) {
+      return parseNamedMixinApplication(token, classKeyword);
+    } else {
+      return parseClass(begin, classKeyword);
+    }
+  }
+
+  Token parseNamedMixinApplication(Token token, Token classKeyword) {
+    token = parseMixinApplication(token);
+    Token implementsKeyword = null;
+    if (optional('implements', token)) {
+      implementsKeyword = token;
+      token = parseTypeList(token.next);
+    }
+    listener.endNamedMixinApplication(
+        classKeyword, implementsKeyword, token);
+    return expect(';', token);
+  }
+
+  Token parseClass(Token begin, Token classKeyword) {
+    Token token = parseIdentifier(classKeyword.next);
     token = parseTypeVariablesOpt(token);
     Token extendsKeyword;
     if (optional('extends', token)) {
       extendsKeyword = token;
       if (optional('with', peekAfterType(token.next))) {
         token = parseMixinApplication(token.next);
       } else {
         token = parseType(token.next);
       }
     } else {
@@ skipping 1915 matching lines @@
     }
     listener.handleContinueStatement(hasTarget, continueKeyword, token);
     return expectSemicolon(token);
   }
 
   Token parseEmptyStatement(Token token) {
     listener.handleEmptyStatement(token);
     return expectSemicolon(token);
   }
 }