FieldMirror => VariableMirror

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 460 matching lines @@
   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 {
+  Map<String, MemberMirror> _members;
+
   Dart2JsObjectMirror(Dart2JsMirrorSystem system, Element element)
       : super(system, element);
+
+  abstract void _ensureMembers();
+
+  Map<String, MemberMirror> get declaredMembers {
+    _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>(

[ahe, 2012/10/31 08:20:08]

This code is really hard to read. Generally, you can assume your code is wrong
if you have more than one type argument.

+        _members,
+        (MemberMirror member) => member is MethodMirror);
+  }
+
+  Map<String, MethodMirror> get getters {
+    _ensureMembers();
+    return new AsFilteredImmutableMap<String, MemberMirror, MethodMirror>(
+        _members,
+        (MemberMirror member) =>
+            member is MethodMirror && (member as MethodMirror).isGetter);
+  }
+
+  Map<String, MethodMirror> get setters {
+    _ensureMembers();
+    return new AsFilteredImmutableMap<String, MemberMirror, MethodMirror>(
+        _members,
+        (MemberMirror member) =>
+            member is MethodMirror && (member as MethodMirror).isSetter);
+  }
+
+  Map<String, VariableMirror> get variables {
+    _ensureMembers();
+    return new AsFilteredImmutableMap<String, MemberMirror, VariableMirror>(
+        _members,
+        (MemberMirror member) => member is VariableMirror);
+  }
 }
 
 class Dart2JsLibraryMirror extends Dart2JsObjectMirror
     implements LibraryMirror {
   Map<String, ClassMirror> _classes;
-  Map<String, MemberMirror> _members;
 
   Dart2JsLibraryMirror(Dart2JsMirrorSystem system, LibraryElement library)
       : super(system, library);
 
   LibraryElement get _library => _element;
 
   Uri get uri => _library.uri;
 
   DeclarationMirror get owner => null;
 
@@ skipping 22 matching lines @@
     }
   }
 
   String get qualifiedName => simpleName;
 
   void _ensureClasses() {
     if (_classes == null) {
       _classes = <String, ClassMirror>{};
       _library.forEachLocalMember((Element e) {
         if (e.isClass()) {
-          e.ensureResolved(system.compiler);
-          var type = new Dart2JsClassMirror.fromLibrary(this, e);
+          ClassElement classElement = e;
+          classElement.ensureResolved(system.compiler);
+          var type = new Dart2JsClassMirror.fromLibrary(this, classElement);
           assert(invariant(_library, !_classes.containsKey(type.simpleName),
               message: "Type name '${type.simpleName}' "
                        "is not unique in $_library."));
           _classes[type.simpleName] = type;
         } else if (e.isTypedef()) {
           var type = new Dart2JsTypedefMirror.fromLibrary(this,
               e.computeType(system.compiler));
           assert(invariant(_library, !_classes.containsKey(type.simpleName),
               message: "Type name '${type.simpleName}' "
                        "is not unique in $_library."));
@@ skipping 10 matching lines @@
         if (!e.isClass() && !e.isTypedef()) {
           for (var member in _convertElementMemberToMemberMirrors(this, e)) {
             assert(!_members.containsKey(member.simpleName));
             _members[member.simpleName] = member;
           }
         }
       });
     }
   }
 
-  Map<String, MemberMirror> get declaredMembers {
-    _ensureMembers();
-    return new ImmutableMapWrapper<String, MemberMirror>(_members);
-  }
-
-  Map<String, Mirror> get members => declaredMembers;
-
-  Map<String, MethodMirror> get functions {
-    _ensureMembers();
-    return new FilteredImmutableMap(_members,
-        (MemberMirror member) => member is MethodMirror);
-  }
-
-  Map<String, MethodMirror> get getters {
-    _ensureMembers();
-    return new FilteredImmutableMap(_members,
-        (MemberMirror member) => member is MethodMirror && member.isGetter);
-  }
-
-  Map<String, MethodMirror> get setters {
-    _ensureMembers();
-    return new FilteredImmutableMap(_members,
-        (MemberMirror member) => member is MethodMirror && member.isSetter);
-  }
-
   Map<String, ClassMirror> get classes {
     _ensureClasses();
     return new ImmutableMapWrapper<String, ClassMirror>(_classes);
   }
 
   SourceLocation get location {
     var script = _library.getCompilationUnit().script;
     return new Dart2JsLocation(
         script,
         new SourceSpan(script.uri, 0, script.text.length));
@@ skipping 66 matching lines @@
     }
     return null;
   }
   bool get hasDefaultValue {
     return _variableElement.cachedNode !== null &&
         _variableElement.cachedNode is SendSet;
   }
 
   bool get isInitializingFormal => false;
 
