Author: chromatic
Date: Sun Nov 30 15:33:50 2008
New Revision: 33386

Modified:
   trunk/src/pmc/namespace.pmc

Log:
[PMC] Reverted the check for an existing PMC in a NameSpace when adding a
MultiSub to a NameSpace with set_pmc_keyed_str.  I added this in r33263, but it
broke Rakudo.  See RT #60910, filed by Patrick Michaud.

Modified: trunk/src/pmc/namespace.pmc
==============================================================================
--- trunk/src/pmc/namespace.pmc (original)
+++ trunk/src/pmc/namespace.pmc Sun Nov 30 15:33:50 2008
@@ -242,7 +242,7 @@
                               :value->vtable->base_type == 
enum_class_NameSpace;
 
         /* don't need this everywhere yet */
-        PMC * const old       = (PMC *)parrot_hash_get(INTERP, NS_HASH(SELF), 
key);
+        PMC *old = (PMC *)parrot_hash_get(INTERP, NS_HASH(SELF), key);
 
         /* If it's a sub... */
         if (!PMC_IS_NULL(value) && VTABLE_isa(INTERP, value, 
CONST_STRING(INTERP, "Sub"))) {
@@ -262,7 +262,6 @@
 
         /* If it's a multi-sub and the first in this NS... */
         if (!PMC_IS_NULL(value)
-        &&  !old
         &&   VTABLE_isa(INTERP, value, CONST_STRING(INTERP, "MultiSub"))) {
 
             if (VTABLE_elements(interp, value) > 0) {

Reply via email to