[fasta] Add and correct even more offsets

pkg/front_end/lib/src/fasta/analyzer/ast_builder.dart

 // Copyright (c) 2016, 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.
 
 library fasta.analyzer.ast_builder;
 
 import 'package:analyzer/analyzer.dart';
 import 'package:analyzer/dart/ast/ast_factory.dart' show AstFactory;
 import 'package:analyzer/dart/ast/standard_ast_factory.dart' as standard;
 import 'package:analyzer/dart/ast/token.dart' as analyzer show Token;
@@ skipping 603 matching lines @@
     TypeAnnotation returnType = pop();
     push(ast.genericFunctionType(returnType, toAnalyzerToken(functionToken),
         typeParameters, parameters));
   }
 
   void handleFormalParameterWithoutValue(Token token) {
     debugEvent("FormalParameterWithoutValue");
     push(NullValue.ParameterDefaultValue);
   }
 
-  void endFormalParameter(
-      Token covariantKeyword, Token thisKeyword, FormalParameterType kind) {
+  void endFormalParameter(Token covariantKeyword, Token thisKeyword,
+      Token nameToken, FormalParameterType kind) {
     debugEvent("FormalParameter");
     _ParameterDefaultValue defaultValue = pop();
 
     AstNode nameOrFunctionTypedParameter = pop();
 
     FormalParameter node;
     SimpleIdentifier name;
     if (nameOrFunctionTypedParameter is FormalParameter) {
       node = nameOrFunctionTypedParameter;
       name = nameOrFunctionTypedParameter.identifier;
@@ skipping 204 matching lines @@
 
   void handleModifiers(int count) {
     debugEvent("Modifiers");
     if (count == 0) {
       push(NullValue.Modifiers);
     } else {
       push(new _Modifiers(popList(count)));
     }
   }
 
-  void endTopLevelMethod(Token beginToken, Token getOrSet, Token endToken) {
+  void endTopLevelMethod(Token beginToken, Token getOrSet,
+      Token formalParametersToken, Token endToken) {
     // TODO(paulberry): set up scopes properly to resolve parameters and type
     // variables.
     debugEvent("TopLevelMethod");
     FunctionBody body = pop();
     FormalParameterList parameters = pop();
     TypeParameterList typeParameters = pop();
     SimpleIdentifier name = pop();
     analyzer.Token propertyKeyword = toAnalyzerToken(getOrSet);
     TypeAnnotation returnType = pop();
     _Modifiers modifiers = pop();
@@ skipping 296 matching lines @@
     StringLiteral uri = null; // TODO(paulberry)
     // TODO(paulberry,ahe): seems hacky.  It would be nice if the parser passed
     // in a reference to the "of" keyword.
     var ofKeyword = partKeyword.next;
     List<Annotation> metadata = pop();
     Comment comment = pop();
     push(ast.partOfDirective(comment, metadata, toAnalyzerToken(partKeyword),
         toAnalyzerToken(ofKeyword), uri, name, toAnalyzerToken(semicolon)));
   }
 
-  void endUnnamedFunction(Token token) {
+  void endUnnamedFunction(Token beginToken, Token token) {
     // TODO(paulberry): set up scopes properly to resolve parameters and type
     // variables.  Note that this is tricky due to the handling of initializers
     // in constructors, so the logic should be shared with BodyBuilder as much
     // as possible.
     debugEvent("UnnamedFunction");
     FunctionBody body = pop();
     FormalParameterList parameters = pop();
     TypeParameterList typeParameters = pop();
     push(ast.functionExpression(typeParameters, parameters, body));
   }
 
   @override
   void handleNoFieldInitializer(Token token) {
     debugEvent("NoFieldInitializer");
     SimpleIdentifier name = pop();
     push(ast.variableDeclaration(name, null, null));
   }
 
   @override
-  void endFactoryMethod(
-      Token beginToken, Token factoryKeyword, Token semicolon) {
+  void endFactoryMethod(Token beginToken, Token factoryKeyword,
+      Token formalParametersToken, Token semicolon) {
     debugEvent("FactoryMethod");
 
     FunctionBody body;
     Token separator;
     ConstructorName redirectedConstructor;
     Object bodyObject = pop();
     if (bodyObject is FunctionBody) {
       body = bodyObject;
     } else if (bodyObject is _RedirectingFactoryBody) {
       separator = bodyObject.equalToken;
@@ skipping 64 matching lines @@
 
   @override
   void endTypeVariables(int count, Token beginToken, Token endToken) {
     debugEvent("TypeVariables");
     List<TypeParameter> typeParameters = popList(count);
     push(ast.typeParameterList(toAnalyzerToken(beginToken), typeParameters,
         toAnalyzerToken(endToken)));
   }
 
   @override
-  void endMethod(Token getOrSet, Token beginToken, Token endToken) {
+  void endMethod(Token getOrSet, Token beginToken, Token formalParametersToken,
+      Token endToken) {
     debugEvent("Method");
     FunctionBody body = pop();
     ConstructorName redirectedConstructor = null; // TODO(paulberry)
     List<ConstructorInitializer> initializers = null; // TODO(paulberry)
     Token separator = null; // TODO(paulberry)
     FormalParameterList parameters = pop();
     TypeParameterList typeParameters = pop(); // TODO(paulberry)
     var name = pop();
     TypeAnnotation returnType = pop(); // TODO(paulberry)
     _Modifiers modifiers = pop();
@@ skipping 291 matching lines @@
       } else if (identical('static', s)) {
         staticKeyword = token;
       } else if (identical('var', s)) {
         finalConstOrVarKeyword = token;
       } else {
         internalError('Unhandled modifier: $s');
       }
     }
   }
 }