Author: allison
Date: Tue Aug 19 11:57:51 2008
New Revision: 30352
Modified:
branches/pdd27mmd/src/multidispatch.c
Log:
[pdd27mmd] Apply a patch from Andrew Whitworth to merge
'mmd_create_builtin_multi_meth2' into 'mmd_create_builtin_multi_meth'. Resolves
RT #58090.
Modified: branches/pdd27mmd/src/multidispatch.c
==============================================================================
--- branches/pdd27mmd/src/multidispatch.c (original)
+++ branches/pdd27mmd/src/multidispatch.c Tue Aug 19 11:57:51 2008
@@ -89,15 +89,6 @@
__attribute__nonnull__(2)
__attribute__nonnull__(4);
-static void Parrot_mmd_create_builtin_multi_meth_2(PARROT_INTERP,
- ARGIN(PMC *ns),
- INTVAL func_nr,
- INTVAL type,
- INTVAL right,
- funcptr_t func_ptr)
- __attribute__nonnull__(1)
- __attribute__nonnull__(2);
-
PARROT_CANNOT_RETURN_NULL
PARROT_WARN_UNUSED_RESULT
static PMC* Parrot_mmd_cvt_to_types(PARROT_INTERP, ARGIN(PMC *multi_sig))
@@ -1896,7 +1887,7 @@
/*
-=item C<static void mmd_create_builtin_multi_meth_2>
+=item C<static void mmd_create_builtin_multi_meth>
RT #48260: Not yet documented!!!
@@ -1905,11 +1896,14 @@
*/
static void
-mmd_create_builtin_multi_meth_2(PARROT_INTERP, ARGIN(PMC *ns),
- INTVAL func_nr, INTVAL type, INTVAL right, funcptr_t func_ptr)
+mmd_create_builtin_multi_meth(PARROT_INTERP, ARGIN(PMC *ns), INTVAL type,
+ ARGIN(const MMD_init *entry))
{
const char *short_name;
char signature[6], val_sig;
+ INTVAL func_nr = entry->func_nr;
+ INTVAL right = entry->right;
+ funcptr_t func_ptr = entry->func_ptr;
STRING *meth_name;
PMC *method, *multi, *_class, *multi_sig;
@@ -1998,26 +1992,6 @@
VTABLE_push_pmc(interp, multi, method);
}
-
-/*
-
-=item C<static void mmd_create_builtin_multi_meth>
-
-RT #48260: Not yet documented!!!
-
-=cut
-
-*/
-
-static void
-mmd_create_builtin_multi_meth(PARROT_INTERP, ARGIN(PMC *ns), INTVAL type,
- ARGIN(const MMD_init *entry))
-{
- mmd_create_builtin_multi_meth_2(interp, ns,
- entry->func_nr, type, entry->right, entry->func_ptr);
-}
-
-
/*
=item C<void Parrot_mmd_register_table>
