merge fasta.Token into analyzer.Token

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

Index: pkg/front_end/lib/src/fasta/scanner.dart
diff --git a/pkg/front_end/lib/src/fasta/scanner.dart b/pkg/front_end/lib/src/fasta/scanner.dart
index bc9550812b5bfcabfb4959c1e0299266fd423806..d265c8ffb770622e7cbfe4e3b921638d5a3f9331 100644
--- a/pkg/front_end/lib/src/fasta/scanner.dart
+++ b/pkg/front_end/lib/src/fasta/scanner.dart
@@ -6,7 +6,7 @@ library fasta.scanner;
 
 import 'dart:convert' show UNICODE_REPLACEMENT_CHARACTER_RUNE, UTF8;
 
-import 'scanner/token.dart' show Token;
+import '../scanner/token.dart' show Token;
 
 import 'scanner/string_scanner.dart' show StringScanner;
 
@@ -17,10 +17,8 @@ import 'scanner/recover.dart' show defaultRecoveryStrategy;
 export 'scanner/token.dart'
     show
         BeginGroupToken,
-        KeywordToken,
         StringToken,
         SymbolToken,
-        Token,
         isBinaryOperator,
         isMinusOperator,
         isTernaryOperator,
@@ -36,7 +34,7 @@ export 'scanner/utf8_bytes_scanner.dart' show Utf8BytesScanner;
 
 export 'scanner/string_scanner.dart' show StringScanner;
 
-export '../scanner/token.dart' show Keyword;
+export '../scanner/token.dart' show Keyword, Token;
 
 const int unicodeReplacementCharacter = UNICODE_REPLACEMENT_CHARACTER_RUNE;