Use the typedef arity to know how to invoke a closure given by the dom.

dart/lib/compiler/implementation/native_handler.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.
 
 #library('native');
 #import('dart:uri');
 #import('leg.dart');
 #import('elements/elements.dart');
 #import('scanner/scannerlib.dart');
 #import('ssa/ssa.dart');
@@ skipping 197 matching lines @@
       && nativeEmitter.toNativeName(element.enclosingElement) == 'DOMType') {
     Element methodElement =
         compiler.findHelper(const SourceString('getTypeNameOf'));
     HStatic method = new HStatic(methodElement);
     builder.add(method);
     builder.push(new HInvokeStatic(Selector.INVOCATION_1,
         <HInstruction>[method, builder.localsHandler.readThis()]));
     return;
   }
 
-  HInstruction convertDartClosure(Element parameter) {
+  HInstruction convertDartClosure(Element parameter, Type type) {
     HInstruction local = builder.localsHandler.readLocal(parameter);
-    // TODO(ngeoffray): by better analyzing the function type and
-    // its formal parameters, we could pass a method with a defined arity.
+    // TODO(ngeoffray): for static methods, we could pass a method with a

[kasperl, 2012/05/29 12:16:24]

for -> For

[ngeoffray, 2012/05/29 12:31:01]

Done.

+    // defined arity.
     builder.push(new HStatic(builder.interceptors.getClosureConverter()));
-    List<HInstruction> callInputs = <HInstruction>[builder.pop(), local];
+    HInstruction arity = builder.graph.addConstantInt(type.arity());
+    List<HInstruction> callInputs = <HInstruction>[builder.pop(), local, arity];
     HInstruction closure = new HInvokeStatic(Selector.INVOCATION_1, callInputs);
     builder.add(closure);
     return closure;
   }
 
 
   // Check which pattern this native method follows:
   // 1) foo() native; hasBody = false, isRedirecting = false
   // 2) foo() native "bar"; hasBody = false, isRedirecting = true
   // 3) foo() native "return 42"; hasBody = true, isRedirecting = false
@@ skipping 24 matching lines @@
     List<String> arguments = <String>[];
     List<HInstruction> inputs = <HInstruction>[];
     String receiver = '';
     if (element.isInstanceMember()) {
       receiver = '#.';
       inputs.add(builder.localsHandler.readThis());
     }
     parameters.forEachParameter((Element parameter) {
       Type type = parameter.computeType(compiler);
       HInstruction input = builder.localsHandler.readLocal(parameter);
-      if (type is FunctionType) input = convertDartClosure(parameter);
+      if (type is FunctionType) input = convertDartClosure(parameter, type);
       inputs.add(input);
       arguments.add('#');
     });
 
     String foreignParameters = Strings.join(arguments, ',');
     String nativeMethodCall;
     if (element.kind == ElementKind.FUNCTION) {
       nativeMethodCall = '$receiver$nativeMethodName($foreignParameters)';
     } else if (element.kind == ElementKind.GETTER) {
       nativeMethodCall = '$receiver$nativeMethodName';
@@ skipping 10 matching lines @@
   } else {
     // This is JS code written in a Dart file with the construct
     // native """ ... """;. It does not work well with mangling,
     // but there should currently be no clash between leg mangling
     // and the library where this construct is being used. This
     // mangling problem will go away once we switch these libraries
     // to use Leg's 'JS' function.
     parameters.forEachParameter((Element parameter) {
       Type type = parameter.computeType(compiler);
       if (type is FunctionType) {
-        HInstruction jsClosure = convertDartClosure(parameter);
+        HInstruction jsClosure = convertDartClosure(parameter, type);
         // Because the JS code references the argument name directly,
         // we must keep the name and assign the JS closure to it.
         builder.add(new HForeign(
             new DartString.literal('${parameter.name.slowToString()} = #'),
             const LiteralDartString('void'),
             <HInstruction>[jsClosure]));
       }
     });
     LiteralString jsCode = node.arguments.head;
     builder.push(new HForeign(jsCode.dartString,
@@ skipping 39 matching lines @@
                                       String parameters) {
   buffer.add("  if (Object.getPrototypeOf(this).hasOwnProperty");
   buffer.add("('$methodName')) {\n");
   buffer.add("  $code");
   buffer.add("  } else {\n");
   buffer.add("    return Object.prototype.$methodName.call(this");
   buffer.add(parameters == '' ? '' : ', $parameters');
   buffer.add(");\n");
   buffer.add("  }\n");
 }