Modify dump_inferred_types to use SummaryDataStore.

pkg/analyzer/tool/summary/dump_inferred_types.dart

Index: pkg/analyzer/tool/summary/dump_inferred_types.dart
diff --git a/pkg/analyzer/tool/summary/dump_inferred_types.dart b/pkg/analyzer/tool/summary/dump_inferred_types.dart
index a964675ff922dcb50784b50a4f297820e4cf3cee..135783e2b864e9aad4a30c492e99a87097d55b50 100644
--- a/pkg/analyzer/tool/summary/dump_inferred_types.dart
+++ b/pkg/analyzer/tool/summary/dump_inferred_types.dart
@@ -8,20 +8,16 @@ import 'dart:io';
 import 'package:analyzer/src/generated/utilities_dart.dart';
 import 'package:analyzer/src/summary/base.dart';
 import 'package:analyzer/src/summary/idl.dart';
+import 'package:analyzer/src/summary/package_bundle_reader.dart';
 
 /**
  * Collect the inferred types from all the summary files listed in [args] and
  * print them in alphabetical order.
  */
 main(List<String> args) {
+  SummaryDataStore summaryDataStore = new SummaryDataStore(args);
   InferredTypeCollector collector = new InferredTypeCollector();
-  for (String arg in args) {
-    PackageBundle bundle =
-        new PackageBundle.fromBuffer(new File(arg).readAsBytesSync());
-    collector.visitPackageBundle(bundle, arg);
-  }
-  collector.dumpLibraryIndex();
-  collector.dumpPartIndex();
+  collector.visitSummaryDataStore(summaryDataStore);
   collector.dumpCollectedTypes();
 }
 
@@ -34,8 +30,6 @@ class InferredTypeCollector {
   LinkedUnit linkedUnit;
   final Map<String, String> inferredTypes = <String, String>{};
   List<String> typeParamsInScope = <String>[];
-  final Map<String, Set<String>> libraryIndex = <String, Set<String>>{};
-  final Map<String, Set<String>> partIndex = <String, Set<String>>{};
 
   /**
    * If an inferred type exists matching the given [slot], record that it is the
@@ -94,38 +88,6 @@ class InferredTypeCollector {
   }
 
   /**
-   * Print out an index mapping library names to the summary files containing
-   * them.
-   */
-  void dumpLibraryIndex() {
-    print('Library index:');
-    List<String> libraryNames = libraryIndex.keys.toList();
-    libraryNames.sort();
-    for (String libraryName in libraryNames) {
-      List<String> summaryFiles = libraryIndex[libraryName].toList();
-      summaryFiles.sort();
-      print('$libraryName -> ${summaryFiles.join(', ')}');
-    }
-    print('');
-  }
-
-  /**
-   * Print out an index mapping part file names to the summary files containing
-   * them.
-   */
-  void dumpPartIndex() {
-    print('Part index:');
-    List<String> partNames = partIndex.keys.toList();
-    partNames.sort();
-    for (String partName in partNames) {
-      List<String> summaryFiles = partIndex[partName].toList();
-      summaryFiles.sort();
-      print('$partName -> ${summaryFiles.join(', ')}');
-    }
-    print('');
-  }
-
-  /**
    * Interpret the given [param] as a parameter in a synthetic typedef, and
    * format it as a string.
    */
@@ -278,25 +240,14 @@ class InferredTypeCollector {
   }
 
   /**
-   * Collect all the inferred types contained in [bundle].
+   * Collect all the inferred types contained in [summaryDataStore].
    */
-  void visitPackageBundle(PackageBundle bundle, String summaryPath) {
-    Map<String, LinkedLibrary> linkedLibraries = <String, LinkedLibrary>{};
-    Map<String, UnlinkedUnit> unlinkedUnits = <String, UnlinkedUnit>{};
-    for (int i = 0; i < bundle.linkedLibraryUris.length; i++) {
-      linkedLibraries[bundle.linkedLibraryUris[i]] = bundle.linkedLibraries[i];
-    }
-    for (int i = 0; i < bundle.unlinkedUnitUris.length; i++) {
-      String unitUriString = bundle.unlinkedUnitUris[i];
-      partIndex
-          .putIfAbsent(unitUriString, () => new Set<String>())
-          .add(summaryPath);
-      unlinkedUnits[unitUriString] = bundle.unlinkedUnits[i];
-    }
+  void visitSummaryDataStore(SummaryDataStore summaryDataStore) {
     // Figure out which unlinked units are a part of another library so we won't
     // visit them redundantly.
     Set<String> partOfUris = new Set<String>();
-    unlinkedUnits.forEach((String unitUriString, UnlinkedUnit unlinkedUnit) {
+    summaryDataStore.unlinkedMap
+        .forEach((String unitUriString, UnlinkedUnit unlinkedUnit) {
       Uri unitUri = Uri.parse(unitUriString);
       for (String relativePartUriString in unlinkedUnit.publicNamespace.parts) {
         partOfUris.add(
@@ -304,16 +255,14 @@ class InferredTypeCollector {
                 .toString());
       }
     });
-    linkedLibraries
+    summaryDataStore.linkedMap
         .forEach((String libraryUriString, LinkedLibrary linkedLibrary) {
       if (partOfUris.contains(libraryUriString)) {
         return;
       }
-      libraryIndex
-          .putIfAbsent(libraryUriString, () => new Set<String>())
-          .add(summaryPath);
       Uri libraryUri = Uri.parse(libraryUriString);
-      UnlinkedUnit definingUnlinkedUnit = unlinkedUnits[libraryUriString];
+      UnlinkedUnit definingUnlinkedUnit =
+          summaryDataStore.unlinkedMap[libraryUriString];
       if (definingUnlinkedUnit != null) {
         visitUnit(
             definingUnlinkedUnit, linkedLibrary.units[0], libraryUriString);
@@ -324,7 +273,8 @@ class InferredTypeCollector {
               Uri.parse(definingUnlinkedUnit.publicNamespace.parts[i]);
           String unitUriString =
               resolveRelativeUri(libraryUri, relativePartUri).toString();
-          UnlinkedUnit unlinkedUnit = unlinkedUnits[unitUriString];
+          UnlinkedUnit unlinkedUnit =
+              summaryDataStore.unlinkedMap[unitUriString];
           if (unlinkedUnit != null) {
             visitUnit(
                 unlinkedUnit, linkedLibrary.units[i + 1], libraryUriString);