Start adding support for mixin application syntax. We now parse the typedef variant of mixin applic…

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 34 matching lines @@
   }
 
   Token parseTopLevelDeclaration(Token token) {
     token = parseMetadataStar(token);
     final String value = token.stringValue;
     if (identical(value, 'interface')) {
       return parseInterface(token);
     } else if ((identical(value, 'abstract')) || (identical(value, 'class'))) {
       return parseClass(token);
     } else if (identical(value, 'typedef')) {
-      return parseNamedFunctionAlias(token);
+      return parseTypedef(token);
     } else if (identical(value, '#')) {
       return parseScriptTags(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 88 matching lines @@
     token = parseIdentifier(token);
     int count = 1;
     while (optional(',', token)) {
       token = parseIdentifier(token.next);
       count++;
     }
     listener.endIdentifierList(count);
     return token;
   }
 
+  /// type (, type)*
+  Token parseTypeList(Token token) {
+    listener.beginTypeList(token);
+    token = parseType(token);
+    int count = 1;
+    while (optional(',', token)) {
+      token = parseType(token.next);
+      count++;
+    }
+    listener.endTypeList(count);
+    return token;
+  }
+
   Token parsePartOrPartOf(Token token) {
     assert(optional('part', token));
     if (optional('of', token.next)) {
       return parsePartOf(token);
     } else {
       return parsePart(token);
     }
   }
 
   Token parsePart(Token token) {
@@ skipping 65 matching lines @@
     token = parseInterfaceBody(token);
     listener.endInterface(supertypeCount, interfaceKeyword,
                           extendsKeyword, token);
     return token.next;
   }
 
   Token parseInterfaceBody(Token token) {
     return parseClassBody(token);
   }
 
-  Token parseNamedFunctionAlias(Token token) {
+  Token parseTypedef(Token token) {
     Token typedefKeyword = token;
-    listener.beginFunctionTypeAlias(token);
-    token = parseReturnTypeOpt(token.next);
-    token = parseIdentifier(token);
-    token = parseTypeVariablesOpt(token);
-    token = parseFormalParameters(token);
-    listener.endFunctionTypeAlias(typedefKeyword, token);
+    // Figure out if we're dealing with a function type alias by
+    // peeking ahead at the token following the name and optional type
+    // parameters. If that is an = token, we found something that
+    // isn't a function type alias.
+    bool isFunctionTypeAlias = true;

[ahe, 2013/01/16 09:37:57]

Try using peekAfterType.

+    if (identical(token.next.kind, IDENTIFIER_TOKEN)) {

[ahe, 2013/01/16 09:37:57]

token.next.isIdentifier() (it's complicated)

+      Token peek = token.next.next;
+      if (identical(peek.kind, LT_TOKEN)) {

[ahe, 2013/01/16 09:37:57]

optional('<', peek)

+        BeginGroupToken beginGroupToken = peek;
+        Token endGroupToken = beginGroupToken.endGroup;
+        if (endGroupToken != null) peek = endGroupToken.next;
+      }
+      // Function type aliases do not use = so the name and type
+      // parameters we've peeked past are part of the return type
+      // specification instead.
+      isFunctionTypeAlias = !optional('=', peek);
+    }
+
+    if (isFunctionTypeAlias) {
+      listener.beginFunctionTypeAlias(token);
+      token = parseReturnTypeOpt(token.next);
+      token = parseIdentifier(token);
+      token = parseTypeVariablesOpt(token);
+      token = parseFormalParameters(token);
+      listener.endFunctionTypeAlias(typedefKeyword, token);
+    } else {
+      listener.beginNamedMixinApplication(token);
+      token = parseIdentifier(token.next);
+      token = parseTypeVariablesOpt(token);
+      token = expect('=', token);
+      token = parseMixinApplication(token);
+      listener.endNamedMixinApplication(typedefKeyword, token);
+    }
     return expect(';', token);
   }
 
+  Token parseMixinApplication(Token token) {
+    listener.beginMixinApplication(token);
+    token = parseModifiers(token);
+    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);
       return token.next;
     } else {
       return parseTypeOpt(token);
     }
   }
 
   Token parseFormalParametersOpt(Token token) {
@@ skipping 1885 matching lines @@
     }
     listener.handleContinueStatement(hasTarget, continueKeyword, token);
     return expectSemicolon(token);
   }
 
   Token parseEmptyStatement(Token token) {
     listener.handleEmptyStatement(token);
     return expectSemicolon(token);
   }
 }