Fix |$c in method signatures and various other cases; it wasn't quite…

… slurpy enough. In turn fixes delegation bits, which are implemented in terms of it.
rakudo · Jun 26, 2010 · cbf03ac · cbf03ac
1 parent b5bd660
commit cbf03ac
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/binder/bind.c b/src/binder/bind.c
@@ -483,6 +483,10 @@ Rakudo_binding_bind_signature(PARROT_INTERP, PMC *lexpad, PMC *signature,
      * taking one - tell us we have a problem. */
     PMC *named_args_copy = PMCNULL;
 
+    /* If we have a |$foo that's followed by slurpies, then we can suppress
+     * any future arity checks. */
+    INTVAL suppress_arity_fail = 0;
+
     /* Check that we have a valid signature and pull the bits out of it. */
     if (!lls_id)
         setup_binder_statics(interp);
@@ -603,6 +607,10 @@ Rakudo_binding_bind_signature(PARROT_INTERP, PMC *lexpad, PMC *signature,
                     mem_sys_free(pos_from_named);
                 return BIND_RESULT_OK;
             }
+            else if (elements[i + 1]->flags &
+                    (SIG_ELEM_SLURPY_POS | SIG_ELEM_SLURPY_NAMED)) {
+                suppress_arity_fail = 1;
+            }
         }
 
         /* Is it a positional sourced from a named? */
@@ -724,7 +732,7 @@ Rakudo_binding_bind_signature(PARROT_INTERP, PMC *lexpad, PMC *signature,
                     bind_fail = Rakudo_binding_bind_one_param(interp, lexpad, elements[i],
                             value, 1, error);
                 }
-                else {
+                else if (!suppress_arity_fail) {
                     if (error)
                         *error = Parrot_sprintf_c(interp, "Required named parameter '%S' not passed",
                                 VTABLE_get_string_keyed_int(interp, elements[i]->named_names, 0));
@@ -752,7 +760,7 @@ Rakudo_binding_bind_signature(PARROT_INTERP, PMC *lexpad, PMC *signature,
         mem_sys_free(pos_from_named);
 
     /* Do we have any left-over args? */
-    if (cur_pos_arg < num_pos_args) {
+    if (cur_pos_arg < num_pos_args && !suppress_arity_fail) {
         /* Oh noes, too many positionals passed. */
         if (error)
             *error = *error = Rakudo_binding_arity_fail(interp, elements, num_elements, num_pos_args, 1);