Introduce an abstract DeclarationMirror in the implementation hierarchy; add a MirrorReference refl…

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 610 matching lines @@
       _returnType = _returnType.resolve(mirrors);
     }
     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;
+
+    List<InstanceMirror> get metadata {
+      // get the metadata objects, convert them into InstanceMirrors using

[siva, 2013/07/18 20:46:15]

"Get"

+      // reflect() and then make them into a Dart list

[siva, 2013/07/18 20:46:15]

missing "."

+      return _metadata(_reflectee).map(reflect).toList();

[siva, 2013/07/18 20:46:15]

toList(false) here? does it need to be a growable list?

[rmacnak, 2013/07/18 21:04:50]

Switched to fixed size.

+    }
+}
 
 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 _LocalMirrorImpl
+class _LocalTypeVariableMirrorImpl extends _LocalDeclarationMirrorImpl
     implements TypeVariableMirror {
-  _LocalTypeVariableMirrorImpl(String simpleName,
+  _LocalTypeVariableMirrorImpl(reflectee,
+                               String simpleName,
                                this._owner,
                                this._upperBound)
-      : this.simpleName = _s(simpleName);
+      : this.simpleName = _s(simpleName),
+        super(reflectee);
 
   final Symbol simpleName;
 
   Symbol _qualifiedName = null;
   Symbol get qualifiedName {
     if (_qualifiedName == null) {
       _qualifiedName = _computeQualifiedName(owner, simpleName);
     }
     return _qualifiedName;
   }
@@ skipping 25 matching lines @@
 
   List<InstanceMirror> get metadata {
     throw new UnimplementedError(
         'TypeVariableMirror.metadata is not implemented');
   }
 
   String toString() => "TypeVariableMirror on '${_n(simpleName)}'";
 }
 
 
-class _LocalTypedefMirrorImpl extends _LocalMirrorImpl
+class _LocalTypedefMirrorImpl extends _LocalDeclarationMirrorImpl
     implements TypedefMirror {
-  _LocalTypedefMirrorImpl(String simpleName,
+  _LocalTypedefMirrorImpl(reflectee,
+                          String simpleName,
                           this._owner,
                           this._referent)
-      : this.simpleName = _s(simpleName);
+      : this.simpleName = _s(simpleName),
+        super(reflectee);
 
   final Symbol simpleName;
 
   Symbol _qualifiedName = null;
   Symbol get qualifiedName {
     if (_qualifiedName == null) {
       _qualifiedName = _computeQualifiedName(owner, simpleName);
     }
     return _qualifiedName;
   }
@@ skipping 127 matching lines @@
   _invoke(reflectee, memberName, positionalArguments)
       native 'LibraryMirror_invoke';
 
   _invokeGetter(reflectee, getterName)
       native 'LibraryMirror_invokeGetter';
 
   _invokeSetter(reflectee, setterName, value)
       native 'LibraryMirror_invokeSetter';
 }
 
-class _LocalMethodMirrorImpl extends _LocalMirrorImpl
+class _LocalMethodMirrorImpl extends _LocalDeclarationMirrorImpl
     implements MethodMirror {
-  _LocalMethodMirrorImpl(this._reflectee,
+  _LocalMethodMirrorImpl(reflectee,
                          this._owner,
                          this.parameters,
                          this._returnType,
                          this.isStatic,
                          this.isAbstract,
                          this.isGetter,
                          this.isSetter,
                          this.isConstructor,
                          this.isConstConstructor,
                          this.isGenerativeConstructor,
                          this.isRedirectingConstructor,
-                         this.isFactoryConstructor);
-
-  final _MirrorReference _reflectee;
+                         this.isFactoryConstructor) : super(reflectee);
 
   Symbol _simpleName = null;
   Symbol get simpleName {
     if (_simpleName == null) {
       _simpleName = _s(_MethodMirror_name(_reflectee));
     }
     return _simpleName;
   }
 
   Symbol _qualifiedName = null;
@@ skipping 67 matching lines @@
       }
     }
     return _constructorName;
   }
 
   final bool isConstConstructor;
   final bool isGenerativeConstructor;
   final bool isRedirectingConstructor;
   final bool isFactoryConstructor;
 
-  List<InstanceMirror> get metadata {
-    owner; // ensure owner is computed
-    // get the metadata objects, convert them into InstanceMirrors using
-    // reflect() and then make them into a Dart list
-    return _metadata(_reflectee).map(reflect).toList();
-  }
-
   String toString() => "MethodMirror on '${_n(simpleName)}'";
 
   static String _MethodMirror_name(reflectee)
       native "MethodMirror_name";
 }
 
-class _LocalVariableMirrorImpl extends _LocalMirrorImpl
+class _LocalVariableMirrorImpl extends _LocalDeclarationMirrorImpl
     implements VariableMirror {
-  _LocalVariableMirrorImpl(this._reflectee,
+  _LocalVariableMirrorImpl(reflectee,
                            String simpleName,
                            this._owner,
                            this._type,
                            this.isStatic,
                            this.isFinal)
-      : this.simpleName = _s(simpleName);
+      : this.simpleName = _s(simpleName),
+        super(reflectee);
 
-  final _MirrorReference _reflectee;
   final Symbol simpleName;
 
   Symbol _qualifiedName = null;
   Symbol get qualifiedName {
     if (_qualifiedName == null) {
       _qualifiedName = _computeQualifiedName(owner, simpleName);
     }
     return _qualifiedName;
   }
 
@@ skipping 22 matching lines @@
   TypeMirror get type {
     if (_type is! Mirror) {
       _type = _type.resolve(mirrors);
     }
     return _type;
   }
 
   final bool isStatic;
   final bool isFinal;
 
-  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();
-  }
-
   String toString() => "VariableMirror on '${_n(simpleName)}'";
 }
 
 class _LocalParameterMirrorImpl extends _LocalVariableMirrorImpl
     implements ParameterMirror {
   _LocalParameterMirrorImpl(type, this.isOptional)
       : super(null, '<TODO:unnamed>', null, type, false, false) {}
 
   final bool isOptional;
 
@@ skipping 82 matching lines @@
   }
 
   // Creates a new local ClassMirror.
   static ClassMirror makeLocalClassMirror(Type key)
       native "Mirrors_makeLocalClassMirror";
 
   static ClassMirror reflectClass(Type key) {
     return makeLocalClassMirror(key);
   }
 }