flatten Keyword into TokenType

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 e88d71319f1bfddc48e72d6b381fe0271c22ed16..07451d7fadce15a9ea6c3c7b71c86ae59cbed130 100644
--- a/pkg/front_end/lib/src/fasta/scanner/token.dart
+++ b/pkg/front_end/lib/src/fasta/scanner/token.dart
@@ -142,12 +142,7 @@ abstract class Token implements analyzer.TokenWithComment {
   bool get isUserDefinableOperator => info.isUserDefinableOperator;
 
   @override
-  analyzer.TokenType get type {
-    // Analyzer has a different concept of what is a Keyword type.
-    return info == TokenType.AS || info == TokenType.IS
-        ? TokenType.KEYWORD
-        : info;
-  }
+  analyzer.TokenType get type => info;
 
   @override
   int get offset => charOffset;
@@ -330,11 +325,11 @@ class KeywordToken extends Token implements analyzer.KeywordTokenWithComment {
 
   KeywordToken(this.keyword, int charOffset) : super(charOffset);
 
-  TokenType get info => keyword.info;
+  TokenType get info => keyword;
 
-  String get lexeme => keyword.syntax;
+  String get lexeme => keyword.lexeme;
 
-  String get stringValue => keyword.syntax;
+  String get stringValue => keyword.lexeme;
 
   bool isIdentifier() => keyword.isPseudo || keyword.isBuiltIn;
 
@@ -351,7 +346,7 @@ class KeywordToken extends Token implements analyzer.KeywordTokenWithComment {
   analyzer.Keyword value() => keyword;
 
   @override
-  analyzer.TokenType get type => TokenType.KEYWORD;
+  analyzer.TokenType get type => keyword;
 }
 
 /**