more work aligning fasta.Token with analyzer.Token

pkg/analyzer/tool/summary/mini_ast.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/errors.dart';
 import 'package:front_end/src/fasta/parser/identifier_context.dart';
 import 'package:front_end/src/fasta/parser/parser.dart';
 import 'package:front_end/src/fasta/scanner/token.dart';
 import 'package:front_end/src/fasta/source/stack_listener.dart';
+import 'package:front_end/src/scanner/token.dart' as analyzer;
 
 /// "Mini AST" representation of a declaration which can accept annotations.
 class AnnotatedNode {
   final Comment documentationComment;
 
   final List<Annotation> metadata;
 
   AnnotatedNode(this.documentationComment, List<Annotation> metadata)
       : metadata = metadata ?? const [];
 }
@@ skipping 27 matching lines @@
   ClassMember(Comment documentationComment, List<Annotation> metadata)
       : super(documentationComment, metadata);
 }
 
 /// "Mini AST" representation of a comment.
 class Comment {
   final bool isDocumentation;
 
   final List<Token> tokens;
 
-  factory Comment(Token commentToken) {
+  factory Comment(analyzer.Token commentToken) {
     var tokens = <Token>[];
     bool isDocumentation = false;
     while (commentToken != null) {
       if (commentToken.lexeme.startsWith('/**') ||
           commentToken.lexeme.startsWith('///')) {
         isDocumentation = true;
       }
       tokens.add(commentToken);
       commentToken = commentToken.next;
     }
@@ skipping 88 matching lines @@
 
   @override
   void beginMetadata(Token token) {
     inMetadata = true;
   }
 
   @override
   void beginMetadataStar(Token token) {
     debugEvent("beginMetadataStar");
     if (token.precedingComments != null) {
-      push(new Comment(token.precedingCommentTokens));
+      push(new Comment(token.precedingComments));
     } else {
       push(NullValue.Comments);
     }
   }
 
   @override
   void endArguments(int count, Token beginToken, Token endToken) {
     debugEvent("Arguments");
     push(popList(count));
   }
@@ skipping 205 matching lines @@
   }
 
   @override
   void handleFunctionBodySkipped(Token token, bool isExpressionBody) {
     if (isExpressionBody) pop();
     push(NullValue.FunctionBody);
   }
 
   void handleIdentifier(Token token, IdentifierContext context) {
     if (context == IdentifierContext.enumValueDeclaration) {
-      var comment = new Comment(token.precedingCommentTokens);
+      var comment = new Comment(token.precedingComments);
       push(new EnumConstantDeclaration(comment, null, token.lexeme));
     } else {
       push(token.lexeme);
     }
   }
 
   void handleLiteralInt(Token token) {
     debugEvent("LiteralInt");
     push(new IntegerLiteral(int.parse(token.lexeme)));
   }
@@ skipping 60 matching lines @@
   final String name;
 
   final List<TypeName> typeArguments;
 
   TypeName(this.name, this.typeArguments);
 }
 
 /// "Mini AST" representation of an expression which summary code generation
 /// need not be concerned about.
 class UnknownExpression extends Expression {}