more work aligning fasta.Token with analyzer.Token

pkg/analyzer/lib/src/fasta/token_utils.dart

Index: pkg/analyzer/lib/src/fasta/token_utils.dart
diff --git a/pkg/analyzer/lib/src/fasta/token_utils.dart b/pkg/analyzer/lib/src/fasta/token_utils.dart
index 0f757c882d98b1fe4237f8b7d7ed3a483d6fb301..c30ed29e9cfe99c89263d5c570f0674c0af86ea9 100644
--- a/pkg/analyzer/lib/src/fasta/token_utils.dart
+++ b/pkg/analyzer/lib/src/fasta/token_utils.dart
@@ -93,7 +93,7 @@ class ToAnalyzerTokenStreamConverter {
         translateErrorToken(errorToken, reportError);
       } else {
         var translatedToken = translateToken(
-            token, translateCommentTokens(token.precedingCommentTokens));
+            token, translateCommentTokens(token.precedingComments));
         _matchGroups(token, translatedToken);
         translatedToken.setNext(translatedToken);
         _analyzerTokenTail.setNext(translatedToken);
@@ -115,7 +115,7 @@ class ToAnalyzerTokenStreamConverter {
 
   /// 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);
@@ -232,7 +232,7 @@ Token fromAnalyzerTokenStream(analyzer.Token analyzerToken) {
     }
   }
 
-  Token translateComments(analyzer.Token token) {
+  analyzer.Token translateComments(analyzer.Token token) {
     if (token == null) {
       return null;
     }
@@ -241,7 +241,7 @@ Token fromAnalyzerTokenStream(analyzer.Token analyzerToken) {
     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;
     }
@@ -250,10 +250,10 @@ Token fromAnalyzerTokenStream(analyzer.Token analyzerToken) {
 
   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;
@@ -262,11 +262,12 @@ Token fromAnalyzerTokenStream(analyzer.Token analyzerToken) {
   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);