Change accessors and AstFactory to use tokens rather than file offsets.

pkg/front_end/lib/src/fasta/builder/ast_factory.dart

 // Copyright (c) 2017, 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.
 
+import 'package:front_end/src/fasta/scanner/token.dart' show Token;

[ahe, 2017/04/26 08:34:36]

If you import package:front_end/src/fasta/scanner.dart instead, you don't need
to change the subpackage relationship.

[Paul Berry, 2017/04/26 20:20:52]

Done.

 import 'package:kernel/ast.dart';
 
 /// An abstract class containing factory methods that create AST objects.
 ///
 /// Itended for use by [BodyBuilder] so that it can create either analyzer or
 /// kernel ASTs depending on which concrete factory it is connected to.
 ///
 /// This class is defined in terms of the builder's shadow AST mixins (which are
 /// shared between kernel and analyzer shadow AST representations).
 ///
@@ skipping 12 matching lines @@
 /// for many AST constructs, not just one.  Note also that for kernel codegen
 /// we want to be very careful not to keep tokens around too long, so consider
 /// having a `toLocation` method on AstFactory that changes tokens to an
 /// abstract type (`int` for kernel, `Token` for analyzer).
 ///
 /// TODO(paulberry): in order to interface with analyzer, we'll need to
 /// shadow-ify [DartType], since analyzer ASTs need to be able to record the
 /// exact tokens that were used to specify a type.
 abstract class AstFactory {
   /// Creates a statement block.
-  Block block(List<Statement> statements, int charOffset);
+  Block block(List<Statement> statements, Token beginToken);
 
   /// Creates a field.
   Field field(Name name, int charOffset, {String fileUri});

[Paul Berry, 2017/04/25 12:37:52]

Note: I realized as I was going through this exercise that this method doesn't
belong in AstFactory, because it's not used by BodyBuilder; it's used by
KernelFieldBuilder, which always builds kernel objects.  I'll submit a separate
CL that removes this method and changes KernelFieldBuilder to construct the
object directly.

 
   /// Creates an integer literal.
-  IntLiteral intLiteral(value, int charOffset);
+  IntLiteral intLiteral(value, Token token);
 
   /// Creates a list literal expression.
   ///
   /// If the list literal did not have an explicitly declared type argument,
   /// [typeArgument] should be `null`.
   ListLiteral listLiteral(List<Expression> expressions, DartType typeArgument,
-      bool isConst, int charOffset);
+      bool isConst, Token token);
 
   /// Creates a null literal expression.
-  NullLiteral nullLiteral(int charOffset);
+  NullLiteral nullLiteral(Token token);
 
   /// Creates a return statement.
-  Statement returnStatement(Expression expression, int charOffset);
+  Statement returnStatement(Expression expression, Token token);
 
   /// Creates a read of a static variable.
-  StaticGet staticGet(Member readTarget, int offset);
+  StaticGet staticGet(Member readTarget, Token token);
 
   /// Creates a variable declaration statement declaring one variable.
   ///
   /// TODO(paulberry): analyzer makes a distinction between a single variable
   /// declaration and a variable declaration statement (which can contain
   /// multiple variable declarations).  Currently this API only makes sense for
   /// kernel, which desugars each variable declaration to its own statement.
   ///
   /// If the variable declaration did not have an explicitly declared type,
   /// [type] should be `null`.
-  VariableDeclaration variableDeclaration(String name, int charOffset,
+  VariableDeclaration variableDeclaration(String name, Token token,
       {DartType type,
       Expression initializer,
-      int equalsCharOffset = TreeNode.noOffset,
+      Token equalsToken,
       bool isFinal: false,
       bool isConst: false});
 }