merge PrecedenceInfo into TokenType and update all refs

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

 // Copyright (c) 2017, 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 licenset hat can be found in the LICENSE file.
 
 library fasta.scanner.recover;
 
 import '../../scanner/token.dart' show TokenType;
 
 import '../fasta_codes.dart'
     show
         FastaCode,
         codeAsciiControlCharacter,
         codeEncoding,
         codeExpectedHexDigit,
         codeMissingExponent,
         codeNonAsciiIdentifier,
         codeNonAsciiWhitespace,
         codeUnexpectedDollarInString,
         codeUnmatchedToken,
         codeUnterminatedComment,
         codeUnterminatedString;
 
 import 'token.dart' show StringToken, SymbolToken, Token;
 
 import 'error_token.dart' show NonAsciiIdentifierToken, ErrorToken;
 
-import 'precedence.dart' as Precedence;
-
 /// Recover from errors in [tokens]. The original sources are provided as
 /// [bytes]. [lineStarts] are the beginning character offsets of lines, and
 /// must be updated if recovery is performed rewriting the original source
 /// code.
 Token defaultRecoveryStrategy(
     List<int> bytes, Token tokens, List<int> lineStarts) {
   // See [Parser.reportErrorToken](../parser/src/parser.dart) for how
   // it currently handles lexical errors. In addition, notice how the parser
   // calls [handleInvalidExpression], [handleInvalidFunctionBody], and
   // [handleInvalidTypeReference] to allow the listener to recover its internal
@@ skipping 40 matching lines @@
     //        NonAsciiIdentifierToken("ø"),
     //        StringToken("d"),
     //        EOF,
     //     ]
     bool prepend = false;
 
     // True if following token is also an identifier that starts right where
     // [errorTail] ends. This is the case for "b" above.
     bool append = false;
     if (goodTail != null) {
-      if (goodTail.info == Precedence.IDENTIFIER_INFO &&
+      if (goodTail.info == TokenType.IDENTIFIER &&
           goodTail.charEnd == first.charOffset) {
         prepend = true;
       }
     }
     Token next = errorTail.next;
-    if (next.info == Precedence.IDENTIFIER_INFO &&
+    if (next.info == TokenType.IDENTIFIER &&
         errorTail.charOffset + 1 == next.charOffset) {
       append = true;
     }
     if (prepend) {
       codeUnits.addAll(goodTail.lexeme.codeUnits);
     }
     NonAsciiIdentifierToken current = first;
     while (current != errorTail) {
       codeUnits.add(current.character);
       current = current.next;
@@ skipping 10 matching lines @@
         beforeGoodTail = null;
       } else {
         goodTail = beforeGoodTail;
       }
     }
     if (append) {
       codeUnits.addAll(next.lexeme.codeUnits);
       next = next.next;
     }
     String value = new String.fromCharCodes(codeUnits);
-    return synthesizeToken(charOffset, value, Precedence.IDENTIFIER_INFO)
+    return synthesizeToken(charOffset, value, TokenType.IDENTIFIER)
       ..next = next;
   }
 
   recoverExponent() {
-    return synthesizeToken(errorTail.charOffset, "NaN", Precedence.DOUBLE_INFO)
+    return synthesizeToken(errorTail.charOffset, "NaN", TokenType.DOUBLE)
       ..next = errorTail.next;
   }
 
   recoverString() {
     // TODO(ahe): Improve this.
     return skipToEof(errorTail);
   }
 
   recoverHexDigit() {
-    return synthesizeToken(errorTail.charOffset, "-1", Precedence.INT_INFO)
+    return synthesizeToken(errorTail.charOffset, "-1", TokenType.INT)
       ..next = errorTail.next;
   }
 
   recoverStringInterpolation() {
     // TODO(ahe): Improve this.
     return skipToEof(errorTail);
   }
 
   recoverComment() {
     // TODO(ahe): Improve this.
@@ skipping 91 matching lines @@
 
 String closeBraceFor(String openBrace) {
   return const {
     '(': ')',
     '[': ']',
     '{': '}',
     '<': '>',
     r'${': '}',
   }[openBrace];
 }