Support 'implements' clause on typedef mixin applications.

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;
 
 /**
  * An event generating parser of Dart programs. This parser expects
  * all tokens in a linked list (aka a token stream).
  *
@@ skipping 248 matching lines @@
     return parseClassBody(token);
   }
 
   Token parseTypedef(Token token) {
     Token typedefKeyword = token;
     if (optional('=', peekAfterType(token.next))) {
       listener.beginNamedMixinApplication(token);
       token = parseIdentifier(token.next);
       token = parseTypeVariablesOpt(token);
       token = expect('=', token);
-      token = parseMixinApplication(token, true);
-      listener.endNamedMixinApplication(typedefKeyword, 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);
   }
 
-  Token parseMixinApplication(Token token, bool isTypedef) {

[Johnni Winther, 2013/01/24 08:33:18]

Good to get rid of this :)

+  Token parseMixinApplication(Token token) {
     listener.beginMixinApplication(token);
-    if (isTypedef) {
-      token = parseModifiers(token);
-    } else {
-      listener.handleModifiers(0);
-    }
     token = parseType(token);
     token = expect('with', token);
     token = parseTypeList(token);
     listener.endMixinApplication();
     return token;
   }
 
   Token parseReturnTypeOpt(Token token) {
     if (identical(token.stringValue, 'void')) {
       listener.handleVoidKeyword(token);
@@ skipping 183 matching lines @@
       modifierCount++;
       token = token.next;
     }
     listener.handleModifiers(modifierCount);
     token = parseIdentifier(token.next);
     token = parseTypeVariablesOpt(token);
     Token extendsKeyword;
     if (optional('extends', token)) {
       extendsKeyword = token;
       if (optional('with', token.next.next)) {
-        token = parseMixinApplication(token.next, false);
+        token = parseMixinApplication(token.next);
       } else {
         token = parseType(token.next);
       }
     } else {
       extendsKeyword = null;
       listener.handleNoType(token);
     }
     Token implementsKeyword;
     int interfacesCount = 0;
     if (optional('implements', token)) {
@@ skipping 1692 matching lines @@
     }
     listener.handleContinueStatement(hasTarget, continueKeyword, token);
     return expectSemicolon(token);
   }
 
   Token parseEmptyStatement(Token token) {
     listener.handleEmptyStatement(token);
     return expectSemicolon(token);
   }
 }