merge fasta.Keyword into analyzer.Keyword

pkg/front_end/lib/src/fasta/parser/parser.dart

 // Copyright (c) 2012, 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.parser.parser;
 
 import '../fasta_codes.dart'
     show
         FastaCode,
         FastaMessage,
@@ skipping 40 matching lines @@
         codeUnspecified,
         codeUnsupportedPrefixPlus,
         codeUnterminatedString,
         codeYieldAsIdentifier,
         codeYieldNotGenerator;
 
 import '../scanner.dart' show ErrorToken;
 
 import '../scanner/recover.dart' show closeBraceFor, skipToEof;
 
-import '../scanner/keyword.dart' show Keyword;
+import '../../scanner/token.dart' show Keyword;
 
 import '../scanner/precedence.dart'
     show
         ASSIGNMENT_PRECEDENCE,
         AS_INFO,
         CASCADE_PRECEDENCE,
         EOF_INFO,
         EQUALITY_PRECEDENCE,
         GENERIC_METHOD_TYPE_ASSIGN,
         GENERIC_METHOD_TYPE_LIST,
@@ skipping 3876 matching lines @@
     previous.setNext(firstToken);
     beforeToken = firstToken;
   }
 }
 
 typedef FastaMessage NoArgument(Uri uri, int charOffset);
 
 typedef FastaMessage TokenArgument(Uri uri, int charOffset, Token token);
 
 typedef FastaMessage StringArgument(Uri uri, int charOffset, String string);