merge PrecedenceInfo into TokenType and update all refs

pkg/front_end/test/precedence_info_test.dart

Index: pkg/front_end/test/precedence_info_test.dart
diff --git a/pkg/front_end/test/precedence_info_test.dart b/pkg/front_end/test/precedence_info_test.dart
index fcdb31dffb2653a1f33e142a793f2549128c0dd9..d2f932c0edc57cd1f8a6d7c1359f63510690b3d4 100644
--- a/pkg/front_end/test/precedence_info_test.dart
+++ b/pkg/front_end/test/precedence_info_test.dart
@@ -2,7 +2,6 @@
 // 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.
 
-import 'package:front_end/src/fasta/scanner/precedence.dart';
 import 'package:front_end/src/fasta/scanner/string_scanner.dart';
 import 'package:front_end/src/fasta/scanner/token.dart' as fasta;
 import 'package:front_end/src/scanner/token.dart';
@@ -18,85 +17,6 @@ main() {
 /// Assert that fasta PrecedenceInfo implements analyzer TokenType.
 @reflectiveTest
 class PrecedenceInfoTest {
-  var allTokenTypes = new Set<TokenType>.from(const [
-    TokenType.EOF,
-    TokenType.DOUBLE,
-    TokenType.HEXADECIMAL,
-    TokenType.IDENTIFIER,
-    TokenType.INT,
-    TokenType.KEYWORD,
-    TokenType.MULTI_LINE_COMMENT,
-    TokenType.SCRIPT_TAG,
-    TokenType.SINGLE_LINE_COMMENT,
-    TokenType.STRING,
-    TokenType.AMPERSAND,
-    TokenType.AMPERSAND_AMPERSAND,
-    TokenType.AMPERSAND_EQ,
-    TokenType.AT,
-    TokenType.BANG,
-    TokenType.BANG_EQ,
-    TokenType.BAR,
-    TokenType.BAR_BAR,
-    TokenType.BAR_EQ,
-    TokenType.COLON,
-    TokenType.COMMA,
-    TokenType.CARET,
-    TokenType.CARET_EQ,
-    TokenType.CLOSE_CURLY_BRACKET,
-    TokenType.CLOSE_PAREN,
-    TokenType.CLOSE_SQUARE_BRACKET,
-    TokenType.EQ,
-    TokenType.EQ_EQ,
-    TokenType.FUNCTION,
-    TokenType.GT,
-    TokenType.GT_EQ,
-    TokenType.GT_GT,
-    TokenType.GT_GT_EQ,
-    TokenType.HASH,
-    TokenType.INDEX,
-    TokenType.INDEX_EQ,
-    TokenType.LT,
-    TokenType.LT_EQ,
-    TokenType.LT_LT,
-    TokenType.LT_LT_EQ,
-    TokenType.MINUS,
-    TokenType.MINUS_EQ,
-    TokenType.MINUS_MINUS,
-    TokenType.OPEN_CURLY_BRACKET,
-    TokenType.OPEN_PAREN,
-    TokenType.OPEN_SQUARE_BRACKET,
-    TokenType.PERCENT,
-    TokenType.PERCENT_EQ,
-    TokenType.PERIOD,
-    TokenType.PERIOD_PERIOD,
-    TokenType.PLUS,
-    TokenType.PLUS_EQ,
-    TokenType.PLUS_PLUS,
-    TokenType.QUESTION,
-    TokenType.QUESTION_PERIOD,
-    TokenType.QUESTION_QUESTION,
-    TokenType.QUESTION_QUESTION_EQ,
-    TokenType.SEMICOLON,
-    TokenType.SLASH,
-    TokenType.SLASH_EQ,
-    TokenType.STAR,
-    TokenType.STAR_EQ,
-    TokenType.STRING_INTERPOLATION_EXPRESSION,
-    TokenType.STRING_INTERPOLATION_IDENTIFIER,
-    TokenType.TILDE,
-    TokenType.TILDE_SLASH,
-    TokenType.TILDE_SLASH_EQ,
-    TokenType.BACKPING,
-    TokenType.BACKSLASH,
-    TokenType.PERIOD_PERIOD_PERIOD,
-    TokenType.GENERIC_METHOD_TYPE_LIST,
-    TokenType.GENERIC_METHOD_TYPE_ASSIGN,
-
-    // These are not yet part of the language and not supported by fasta
-    //TokenType.AMPERSAND_AMPERSAND_EQ,
-    //TokenType.BAR_BAR_EQ,
-  ]);
-
   void assertInfo(check(String source, fasta.Token token),
       {bool includeLazyAssignmentOperators: true}) {
     void assertLexeme(String source) {
@@ -109,9 +29,6 @@ class PrecedenceInfoTest {
     for (TokenType info in TokenType.all) {
       assertLexeme(info.value);
     }
-    for (TokenType tt in allTokenTypes) {
-      assertLexeme(tt.lexeme);
-    }
     assertLexeme('1.0'); // DOUBLE
     assertLexeme('0xA'); // HEXADECIMAL
     assertLexeme('1'); // INT
@@ -462,53 +379,18 @@ class PrecedenceInfoTest {
     });
   }
 
-  void test_identity() {
-    var exceptions = <TokenType>[
-      // Null lexeme - no corresponding PrecedenceInfo
-      TokenType.MULTI_LINE_COMMENT,
-      TokenType.SINGLE_LINE_COMMENT,
-      TokenType.GENERIC_METHOD_TYPE_LIST,
-      TokenType.GENERIC_METHOD_TYPE_ASSIGN,
-
-      // Manually compared below
-      TokenType.DOUBLE,
-      TokenType.HEXADECIMAL,
-      TokenType.INT,
-      TokenType.KEYWORD,
-      TokenType.SCRIPT_TAG,
-      TokenType.STRING,
-      TokenType.STRING_INTERPOLATION_EXPRESSION,
-      TokenType.STRING_INTERPOLATION_IDENTIFIER,
-    ];
-
+  void test_type() {
     void assertLexeme(String source, TokenType tt) {
       var scanner = new StringScanner(source, includeComments: true);
       var token = scanner.tokenize();
       expect(token.type, same(tt), reason: source);
     }
 
-    for (TokenType tt in allTokenTypes) {
-      if (!exceptions.contains(tt)) {
-        assertLexeme(tt.lexeme, tt);
-      }
-    }
-    expect(DOUBLE_INFO, same(TokenType.DOUBLE));
-    expect(HEXADECIMAL_INFO, same(TokenType.HEXADECIMAL));
-    expect(INT_INFO, same(TokenType.INT));
-    expect(KEYWORD_INFO, same(TokenType.KEYWORD));
-    expect(SCRIPT_INFO, same(TokenType.SCRIPT_TAG));
-    expect(STRING_INFO, same(TokenType.STRING));
-
     assertLexeme('1.0', TokenType.DOUBLE);
     assertLexeme('0xA', TokenType.HEXADECIMAL);
     assertLexeme('1', TokenType.INT);
     assertLexeme('var', TokenType.KEYWORD);
     assertLexeme('#!/', TokenType.SCRIPT_TAG);
     assertLexeme('"foo"', TokenType.STRING);
-
-    expect(STRING_INTERPOLATION_INFO,
-        same(TokenType.STRING_INTERPOLATION_EXPRESSION));
-    expect(STRING_INTERPOLATION_IDENTIFIER_INFO,
-        same(TokenType.STRING_INTERPOLATION_IDENTIFIER));
   }
 }