-  FieldMirror get initializedField => null;
+  VariableMirror get initializedField => null;
 }
 
 class Dart2JsFieldParameterMirror extends Dart2JsParameterMirror {
 
   Dart2JsFieldParameterMirror(Dart2JsMirrorSystem system,
                               MethodMirror method,
                               FieldParameterElement element,
                               bool isOptional)
       : super._normal(system, method, element, isOptional);
 
   FieldParameterElement get _fieldParameterElement => _element;
 
   TypeMirror get type {
     if (_fieldParameterElement.variables.cachedNode.type !== null) {
       return super.type;
     }
     return _convertTypeToTypeMirror(system,
       _fieldParameterElement.fieldElement.computeType(system.compiler),
       system.compiler.types.dynamicType,
       _variableElement.variables.functionSignature);
   }
 
   bool get isInitializingFormal => true;
 
-  FieldMirror get initializedField => new Dart2JsFieldMirror(
+  VariableMirror get initializedField => new Dart2JsFieldMirror(
       _method.owner, _fieldParameterElement.fieldElement);
 }
 
 //------------------------------------------------------------------------------
 // Declarations
 //------------------------------------------------------------------------------
 class Dart2JsClassMirror extends Dart2JsObjectMirror
     implements Dart2JsTypeMirror, ClassMirror {
   final Dart2JsLibraryMirror library;
-  Map<String, Dart2JsMemberMirror> _members;
   List<TypeVariableMirror> _typeVariables;
 
   Dart2JsClassMirror(Dart2JsMirrorSystem system, ClassElement _class)
       : this.library = system.getLibrary(_class.getLibrary()),
         super(system, _class);
 
   ClassElement get _class => _element;
 
   Dart2JsClassMirror.fromLibrary(Dart2JsLibraryMirror library,
                                  ClassElement _class)
@@ skipping 21 matching lines @@
       _members = <String, Dart2JsMemberMirror>{};
       _class.forEachMember((_, e) {
         for (var member in _convertElementMemberToMemberMirrors(this, e)) {
           assert(!_members.containsKey(member.simpleName));
           _members[member.simpleName] = member;
         }
       });
     }
   }
 
-  Map<String, MemberMirror> get declaredMembers {
+  Map<String, MethodMirror> get methods => functions;
+
+  Map<String, MethodMirror> get constructors {
     _ensureMembers();
-    return new ImmutableMapWrapper<String, MemberMirror>(_members);
-  }
-
-  Map<String, Mirror> get members => declaredMembers;
-
-  Map<String, MethodMirror> get methods {
-    _ensureMembers();
-    return new FilteredImmutableMap(_members,
-        (MemberMirror member) => member is MethodMirror);
-  }
-
-  Map<String, MethodMirror> get getters {
-    _ensureMembers();
-    return new FilteredImmutableMap(_members,
-        (MemberMirror member) => member is MethodMirror && member.isGetter);
-  }
-
-  Map<String, MethodMirror> get setters {
-    _ensureMembers();
-    return new FilteredImmutableMap(_members,
-        (MemberMirror member) => member is MethodMirror && member.isSetter);
+    return new AsFilteredImmutableMap<String, MemberMirror, MethodMirror>(
+        _members, (m) => m.isConstructor ? m : null);
   }
 
   bool get isObject => _class == system.compiler.objectClass;
 
   bool get isDynamic => false;
 
   bool get isVoid => false;
 
   bool get isTypeVariable => false;
 
@@ skipping 40 matching lines @@
       _typeVariables = <TypeVariableMirror>[];
       _class.ensureResolved(system.compiler);
       for (TypeVariableType typeVariable in _class.typeVariables) {
         _typeVariables.add(
             new Dart2JsTypeVariableMirror(system, typeVariable));
       }
     }
     return _typeVariables;
   }
 
-  Map<String, MethodMirror> get constructors {
-    _ensureMembers();
-    return new AsFilteredImmutableMap<String, MemberMirror, MethodMirror>(
-        _members, (m) => m.isConstructor ? m : null);
-  }
-
   /**
    * Returns the default type for this interface.
    */
   ClassMirror get defaultFactory {
     if (_class.defaultClass != null) {
       return new Dart2JsInterfaceTypeMirror(system, _class.defaultClass);
     }
     return null;
   }
 
@@ skipping 190 matching lines @@
   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);
@@ skipping 54 matching lines @@
 
   // TODO(johnniwinther): Substitute type arguments for type variables.
   Map<String, MethodMirror> get methods => originalDeclaration.methods;
 
   // TODO(johnniwinther): Substitute type arguments for type variables.
   Map<String, MethodMirror> get setters => originalDeclaration.setters;
 
   // TODO(johnniwinther): Substitute type arguments for type variables.
   Map<String, MethodMirror> get getters => originalDeclaration.getters;
 
+  // TODO(johnniwinther): Substitute type arguments for type variables.
+  Map<String, VariableMirror> get variables => originalDeclaration.variables;
+
   // TODO(johnniwinther): Substitute type arguments for type variables?
   ClassMirror get defaultFactory => originalDeclaration.defaultFactory;
 
   bool operator ==(Object other) {
     if (this === other) {
       return true;
     }
     if (other is! ClassMirror) {
       return false;
     }
@@ skipping 284 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 Dart2JsElementMirror
-    implements Dart2JsMemberMirror, FieldMirror {
+    implements Dart2JsMemberMirror, VariableMirror {
   Dart2JsObjectMirror _objectMirror;
   VariableElement _variable;
 
   Dart2JsFieldMirror(Dart2JsObjectMirror objectMirror,
                      VariableElement variable)
       : this._objectMirror = objectMirror,
         this._variable = variable,
         super(objectMirror.system, variable);
 
   String get qualifiedName
@@ skipping 25 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);
     }
   }
 }