ObjectMirror => ContainerMirror

pkg/dartdoc/lib/mirrors.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('mirrors');
 
 #import('dart:io');
 #import('dart:uri');
 
 // TODO(rnystrom): Use "package:" URL (#4968).
@@ skipping 115 matching lines @@
   /**
    * Is this declaration top-level?
    *
    * This is defined to be equivalent to:
    *    [:mirror.owner != null && mirror.owner is LibraryMirror:]
    */
   bool get isTopLevel;
 }
 
 /**
- * Common interface for interface types and libraries.
+ * Common interface for classes and libraries.
  */
-abstract class ObjectMirror implements Mirror {
+abstract class ContainerMirror implements Mirror {
 
   /**
-   * Returns an unmodifiable map of the members of declared in this type or
-   * library.
+   * An immutable map from from names to mirrors for all members in this
+   * container.
    */
-  Map<String, MemberMirror> get declaredMembers;
+  Map<String, MemberMirror> get members;
 }
 
 /**
  * A library.
  */
-abstract class LibraryMirror implements ObjectMirror, DeclarationMirror {
+abstract class LibraryMirror implements ContainerMirror, DeclarationMirror {
   /**
-   * An immutable map from from names to mirrors for all members in
-   * this library.
+   * An immutable map from from names to mirrors for all members in this
+   * library.
    *
-   * The members of a library are its top-level classes,
-   * functions, variables, getters, and setters.
+   * The members of a library are its top-level classes, functions, variables,
+   * getters, and setters.
    */
-  Map<String, Mirror> get members;
+  Map<String, MemberMirror> get members;
 
   /**
    * An immutable map from names to mirrors for all class
    * declarations in this library.
    */
   Map<String, ClassMirror> get classes;
 
   /**
    * An immutable map from names to mirrors for all function, getter,
    * and setter declarations in this library.
@@ skipping 60 matching lines @@
 
   /**
    * Is [:true:] iff this type is a function type.
    */
   bool get isFunction;
 }
 
 /**
  * A class or interface type.
  */
-abstract class ClassMirror implements TypeMirror, ObjectMirror {
+abstract class ClassMirror implements TypeMirror, ContainerMirror {
   /**
    * A mirror on the original declaration of this type.
    *
    * For most classes, they are their own original declaration.  For
    * generic classes, however, there is a distinction between the
    * original class declaration, which has unbound type variables, and
    * the instantiations of generic classes, which have bound type
    * variables.
    */
   ClassMirror get originalDeclaration;
@@ skipping 48 matching lines @@
   /**
    * An immutable map from from names to mirrors for all members of
    * this type.
    *
    * The members of a type are its methods, fields, getters, and
    * setters.  Note that constructors and type variables are not
    * considered to be members of a type.
    *
    * This does not include inherited members.
    */
-  Map<String, Mirror> get members;
+  Map<String, MemberMirror> get members;
 
   /**
    * An immutable map from names to mirrors for all method,
    * declarations for this type.  This does not include getters and
    * setters.
    */
   Map<String, MethodMirror> get methods;
 
   /**
    * An immutable map from names to mirrors for all getter
@@ skipping 250 matching lines @@
   /**
    * Returns the URI where the source originated.
    */
   Uri get uri;
 
   /**
    * Returns the text of this source.
    */
   String get text;
 }