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

sdk/lib/_internal/compiler/implementation/tree/nodes.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 tree;
 
 abstract class Visitor<R> {
   const Visitor();
 
   R visitNode(Node node);
@@ skipping 30 matching lines @@
   R visitLiteralBool(LiteralBool node) => visitLiteral(node);
   R visitLiteralDouble(LiteralDouble node) => visitLiteral(node);
   R visitLiteralInt(LiteralInt node) => visitLiteral(node);
   R visitLiteralList(LiteralList node) => visitExpression(node);
   R visitLiteralMap(LiteralMap node) => visitExpression(node);
   R visitLiteralMapEntry(LiteralMapEntry node) => visitNode(node);
   R visitLiteralNull(LiteralNull node) => visitLiteral(node);
   R visitLiteralString(LiteralString node) => visitStringNode(node);
   R visitStringJuxtaposition(StringJuxtaposition node) => visitStringNode(node);
   R visitLoop(Loop node) => visitStatement(node);
+  R visitMixinApplication(MixinApplication node) => visitNode(node);
   R visitModifiers(Modifiers node) => visitNode(node);
   R visitNamedArgument(NamedArgument node) => visitExpression(node);
   R visitNewExpression(NewExpression node) => visitExpression(node);
   R visitNodeList(NodeList node) => visitNode(node);
   R visitOperator(Operator node) => visitIdentifier(node);
   R visitParenthesizedExpression(ParenthesizedExpression node) {
     return visitExpression(node);
   }
   R visitPart(Part node) => visitLibraryTag(node);
   R visitPartOf(PartOf node) => visitNode(node);
@@ skipping 76 matching lines @@
   Cascade asCascade() => null;
   CascadeReceiver asCascadeReceiver() => null;
   CaseMatch asCaseMatch() => null;
   CatchBlock asCatchBlock() => null;
   ClassNode asClassNode() => null;
   Combinator asCombinator() => null;
   Conditional asConditional() => null;
   ContinueStatement asContinueStatement() => null;
   DoWhile asDoWhile() => null;
   EmptyStatement asEmptyStatement() => null;
-  Export AsExport() => null;
+  Export asExport() => null;
   Expression asExpression() => null;
   ExpressionStatement asExpressionStatement() => null;
   For asFor() => null;
   ForIn asForIn() => null;
   FunctionDeclaration asFunctionDeclaration() => null;
   FunctionExpression asFunctionExpression() => null;
   Identifier asIdentifier() => null;
   If asIf() => null;
-  Import AsImport() => null;
+  Import asImport() => null;
   Label asLabel() => null;
   LabeledStatement asLabeledStatement() => null;
-  LibraryName AsLibraryName() => null;
+  LibraryName asLibraryName() => null;
   LiteralBool asLiteralBool() => null;
   LiteralDouble asLiteralDouble() => null;
   LiteralInt asLiteralInt() => null;
   LiteralList asLiteralList() => null;
   LiteralMap asLiteralMap() => null;
   LiteralMapEntry asLiteralMapEntry() => null;
   LiteralNull asLiteralNull() => null;
   LiteralString asLiteralString() => null;
+  MixinApplication asMixinApplication() => null;
   Modifiers asModifiers() => null;
   NamedArgument asNamedArgument() => null;
   NodeList asNodeList() => null;
   Operator asOperator() => null;
   ParenthesizedExpression asParenthesizedExpression() => null;
-  Part AsPart() => null;
-  PartOf AsPartOf() => null;
+  Part asPart() => null;
+  PartOf asPartOf() => null;
   Return asReturn() => null;
   ScriptTag asScriptTag() => null;
   Send asSend() => null;
   SendSet asSendSet() => null;
   Statement asStatement() => null;
   StringInterpolation asStringInterpolation() => null;
   StringInterpolationPart asStringInterpolationPart() => null;
   StringJuxtaposition asStringJuxtaposition() => null;
   StringNode asStringNode() => null;
   SwitchCase asSwitchCase() => null;
@@ skipping 43 matching lines @@
 
   bool get isInterface => identical(beginToken.stringValue, 'interface');
 
   bool get isClass => !isInterface;
 
   Token getBeginToken() => beginToken;
 
   Token getEndToken() => endToken;
 }
 
+class MixinApplication extends Node {
+  final Modifiers modifiers;
+  final TypeAnnotation superclass;
+  final NodeList mixins;
+  final Token beginToken;

[ahe, 2013/01/15 15:35:04]

typedefKeyword?

[kasperl, 2013/01/15 15:58:18]

The mixin application itself doesn't start with typedef. It starts with the
superclass reference.

+  final Token endToken;

[ahe, 2013/01/15 15:35:04]

This is not necessary.

+
+  MixinApplication(this.modifiers, this.superclass, this.mixins,
+                   this.beginToken, this.endToken);
+
+  MixinApplication asMixinApplication() => this;
+
+  accept(Visitor visitor) => visitor.visitMixinApplication(this);
+
+  visitChildren(Visitor visitor) {
+    if (modifiers != null) modifiers.accept(visitor);
+    if (superclass != null) superclass.accept(visitor);
+    if (mixins != null) mixins.accept(visitor);
+  }
+
+  Token getBeginToken() => beginToken;
+
+  Token getEndToken() => endToken;

[ahe, 2013/01/15 15:35:04]

mixins.getEndToken();

[kasperl, 2013/01/15 15:58:18]

Unfortunately, the node list produced from parseTypeList doesn't get a good
endToken. Any suggestion on how to make it get a reasonable endToken? I tried a
few simple things, but the token I have available after parsing the last type
using parseType isn't exactly what I need (again one too far ahead).

[ahe, 2013/01/15 16:03:40]

I think NodeList.getEndToken() should do what you want.

[kasperl, 2013/01/16 07:00:03]

Thanks. That looks exactly right.

+}
+
 abstract class Expression extends Node {
   Expression();
 
   Expression asExpression() => this;
 
   // TODO(ahe): make class abstract instead of adding an abstract method.
   accept(Visitor visitor);
 }
 
 abstract class Statement extends Node {
@@ skipping 1752 matching lines @@
  * argument).
  *
  * TODO(ahe): This method is controversial, the team needs to discuss
  * if top-level methods are acceptable and what naming conventions to
  * use.
  */
 initializerDo(Node node, f(Node node)) {
   SendSet send = node.asSendSet();
   if (send != null) return f(send.arguments.head);
 }