merge fasta.PrecedenceInfo into analyzer.TokenType

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;
-
-import 'precedence.dart' show PrecedenceInfo;
+import '../../scanner/token.dart' show Keyword, TokenType;
 
 import 'token.dart'
     show
         BeginGroupToken,
         KeywordToken,
         StringToken,
         SymbolToken,
         SyntheticSymbolToken,
         Token;
 
@@ skipping 23 matching lines @@
    */
   Link<BeginGroupToken> groupingStack = const Link<BeginGroupToken>();
 
   /**
    * Appends a fixed token whose kind and content is determined by [info].
    * Appends an *operator* token from [info].
    *
    * An operator token represent operators like ':', '.', ';', '&&', '==', '--',
    * '=>', etc.
    */
-  void appendPrecedenceToken(PrecedenceInfo info) {
+  void appendPrecedenceToken(TokenType info) {
     appendToken(new SymbolToken(info, tokenStart));
   }
 
   /**
    * 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, PrecedenceInfo yes, PrecedenceInfo no) {
+  int select(int choice, TokenType yes, TokenType no) {
     int next = advance();
     if (identical(next, choice)) {
       appendPrecedenceToken(yes);
       return advance();
     } else {
       appendPrecedenceToken(no);
       return next;
     }
   }
 
@@ skipping 39 matching lines @@
    * [lineStarts] map.
    */
   void lineFeedInMultiline() {
     lineStarts.add(stringOffset + 1);
   }
 
   /**
    * Appends a token that begins a new group, represented by [info].
    * Group begin tokens are '{', '(', '[' and '${'.
    */
-  void appendBeginGroup(PrecedenceInfo info) {
+  void appendBeginGroup(TokenType info) {
     Token token = new BeginGroupToken(info, tokenStart);
     appendToken(token);
 
     // { [ ${ cannot appear inside a type parameters / arguments.
     if (!identical(info.kind, LT_TOKEN) &&
         !identical(info.kind, OPEN_PAREN_TOKEN)) {
       discardOpenLt();
     }
     groupingStack = groupingStack.prepend(token);
   }
 
   /**
    * Appends a token that begins an end group, represented by [info].
    * It handles the group end tokens '}', ')' and ']'. The tokens '>' and
    * '>>' are handled separately bo [appendGt] and [appendGtGt].
    */
-  int appendEndGroup(PrecedenceInfo info, int openKind) {
+  int appendEndGroup(TokenType info, int openKind) {
     assert(!identical(openKind, LT_TOKEN)); // openKind is < for > and >>
     discardBeginGroupUntil(openKind);
     appendPrecedenceToken(info);
     Token close = tail;
     if (groupingStack.isEmpty) {
       return advance();
     }
     BeginGroupToken begin = groupingStack.head;
     if (!identical(begin.kind, openKind)) {
       assert(begin.kind == STRING_INTERPOLATION_TOKEN &&
@@ skipping 26 matching lines @@
       unmatchedBeginGroup(begin);
       groupingStack = groupingStack.tail;
     }
   }
 
   /**
    * Appends a token for '>'.
    * This method does not issue unmatched errors, because > is also the
    * greater-than operator. It does not necessarily have to close a group.
    */
-  void appendGt(PrecedenceInfo info) {
+  void appendGt(TokenType info) {
     appendPrecedenceToken(info);
     if (groupingStack.isEmpty) return;
     if (identical(groupingStack.head.kind, LT_TOKEN)) {
       groupingStack.head.endGroup = tail;
       groupingStack = groupingStack.tail;
     }
   }
 
   /**
    * Appends a token for '>>'.
    * This method does not issue unmatched errors, because >> is also the
    * shift operator. It does not necessarily have to close a group.
    */
-  void appendGtGt(PrecedenceInfo info) {
+  void appendGtGt(TokenType info) {
     appendPrecedenceToken(info);
     if (groupingStack.isEmpty) return;
     if (identical(groupingStack.head.kind, LT_TOKEN)) {
       // Don't assign endGroup: in "T<U<V>>", the '>>' token closes the outer
       // '<', the inner '<' is left without endGroup.
       groupingStack = groupingStack.tail;
     }
     if (groupingStack.isEmpty) return;
     if (identical(groupingStack.head.kind, LT_TOKEN)) {
       groupingStack.head.endGroup = tail;
       groupingStack = groupingStack.tail;
     }
   }
 
   void appendErrorToken(ErrorToken token) {
     hasErrors = true;
     appendToken(token);
   }
 
-  void appendSubstringToken(PrecedenceInfo info, int start, bool asciiOnly,
+  void appendSubstringToken(TokenType info, int start, bool asciiOnly,
       [int extraOffset = 0]) {
     appendToken(createSubstringToken(info, start, asciiOnly, extraOffset));
   }
 
   /**
    * Returns a new 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.
    */
-  StringToken createSubstringToken(
-      PrecedenceInfo info, int start, bool asciiOnly,
+  StringToken createSubstringToken(TokenType info, int start, bool asciiOnly,
       [int extraOffset = 0]);
 
   /**
    * This method is called to discard '<' from the "grouping" stack.
    *
    * [PartialParser.skipExpression] relies on the fact that we do not
    * create groups for stuff like:
    * [:a = b < c, d = e > f:].
    *
    * In other words, this method is called when the scanner recognizes
@@ skipping 45 matching lines @@
     //      v                                           |
     // SymbolToken(})<----------------------------------+
     //      |
     //     next
     //      v
     // SymbolToken(;)
     //      |
     //     next
     //      v
     //     EOF
-    PrecedenceInfo info = closeBraceInfoFor(begin);
+    TokenType info = closeBraceInfoFor(begin);
     appendToken(new SyntheticSymbolToken(info, tokenStart));
     begin.endGroup = tail;
     appendErrorToken(new UnmatchedToken(begin));
   }
 }