Skeleton typedef type implementation

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('js_backend/js_backend.dart');
 #import('scanner/scannerlib.dart');
@@ skipping 227 matching lines @@
   FunctionSignature parameters = element.computeSignature(builder.compiler);
   if (!hasBody) {
     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);
+      Type type = parameter.computeType(compiler).unalias(compiler);
       HInstruction input = builder.localsHandler.readLocal(parameter);
-      if (type is FunctionType) input = convertDartClosure(parameter, type);
+      if (type is FunctionType) {
+        // The parameter type is a function type either directly or through
+        // typedef(s).
+        input = convertDartClosure(parameter, type);

[ahe, 2012/08/16 13:22:58]

I suspect that we want to pass the unaliased type here eventually.

[Johnni Winther, 2012/08/17 11:15:19]

It seems that what is need is the arity, which implies that type is must be a
FunctionType.

+      }
       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';
     } else if (element.kind == ElementKind.SETTER) {
       nativeMethodCall = '$receiver$nativeMethodName = $foreignParameters';
     } else {
       builder.compiler.internalError('unexpected kind: "${element.kind}"',
                                      element: element);
     }
 
     DartString jsCode = new DartString.literal(nativeMethodCall);
     builder.push(
         new HForeign(jsCode, const LiteralDartString('Object'), inputs));
     builder.close(new HReturn(builder.pop())).addSuccessor(builder.graph.exit);
   } 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);
+      Type type = parameter.computeType(compiler).unalias(compiler);
       if (type is FunctionType) {
+        // The parameter type is a function type either directly or through
+        // typedef(s).
         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 = nativeBody.asLiteralString();
@@ skipping 38 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");
 }