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 41 matching lines @@
       listener.endTopLevelDeclaration(token);
       count++;
     }
     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')) {
+    if (identical(value, 'abstract') && optional('class', token.next)) {
       return parseClass(token);
+    } else if (identical(value, 'class')) {
+      return parseClassOrMixinApplication(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.
       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);
       }
       listener.endNamedMixinApplication(
           typedefKeyword, implementsKeyword, token);
     } else {
       listener.beginFunctionTypeAlias(token);
       token = parseReturnTypeOpt(token.next);
       token = parseIdentifier(token);
       token = parseTypeVariablesOpt(token);
       token = parseFormalParameters(token);
       listener.endFunctionTypeAlias(typedefKeyword, token);
     }
     return expect(';', token);
   }
 
+

[Johnni Winther, 2013/10/10 07:29:56]

Extra line.

[aam-me, 2013/10/11 03:02:06]

Done.

   Token parseMixinApplication(Token token) {
     listener.beginMixinApplication(token);
     token = parseType(token);
     token = expect('with', token);
     token = parseTypeList(token);
     listener.endMixinApplication();
     return token;
   }
 
   Token parseReturnTypeOpt(Token token) {
@@ skipping 163 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 parseClassOrMixinApplication(Token token) {
+    Token classKeyword = token;
+    if (optional('=', peekAfterType(token.next))) {
+      listener.beginNamedMixinApplication(token);
+      token = parseIdentifier(token.next);
+      token = parseTypeVariablesOpt(token);
+      token = expect('=', token);
+      token = parseModifiers(token);

[Johnni Winther, 2013/10/10 07:29:56]

Modifiers should preceed the 'class' keyword:

abstract class C = S with M1, M2;

[aam-me, 2013/10/11 03:02:06]

Done.

+      token = parseMixinApplication(token);
+      Token implementsKeyword = null;
+      if (optional('implements', token)) {
+        implementsKeyword = token;
+        token = parseTypeList(token.next);
+      }
+      listener.endNamedMixinApplication(
+          classKeyword, implementsKeyword, token);
+      return expect(';', token);
+    } else {
+      return parseClass(token);
+    }
+  }
+
   Token parseClass(Token token) {
     Token begin = token;
     listener.beginClassDeclaration(token);
     int modifierCount = 0;
     if (optional('abstract', token)) {
       listener.handleModifier(token);
       modifierCount++;
       token = token.next;
     }
     listener.handleModifiers(modifierCount);
@@ skipping 1926 matching lines @@
     }
     listener.handleContinueStatement(hasTarget, continueKeyword, token);
     return expectSemicolon(token);
   }
 
   Token parseEmptyStatement(Token token) {
     listener.handleEmptyStatement(token);
     return expectSemicolon(token);
   }
 }