flatten Keyword into TokenType

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

Index: pkg/front_end/lib/src/fasta/scanner/keyword_state.dart
diff --git a/pkg/front_end/lib/src/fasta/scanner/keyword_state.dart b/pkg/front_end/lib/src/fasta/scanner/keyword_state.dart
index 9b545603c72ed079cfad90a08cce0d67a015b0b2..ba66e41580c7ef074ffb1ae79b54c5a298cf3661 100644
--- a/pkg/front_end/lib/src/fasta/scanner/keyword_state.dart
+++ b/pkg/front_end/lib/src/fasta/scanner/keyword_state.dart
@@ -22,7 +22,7 @@ abstract class KeywordState {
     if (_KEYWORD_STATE == null) {
       List<String> strings = new List<String>(analyzer.Keyword.values.length);
       for (int i = 0; i < analyzer.Keyword.values.length; i++) {
-        strings[i] = analyzer.Keyword.values[i].syntax;
+        strings[i] = analyzer.Keyword.values[i].lexeme;
       }
       strings.sort((a, b) => a.compareTo(b));
       _KEYWORD_STATE = computeKeywordStateTable(0, strings, 0, strings.length);
@@ -144,5 +144,5 @@ class LeafKeywordState implements KeywordState {
   KeywordState next(int c) => null;
   KeywordState nextCapital(int c) => null;
 
-  String toString() => keyword.syntax;
+  String toString() => keyword.lexeme;
 }