merge fasta.PrecedenceInfo into analyzer.TokenType

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

 // Copyright (c) 2012, 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.abstract_scanner;
 
 import 'dart:collection' show ListMixin;
 
 import 'dart:typed_data' show Uint16List, Uint32List;
 
+import '../../scanner/token.dart' show TokenType;
+
 import '../scanner.dart'
     show ErrorToken, Keyword, Scanner, buildUnexpectedCharacterToken;
 
 import 'error_token.dart' show UnterminatedToken;
 
 import 'keyword_state.dart' show KeywordState;
 
 import 'precedence.dart';
 
 import 'token.dart'
@@ skipping 131 matching lines @@
 
   /**
    * Appends a substring from the scan offset [:start:] to the current
    * [:scanOffset:] plus the [:extraOffset:]. For example, if the current
    * scanOffset is 10, then [:appendSubstringToken(5, -1):] will append the
    * substring string [5,9).
    *
    * Note that [extraOffset] can only be used if the covered character(s) are
    * known to be ASCII.
    */
-  void appendSubstringToken(PrecedenceInfo info, int start, bool asciiOnly,
+  void appendSubstringToken(TokenType info, int start, bool asciiOnly,
       [int extraOffset]);
 
   /** Documentation in subclass [ArrayBasedScanner]. */
-  void appendPrecedenceToken(PrecedenceInfo info);
+  void appendPrecedenceToken(TokenType info);
 
   /** Documentation in subclass [ArrayBasedScanner]. */
-  int select(int choice, PrecedenceInfo yes, PrecedenceInfo no);
+  int select(int choice, TokenType yes, TokenType no);
 
   /** Documentation in subclass [ArrayBasedScanner]. */
   void appendKeywordToken(Keyword keyword);
 
   /** Documentation in subclass [ArrayBasedScanner]. */
   void appendEofToken();
 
   /** Documentation in subclass [ArrayBasedScanner]. */
   void appendWhiteSpace(int next);
 
   /** Documentation in subclass [ArrayBasedScanner]. */
   void lineFeedInMultiline();
 
   /** Documentation in subclass [ArrayBasedScanner]. */
-  void appendBeginGroup(PrecedenceInfo info);
+  void appendBeginGroup(TokenType info);
 
   /** Documentation in subclass [ArrayBasedScanner]. */
-  int appendEndGroup(PrecedenceInfo info, int openKind);
+  int appendEndGroup(TokenType info, int openKind);
 
   /** Documentation in subclass [ArrayBasedScanner]. */
-  void appendGt(PrecedenceInfo info);
+  void appendGt(TokenType info);
 
   /** Documentation in subclass [ArrayBasedScanner]. */
-  void appendGtGt(PrecedenceInfo info);
+  void appendGtGt(TokenType info);
 
   /// Append [token] to the token stream.
   void appendErrorToken(ErrorToken token);
 
   /**
    * Returns a new comment from the scan offset [start] to the current
    * [scanOffset] plus the [extraOffset]. For example, if the current
    * scanOffset is 10, then [appendSubstringToken(5, -1)] will append the
    * substring string [5,9).
    *
    * Note that [extraOffset] can only be used if the covered character(s) are
    * known to be ASCII.
    */
-  CommentToken createCommentToken(
-      PrecedenceInfo info, int start, bool asciiOnly,
+  CommentToken createCommentToken(TokenType info, int start, bool asciiOnly,
       [int extraOffset = 0]);
 
   /**
    * Returns a new dartdoc from the scan offset [start] to the current
    * [scanOffset] plus the [extraOffset]. For example, if the current
    * scanOffset is 10, then [appendSubstringToken(5, -1)] will append the
    * substring string [5,9).
    *
    * Note that [extraOffset] can only be used if the covered character(s) are
    * known to be ASCII.
    */
-  DartDocToken createDartDocToken(
-      PrecedenceInfo info, int start, bool asciiOnly,
+  DartDocToken createDartDocToken(TokenType info, int start, bool asciiOnly,
       [int extraOffset = 0]);
 
   /** Documentation in subclass [ArrayBasedScanner]. */
   void discardOpenLt();
 
   /// Return true when at EOF.
   bool atEndOfFile();
 
   Token tokenize() {
     while (!atEndOfFile()) {
@@ skipping 586 matching lines @@
         if (next > 127) {
           asciiOnlyLines = false;
           asciiOnlyComment = false;
         }
         next = advance();
       }
     }
     return next;
   }
 
-  void appendComment(int start, PrecedenceInfo info, bool asciiOnly) {
+  void appendComment(int start, TokenType info, bool asciiOnly) {
     if (!includeComments) return;
     CommentToken newComment = createCommentToken(info, start, asciiOnly);
     if (scanGenericMethodComments) {
       String value = newComment.lexeme;
       int length = value.length;
       if (length > 5 &&
           value.codeUnitAt(0) == $SLASH &&
           value.codeUnitAt(1) == $STAR &&
           value.codeUnitAt(2) == $EQ) {
         newComment = new CommentToken.fromString(
             GENERIC_METHOD_TYPE_ASSIGN, value, start);
       } else if (length > 6 &&
           value.codeUnitAt(0) == $SLASH &&
           value.codeUnitAt(1) == $STAR &&
           value.codeUnitAt(2) == $LT &&
           value.codeUnitAt(length - 1) == $SLASH &&
           value.codeUnitAt(length - 2) == $STAR &&
           value.codeUnitAt(length - 3) == $GT) {
         newComment =
             new CommentToken.fromString(GENERIC_METHOD_TYPE_LIST, value, start);
       }
     }
     _appendToCommentStream(newComment);
   }
 
-  void appendDartDoc(int start, PrecedenceInfo info, bool asciiOnly) {
+  void appendDartDoc(int start, TokenType info, bool asciiOnly) {
     if (!includeComments) return;
     Token newComment = createDartDocToken(info, start, asciiOnly);
     _appendToCommentStream(newComment);
   }
 
   /**
    * Append the given token to the [tail] of the current stream of tokens.
    */
   void appendToken(Token token) {
     tail.next = token;
@@ skipping 333 matching lines @@
   int advanceAfterError(bool shouldAdvance) {
     if (atEndOfFile()) return $EOF;
     if (shouldAdvance) {
       return advance(); // Ensure progress.
     } else {
       return -1;
     }
   }
 }
 
-PrecedenceInfo closeBraceInfoFor(BeginGroupToken begin) {
+TokenType closeBraceInfoFor(BeginGroupToken begin) {
   return const {
     '(': CLOSE_PAREN_INFO,
     '[': CLOSE_SQUARE_BRACKET_INFO,
     '{': CLOSE_CURLY_BRACKET_INFO,
     '<': GT_INFO,
     r'${': CLOSE_CURLY_BRACKET_INFO,
   }[begin.lexeme];
 }
 
 class LineStarts extends Object with ListMixin<int> {
@@ skipping 65 matching lines @@
       switchToUint32(newLength);
     }
   }
 
   void switchToUint32(int newLength) {
     final newArray = new Uint32List(newLength);
     newArray.setRange(0, arrayLength, array);
     array = newArray;
   }
 }