flatten Keyword into TokenType

pkg/front_end/test/scanner_test.dart

 // Copyright (c) 2016, the Dart project authors.  Please see the AUTHORS file
 // 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/base/errors.dart';
 import 'package:front_end/src/base/jenkins_smi_hash.dart';
 import 'package:front_end/src/scanner/errors.dart';
 import 'package:front_end/src/scanner/reader.dart';
 import 'package:front_end/src/scanner/scanner.dart';
 import 'package:front_end/src/scanner/token.dart';
@@ skipping 72 matching lines @@
 @reflectiveTest
 class KeywordStateTest {
   void test_KeywordState() {
     //
     // Generate the test data to be scanned.
     //
     List<Keyword> keywords = Keyword.values;
     int keywordCount = keywords.length;
     List<String> textToTest = new List<String>(keywordCount * 3);
     for (int i = 0; i < keywordCount; i++) {
-      String syntax = keywords[i].syntax;
+      String syntax = keywords[i].lexeme;
       textToTest[i] = syntax;
       textToTest[i + keywordCount] = "${syntax}x";
       textToTest[i + keywordCount * 2] = syntax.substring(0, syntax.length - 1);
     }
     //
     // Scan each of the identifiers.
     //
     KeywordState firstState = KeywordState.KEYWORD_STATE;
     for (int i = 0; i < textToTest.length; i++) {
       String text = textToTest[i];
@@ skipping 69 matching lines @@
     // Analyzer's token streams don't consider "<" to be an opener
     // but fasta does.
     if (lessThan is BeginToken) {
       expect(lessThan.endToken, greaterThan);
     }
     expect(greaterThan, isNot(new isInstanceOf<BeginToken>()));
   }
 
   void test_async_star() {
     Token token = _scan("async*");
-    expect(token.type, TokenType.KEYWORD);
+    expect(token.type.isKeyword, true);
     expect(token.lexeme, 'async');
     expect(token.next.type, TokenType.STAR);
     expect(token.next.next.type, TokenType.EOF);
   }
 
   void test_at() {
     _assertToken(TokenType.AT, "@");
   }
 
   void test_backping() {
@@ skipping 967 matching lines @@
         ScannerErrorCode.UNTERMINATED_STRING_LITERAL, 5, "'\$name", [
       new StringToken(TokenType.STRING, "'", 0),
       new StringToken(TokenType.STRING_INTERPOLATION_IDENTIFIER, "\$", 1),
       new StringToken(TokenType.IDENTIFIER, "name", 2),
       new StringToken(TokenType.STRING, "", 6)
     ]);
   }
 
   void test_sync_star() {
     Token token = _scan("sync*");
-    expect(token.type, TokenType.KEYWORD);
+    expect(token.type.isKeyword, true);
     expect(token.lexeme, 'sync');
     expect(token.next.type, TokenType.STAR);
     expect(token.next.next.type, TokenType.EOF);
   }
 
   void test_tilde() {
     _assertToken(TokenType.TILDE, "~");
   }
 
   void test_tilde_slash() {
@@ skipping 81 matching lines @@
     _checkTokens(token, expectedTokens);
   }
 
   /**
    * Assert that when scanned the given [source] contains a single keyword token
    * with the same lexeme as the original source.
    */
   void _assertKeywordToken(String source) {
     Token token = _scan(source);
     expect(token, isNotNull);
-    expect(token.type, TokenType.KEYWORD);
+    expect(token.type.isKeyword, true);
     expect(token.offset, 0);
     expect(token.length, source.length);
     expect(token.lexeme, source);
     Object value = token.value();
     expect(value is Keyword, isTrue);
-    expect((value as Keyword).syntax, source);
+    expect((value as Keyword).lexeme, source);
     token = _scan(" $source ");
     expect(token, isNotNull);
-    expect(token.type, TokenType.KEYWORD);
+    expect(token.type.isKeyword, true);
     expect(token.offset, 1);
     expect(token.length, source.length);
     expect(token.lexeme, source);
     value = token.value();
     expect(value is Keyword, isTrue);
-    expect((value as Keyword).syntax, source);
+    expect((value as Keyword).lexeme, source);
     expect(token.next.type, TokenType.EOF);
   }
 
   /**
    * Assert that the token scanned from the given [source] has the
    * [expectedType].
    */
   Token _assertToken(TokenType expectedType, String source,
       {bool lazyAssignmentOperators: false}) {
     Token originalToken =
@@ skipping 200 matching lines @@
   _TestScanner(CharacterReader reader, [this.listener]) : super.create(reader);
 
   @override
   void reportError(
       ScannerErrorCode errorCode, int offset, List<Object> arguments) {
     if (listener != null) {
       listener.errors.add(new TestError(offset, errorCode, arguments));
     }
   }
 }