merge fasta.Token into analyzer.Token

pkg/compiler/lib/src/parser/element_listener.dart

Index: pkg/compiler/lib/src/parser/element_listener.dart
diff --git a/pkg/compiler/lib/src/parser/element_listener.dart b/pkg/compiler/lib/src/parser/element_listener.dart
index 3145497e7b7f1153a8579f574d8f00502e7d503f..9420beddbc3f8e55f29884cc7a6abb79540212b5 100644
--- a/pkg/compiler/lib/src/parser/element_listener.dart
+++ b/pkg/compiler/lib/src/parser/element_listener.dart
@@ -27,7 +27,7 @@ import '../id_generator.dart';
 import '../native/native.dart' as native;
 import '../string_validator.dart' show StringValidator;
 import 'package:front_end/src/fasta/scanner.dart'
-    show Keyword, BeginGroupToken, ErrorToken, KeywordToken, StringToken, Token;
+    show BeginGroupToken, ErrorToken, StringToken, Token;
 import 'package:front_end/src/fasta/scanner.dart' as Tokens show EOF_TOKEN;
 import '../tree/tree.dart';
 import '../util/util.dart' show Link, LinkBuilder;
@@ -35,7 +35,7 @@ import 'package:front_end/src/fasta/parser.dart'
     show Listener, ParserError, optional;
 import 'package:front_end/src/fasta/parser/identifier_context.dart'
     show IdentifierContext;
-import 'package:front_end/src/scanner/token.dart' show TokenType;
+import 'package:front_end/src/scanner/token.dart' show KeywordToken, TokenType;
 import 'partial_elements.dart'
     show
         PartialClassElement,
@@ -299,9 +299,9 @@ class ElementListener extends Listener {
 
   void rejectBuiltInIdentifier(Identifier name) {
     if (name.token is KeywordToken) {
-      Keyword keyword = (name.token as KeywordToken).keyword;
-      if (!keyword.isPseudo) {
-        recoverableError(name, "Illegal name '${keyword.lexeme}'.");
+      TokenType type = name.token.type;
+      if (!type.isPseudo) {
+        recoverableError(name, "Illegal name '${type.lexeme}'.");
       }
     }
   }