new TokenType and Keyword API

pkg/analyzer/lib/src/fasta/token_utils.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.
 
 library fasta.analyzer.token_utils;
 
 import 'package:front_end/src/fasta/scanner/error_token.dart' show ErrorToken;
 
 import 'package:front_end/src/scanner/token.dart' show Keyword;
 
@@ skipping 261 matching lines @@
     analyzerToken = translateAndAppend(analyzerToken);
   }
 }
 
 /// Converts a single analyzer token into a Fasta token.
 Token fromAnalyzerToken(analyzer.Token token) {
   Token beginGroup(TokenType info) => new BeginGroupToken(info, token.offset);
   Token string(TokenType info) =>
       new StringToken.fromString(info, token.lexeme, token.offset);
   Token symbol(TokenType info) => new SymbolToken(info, token.offset);
+  if (token.type.isKeyword) {
+    var keyword = Keyword.keywords[token.lexeme];
+    if (keyword != null) {
+      return new KeywordToken(keyword, token.offset);
+    } else {
+      return internalError("Unrecognized keyword: '${token.lexeme}'.");
+    }
+  }
   switch (token.type) {
     case TokenType.DOUBLE:
       return string(TokenType.DOUBLE);
     case TokenType.HEXADECIMAL:
       return string(TokenType.HEXADECIMAL);
     case TokenType.IDENTIFIER:
       // Certain identifiers have special grammatical meanings even though they
       // are neither keywords nor built-in identifiers (e.g. "async").  Analyzer
       // represents these as identifiers.  Fasta represents them as keywords
       // with the "isPseudo" property.
       var keyword = Keyword.keywords[token.lexeme];
       if (keyword != null) {
         assert(keyword.isPseudo);
         return new KeywordToken(keyword, token.offset);
       } else {
         return string(TokenType.IDENTIFIER);
       }
       break;
     case TokenType.INT:
       return string(TokenType.INT);
-    case TokenType.KEYWORD:
-      var keyword = Keyword.keywords[token.lexeme];
-      if (keyword != null) {
-        return new KeywordToken(keyword, token.offset);
-      } else {
-        return internalError("Unrecognized keyword: '${token.lexeme}'.");
-      }
-      break;
     case TokenType.MULTI_LINE_COMMENT:
       if (token.lexeme.startsWith('/**')) {
         return new DartDocToken.fromSubstring(TokenType.MULTI_LINE_COMMENT,
             token.lexeme, 0, token.lexeme.length, 0);
       }
       return new CommentToken.fromSubstring(TokenType.MULTI_LINE_COMMENT,
           token.lexeme, 0, token.lexeme.length, 0);
     case TokenType.SCRIPT_TAG:
       return string(TokenType.SCRIPT_TAG);
     case TokenType.SINGLE_LINE_COMMENT:
@@ skipping 164 matching lines @@
       return makeStringToken(TokenType.HEXADECIMAL);
 
     case IDENTIFIER_TOKEN:
       return makeStringToken(TokenType.IDENTIFIER);
 
     case INT_TOKEN:
       return makeStringToken(TokenType.INT);
 
     case KEYWORD_TOKEN:
       KeywordToken keywordToken = token;
-      var syntax = keywordToken.keyword.syntax;
+      var syntax = keywordToken.keyword.lexeme;
       // TODO(paulberry): if the map lookup proves to be too slow, consider
       // using a switch statement, or perhaps a string of
       // "if (identical(syntax, "foo"))" checks.  (Note that identical checks
       // should be safe because the Fasta scanner uses string literals for
       // the values of keyword.syntax.)
       var keyword =
           _keywordMap[syntax] ?? internalError('Unknown keyword: $syntax');
       if (commentToken == null) {
         return new analyzer.KeywordToken(keyword, token.charOffset);
       } else {
@@ skipping 85 matching lines @@
   "hide": analyzer.Keyword.HIDE,
   "native": analyzer.Keyword.NATIVE,
   "of": analyzer.Keyword.OF,
   "on": analyzer.Keyword.ON,
   "patch": analyzer.Keyword.PATCH,
   "show": analyzer.Keyword.SHOW,
   "source": analyzer.Keyword.SOURCE,
   "sync": analyzer.Keyword.SYNC,
   "yield": analyzer.Keyword.YIELD,
 };