From 7ce3765cedd60758f436789fd9c8424e0ad65087 Mon Sep 17 00:00:00 2001
From: Jonathan Worthington <jnthn@jnthn.net>
Date: Fri, 26 Feb 2010 00:03:16 +0100
Subject: [PATCH] Fix up .+ and .* with multis.

---
 src/glue/dispatch.pir | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/glue/dispatch.pir b/src/glue/dispatch.pir
index cb33a4970c5..fc420fceb7f 100644
--- a/src/glue/dispatch.pir
+++ b/src/glue/dispatch.pir
@@ -165,10 +165,15 @@ Implements the .* operator. Calls one or more matching methods.
 =cut
 
 .sub '!dispatch_.*'
-    .param pmc invocant
-    .param string method_name
-    .param pmc pos_args   :slurpy
-    .param pmc named_args :slurpy :named
+    .param pmc call_sig :call_sig
+
+    # Deconstruct call signature (no caller side :call_sig yet).
+    .local pmc invocant, pos_args, named_args
+    .local string method_name
+    invocant = shift call_sig
+    method_name = shift call_sig
+    (pos_args, named_args) = '!deconstruct_call_sig'(call_sig)
+    unshift call_sig, invocant
 
     # Set up result list.
     .local pmc result_list
@@ -200,9 +205,7 @@ Implements the .* operator. Calls one or more matching methods.
     push result_list, res_parcel
     goto it_loop
   is_multi:
-    # XXX To do: need a call_sig
-    die 'Multis and .* NYI.'
-    #$P0 = $P0.'find_possible_candidates'(call_sig)
+    $P0 = $P0.'find_possible_candidates'(call_sig)
     multi_it = iter $P0
   multi_it_loop:
     unless multi_it goto it_loop