merge fasta.Token into analyzer.Token

pkg/front_end/lib/src/fasta/scanner/array_based_scanner.dart

 // Copyright (c) 2011, 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.scanner.array_based_scanner;
 
 import 'error_token.dart' show ErrorToken, UnmatchedToken;
 
-import '../../scanner/token.dart' show Keyword, TokenType;
+import '../../scanner/token.dart'
+    show Keyword, KeywordTokenWithComment, Token, TokenType;
 
 import 'token.dart'
-    show
-        BeginGroupToken,
-        KeywordToken,
-        StringToken,
-        SymbolToken,
-        SyntheticSymbolToken,
-        Token;
+    show BeginGroupToken, StringToken, SymbolToken, SyntheticSymbolToken;
 
 import 'token_constants.dart'
     show
         LT_TOKEN,
         OPEN_CURLY_BRACKET_TOKEN,
         OPEN_PAREN_TOKEN,
         STRING_INTERPOLATION_TOKEN;
 
 import 'characters.dart' show $LF, $STX;
 
@@ skipping 17 matching lines @@
   Link<BeginGroupToken> groupingStack = const Link<BeginGroupToken>();
 
   /**
    * Appends a fixed token whose kind and content is determined by [type].
    * Appends an *operator* token from [type].
    *
    * An operator token represent operators like ':', '.', ';', '&&', '==', '--',
    * '=>', etc.
    */
   void appendPrecedenceToken(TokenType type) {
-    appendToken(new SymbolToken(type, tokenStart));
+    appendToken(new SymbolToken(type, tokenStart, comments));
   }
 
   /**
    * Appends a fixed token based on whether the current char is [choice] or not.
    * If the current char is [choice] a fixed token whose kind and content
    * is determined by [yes] is appended, otherwise a fixed token whose kind
    * and content is determined by [no] is appended.
    */
   int select(int choice, TokenType yes, TokenType no) {
     int next = advance();
     if (identical(next, choice)) {
       appendPrecedenceToken(yes);
       return advance();
     } else {
       appendPrecedenceToken(no);
       return next;
     }
   }
 
   /**
    * Appends a keyword token whose kind is determined by [keyword].
    */
   void appendKeywordToken(Keyword keyword) {
     String syntax = keyword.lexeme;
     // Type parameters and arguments cannot contain 'this'.
     if (identical(syntax, 'this')) {
       discardOpenLt();
     }
-    appendToken(new KeywordToken(keyword, tokenStart));
+    appendToken(new KeywordTokenWithComment(keyword, tokenStart, comments));
   }
 
   void appendEofToken() {
     beginToken();
     discardOpenLt();
     while (!groupingStack.isEmpty) {
       unmatchedBeginGroup(groupingStack.head);
       groupingStack = groupingStack.tail;
     }
-    appendToken(new SymbolToken.eof(tokenStart));
+    appendToken(new SymbolToken.eof(tokenStart, comments));
   }
 
   /**
    * Notifies scanning a whitespace character. Note that [appendWhiteSpace] is
    * not always invoked for [$SPACE] characters.
    *
    * This method is used by the scanners to track line breaks and create the
    * [lineStarts] map.
    */
   void appendWhiteSpace(int next) {
@@ skipping 10 matching lines @@
    */
   void lineFeedInMultiline() {
     lineStarts.add(stringOffset + 1);
   }
 
   /**
    * Appends a token that begins a new group, represented by [type].
    * Group begin tokens are '{', '(', '[' and '${'.
    */
   void appendBeginGroup(TokenType type) {
-    Token token = new BeginGroupToken(type, tokenStart);
+    Token token = new BeginGroupToken(type, tokenStart, comments);
     appendToken(token);
 
     // { [ ${ cannot appear inside a type parameters / arguments.
     if (!identical(type.kind, LT_TOKEN) &&
         !identical(type.kind, OPEN_PAREN_TOKEN)) {
       discardOpenLt();
     }
     groupingStack = groupingStack.prepend(token);
   }
 
@@ skipping 157 matching lines @@
     // SymbolToken(})<----------------------------------+
     //      |
     //     next
     //      v
     // SymbolToken(;)
     //      |
     //     next
     //      v
     //     EOF
     TokenType type = closeBraceInfoFor(begin);
-    appendToken(new SyntheticSymbolToken(type, tokenStart));
+    appendToken(new SyntheticSymbolToken(type, tokenStart, comments));
     begin.endGroup = tail;
     appendErrorToken(new UnmatchedToken(begin));
   }
 }