Generate AST nodes for field initializers.

dart/frog/leg/tree/nodes.dart

 // Copyright (c) 2011, 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.
 
 interface Visitor<R> {
   R visitBlock(Block node);
   R visitBreakStatement(BreakStatement node);
   R visitCatchBlock(CatchBlock node);
   R visitClassNode(ClassNode node);
   R visitConditional(Conditional node);
@@ skipping 518 matching lines @@
   accept(Visitor visitor) => visitor.visitFunctionExpression(this);
 
   visitChildren(Visitor visitor) {
     if (name !== null) name.accept(visitor);
     if (parameters !== null) parameters.accept(visitor);
     if (body !== null) body.accept(visitor);
     if (returnType !== null) returnType.accept(visitor);
   }
 
   Token getBeginToken() {
-    return firstBeginToken(returnType, name);
+    if (returnType === null) return firstBeginToken(name, parameters);
+    return returnType.getBeginToken();
   }
 
   Token getEndToken() {
     return (body === null) ? parameters.getEndToken() : body.getEndToken();
   }
 }
 
 typedef void DecodeErrorHandler(Token token, var error);
 
 class Literal<T> extends Expression {
@@ skipping 151 matching lines @@
   bool get hasExpression() => expression !== null;
 
   accept(Visitor visitor) => visitor.visitReturn(this);
 
   visitChildren(Visitor visitor) {
     if (expression !== null) expression.accept(visitor);
   }
 
   Token getBeginToken() => beginToken;
 
-  Token getEndToken() => endToken;
+  Token getEndToken() {
+    if (endToken === null) return expression.getEndToken();
+    return endToken;
+  }
 }
 
 class ExpressionStatement extends Statement {
   final Expression expression;
   final Token endToken;
 
   ExpressionStatement(this.expression, this.endToken);
 
   ExpressionStatement asExpressionStatement() => this;
 
@@ skipping 529 matching lines @@
 
   visitChildren(Visitor visitor) {
     formals.accept(visitor);
     block.accept(visitor);
   }
 
   Token getBeginToken() => catchKeyword;
 
   Token getEndToken() => block.getEndToken();
 }