Compute function types together with the parameters.

lib/compiler/implementation/emitter.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.
 
 /**
  * A function element that represents a closure call. The signature is copied
  * from the given element.
  */
 class ClosureInvocationElement extends FunctionElement {
   ClosureInvocationElement(SourceString name,
@@ skipping 118 matching lines @@
     buffer.add("$defineClassName = ${buildDefineClassFunction(isolate)};\n");
     buffer.add("$isolate.pendingClasses = {};\n");
     buffer.add("$finishClassesName = ${buildFinishClassesFunction(isolate)};");
     buffer.add("\n");
   }
 
   void addParameterStub(FunctionElement member,
                         Selector selector,
                         void defineInstanceMember(String invocationName,
                                                   String definition)) {
-    FunctionParameters parameters = member.computeParameters(compiler);
+    FunctionSignature parameters = member.computeSignature(compiler);
     int positionalArgumentCount = selector.positionalArgumentCount;
     if (positionalArgumentCount == parameters.parameterCount) {
       assert(selector.namedArgumentCount == 0);
       return;
     }
     ConstantHandler handler = compiler.constantHandler;
     List<SourceString> names = selector.getOrderedNamedArguments();
 
     String invocationName =
         namer.instanceMethodInvocationName(member.getLibrary(), member.name,
@@ skipping 111 matching lines @@
         || member.kind === ElementKind.SETTER) {
       if (member.modifiers !== null && member.modifiers.isAbstract()) return;
       String codeBlock = compiler.universe.generatedCode[member];
       if (codeBlock == null) return;
       defineInstanceMember(namer.getName(member), codeBlock);
       codeBlock = compiler.universe.generatedBailoutCode[member];
       if (codeBlock !== null) {
         defineInstanceMember(compiler.namer.getBailoutName(member), codeBlock);
       }
       FunctionElement function = member;
-      FunctionParameters parameters = function.computeParameters(compiler);
+      FunctionSignature parameters = function.computeSignature(compiler);
       if (!parameters.optionalParameters.isEmpty()) {
         addParameterStubs(member, defineInstanceMember);
       }
     } else if (member.kind === ElementKind.FIELD) {
       // TODO(ngeoffray): Have another class generate the code for the
       // fields.
       if ((member.modifiers === null || !member.modifiers.isFinal()) &&
           compiler.universe.hasSetter(member, compiler)) {
         String setterName = namer.setterName(member.getLibrary(), member.name);
         String name = member.isNative()
@@ skipping 553 matching lines @@
       emitFinishClassesInvocationIfNecessary(mainBuffer);
       emitMain(mainBuffer);
       mainBuffer.add('function init() {\n');
       addDefineClassAndFinishClassFunctionsIfNecessary(mainBuffer);
       mainBuffer.add('}\n');
       compiler.assembledCode = mainBuffer.toString();
     });
     return compiler.assembledCode;
   }
 }