merge fasta.Keyword into analyzer.Keyword

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

Index: pkg/front_end/lib/src/fasta/scanner/token.dart
diff --git a/pkg/front_end/lib/src/fasta/scanner/token.dart b/pkg/front_end/lib/src/fasta/scanner/token.dart
index 891cd302c4b7632a54cdfc3faa9b9e5dea53195f..07d9afb3ae341e197df7fb74bd9dbdcd3efd25ff 100644
--- a/pkg/front_end/lib/src/fasta/scanner/token.dart
+++ b/pkg/front_end/lib/src/fasta/scanner/token.dart
@@ -6,8 +6,6 @@ library fasta.scanner.token;
 
 import '../../scanner/token.dart' as analyzer;
 
-import 'keyword.dart' show Keyword;
-
 import 'precedence.dart'
     show
         AS_INFO,
@@ -335,7 +333,7 @@ class BeginGroupToken extends SymbolToken
  * A keyword token.
  */
 class KeywordToken extends Token implements analyzer.KeywordTokenWithComment {
-  final Keyword keyword;
+  final analyzer.Keyword keyword;
 
   KeywordToken(this.keyword, int charOffset) : super(charOffset);
 
@@ -357,7 +355,7 @@ class KeywordToken extends Token implements analyzer.KeywordTokenWithComment {
   Token copyWithoutComments() => new KeywordToken(keyword, charOffset);
 
   @override
-  Keyword value() => keyword;
+  analyzer.Keyword value() => keyword;
 
   @override
   analyzer.TokenType get type => KEYWORD_INFO;
@@ -372,7 +370,8 @@ class SyntheticKeywordToken extends KeywordToken
    * Initialize a newly created token to represent the given [keyword] at the
    * given [offset].
    */
-  SyntheticKeywordToken(Keyword keyword, int offset) : super(keyword, offset);
+  SyntheticKeywordToken(analyzer.Keyword keyword, int offset)
+      : super(keyword, offset);
 
   @override
   bool get isSynthetic => true;