[svn:parrot] r40842 - trunk/src/pmc

[NotFound at svn.parrot.org]

Author: NotFound
Date: Fri Aug 28 19:35:23 2009
New Revision: 40842
URL: https://trac.parrot.org/parrot/changeset/40842

Log:
[pmc] fix set_pmc vtable in Undef PMC

Modified:
   trunk/src/pmc/undef.pmc

Modified: trunk/src/pmc/undef.pmc
==============================================================================
--- trunk/src/pmc/undef.pmc	Fri Aug 28 16:20:11 2009	(r40841)
+++ trunk/src/pmc/undef.pmc	Fri Aug 28 19:35:23 2009	(r40842)
@@ -45,19 +45,28 @@
             VTABLE_set_pmc(INTERP, SELF, other);
         }
         else {
-            PMC * const class_ = PARROT_OBJECT(other)->_class;
-            PMC        *clone  = VTABLE_clone(interp, other);
-            void       *attrs;
+            PMC * const class_  = PARROT_OBJECT(other)->_class;
+            PMC        *clone   = VTABLE_clone(interp, other);
+            void       *attrs   = PMC_data(clone);
+            PMC        *meta    = PMC_metadata(clone);
             pmc_reuse_by_class(INTERP, SELF, class_, PObj_is_object_FLAG);
 
             /* now swap memory without leaking it */
-            attrs              = PMC_data(SELF);
-            PMC_data(SELF)     = PMC_data(clone);
-            PMC_data(clone)    = attrs;
-            VTABLE_destroy(interp, clone);
+            PMC_data(clone)     = PMC_data(SELF);
+            PMC_data(SELF)      = attrs;
 
-            PObj_is_object_SET(SELF);
+            /* Restore metadata. */
+            if (!PMC_IS_NULL(meta)) {
+                PMC * const iter = VTABLE_get_iter(interp, meta);
+                while (VTABLE_get_bool(interp, iter)) {
+                    STRING * const key = VTABLE_shift_string(interp, iter);
+                    PMC * const value  = VTABLE_get_pmc_keyed_str(interp, meta, key);
+                    VTABLE_setprop(interp, SELF, key, value);
+                }
+            }
+            PMC_data(clone) = NULL;
 
+            PObj_is_object_SET(SELF);
         }
     }