Support named arguments for statically resolved calls.

frog/leg/ssa/builder.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.
 
 class Interceptors {
   Compiler compiler;
   Interceptors(Compiler this.compiler);
 
   SourceString mapOperatorToMethodName(Operator op) {
     String name = op.source.stringValue;
@@ skipping 190 matching lines @@
 
   HGraph buildFactory(ClassElement classElement,
                       ConstructorBodyElement bodyElement,
                       FunctionElement functionElement) {
     // The initializer list could contain closures.
     translateClosures(functionElement);
     openFunction(functionElement);
 
     FunctionExpression function = functionElement.parseNode(compiler);
     NodeList initializers = function.initializers;
-    NodeList parameters = function.parameters;
     // Run through the initializers.
     if (initializers !== null) {
       for (Link<Node> link = initializers.nodes;
            !link.isEmpty();
            link = link.tail) {
         assert(link.head is Send);
         if (link.head is !SendSet) {
           compiler.unimplemented('SsaBuilder.buildFactory super-init');
         } else {
           SendSet init = link.head;
@@ skipping 21 matching lines @@
       }
     }
     HForeignNew newObject = new HForeignNew(classElement, fieldValues);
     add(newObject);
 
     // Call the method body.
     SourceString methodName = bodyElement.name;
 
     List bodyCallInputs = <HInstruction>[];
     bodyCallInputs.add(newObject);
-    for (Link link = parameters.nodes; !link.isEmpty(); link = link.tail) {
-      Link<Node> nodeLink = link.head.definitions.nodes;
-      // We expect exactly one identifier.
-      assert(!nodeLink.isEmpty() && nodeLink.tail.isEmpty());
-      Node current = nodeLink.head;
-      Element parameterElement = elements[current];
+    FunctionParameters parameters = functionElement.computeParameters(compiler);
+    parameters.forEachParameter((Element parameterElement) {
       HInstruction currentValue = definitions[parameterElement];
       bodyCallInputs.add(currentValue);
-    }
+    });
     add(new HInvokeDynamicMethod(null, methodName, bodyCallInputs));
     close(new HReturn(newObject)).addSuccessor(graph.exit);
     return closeFunction();
   }
 
   void openFunction(FunctionElement functionElement) {
     stack = new List<HInstruction>();
     definitions = new Map<Element, HInstruction>();
 
     graph = new HGraph();
@@ skipping 608 matching lines @@
       push(new HIs(elements[node.arguments.head], expression));
     } else {
       visit(node.receiver);
       visit(node.argumentsNode);
       var right = pop();
       var left = pop();
       visitBinary(left, op, right);
     }
   }
 
-  addVisitedSendArgumentsToList(Link<Node> link, List<HInstruction> list) {
+  void addDynamicSendArgumentsToList(Send node, List<HInstruction> list) {
+    Selector selector = elements.getSelector(node);
+    if (selector.namedArgumentCount == 0) {
+      addGenericSendArgumentsToList(node.arguments, list);
+    } else {
+      compiler.cancel(
+          'Unimplemented named argument for dynamic sends', node: node);
+    }
+  }
+
+  void addStaticSendArgumentsToList(Send node,
+                                    FunctionElement element,
+                                    List<HInstruction> list) {
+    Selector selector = elements.getSelector(node);
+    if (!selector.applies(compiler, element)) {
+      // TODO(ngeoffray): Match the VM behavior and throw an
+      // exception at runtime.
+      compiler.cancel('Unimplemented non-matching static call', node: node);
+    } else if (selector.namedArgumentCount == 0) {
+      addGenericSendArgumentsToList(node.arguments, list);
+    } else {
+      // If there are named arguments, provide them in the order
+      // expected by the called function, which is the source order.
+      FunctionParameters parameters = element.computeParameters(compiler);
+
+      // Visit positional arguments and add them to the list.
+      Link<Node> arguments = node.arguments;
+      int positionalArgumentCount = selector.positionalArgumentCount;
+      for (int i = 0;
+           i < positionalArgumentCount;
+           arguments = arguments.tail, i++) {
+        visit(arguments.head);
+        list.add(pop());
+      }
+
+      // Visit named arguments and add them into a temporary list.
+      List<HInstruction> namedArguments = <HInstruction>[];
+      for (; !arguments.isEmpty(); arguments = arguments.tail) {
+        visit(arguments.head);
+        namedArguments.add(pop());
+      }
+
+      Link<Element> remainingNamedParameters = parameters.optionalParameters;
+      // Skip the optional parameters that have been given in the
+      // positional arguments.
+      for (int i = parameters.requiredParameterCount;
+           i < positionalArgumentCount;
+           i++) {
+        remainingNamedParameters = remainingNamedParameters.tail;
+      }
+
+      // Loop over the remaining named parameters, and try to find
+      // their values: either in the temporary list or using the
+      // default value.
+      for (;
+           !remainingNamedParameters.isEmpty();
+           remainingNamedParameters = remainingNamedParameters.tail) {
+        Element parameter = remainingNamedParameters.head;
+        int foundIndex = -1;
+        for (int i = 0; i < selector.namedArguments.length; i++) {
+          SourceString name = selector.namedArguments[i];
+          if (name == parameter.name) {
+            foundIndex = i;
+            break;
+          }
+        }
+        if (foundIndex != -1) {
+          list.add(namedArguments[foundIndex]);
+        } else {
+          // TODO(ngeoffray): Add the default value.

[floitsch, 2012/01/31 15:52:41]

If it is not too difficult I would prefer checking if there actually is a
default value. Bailing out is still fine, though.
If it is difficult, don't worry.

[ngeoffray, 2012/01/31 16:46:17]

We don't support default values for parameters yet. We cancel early in the
pipeline.

+          push(new HLiteral(null, HType.UNKNOWN));
+          list.add(pop());
+        }
+      }
+    }
+  }
+
+  void addGenericSendArgumentsToList(Link<Node> link, List<HInstruction> list) {
     for (; !link.isEmpty(); link = link.tail) {
       visit(link.head);
       list.add(pop());
     }
   }
 
   visitDynamicSend(Send node) {
     Selector selector = elements.getSelector(node);
     var inputs = <HInstruction>[];
 
@@ skipping 18 matching lines @@
     if (methodInterceptionEnabled) {
       interceptor = interceptors.getStaticInterceptor(dartMethodName,
                                                       node.argumentCount());
     }
     if (interceptor != null) {
       HStatic target = new HStatic(interceptor);
       add(target);
       inputs.add(target);
       visit(node.receiver);
       inputs.add(pop());
-      addVisitedSendArgumentsToList(node.arguments, inputs);
+      addGenericSendArgumentsToList(node.arguments, inputs);
       push(new HInvokeInterceptor(selector, dartMethodName, false, inputs));
       return;
     }
 
     if (node.receiver === null) {
       HThis receiver = thisDefinition;
       if (receiver === null) {
         compiler.unimplemented("Ssa.visitDynamicSend.", node: node);
       }
       inputs.add(receiver);
     } else {
       visit(node.receiver);
       inputs.add(pop());
     }
 
-    addVisitedSendArgumentsToList(node.arguments, inputs);
+    addDynamicSendArgumentsToList(node, inputs);
 
     // The first entry in the inputs list is the receiver.
     push(new HInvokeDynamicMethod(selector, dartMethodName, inputs));
 
     if (isNotEquals) {
       HNot not = new HNot(popBoolified());
       push(not);
     }
   }
 
   visitClosureSend(Send node) {
     Selector selector = elements.getSelector(node);
     assert(node.receiver === null);
     Element element = elements[node];
     HInstruction closureTarget;
     if (element === null) {
       visit(node.selector);
       closureTarget = pop();
     } else {
       assert(element.kind === ElementKind.VARIABLE ||
              element.kind === ElementKind.PARAMETER);
       closureTarget = definitions[element];
       assert(closureTarget !== null);
     }
     var inputs = <HInstruction>[];
     inputs.add(closureTarget);
-    addVisitedSendArgumentsToList(node.arguments, inputs);
+    addDynamicSendArgumentsToList(node, inputs);
     push(new HInvokeClosure(selector, inputs));
   }
 
   visitForeignSend(Send node) {
     Identifier selector = node.selector;
     switch (selector.source.stringValue) {
       case "JS":
         Link<Node> link = node.arguments;
         // If the invoke is on foreign code, don't visit the first
         // argument, which is the type, and the second argument,
         // which is the foreign code.
         link = link.tail.tail;
         List<HInstruction> inputs = <HInstruction>[];
-        addVisitedSendArgumentsToList(link, inputs);
+        addGenericSendArgumentsToList(link, inputs);
         LiteralString type = node.arguments.head;
         LiteralString literal = node.arguments.tail.head;
         compiler.ensure(literal is LiteralString);
         compiler.ensure(type is LiteralString);
         compiler.ensure(literal.value.stringValue[0] == '@');
         push(new HForeign(unquote(literal, 1), unquote(type, 0), inputs));
         break;
       case "UNINTERCEPTED":
         Link<Node> link = node.arguments;
         if (!link.tail.isEmpty()) {
           compiler.cancel('More than one expression in UNINTERCEPTED()');
         }
         Expression expression = link.head;
         disableMethodInterception();
         visit(expression);
         enableMethodInterception();
         break;
       case "JS_HAS_EQUALS":
         List<HInstruction> inputs = <HInstruction>[];
         if (!node.arguments.tail.isEmpty()) {
           compiler.cancel('More than one expression in JS_HAS_EQUALS()');
         }
-        addVisitedSendArgumentsToList(node.arguments, inputs);
+        addGenericSendArgumentsToList(node.arguments, inputs);
         String name = compiler.namer.instanceMethodName(
             Namer.OPERATOR_EQUALS, 1);
         push(new HForeign(
             new SourceString('\$0.$name'), const SourceString('bool'), inputs));
         break;
       default:
         throw "Unknown foreign: ${node.selector}";
     }
   }
 
   visitSuperSend(Send node) {
     Selector selector = elements.getSelector(node);
     Element element = elements[node];
     HStatic target = new HStatic(element);
     HThis context = thisDefinition;
     if (context === null) {
       compiler.unimplemented("Ssa.visitSuperSend without thisDefinition.",
                              node: node);
     }
     add(target);
     var inputs = <HInstruction>[target, context];
-    addVisitedSendArgumentsToList(node.arguments, inputs);
+    addStaticSendArgumentsToList(node, element, inputs);
     push(new HInvokeSuper(selector, inputs));
   }
 
   visitStaticSend(Send node) {
     Selector selector = elements.getSelector(node);
     Element element = elements[node];
     HStatic target = new HStatic(element);
     add(target);
     var inputs = <HInstruction>[];
     inputs.add(target);
-    addVisitedSendArgumentsToList(node.arguments, inputs);
+    addStaticSendArgumentsToList(node, element, inputs);
     push(new HInvokeStatic(selector, inputs));
   }
 
   visitSend(Send node) {
     if (node.selector is Operator && methodInterceptionEnabled) {
       visitOperatorSend(node);
     } else if (node.isPropertyAccess) {
       generateGetter(node, elements[node]);
     } else if (Elements.isClosureSend(node, elements)) {
       visitClosureSend(node);
     } else if (node.isSuperCall) {
       visitSuperSend(node);
     } else {
       Element element = elements[node];
       if (element === null) {
         // Example: f() with 'f' unbound.
         // This can only happen inside an instance method.
         visitDynamicSend(node);
+      } else if (element.kind == ElementKind.CLASS) {
+        compiler.internalError("Cannot generate code for send", node: node);
       } else if (element.isInstanceMember()) {
         // Example: f() with 'f' bound to instance method.
         visitDynamicSend(node);
       } else if (element.kind === ElementKind.FOREIGN) {
         visitForeignSend(node);
       } else if (!element.isInstanceMember()) {
         // Example: A.f() or f() with 'f' bound to a static function.
         // Also includes new A() or new A.named() which is treated like a
         // static call to a factory.
         visitStaticSend(node);
@@ skipping 334 matching lines @@
 
   visitLiteralMap(LiteralMap node) {
     compiler.unimplemented('SsaBuilder.visitLiteralMap', node: node);
   }
 
   visitLiteralMapEntry(LiteralMapEntry node) {
     compiler.unimplemented('SsaBuilder.visitLiteralMapEntry', node: node);
   }
 
   visitNamedArgument(NamedArgument node) {
-    compiler.unimplemented('SsaBuilder.visitNamedArgument', node: node);
+    visit(node.expression);
   }
 
   visitSwitchStatement(SwitchStatement node) {
     compiler.unimplemented('SsaBuilder.visitSwitchStatement', node: node);
   }
 
   visitTryStatement(TryStatement node) {
     compiler.unimplemented('SsaBuilder.visitTryStatement', node: node);
   }
 
   visitScriptTag(ScriptTag node) {
     compiler.unimplemented('SsaBuilder.visitScriptTag', node: node);
   }
 
   visitCatchBlock(CatchBlock node) {
     compiler.unimplemented('SsaBuilder.visitCatchBlock', node: node);
   }
 
   visitTypedef(Typedef node) {
     compiler.unimplemented('SsaBuilder.visitTypedef', node: node);
   }
 }