Hoist .simpleName and .qualifiedName up to _LocalDeclarationMirrorImpl.

runtime/lib/mirrors_impl.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.
 
 // VM-specific implementation of the dart:mirrors library.
 
 // These values are allowed to be passed directly over the wire.
 bool _isSimpleValue(var value) {
   return (value == null || value is num || value is String || value is bool);
 }
@@ skipping 638 matching lines @@
     return _returnType;
   }
 
   final List<ParameterMirror> parameters;
 
   String toString() => "FunctionTypeMirror on '${_n(simpleName)}'";
 }
 
 abstract class _LocalDeclarationMirrorImpl extends _LocalMirrorImpl
     implements DeclarationMirror {
-    _LocalDeclarationMirrorImpl(this._reflectee);
-    final _MirrorReference _reflectee;
+  _LocalDeclarationMirrorImpl(this._reflectee, this._simpleName);
 
-    List<InstanceMirror> get metadata {
-      // Get the metadata objects, convert them into InstanceMirrors using
-      // reflect() and then make them into a Dart list.
-      return _metadata(_reflectee).map(reflect).toList(growable:false);
+  final _MirrorReference _reflectee;
+
+  final Symbol _simpleName;
+  Symbol get simpleName => _simpleName;

[rmacnak, 2013/07/30 19:48:37]

If the getter just answers the field, we can just use the field.

[Michael Lippautz (Google), 2013/07/30 19:58:18]

Done.

+
+  Symbol _qualifiedName = null;
+  Symbol get qualifiedName {
+    if (_qualifiedName == null) {
+      _qualifiedName = _computeQualifiedName(owner, simpleName);
     }
+    return _qualifiedName;
+  }
+
+  List<InstanceMirror> get metadata {
+    // Get the metadata objects, convert them into InstanceMirrors using
+    // reflect() and then make them into a Dart list.
+    return _metadata(_reflectee).map(reflect).toList(growable:false);
+  }
 }
 
 class _LazyTypeVariableMirror {
   _LazyTypeVariableMirror(String variableName, this._owner)
       : this._variableName = _s(variableName);
 
   TypeVariableMirror resolve(MirrorSystem mirrors) {
     ClassMirror owner = _owner.resolve(mirrors);
     return owner.typeVariables[_variableName];
   }
 
   final Symbol _variableName;
   final _LazyTypeMirror _owner;
 }
 
 class _LocalTypeVariableMirrorImpl extends _LocalDeclarationMirrorImpl
     implements TypeVariableMirror {
   _LocalTypeVariableMirrorImpl(reflectee,
                                String simpleName,
                                this._owner,
                                this._upperBound)
-      : this.simpleName = _s(simpleName),
-        super(reflectee);
-
-  final Symbol simpleName;
-
-  Symbol _qualifiedName = null;
-  Symbol get qualifiedName {
-    if (_qualifiedName == null) {
-      _qualifiedName = _computeQualifiedName(owner, simpleName);
-    }
-    return _qualifiedName;
-  }
+      : super(reflectee, _s(simpleName));
 
   var _owner;
   DeclarationMirror get owner {
     if (_owner is! Mirror) {
       _owner = _owner.resolve(mirrors);
     }
     return _owner;
   }
 
   bool get isPrivate => false;
@@ skipping 21 matching lines @@
   String toString() => "TypeVariableMirror on '${_n(simpleName)}'";
 }
 
 
 class _LocalTypedefMirrorImpl extends _LocalDeclarationMirrorImpl
     implements TypedefMirror {
   _LocalTypedefMirrorImpl(reflectee,
                           String simpleName,
                           this._owner,
                           this._referent)
-      : this.simpleName = _s(simpleName),
-        super(reflectee);
-
-  final Symbol simpleName;
+      : super(reflectee, _s(simpleName));
 
   Symbol _qualifiedName = null;
   Symbol get qualifiedName {

[rmacnak, 2013/07/30 19:48:37]

Isn't this inherited now?

[Michael Lippautz (Google), 2013/07/30 19:58:18]

Yep, did miss this one.

     if (_qualifiedName == null) {
       _qualifiedName = _computeQualifiedName(owner, simpleName);
     }
     return _qualifiedName;
   }
 
   var _owner;
   DeclarationMirror get owner {
     if (_owner == null) {
       _owner = _LocalClassMirrorImpl._library(_reflectee);
@@ skipping 137 matching lines @@
   _invokeSetter(reflectee, setterName, value)
       native 'LibraryMirror_invokeSetter';
 
   _computeMembers(reflectee)
       native "LibraryMirror_members";
 }
 
 class _LocalMethodMirrorImpl extends _LocalDeclarationMirrorImpl
     implements MethodMirror {
   _LocalMethodMirrorImpl(reflectee,
+                         String simpleName,
                          this._owner,
                          this.isStatic,
                          this.isAbstract,
                          this.isGetter,
                          this.isSetter,
                          this.isConstructor,
                          this.isConstConstructor,
                          this.isGenerativeConstructor,
                          this.isRedirectingConstructor,
-                         this.isFactoryConstructor) : super(reflectee);
-
-  Symbol _simpleName = null;
-  Symbol get simpleName {
-    if (_simpleName == null) {
-      _simpleName = _s(_MethodMirror_name(_reflectee));
-    }
-    return _simpleName;
-  }
-
-  Symbol _qualifiedName = null;
-  Symbol get qualifiedName {
-    if (_qualifiedName == null) {
-      _qualifiedName = _computeQualifiedName(owner, simpleName);
-    }
-    return _qualifiedName;
-  }
+                         this.isFactoryConstructor)
+      : super(reflectee, _s(simpleName));
 
   var _owner;
   DeclarationMirror get owner {
     // For nested closures it is possible, that the mirror for the owner has not
     // been created yet.
     if (_owner == null) {
       _owner = _MethodMirror_owner(_reflectee);
     }
     // TODO(11897): This will go away, as soon as lazy mirrors go away.
     if (_owner is! Mirror) {
@@ skipping 69 matching lines @@
     return _constructorName;
   }
 
   final bool isConstConstructor;
   final bool isGenerativeConstructor;
   final bool isRedirectingConstructor;
   final bool isFactoryConstructor;
 
   String toString() => "MethodMirror on '${_n(simpleName)}'";
 
-  static String _MethodMirror_name(reflectee)
-      native "MethodMirror_name";
-
   static dynamic _MethodMirror_owner(reflectee)
       native "MethodMirror_owner";
 
   static dynamic _MethodMirror_return_type(reflectee)
       native "MethodMirror_return_type";
 
   static List<MethodMirror> _MethodMirror_parameters(reflectee)
       native "MethodMirror_parameters";
 }
 
 class _LocalVariableMirrorImpl extends _LocalDeclarationMirrorImpl
     implements VariableMirror {
   _LocalVariableMirrorImpl(reflectee,
                            String simpleName,
                            this._owner,
                            this._type,
                            this.isStatic,
                            this.isFinal)
-      : this.simpleName = _s(simpleName),
-        super(reflectee);
-
-  final Symbol simpleName;
-
-  Symbol _qualifiedName = null;
-  Symbol get qualifiedName {
-    if (_qualifiedName == null) {
-      _qualifiedName = _computeQualifiedName(owner, simpleName);
-    }
-    return _qualifiedName;
-  }
+      : super(reflectee, _s(simpleName));
 
   var _owner;
   DeclarationMirror get owner {
     if (_owner is! Mirror) {
       _owner = _owner.resolve(mirrors);
     }
     return _owner;
   }
 
   bool get isPrivate {
@@ skipping 151 matching lines @@
   static Expando<ClassMirror> _classMirrorCache = new Expando("ClassMirror");
   static ClassMirror reflectClass(Type key) {
     var classMirror = _classMirrorCache[key];
     if (classMirror == null) {
       classMirror = makeLocalClassMirror(key);
       _classMirrorCache[key] = classMirror;
     }
     return classMirror;
   }
 }