more work aligning fasta.Token with analyzer.Token

pkg/analyzer/lib/src/fasta/token_utils.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.token_utils;
 
 import 'package:front_end/src/fasta/scanner/error_token.dart' show ErrorToken;
 
 import 'package:front_end/src/scanner/token.dart' show Keyword;
 
@@ skipping 75 matching lines @@
     _analyzerTokenTail = _analyzerTokenHead;
     _beginTokenStack = [null];
     _endTokenStack = <Token>[null];
 
     while (true) {
       if (token.type.kind == BAD_INPUT_TOKEN) {
         ErrorToken errorToken = token;
         translateErrorToken(errorToken, reportError);
       } else {
         var translatedToken = translateToken(
-            token, translateCommentTokens(token.precedingCommentTokens));
+            token, translateCommentTokens(token.precedingComments));
         _matchGroups(token, translatedToken);
         translatedToken.setNext(translatedToken);
         _analyzerTokenTail.setNext(translatedToken);
         translatedToken.previous = _analyzerTokenTail;
         _analyzerTokenTail = translatedToken;
       }
       if (token.isEof) {
         return _analyzerTokenHead.next;
       }
       token = token.next;
     }
   }
 
   /// Handles an error found during [convertTokens].
   ///
   /// Intended to be overridden by derived classes; by default, does nothing.
   void reportError(analyzer.ScannerErrorCode errorCode, int offset,
       List<Object> arguments) {}
 
   /// Translates a sequence of fasta comment tokens to the corresponding
   /// analyzer tokens.
-  analyzer.CommentToken translateCommentTokens(Token token) {
+  analyzer.CommentToken translateCommentTokens(analyzer.Token token) {
     analyzer.CommentToken head;
     if (token != null) {
       head = toAnalyzerCommentToken(token);
       analyzer.CommentToken tail = head;
       token = token.next;
       while (token != null) {
         tail = tail.setNext(toAnalyzerCommentToken(token));
         token = token.next;
       }
     }
@@ skipping 96 matching lines @@
     // tokens as appropriate.
     if (translatedToken is BeginGroupToken &&
         analyzerToken is analyzer.BeginToken &&
         analyzerToken.endToken != null) {
       angleBracketStack.clear();
       beginTokenStack.add(translatedToken);
       endTokenStack.add(analyzerToken.endToken);
     }
   }
 
-  Token translateComments(analyzer.Token token) {
+  analyzer.Token translateComments(analyzer.Token token) {
     if (token == null) {
       return null;
     }
     Token head = fromAnalyzerToken(token);
     Token tail = head;
     token = token.next;
     while (token != null) {
       tail.next = fromAnalyzerToken(token);
-      tail.next.previousToken = tail; // ignore: deprecated_member_use
+      tail.next.previous = tail; // ignore: deprecated_member_use
       tail = tail.next;
       token = token.next;
     }
     return head;
   }
 
   analyzer.Token translateAndAppend(analyzer.Token analyzerToken) {
     var token = fromAnalyzerToken(analyzerToken);
-    token.precedingCommentTokens =
+    token.precedingComments =
         translateComments(analyzerToken.precedingComments);
     tokenTail.next = token;
-    tokenTail.next.previousToken = tokenTail; // ignore: deprecated_member_use
+    tokenTail.next.previous = tokenTail; // ignore: deprecated_member_use
     tokenTail = token;
     matchGroups(analyzerToken, token);
     return analyzerToken.next;
   }
 
   while (true) {
     // TODO(paulberry): join up begingroup/endgroup.
     if (analyzerToken.type == TokenType.EOF) {
-      tokenTail.next = new SymbolToken.eof(analyzerToken.offset);
-      tokenTail.next.previousToken = tokenTail; // ignore: deprecated_member_use
-      tokenTail.next.precedingCommentTokens =
+      SymbolToken eof = new SymbolToken.eof(analyzerToken.offset);
+      tokenTail.next = eof;
+      eof.previous = tokenTail; // ignore: deprecated_member_use
+      eof.precedingComments =
           translateComments(analyzerToken.precedingComments);
-      tokenTail.next.next = tokenTail.next;
+      eof.next = eof;
       return tokenHead.next;
     }
     analyzerToken = translateAndAppend(analyzerToken);
   }
 }
 
 /// Converts a single analyzer token into a Fasta token.
 Token fromAnalyzerToken(analyzer.Token token) {
   Token beginGroup(TokenType type) => new BeginGroupToken(type, token.offset);
   Token string(TokenType type) =>
@@ skipping 310 matching lines @@
   "hide": analyzer.Keyword.HIDE,
   "native": analyzer.Keyword.NATIVE,
   "of": analyzer.Keyword.OF,
   "on": analyzer.Keyword.ON,
   "patch": analyzer.Keyword.PATCH,
   "show": analyzer.Keyword.SHOW,
   "source": analyzer.Keyword.SOURCE,
   "sync": analyzer.Keyword.SYNC,
   "yield": analyzer.Keyword.YIELD,
 };