Merge the prefix and references tables.

pkg/analyzer/tool/summary/idl.dart

Index: pkg/analyzer/tool/summary/idl.dart
diff --git a/pkg/analyzer/tool/summary/idl.dart b/pkg/analyzer/tool/summary/idl.dart
index b2cafdd983f48241869d83fe2b541c3b7a09c421..1debbbbc20f7c1f57afbfb0b2d4ff92cbc34e803 100644
--- a/pkg/analyzer/tool/summary/idl.dart
+++ b/pkg/analyzer/tool/summary/idl.dart
@@ -87,11 +87,6 @@ class PrelinkedLibrary {
   List<PrelinkedUnit> units;
 
   /**
-   * The unlinked library summary.
-   */
-  UnlinkedLibrary unlinked;
-
-  /**
    * The libraries that this library depends on (either via an explicit import
    * statement or via the implicit dependencies on `dart:core` and
    * `dart:async`).  The first element of this array is a pseudo-dependency
@@ -158,6 +153,11 @@ enum PrelinkedReferenceKind {
   other,
 
   /**
+   * The entity is a prefix.
+   */
+  prefix,
+
+  /**
    * The entity being referred to does not exist.
    */
   unresolved
@@ -410,12 +410,12 @@ class UnlinkedImport {
   int offset;
 
   /**
-   * Index into [UnlinkedLibrary.prefixes] of the prefix declared by this
+   * Index into [UnlinkedUnit.references] of the prefix declared by this
    * import declaration, or zero if this import declaration declares no prefix.
    *
    * Note that multiple imports can declare the same prefix.
    */
-  int prefix;
+  int prefixReference;
 
   /**
    * Combinators contained in this import declaration.
@@ -434,17 +434,6 @@ class UnlinkedImport {
 }
 
 /**
- * Unlinked summary of an entire library.
- */
-class UnlinkedLibrary {
-  /**
-   * Prefixes introduced by import declarations.  The first element in this
-   * array is a pseudo-prefix used by references made with no prefix.
-   */
-  List<UnlinkedPrefix> prefixes;
-}
-
-/**
  * Unlinked summary information about a function parameter.
  */
 class UnlinkedParam {
@@ -520,14 +509,6 @@ class UnlinkedPart {
   String uri;
 }
 
-class UnlinkedPrefix {
-  /**
-   * The name of the prefix, or the empty string in the case of the
-   * pseudo-prefix which represents "no prefix".
-   */
-  String name;
-}
-
 /**
  * Unlinked summary information about a name referred to in one library that
  * might be defined in another.
@@ -540,10 +521,10 @@ class UnlinkedReference {
   String name;
 
   /**
-   * Prefix used to refer to the entity.  This is an index into
-   * [UnlinkedLibrary.prefixes].
+   * Prefix used to refer to the entity, or zero if no prefix is used.  This is
+   * an index into [UnlinkedUnit.references].
    */
-  int prefix;
+  int prefixReference;
 }
 
 /**