flatten Keyword into TokenType

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

 // Copyright (c) 2011, 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.
 
 library fasta.scanner.token;
 
 import '../../scanner/token.dart' as analyzer;
 import '../../scanner/token.dart' show TokenType;
 
 import 'token_constants.dart' show IDENTIFIER_TOKEN;
@@ skipping 124 matching lines @@
 
   bool get isBuiltInIdentifier => false;
 
   @override
   bool get isOperator => info.isOperator;
 
   @override
   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;
 
   @override
   set offset(int newOffset) {
     charOffset = newOffset;
   }
 
   @override
@@ skipping 162 matching lines @@
 }
 
 /**
  * A keyword token.
  */
 class KeywordToken extends Token implements analyzer.KeywordTokenWithComment {
   final analyzer.Keyword keyword;
 
   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;
 
   bool get isPseudo => keyword.isPseudo;
 
   bool get isBuiltInIdentifier => keyword.isBuiltIn;
 
   String toString() => "KeywordToken($lexeme)";
 
   @override
   Token copyWithoutComments() => new KeywordToken(keyword, charOffset);
 
   @override
   analyzer.Keyword value() => keyword;
 
   @override
-  analyzer.TokenType get type => TokenType.KEYWORD;
+  analyzer.TokenType get type => keyword;
 }
 
 /**
  * A synthetic keyword token.
  */
 class SyntheticKeywordToken extends KeywordToken
     implements analyzer.SyntheticKeywordToken {
   /**
    * Initialize a newly created token to represent the given [keyword] at the
    * given [offset].
@@ skipping 317 matching lines @@
       identical(value, "<=") ||
       identical(value, "<") ||
       identical(value, "&") ||
       identical(value, "^") ||
       identical(value, "|");
 }
 
 bool isTernaryOperator(String value) => identical(value, "[]=");
 
 bool isMinusOperator(String value) => identical(value, "-");