Merge the prefix and references tables.

pkg/analyzer/tool/summary/idl.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.
 
 /**
  * This file is an "idl" style description of the summary format.  It is not
  * executed directly; instead it is parsed and transformed into code that
  * implements the summary format.
  *
  * The code generation process introduces the following non-typical semantics:
@@ skipping 69 matching lines @@
 class PrelinkedLibrary {
   /**
    * The pre-linked summary of all the compilation units constituting the
    * library.  The summary of the defining compilation unit is listed first,
    * followed by the summary of each part, in the order of the `part`
    * declarations in the defining compilation unit.
    */
   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
    * representing the library itself (it is also used for "dynamic").
    *
    * TODO(paulberry): consider removing this entirely and just using
    * [UnlinkedLibrary.imports].
    */
   List<PrelinkedDependency> dependencies;
 
@@ skipping 46 matching lines @@
    * The entity is a typedef.
    */
   typedef,
 
   /**
    * The entity is a variable or executable.
    */
   other,
 
   /**
+   * The entity is a prefix.
+   */
+  prefix,
+
+  /**
    * The entity being referred to does not exist.
    */
   unresolved
 }
 
 /**
  * Pre-linked summary of a compilation unit.
  */
 class PrelinkedUnit {
   /**
@@ skipping 232 matching lines @@
   String uri;
 
   /**
    * If [isImplicit] is false, offset of the "import" keyword.  If [isImplicit]
    * is true, zero.
    */
   @informative
   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.
    */
   List<UnlinkedCombinator> combinators;
 
   /**
    * Indicates whether the import declaration uses the `deferred` keyword.
    */
   bool isDeferred;
 
   /**
    * Indicates whether the import declaration is implicit.
    */
   bool isImplicit;
 }
 
 /**
- * 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 {
   /**
    * Name of the parameter.
    */
   String name;
 
   /**
    * If [isFunctionTyped] is `true`, the declared return type.  If
@@ skipping 55 matching lines @@
 /**
  * Unlinked summary information about a part declaration.
  */
 class UnlinkedPart {
   /**
    * String used in the compilation unit to refer to the part file.
    */
   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.
  */
 class UnlinkedReference {
   /**
    * Name of the entity being referred to.  The empty string refers to the
    * pseudo-type `dynamic`.
    */
   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;
 }
 
 /**
  * Unlinked summary information about a typedef declaration.
  */
 class UnlinkedTypedef {
   /**
    * Name of the typedef.
    */
   String name;
@@ skipping 165 matching lines @@
   /**
    * Indicates whether the variable is declared using the `const` keyword.
    */
   bool isConst;
 
   /**
    * Indicates whether this variable lacks an explicit type declaration.
    */
   bool hasImplicitType;
 }