Make FunctionTypeMirror and ClosureMirror handle user-defined classes that implement the call opera…

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.
 
 import "dart:collection";
 
 // These values are allowed to be passed directly over the wire.
 bool _isSimpleValue(var value) {
@@ skipping 579 matching lines @@
   _invokeSetter(reflectee, setterName, value)
       native 'ClassMirror_invokeSetter';
 
   static _invokeConstructor(reflectee, constructorName, positionalArguments)
       native 'ClassMirror_invokeConstructor';
 
   static _ClassMirror_type_variables(reflectee)
       native "ClassMirror_type_variables";
 }
 
+// Instances represent user-defined classes that implement the call operator.
 class _LocalFunctionTypeMirrorImpl extends _LocalClassMirrorImpl
     implements FunctionTypeMirror {
-  _LocalFunctionTypeMirrorImpl(reflectee) : super(reflectee, null);
+  _LocalFunctionTypeMirrorImpl(reflectee, owner) : super(reflectee, owner);
 
-  // FunctionTypeMirrors have a simpleName generated from their signature.
-  Symbol _simpleName = null;
-  Symbol get simpleName {
-    if (_simpleName == null) {
-      _simpleName = _s(_makeSignatureString(returnType, parameters));
+  MethodMirror _callMethod;
+  MethodMirror get callMethod {
+    if (_callMethod==null) {
+      _callMethod = this._FunctionTypeMirror_call_method(_reflectee);
     }
-    return _simpleName;
+    return _callMethod;
   }
 
   TypeMirror _returnType = null;
   TypeMirror get returnType {
     if (_returnType == null) {
       _returnType = _FunctionTypeMirror_return_type(_reflectee);
     }
     return _returnType;
   }
 
   List<ParameterMirror> _parameters = null;
   List<ParameterMirror> get parameters {
     if (_parameters == null) {
       _parameters = _FunctionTypeMirror_parameters(_reflectee);
     }
     return _parameters;
   }
 
-  Map<Symbol, Mirror> get members => new Map<Symbol,Mirror>();
-  Map<Symbol, MethodMirror> get constructors => new Map<Symbol,MethodMirror>();
-  final Map<Symbol, TypeVariableMirror> typeVariables = const {};
+  String toString() => "FunctionTypeMirror on '${_n(simpleName)}'";
 
-  String toString() => "FunctionTypeMirror on '${_n(simpleName)}'";
+  MethodMirror _FunctionTypeMirror_call_method(reflectee)
+      native "FunctionTypeMirror_call_method";
 
   static TypeMirror _FunctionTypeMirror_return_type(reflectee)
       native "FunctionTypeMirror_return_type";
 
   static List<ParameterMirror> _FunctionTypeMirror_parameters(reflectee)
       native "FunctionTypeMirror_parameters";
 }
 
+// Instances represent the classes of true closures.
+class _LocalClosureTypeMirrorImpl extends _LocalFunctionTypeMirrorImpl
+    implements FunctionTypeMirror {
+  _LocalClosureTypeMirrorImpl(reflectee) : super(reflectee, null);
+
+  // FunctionTypeMirrors have a simpleName generated from their signature.
+  Symbol _simpleName = null;
+  Symbol get simpleName {
+    if (_simpleName == null) {
+      _simpleName = _s(_makeSignatureString(returnType, parameters));
+    }
+    return _simpleName;
+  }
+
+  Map<Symbol, Mirror> get members => new Map<Symbol,Mirror>();
+  Map<Symbol, MethodMirror> get constructors => new Map<Symbol,MethodMirror>();
+  final Map<Symbol, TypeVariableMirror> typeVariables = const {};
+}
+
 abstract class _LocalDeclarationMirrorImpl extends _LocalMirrorImpl
     implements DeclarationMirror {
   _LocalDeclarationMirrorImpl(this._reflectee, this.simpleName);
 
   final _reflectee;
 
   final Symbol simpleName;
 
   Symbol _qualifiedName = null;
   Symbol get qualifiedName {
@@ skipping 84 matching lines @@
   final bool isTopLevel = true;
 
   SourceLocation get location {
     throw new UnimplementedError(
         'TypedefMirror.location is not implemented');
   }
 
   TypeMirror _referent = null;
   TypeMirror get referent {
     if (_referent == null) {
-      return new _LocalFunctionTypeMirrorImpl(
+      return new _LocalClosureTypeMirrorImpl(
           _TypedefMirror_referent(_reflectee));
     }
     return _referent;
   }
 
   String toString() => "TypedefMirror on '${_n(simpleName)}'";
 
   static _TypedefMirror_referent(_reflectee)
       native "TypedefMirror_referent";
 }
@@ skipping 385 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;
   }
 }