merge fasta.Keyword into analyzer.Keyword

pkg/front_end/test/subpackage_relationships_test.dart

 // Copyright (c) 2017, 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.
 
 import 'dart:async';
 import 'dart:io';
 
 import 'package:front_end/compiler_options.dart';
 import 'package:front_end/dependency_grapher.dart';
 import 'package:path/path.dart' as pathos;
@@ skipping 23 matching lines @@
   'lib/src/codegen': new SubpackageRules(),
   'lib/src/fasta':
       new SubpackageRules(mayImportAnalyzer: false, allowedDependencies: [
     'lib/src/fasta/builder',
     'lib/src/fasta/dill',
     'lib/src/fasta/kernel',
     'lib/src/fasta/parser',
     'lib/src/fasta/scanner',
     'lib/src/fasta/testing',
     'lib/src/fasta/util',
+    'lib/src/scanner',
   ]),
   'lib/src/fasta/analyzer':
       new SubpackageRules(mayImportAnalyzer: true, allowedDependencies: [
     'lib/src/fasta',
     'lib/src/fasta/builder',
     'lib/src/fasta/dill',
     'lib/src/fasta/kernel',
     'lib/src/fasta/source',
   ]),
   'lib/src/fasta/builder': new SubpackageRules(allowedDependencies: [
@@ skipping 12 matching lines @@
     'lib/src/fasta/dill',
     'lib/src/fasta/parser',
     'lib/src/fasta/scanner',
     'lib/src/fasta/source',
     'lib/src/fasta/util',
   ]),
   'lib/src/fasta/parser': new SubpackageRules(allowedDependencies: [
     'lib/src/fasta',
     'lib/src/fasta/scanner',
     'lib/src/fasta/util',
+    'lib/src/scanner',
   ]),
   'lib/src/fasta/scanner': new SubpackageRules(allowedDependencies: [
     'lib/src/fasta',
     // fasta scanner produces analyzer scanner tokens
     'lib/src/scanner',
     'lib/src/fasta/util',
   ]),
   'lib/src/fasta/source': new SubpackageRules(allowedDependencies: [
     'lib/src/fasta',
     'lib/src/fasta/builder',
@@ skipping 177 matching lines @@
       if (subpackageRules[subpackage].allowSubdirs) {
         subpackageRules[subpackage].actuallyHasSubdirs = true;
       } else {
         problem('Uri $src is in a subfolder of $subpackage, but that '
             'subpackage does not allow dart files in subdirectories.');
       }
     }
     return subpackage;
   }
 }