Rip out the NQPMultiSig PMC; we don't need it any more.

Author: jnthn

src/guts/multi_dispatch.c

@@ -4,7 +4,6 @@
 #include "../6model/sixmodelobject.h"
 #include "../pmc/pmc_dispatchersub.h"
 #include "pmc_sub.h"
-#include "../pmc/pmc_nqpmultisig.h"
 #include "multi_dispatch.h"
 
 /* This file contains a somewhat simplified implementation of the Perl 6
@@ -142,15 +141,9 @@ static candidate_info** sort_candidates(PARROT_INTERP, PMC *candidates) {
 
         /* Get hold of signature, types and definednesses. */
         GETATTR_Sub_multi_signature(interp, candidate, multi_sig_pmc);
-        if (multi_sig_pmc->vtable->base_type == smo_id) {
-            multi_sig = (NQP_Signature *)PMC_data(multi_sig_pmc);
-            types_list = multi_sig->types;
-            definedness_list = multi_sig->definednesses;
-        }
-        else {
-            GETATTR_NQPMultiSig_types(interp, multi_sig_pmc, types_list);
-            GETATTR_NQPMultiSig_definedness_constraints(interp, multi_sig_pmc, definedness_list);
-        }
+        multi_sig = (NQP_Signature *)PMC_data(multi_sig_pmc);
+        types_list = multi_sig->types;
+        definedness_list = multi_sig->definednesses;
         sig_elems = VTABLE_elements(interp, types_list);
 
         /* Type information. */

src/ops/nqp.ops

@@ -11,7 +11,6 @@ BEGIN_OPS_PREAMBLE
 #include "../6model/serialization_context.h"
 #include "../guts/multi_dispatch.h"
 #include "../pmc/pmc_dispatchersub.h"
-#include "../pmc/pmc_nqpmultisig.h"
 #include "pmc_sub.h"
 
 /* SHA1 algorithm. */
@@ -29,7 +28,6 @@ static INTVAL initialized = 0;
 static INTVAL stable_id = 0;
 static INTVAL smo_id    = 0;
 static INTVAL disp_id   = 0;
-static INTVAL ms_id     = 0;
 
 /* Built-in meta-objects. */
 static PMC *KnowHOW = NULL;
@@ -58,7 +56,6 @@ inline op nqp_dynop_setup() :base_core {
         stable_id = Parrot_pmc_get_type_str(interp, Parrot_str_new(interp, "STable", 0));
         smo_id    = Parrot_pmc_get_type_str(interp, Parrot_str_new(interp, "SixModelObject", 0));
         disp_id   = Parrot_pmc_get_type_str(interp, Parrot_str_new(interp, "DispatcherSub", 0));
-        ms_id     = Parrot_pmc_get_type_str(interp, Parrot_str_new(interp, "NQPMultiSig", 0));
 
         /* Initialize the object model. */
         SixModelObject_initialize(interp, &KnowHOW, &KnowHOWAttribute);
@@ -1278,30 +1275,6 @@ inline op is_dispatcher(out INT, in PMC) :base_core {
 }
 
 
-/*
-
-=item set_sub_multisig()
-
-Sets a sub's multi_signature. $1 is the sub, $2 is an array of type objects
-and $3 is is an array of definedness constraint descriptors.
-
-=cut
-
-*/
-inline op set_sub_multisig(in PMC, in PMC, in PMC) :base_core {
-    if ($1->vtable->base_type == enum_class_Sub) {
-        PMC *sig = Parrot_pmc_new(interp, ms_id);
-        SETATTR_NQPMultiSig_types(interp, sig, $2);
-        SETATTR_NQPMultiSig_definedness_constraints(interp, sig, $3);
-        SETATTR_Sub_multi_signature(interp, $1, sig);
-        PARROT_GC_WRITE_BARRIER(interp, $1);
-    }
-    else
-        Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_INVALID_OPERATION,
-            "Can only use set_sub_multisig if first operand is a Sub.");
-}
-
-
 /*
 
 =item set_sub_multisig()

src/pmc/nqpmultisig.pmc

@@ -171,8 +171,7 @@ DYNPMC          = $(PMC_DIR)/$(GROUP)$(LOAD_EXT)
 DYNOPS          = $(OPS_DIR)/$(OPS)$(LOAD_EXT)
 
 PMC_SOURCES     = $(PMC_DIR)/stable.pmc $(PMC_DIR)/sixmodelobject.pmc \
-                  $(PMC_DIR)/dispatchersub.pmc \
-                  $(PMC_DIR)/nqpmultisig.pmc $(PMC_DIR)/nqplexinfo.pmc \
+                  $(PMC_DIR)/dispatchersub.pmc $(PMC_DIR)/nqplexinfo.pmc \
                   $(PMC_DIR)/nqplexpad.pmc $(PMC_DIR)/serializationcontext.pmc
 
 OPS_SOURCE      = nqp.ops