ObjectMirror => ContainerMirror

pkg/dartdoc/lib/src/mirrors/dart2js_mirror.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_dart2js;
 
 import 'dart:io';
 import 'dart:uri';
 
 import '../../../../../lib/compiler/compiler.dart' as diagnostics;
@@ skipping 63 matching lines @@
     return new Dart2JsFunctionTypeMirror(system, type, functionSignature);
   } else if (type is VoidType) {
     return new Dart2JsVoidMirror(system, type);
   } else if (type is TypedefType) {
     return new Dart2JsTypedefMirror(system, type);
   }
   throw new ArgumentError("Unexpected interface type $type");
 }
 
 Collection<Dart2JsMemberMirror> _convertElementMemberToMemberMirrors(
-    Dart2JsObjectMirror library, Element element) {
+    Dart2JsContainerMirror library, Element element) {
   if (element is SynthesizedConstructorElement) {
     return const <Dart2JsMemberMirror>[];
   } else if (element is VariableElement) {
     return <Dart2JsMemberMirror>[new Dart2JsFieldMirror(library, element)];
   } else if (element is FunctionElement) {
     return <Dart2JsMemberMirror>[new Dart2JsMethodMirror(library, element)];
   } else if (element is AbstractFieldElement) {
     var members = <Dart2JsMemberMirror>[];
     if (element.getter !== null) {
       members.add(new Dart2JsMethodMirror(library, element.getter));
     }
     if (element.setter !== null) {
       members.add(new Dart2JsMethodMirror(library, element.setter));
     }
     return members;
   }
   throw new ArgumentError(
       "Unexpected member type $element ${element.kind}");
 }
 
