merge fasta.Token into analyzer.Token

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

 // Copyright (c) 2015, 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 dart2js.parser.element_listener;
 
 import 'package:front_end/src/fasta/fasta_codes.dart' show FastaMessage;
 
 import 'package:front_end/src/fasta/fasta_codes.dart' as codes;
 
 import '../common.dart';
 import '../diagnostics/messages.dart' show MessageTemplate;
 import '../elements/elements.dart'
     show Element, LibraryElement, MetadataAnnotation;
 import '../elements/modelx.dart'
     show
         CompilationUnitElementX,
         DeclarationSite,
         ElementX,
         EnumClassElementX,
         FieldElementX,
         LibraryElementX,
         MetadataAnnotationX,
         NamedMixinApplicationElementX,
         VariableList;
 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;
 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,
         PartialElement,
         PartialFieldList,
         PartialFunctionElement,
         PartialMetadataAnnotation,
         PartialTypedefElement;
 
 const bool VERBOSE = false;
@@ skipping 243 matching lines @@
     Identifier name = popNode();
     int id = idGenerator.getNextFreeId();
     PartialClassElement element = new PartialClassElement(
         name.source, beginToken, endToken, compilationUnitElement, id);
     pushElement(element);
     rejectBuiltInIdentifier(name);
   }
 
   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}'.");
       }
     }
   }
 
   @override
   void endFunctionTypeAlias(
       Token typedefKeyword, Token equals, Token endToken) {
     Identifier name;
     if (equals == null) {
       popNode(); // TODO(karlklose): do not throw away typeVariables.
@@ skipping 620 matching lines @@
       memberErrors = memberErrors.tail.prepend(true);
     }
     reporter.reportErrorMessage(spannable, errorCode, arguments);
   }
 
   void reportErrorFromToken(Token token, MessageKind errorCode,
       [Map arguments = const {}]) {
     reportError(reporter.spanFromToken(token), errorCode, arguments);
   }
 }