Changes to mirrors in support of metadata access at runtime. Assumes VM changes in flight.…

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 52 matching lines @@
 }
 
 Map<Uri, LibraryMirror> _createLibrariesMap(Map<String, LibraryMirror> map) {
     var result = new Map<Uri, LibraryMirror>();
     map.forEach((String url, LibraryMirror mirror) {
       result[Uri.parse(url)] = mirror;
     });
     return result;
 }
 
+List<InstanceMirror> _metadata(mirror) {
+  native 'LocalMirrorImpl_metadata';

[ahe, 2013/06/11 08:48:10]

I don't think you can wrap the native declaration in curly braces.

[hausner, 2013/06/11 16:17:13]

This isn't legal dart code.

[ahe, 2013/06/11 16:21:22]

Neither is this:

List<InstanceMirror> _metadata(mirror) native 'LocalMirrorImpl_metadata';

What matters is what the VM accepts.

[gbracha, 2013/06/12 21:21:18]

Done.

+}
+
 class _LocalMirrorSystemImpl extends MirrorSystem {
   // Change parameter back to "this.libraries" when native code is changed.
   _LocalMirrorSystemImpl(Map<String, LibraryMirror> libraries, this.isolate)
       : this.libraries = _createLibrariesMap(libraries),
         _functionTypes = new Map<String, FunctionTypeMirror>();
 
   final Map<Uri, LibraryMirror> libraries;
   final IsolateMirror isolate;
 
   TypeMirror _dynamicType = null;
@@ skipping 73 matching lines @@
 }
 
 abstract class _LocalVMObjectMirrorImpl extends _LocalMirrorImpl {
   _LocalVMObjectMirrorImpl(this._reference) {}
 
   // For now, all VMObjects hold a VMReference.  We could consider
   // storing the Object reference itself here if the object is a Dart
   // language objects (except for objects of type VMReference, of
   // course).
   VMReference _reference;
+
+  int get hashCode => _reference.hashCode;

[ahe, 2013/06/11 08:48:10]

This is a bad hashCode.

It should be the hashCode from Object (identity hashCode).

[gbracha, 2013/06/12 21:21:18]

This really should be part of a different CL dealing with mirror equality. I'll
take it out of this CL.

+  
+  bool operator == (m) {
+    return (runtimeType == m.runtimeType) && (_reference == m._reference);

[ahe, 2013/06/11 08:48:10]

I don't understand the need to check for runtimeType, and I don't understand why
you use a private field for comparison.

I think this should be:

bool operator== (other) {
  return other is InstanceMirror && identical(reflectee, other.reflectee);
}

And so forth for other subclasses of _LocalVMObjectMirrorImpl.

[gbracha, 2013/06/12 21:21:18]

Indeed, it probably is in the equality CL. This was placeholder that got in by
accident. Removing, to be added in a different CL.

+  }
+
 }
 
 abstract class _LocalObjectMirrorImpl extends _LocalVMObjectMirrorImpl
     implements ObjectMirror {
   _LocalObjectMirrorImpl(ref) : super(ref) {}
 
   InstanceMirror invoke(Symbol memberName,
                         List positionalArguments,
                         [Map<Symbol, dynamic> namedArguments]) {
     if (namedArguments != null) {
@@ skipping 419 matching lines @@
       return new Future<InstanceMirror>.value(
           _invokeConstructor(this,
                              _n(constructorName),
                              positionalArguments,
                              true));
     } catch (exception) {
       return new Future<InstanceMirror>.error(exception);
     }
   }
 
+  List<InstanceMirror> get metadata {
+    return _metadata(this).map((o) => reflect(o));

[ahe, 2013/06/11 08:48:10]

This should be:

List<InstanceMirror> get metadata => _metadata(this).map(reflect).toList();

Notice that you need to call toList(), and there's no need to create an explicit
closure.

[gbracha, 2013/06/12 21:21:18]

Done. In all 5 places.

+  }
+
   static _invokeConstructor(ref, constructorName, positionalArguments, async)
       native 'LocalClassMirrorImpl_invokeConstructor';
 }
 
 class _LazyFunctionTypeMirror {
   _LazyFunctionTypeMirror(this.returnType, this.parameters) {}
 
   ClassMirror resolve(MirrorSystem mirrors) {
     return mirrors._lookupFunctionTypeMirror(returnType.resolve(mirrors),
                                              parameters);
@@ skipping 82 matching lines @@
   }
 
   var _upperBound;
   TypeMirror get upperBound {
     if (_upperBound is! Mirror) {
       _upperBound = _upperBound.resolve(mirrors);
     }
     return _upperBound;
   }
 
+  List<InstanceMirror> get metadata {
+    return _metadata(this).map((o) => reflect(o));
+  }
+
   String toString() => "TypeVariableMirror on '$simpleName'";
 }
 
 
 class _LocalTypedefMirrorImpl extends _LocalMirrorImpl
     implements TypedefMirror {
   _LocalTypedefMirrorImpl(String simpleName,
                           this._owner,
                           this._referent)
       : this.simpleName = _s(simpleName);
@@ skipping 119 matching lines @@
   }
 
   Map<Symbol, VariableMirror> get variables {
     if (_variables == null) {
       _variables = _filterMap(members,
                               (key, value) => (value is VariableMirror));
     }
     return _variables;
   }
 
+  List<InstanceMirror> get metadata {
+    return _metadata(this).map((o) => reflect(o));
+  }
+
   String toString() => "LibraryMirror on '$simpleName'";
 }
 
 class _LocalMethodMirrorImpl extends _LocalMirrorImpl
     implements MethodMirror {
   _LocalMethodMirrorImpl(String simpleName,
                          this._owner,
                          this.parameters,
                          this._returnType,
                          this.isStatic,
@@ skipping 80 matching lines @@
       }
     }
     return _constructorName;
   }
 
   final bool isConstConstructor;
   final bool isGenerativeConstructor;
   final bool isRedirectingConstructor;
   final bool isFactoryConstructor;
 
+  List<InstanceMirror> get metadata {
+    return _metadata(this).map((o) => reflect(o));
+  }
+
   String toString() => "MethodMirror on '$simpleName'";
 }
 
 class _LocalVariableMirrorImpl extends _LocalMirrorImpl
     implements VariableMirror {
   _LocalVariableMirrorImpl(String simpleName,
                            this._owner,
                            this._type,
                            this.isStatic,
                            this.isFinal)
@@ skipping 34 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 {
+    return _metadata(this).map((o) => reflect(o));
+  }
+
   String toString() => "VariableMirror on '$simpleName'";
 }
 
 class _LocalParameterMirrorImpl extends _LocalVariableMirrorImpl
     implements ParameterMirror {
   _LocalParameterMirrorImpl(type, this.isOptional)
       : super('<TODO:unnamed>', null, type, false, false) {}
 
   final bool isOptional;
 
@@ skipping 51 matching lines @@
   }
 
   // Creates a new local ClassMirror.
   static ClassMirror makeLocalClassMirror(Type key)
       native "Mirrors_makeLocalClassMirror";
 
   static ClassMirror reflectClass(Type key) {
     return makeLocalClassMirror(key);
   }
 }