Author: allison
Date: Tue Aug 19 11:19:44 2008
New Revision: 30349
Modified:
branches/pdd27mmd/docs/pdds/pdd27_multiple_dispatch.pod
branches/pdd27mmd/include/parrot/multidispatch.h
branches/pdd27mmd/src/multidispatch.c
branches/pdd27mmd/src/pmc/multisub.pmc
Log:
[pdd27mmd] Apply a patch from Andrew Whitworth changing the name of
'Parrot_mmd_sort_candidate_list' to 'Parrot_mmd_sort_manhattan'. Resolves RT
#58088.
Modified: branches/pdd27mmd/docs/pdds/pdd27_multiple_dispatch.pod
==============================================================================
--- branches/pdd27mmd/docs/pdds/pdd27_multiple_dispatch.pod (original)
+++ branches/pdd27mmd/docs/pdds/pdd27_multiple_dispatch.pod Tue Aug 19
11:19:44 2008
@@ -93,7 +93,7 @@
=item invoke
Invoke the best matching candidate for the current call arguments. This vtable
-function calls C<Parrot_mmd_sort_candidate_list> from the public MMD API, but
+function calls C<Parrot_mmd_sort_manhattan> from the public MMD API, but
may be changed to call C<Parrot_mmd_invoke>.
=item set_integer_keyed_int, set_number_keyed_int, set_string_keyed_int
@@ -140,7 +140,7 @@
=over 4
-=item Parrot_mmd_sort_candidate_list
+=item Parrot_mmd_sort_manhattan
Performs a multiple dispatch lookup on an array of subroutines. The call
signature to match is pulled from the current interpreter, following the
Modified: branches/pdd27mmd/include/parrot/multidispatch.h
==============================================================================
--- branches/pdd27mmd/include/parrot/multidispatch.h (original)
+++ branches/pdd27mmd/include/parrot/multidispatch.h Tue Aug 19 11:19:44 2008
@@ -214,7 +214,7 @@
PARROT_API
PARROT_CAN_RETURN_NULL
PARROT_WARN_UNUSED_RESULT
-PMC * Parrot_mmd_sort_candidate_list(PARROT_INTERP, ARGIN(PMC *candidates))
+PMC * Parrot_mmd_sort_manhattan(PARROT_INTERP, ARGIN(PMC *candidates))
__attribute__nonnull__(1)
__attribute__nonnull__(2);
Modified: branches/pdd27mmd/src/multidispatch.c
==============================================================================
--- branches/pdd27mmd/src/multidispatch.c (original)
+++ branches/pdd27mmd/src/multidispatch.c Tue Aug 19 11:19:44 2008
@@ -1100,7 +1100,7 @@
/*
-=item C<PMC * Parrot_mmd_sort_candidate_list>
+=item C<PMC * Parrot_mmd_sort_manhattan>
Given an array PMC (usually a MultiSub) sort the mmd candidates by their
manhatten distance to the current args.
@@ -1113,7 +1113,7 @@
PARROT_CAN_RETURN_NULL
PARROT_WARN_UNUSED_RESULT
PMC *
-Parrot_mmd_sort_candidate_list(PARROT_INTERP, ARGIN(PMC *candidates))
+Parrot_mmd_sort_manhattan(PARROT_INTERP, ARGIN(PMC *candidates))
{
PMC *arg_tuple;
INTVAL n = VTABLE_elements(interp, candidates);
Modified: branches/pdd27mmd/src/pmc/multisub.pmc
==============================================================================
--- branches/pdd27mmd/src/pmc/multisub.pmc (original)
+++ branches/pdd27mmd/src/pmc/multisub.pmc Tue Aug 19 11:19:44 2008
@@ -60,7 +60,7 @@
}
VTABLE opcode_t *invoke(void *next) {
- PMC * const list = Parrot_mmd_sort_candidate_list(interp, SELF);
+ PMC * const list = Parrot_mmd_sort_manhattan(interp, SELF);
PMC *func;
if (PMC_IS_NULL(list))
