Clean up ClosureMirror.invoke(#call, ...).

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";
 
 final emptyList = new UnmodifiableListView([]);
 final emptyMap = new _UnmodifiableMapView({});
@@ skipping 429 matching lines @@
 
   MethodMirror _function;
   MethodMirror get function {
     if (_function == null) {
       _function = _computeFunction(reflectee);
     }
     return _function;
   }
 
   // TODO(12602): Remove this special case.
-  delegate(Invocation invocation) {
-    if (invocation.isMethod && (invocation.memberName == #call)) {
-      return this.apply(invocation.positionalArguments,
-                        invocation.namedArguments).reflectee;
+  InstanceMirror invoke(Symbol memberName,
+                        List positionalArguments,
+                        [Map<Symbol, dynamic> namedArguments]) {
+    if (memberName == #call) {
+      return this.apply(positionalArguments, namedArguments);
     }
-    return super.delegate(invocation);
+    return super.invoke(memberName, positionalArguments, namedArguments);
   }
 
   InstanceMirror apply(List<Object> positionalArguments,
                        [Map<Symbol, Object> namedArguments]) {
     // TODO(12602): When closures get an ordinary call method, this can be
     // replaced with
     //   return this.invoke(#call, positionalArguments, namedArguments);

[Florian Schneider, 2014/03/13 08:14:18]

Functions now have a .call method for invocation.

     // and the native ClosureMirror_apply can be removed.
     int numPositionalArguments = positionalArguments.length + 1;  // Receiver.
     int numNamedArguments = namedArguments != null ? namedArguments.length : 0;
     int numArguments = numPositionalArguments + numNamedArguments;
     List arguments = new List(numArguments);
     arguments[0] = _reflectee;  // Receiver.
     arguments.setRange(1, numPositionalArguments, positionalArguments);
     List names = new List(numNamedArguments);
     int argumentIndex = numPositionalArguments;
     int nameIndex = 0;
@@ skipping 1157 matching lines @@
     if (typeMirror == null) {
       typeMirror = makeLocalTypeMirror(key);
       _instanitationCache[key] = typeMirror;
       if (typeMirror is ClassMirror && !typeMirror._isGeneric) {
         _declarationCache[key] = typeMirror;
       }
     }
     return typeMirror;
   }
 }