-MethodMirror _convertElementMethodToMethodMirror(Dart2JsObjectMirror library,
+MethodMirror _convertElementMethodToMethodMirror(Dart2JsContainerMirror library,
                                                  Element element) {
   if (element is FunctionElement) {
     return new Dart2JsMethodMirror(library, element);
   } else {
     return null;
   }
 }
 
 class Dart2JsMethodKind {
   static const Dart2JsMethodKind NORMAL = const Dart2JsMethodKind("normal");
@@ skipping 364 matching lines @@
   Dart2JsMirrorSystem get system => this;
 
   String get simpleName => "mirror";
   String get displayName => simpleName;
   String get qualifiedName => simpleName;
 
   // TODO(johnniwinther): Hack! Dart2JsMirrorSystem need not be a Mirror.
   int get hashCode => qualifiedName.hashCode;
 }
 
-abstract class Dart2JsObjectMirror extends Dart2JsElementMirror
-    implements ObjectMirror {
+abstract class Dart2JsContainerMirror extends Dart2JsElementMirror
+    implements ContainerMirror {
   Map<String, MemberMirror> _members;
 
-  Dart2JsObjectMirror(Dart2JsMirrorSystem system, Element element)
+  Dart2JsContainerMirror(Dart2JsMirrorSystem system, Element element)
       : super(system, element);
 
   abstract void _ensureMembers();
 
-  Map<String, MemberMirror> get declaredMembers {
+  Map<String, MemberMirror> get members {
     _ensureMembers();
     return new ImmutableMapWrapper<String, MemberMirror>(_members);
   }
 
-  Map<String, Mirror> get members => declaredMembers;
-
   Map<String, MethodMirror> get functions {
     _ensureMembers();
     return new AsFilteredImmutableMap<String, MemberMirror, MethodMirror>(
         _members,
         (MemberMirror member) => member is MethodMirror);
   }
 
   Map<String, MethodMirror> get getters {
     _ensureMembers();
     return new AsFilteredImmutableMap<String, MemberMirror, MethodMirror>(
@@ skipping 11 matching lines @@
   }
 
   Map<String, VariableMirror> get variables {
     _ensureMembers();
     return new AsFilteredImmutableMap<String, MemberMirror, VariableMirror>(
         _members,
         (MemberMirror member) => member is VariableMirror);
   }
 }
 
-class Dart2JsLibraryMirror extends Dart2JsObjectMirror
+class Dart2JsLibraryMirror extends Dart2JsContainerMirror
     implements LibraryMirror {
   Map<String, ClassMirror> _classes;
 
   Dart2JsLibraryMirror(Dart2JsMirrorSystem system, LibraryElement library)
       : super(system, library);
 
   LibraryElement get _library => _element;
 
   Uri get uri => _library.uri;
 
@@ skipping 185 matching lines @@
 
   bool get isInitializingFormal => true;
 
   VariableMirror get initializedField => new Dart2JsFieldMirror(
       _method.owner, _fieldParameterElement.fieldElement);
 }
 
 //------------------------------------------------------------------------------
 // Declarations
 //------------------------------------------------------------------------------
-class Dart2JsClassMirror extends Dart2JsObjectMirror
+class Dart2JsClassMirror extends Dart2JsContainerMirror
     implements Dart2JsTypeMirror, ClassMirror {
   final Dart2JsLibraryMirror library;
   List<TypeVariableMirror> _typeVariables;
 
   Dart2JsClassMirror(Dart2JsMirrorSystem system, ClassElement _class)
       : this.library = system.getLibrary(_class.getLibrary()),
         super(system, _class);
 
   ClassElement get _class => _element;
 
@@ skipping 288 matching lines @@
   bool get isDynamic => false;
 
   bool get isTypeVariable => false;
 
   bool get isTypedef => false;
 
   bool get isFunction => false;
 
   String toString() => _type.element.toString();
 
-  Map<String, MemberMirror> get declaredMembers =>
-      const <String, MemberMirror>{};
-
   Map<String, MemberMirror> get members => const <String, MemberMirror>{};
 
   Map<String, MethodMirror> get constructors => const <String, MethodMirror>{};
 
   Map<String, MethodMirror> get methods => const <String, MethodMirror>{};
 
   Map<String, MethodMirror> get getters => const <String, MethodMirror>{};
 
   Map<String, MethodMirror> get setters => const <String, MethodMirror>{};
 
   Map<String, VariableMirror> get variables => const <String, VariableMirror>{};
 
   ClassMirror get defaultFactory => null;
 }
 
 class Dart2JsInterfaceTypeMirror extends Dart2JsTypeElementMirror
     implements ClassMirror {
   List<TypeMirror> _typeArguments;
 
   Dart2JsInterfaceTypeMirror(Dart2JsMirrorSystem system,
                              InterfaceType interfaceType)
       : super(system, interfaceType);
 
   InterfaceType get _interfaceType => _type;
 
   String get qualifiedName => originalDeclaration.qualifiedName;
 
   // TODO(johnniwinther): Substitute type arguments for type variables.
-  Map<String, MemberMirror> get declaredMembers =>
-      originalDeclaration.declaredMembers;
-
-  // TODO(johnniwinther): Substitute type arguments for type variables.
   Map<String, MemberMirror> get members => originalDeclaration.members;
 
   bool get isObject => system.compiler.objectClass == _type.element;
 
   bool get isDynamic => system.compiler.dynamicClass == _type.element;
 
   ClassMirror get originalDeclaration
       => new Dart2JsClassMirror(system, _type.element);
 
   // TODO(johnniwinther): Substitute type arguments for type variables.
@@ skipping 82 matching lines @@
       : super(system, functionType) {
     assert (_functionSignature !== null);
   }
 
   FunctionType get _functionType => _type;
 
   // TODO(johnniwinther): Is this the qualified name of a function type?
   String get qualifiedName => originalDeclaration.qualifiedName;
 
   // TODO(johnniwinther): Substitute type arguments for type variables.
-  Map<String, MemberMirror> get declaredMembers {
+  Map<String, MemberMirror> get members {
     var method = callMethod;
     if (method !== null) {
       var map = new Map<String, MemberMirror>.from(
-          originalDeclaration.declaredMembers);
+          originalDeclaration.members);
       var name = method.qualifiedName;
       assert(!map.containsKey(name));
       map[name] = method;
       return new ImmutableMapWrapper<String, MemberMirror>(map);
     }
-    return originalDeclaration.declaredMembers;
+    return originalDeclaration.members;
   }
 
   bool get isFunction => true;
 
   MethodMirror get callMethod => _convertElementMethodToMethodMirror(
       system.getLibrary(_functionType.element.getLibrary()),
       _functionType.element);
 
   ClassMirror get originalDeclaration
       => new Dart2JsClassMirror(system, system.compiler.functionClass);
@@ skipping 96 matching lines @@
     return other.isDynamic;
   }
 }
 
 //------------------------------------------------------------------------------
 // Member mirrors implementation.
 //------------------------------------------------------------------------------
 
 class Dart2JsMethodMirror extends Dart2JsMemberMirror
     implements MethodMirror {
-  final Dart2JsObjectMirror _objectMirror;
+  final Dart2JsContainerMirror _objectMirror;
   String _simpleName;
   String _displayName;
   String _constructorName;
   String _operatorName;
   Dart2JsMethodKind _kind;
 
-  Dart2JsMethodMirror(Dart2JsObjectMirror objectMirror,
+  Dart2JsMethodMirror(Dart2JsContainerMirror objectMirror,
                       FunctionElement function)
       : this._objectMirror = objectMirror,
         super(objectMirror.system, function) {
     _simpleName = _element.name.slowToString();
     if (_function.kind == ElementKind.GETTER) {
       _kind = Dart2JsMethodKind.GETTER;
       _displayName = _simpleName;
     } else if (_function.kind == ElementKind.SETTER) {
       _kind = Dart2JsMethodKind.SETTER;
       _displayName = _simpleName;
@@ skipping 102 matching lines @@
       var script = _function.getCompilationUnit().script;
       var span = system.compiler.spanFromNode(node, script.uri);
       return new Dart2JsLocation(script, span);
     }
     return super.location;
   }
 
 }
 
 class Dart2JsFieldMirror extends Dart2JsMemberMirror implements VariableMirror {
-  Dart2JsObjectMirror _objectMirror;
+  Dart2JsContainerMirror _objectMirror;
   VariableElement _variable;
 
-  Dart2JsFieldMirror(Dart2JsObjectMirror objectMirror,
+  Dart2JsFieldMirror(Dart2JsContainerMirror objectMirror,
                      VariableElement variable)
       : this._objectMirror = objectMirror,
         this._variable = variable,
         super(objectMirror.system, variable);
 
   String get qualifiedName
       => '${owner.qualifiedName}.$simpleName';
 
   DeclarationMirror get owner => _objectMirror;
 
@@ skipping 17 matching lines @@
     if (node !== null) {
       var span = system.compiler.spanFromNode(node, script.uri);
       return new Dart2JsLocation(script, span);
     } else {
       var span = system.compiler.spanFromElement(_variable);
       return new Dart2JsLocation(script, span);
     }
   }
 }