[svn:parrot] r40936 - in trunk: config/gen/crypto docs docs/pdds include/parrot src src/dynpmc src/gc src/jit/i386 src/pmc

chromatic at svn.parrot.org chromatic at svn.parrot.org
Thu Sep 3 00:21:53 UTC 2009


Author: chromatic
Date: Thu Sep  3 00:21:51 2009
New Revision: 40936
URL: https://trac.parrot.org/parrot/changeset/40936

Log:
[HLL] Fixed two compilation-breaking typos accidentally committed in r40934.

Modified:
   trunk/config/gen/crypto/digest_pmc.in
   trunk/docs/embed.pod
   trunk/docs/pdds/pdd09_gc.pod
   trunk/docs/pmc.pod
   trunk/docs/vtables.pod
   trunk/include/parrot/pobj.h
   trunk/src/dynpmc/gdbmhash.pmc
   trunk/src/dynpmc/rational.pmc
   trunk/src/gc/generational_ms.c
   trunk/src/hll.c
   trunk/src/jit/i386/jit_defs.c
   trunk/src/oo.c
   trunk/src/packdump.c
   trunk/src/pmc.c
   trunk/src/pmc/bigint.pmc
   trunk/src/pmc/bignum.pmc
   trunk/src/pmc/class.pmc
   trunk/src/pmc/eventhandler.pmc
   trunk/src/pmc/exception.pmc
   trunk/src/pmc/exceptionhandler.pmc
   trunk/src/pmc/filehandle.pmc
   trunk/src/pmc/fixedbooleanarray.pmc
   trunk/src/pmc/fixedfloatarray.pmc
   trunk/src/pmc/fixedintegerarray.pmc
   trunk/src/pmc/lexinfo.pmc
   trunk/src/pmc/managedstruct.pmc
   trunk/src/pmc/object.pmc
   trunk/src/pmc/packfileannotation.pmc
   trunk/src/pmc/parrotinterpreter.pmc
   trunk/src/pmc/parrotlibrary.pmc
   trunk/src/pmc/parrotrunningthread.pmc
   trunk/src/pmc/resizablebooleanarray.pmc
   trunk/src/pmc/scheduler.pmc
   trunk/src/pmc/sockaddr.pmc
   trunk/src/pmc/timer.pmc

Modified: trunk/config/gen/crypto/digest_pmc.in
==============================================================================
--- trunk/config/gen/crypto/digest_pmc.in	Thu Sep  3 00:10:54 2009	(r40935)
+++ trunk/config/gen/crypto/digest_pmc.in	Thu Sep  3 00:21:51 2009	(r40936)
@@ -36,7 +36,7 @@
 @TEMP_md_guard@
         @TEMP_md_ctx@ *c    = mem_allocate_zeroed_typed(@TEMP_md_ctx@);
         PMC_data(SELF) = c;
-        PObj_active_destroy_SET(SELF);
+        PObj_custom_destroy_SET(SELF);
 #else
         Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_ILL_INHERIT,
             "@TEMP_md_name@ is disabled");
@@ -75,7 +75,7 @@
         memcpy(c, PMC_data(SELF), sizeof (@TEMP_md_ctx@));
         PMC_data(retval) = c;
 
-        PObj_active_destroy_SET(retval);
+        PObj_custom_destroy_SET(retval);
         return retval;
 #else
         return NULL;

Modified: trunk/docs/embed.pod
==============================================================================
--- trunk/docs/embed.pod	Thu Sep  3 00:10:54 2009	(r40935)
+++ trunk/docs/embed.pod	Thu Sep  3 00:21:51 2009	(r40936)
@@ -1853,7 +1853,7 @@
 
 =item C<pmc_type>
 
-=item C<PObj_active_destroy_SET>
+=item C<PObj_custom_destroy_SET>
 
 =item C<PObj_custom_mark_SET>
 

Modified: trunk/docs/pdds/pdd09_gc.pod
==============================================================================
--- trunk/docs/pdds/pdd09_gc.pod	Thu Sep  3 00:10:54 2009	(r40935)
+++ trunk/docs/pdds/pdd09_gc.pod	Thu Sep  3 00:21:51 2009	(r40936)
@@ -560,7 +560,7 @@
 
 =over 4
 
-=item PObj_active_destroy_FLAG
+=item PObj_custom_destroy_FLAG
 
 The PMC has some sort of active destructor, and will have that destructor
 called when the PMC is destroyed. The destructor is typically called from

Modified: trunk/docs/pmc.pod
==============================================================================
--- trunk/docs/pmc.pod	Thu Sep  3 00:10:54 2009	(r40935)
+++ trunk/docs/pmc.pod	Thu Sep  3 00:21:51 2009	(r40936)
@@ -42,7 +42,7 @@
 C<PMC_data> in the PMC's C<init()> and C<init_pmc()> VTABLE functions (if used)
 and it must be destroyed in the C<destroy()> VTABLE function.  PMCs with ATTRs
 also need to indicate that they need active destruction by calling
-C<PObj_active_destroy_SET()> or C<PObj_custom_mark_destroy_SETALL()>.
+C<PObj_custom_destroy_SET()> or C<PObj_custom_mark_destroy_SETALL()>.
 
 If your PMC only needs to store a single pointer, it can use C<PMC_data> directly.
 Note that this may make maintaining your PMC difficult, should more data ever
@@ -80,10 +80,10 @@
 VTABLE function must call B<Parrot_gc_mark_PObj_alive()> on all B<PObj>s which your PMC
 contains.
 
-=item PObj_active_destroy_FLAG
+=item PObj_custom_destroy_FLAG
 
 If your PMC allocates any memory or opens any resources during its lifetime, it
-must set B<PObj_active_destroy> and implement the B<destroy()> VTABLE function to
+must set B<PObj_custom_destroy> and implement the B<destroy()> VTABLE function to
 free those resources.
 
 =item PObj_needs_early_gc_FLAG

Modified: trunk/docs/vtables.pod
==============================================================================
--- trunk/docs/vtables.pod	Thu Sep  3 00:10:54 2009	(r40935)
+++ trunk/docs/vtables.pod	Thu Sep  3 00:21:51 2009	(r40936)
@@ -211,7 +211,7 @@
 =item C<destroy>
 
 Do any data shut-down and finalization you need to do. To have this method
-called, you must set the C<Pobj_active_destroy_FLAG>.
+called, you must set the C<Pobj_custom_destroy_FLAG>.
 
 =item C<get_integer>
 

Modified: trunk/include/parrot/pobj.h
==============================================================================
--- trunk/include/parrot/pobj.h	Thu Sep  3 00:10:54 2009	(r40935)
+++ trunk/include/parrot/pobj.h	Thu Sep  3 00:21:51 2009	(r40936)
@@ -191,7 +191,7 @@
     /* Mark the buffer as needing GC */
     PObj_custom_GC_FLAG         = POBJ_FLAG(21),
     /* Set if the PObj has a destroy method that must be called */
-    PObj_active_destroy_FLAG    = POBJ_FLAG(22),
+    PObj_custom_destroy_FLAG    = POBJ_FLAG(22),
     /* For debugging, report when this buffer gets moved around */
     PObj_report_FLAG            = POBJ_FLAG(23),
 
@@ -289,7 +289,7 @@
 #define PObj_special_CLEAR(flag, o) do { \
     PObj_flag_CLEAR(flag, o); \
     if ((PObj_get_FLAGS(o) & \
-                (PObj_active_destroy_FLAG | \
+                (PObj_custom_destroy_FLAG | \
                  PObj_custom_mark_FLAG | \
                  PObj_needs_early_gc_FLAG))) \
         gc_flag_SET(is_special_PMC, o); \
@@ -312,9 +312,17 @@
 #define PObj_custom_mark_CLEAR(o)   PObj_special_CLEAR(custom_mark, o)
 #define PObj_custom_mark_TEST(o)   PObj_flag_TEST(custom_mark, o)
 
-#define PObj_active_destroy_SET(o) PObj_flag_SET(active_destroy, o)
-#define PObj_active_destroy_TEST(o) PObj_flag_TEST(active_destroy, o)
-#define PObj_active_destroy_CLEAR(o) PObj_flag_CLEAR(active_destroy, o)
+#define PObj_custom_destroy_SET(o)   PObj_flag_SET(custom_destroy,   o)
+#define PObj_custom_destroy_TEST(o)  PObj_flag_TEST(custom_destroy,  o)
+#define PObj_custom_destroy_CLEAR(o) PObj_flag_CLEAR(custom_destroy, o)
+
+/*******************************************************
+ * DEPRECATED -- use PObj_custom_destroy_FOO() instead *
+ *******************************************************/
+#define PObj_active_destroy_FLAG     PObj_custom_destroy_FLAG
+#define PObj_active_destroy_SET(o)   PObj_flag_SET(custom_destroy,   o)
+#define PObj_active_destroy_TEST(o)  PObj_flag_TEST(custom_destroy,  o)
+#define PObj_active_destroy_CLEAR(o) PObj_flag_CLEAR(custom_destroy, o)
 
 #define PObj_is_class_SET(o) PObj_flag_SET(is_class, o)
 #define PObj_is_class_TEST(o) PObj_flag_TEST(is_class, o)
@@ -356,7 +364,7 @@
 
 #define PObj_custom_mark_destroy_SETALL(o) do { \
         PObj_custom_mark_SET(o); \
-        PObj_active_destroy_SET(o); \
+        PObj_custom_destroy_SET(o); \
 } while (0)
 
 #endif /* PARROT_POBJ_H_GUARD */

Modified: trunk/src/dynpmc/gdbmhash.pmc
==============================================================================
--- trunk/src/dynpmc/gdbmhash.pmc	Thu Sep  3 00:10:54 2009	(r40935)
+++ trunk/src/dynpmc/gdbmhash.pmc	Thu Sep  3 00:21:51 2009	(r40936)
@@ -105,7 +105,7 @@
 
         attrs->db_handle = mem_allocate_zeroed_typed(GDBM_FH);
         PMC_data(SELF)   = attrs;
-        PObj_active_destroy_SET(SELF);
+        PObj_custom_destroy_SET(SELF);
     }
 
     VTABLE void destroy() {

Modified: trunk/src/dynpmc/rational.pmc
==============================================================================
--- trunk/src/dynpmc/rational.pmc	Thu Sep  3 00:10:54 2009	(r40935)
+++ trunk/src/dynpmc/rational.pmc	Thu Sep  3 00:21:51 2009	(r40936)
@@ -269,7 +269,7 @@
         PMC_data(SELF)     = attrs;
         PMC_rational(SELF) = (RATIONAL *)malloc(sizeof (RATIONAL));
         mpq_init(RT(SELF));
-        PObj_active_destroy_SET(SELF);
+        PObj_custom_destroy_SET(SELF);
       #endif
     }
 

Modified: trunk/src/gc/generational_ms.c
==============================================================================
--- trunk/src/gc/generational_ms.c	Thu Sep  3 00:10:54 2009	(r40935)
+++ trunk/src/gc/generational_ms.c	Thu Sep  3 00:21:51 2009	(r40936)
@@ -606,7 +606,7 @@
 =item C<static void gc_gms_chain_objects(PARROT_INTERP, Small_Object_Pool *pool,
 Small_Object_Arena *new_arena, size_t real_size)>
 
-TODO: interfere active_destroy and put these items into a
+TODO: interfere custom_destroy and put these items into a
 separate white area, so that a sweep has just to run through these
 objects
 
@@ -1691,7 +1691,7 @@
         PMC * const obj = (PMC*)GMSH_to_PObj(h);
         if (PObj_needs_early_gc_TEST(obj))
             --arena_base->num_early_gc_PMCs;
-        if (PObj_active_destroy_TEST(obj))
+        if (PObj_custom_destroy_TEST(obj))
             VTABLE_destroy(interp, (PMC *)obj);
     }
     pool->free_list = pool->white;

Modified: trunk/src/hll.c
==============================================================================
--- trunk/src/hll.c	Thu Sep  3 00:10:54 2009	(r40935)
+++ trunk/src/hll.c	Thu Sep  3 00:21:51 2009	(r40936)
@@ -53,7 +53,7 @@
 #define END_READ_HLL_INFO(interp, hll_info)
 #define START_WRITE_HLL_INFO(interp, hll_info) \
     do { \
-	if (PObj_is_PMC_shared_TEST(obj) && PMC_sync((interp)->HLL_info)) { \
+	if (PObj_is_PMC_shared_TEST(hll_info) && PMC_sync((interp)->HLL_info)) { \
             (hll_info) = (interp)->HLL_info = \
                 Parrot_clone((interp), (interp)->HLL_info); \
             if (PMC_sync((interp)->HLL_info)) \
@@ -363,7 +363,7 @@
 
     /* the type might already be registered in a non-conflicting way, in which
      * ca se we can avoid copying */
-    if (PObj_is_PMC_shared_TEST(obj) && PMC_sync(hll_info)) {
+    if (PObj_is_PMC_shared_TEST(hll_info) && PMC_sync(hll_info)) {
         if (hll_type == Parrot_get_HLL_type(interp, hll_id, core_type))
             return;
     }

Modified: trunk/src/jit/i386/jit_defs.c
==============================================================================
--- trunk/src/jit/i386/jit_defs.c	Thu Sep  3 00:10:54 2009	(r40935)
+++ trunk/src/jit/i386/jit_defs.c	Thu Sep  3 00:21:51 2009	(r40936)
@@ -2410,7 +2410,7 @@
     emitm_ret(pc);
     PARROT_ASSERT(pc - jit_info.arena.start <= JIT_ALLOC_SIZE);
     /* could shrink arena.start here to used size */
-    PObj_active_destroy_SET(pmc_nci);
+    PObj_custom_destroy_SET(pmc_nci);
     if (sizeptr)
         *sizeptr = JIT_ALLOC_SIZE;
     return (void *)D2FPTR(jit_info.arena.start);

Modified: trunk/src/oo.c
==============================================================================
--- trunk/src/oo.c	Thu Sep  3 00:10:54 2009	(r40935)
+++ trunk/src/oo.c	Thu Sep  3 00:21:51 2009	(r40936)
@@ -286,7 +286,7 @@
 
     /* Set custom GC mark and destroy on the object. */
     PObj_custom_mark_SET(cloned);
-    PObj_active_destroy_SET(cloned);
+    PObj_custom_destroy_SET(cloned);
 
     /* Flag that it is an object */
     PObj_is_object_SET(cloned);

Modified: trunk/src/packdump.c
==============================================================================
--- trunk/src/packdump.c	Thu Sep  3 00:10:54 2009	(r40935)
+++ trunk/src/packdump.c	Thu Sep  3 00:21:51 2009	(r40936)
@@ -111,7 +111,7 @@
     "on_free_list",
     "custom_mark",
     "custom_GC",
-    "active_destroy",
+    "custom_destroy",
     "report",
     "data_is_PMC_array",
     "need_finalize",

Modified: trunk/src/pmc.c
==============================================================================
--- trunk/src/pmc.c	Thu Sep  3 00:10:54 2009	(r40935)
+++ trunk/src/pmc.c	Thu Sep  3 00:21:51 2009	(r40936)
@@ -109,10 +109,10 @@
 {
     ASSERT_ARGS(Parrot_pmc_destroy)
 
-    if (PObj_active_destroy_TEST(pmc)) {
+    if (PObj_custom_destroy_TEST(pmc)) {
         VTABLE_destroy(interp, pmc);
         /* Prevent repeated calls. */
-        PObj_active_destroy_CLEAR(pmc);
+        PObj_custom_destroy_CLEAR(pmc);
     }
 
     PObj_custom_mark_CLEAR(pmc);

Modified: trunk/src/pmc/bigint.pmc
==============================================================================
--- trunk/src/pmc/bigint.pmc	Thu Sep  3 00:10:54 2009	(r40935)
+++ trunk/src/pmc/bigint.pmc	Thu Sep  3 00:21:51 2009	(r40936)
@@ -627,7 +627,7 @@
 
     VTABLE void init() {
         bigint_init(INTERP, SELF);
-        PObj_active_destroy_SET(SELF);
+        PObj_custom_destroy_SET(SELF);
     }
 
     VTABLE PMC *clone() {

Modified: trunk/src/pmc/bignum.pmc
==============================================================================
--- trunk/src/pmc/bignum.pmc	Thu Sep  3 00:10:54 2009	(r40935)
+++ trunk/src/pmc/bignum.pmc	Thu Sep  3 00:21:51 2009	(r40936)
@@ -841,7 +841,7 @@
 
     VTABLE void init() {
         bignum_init(INTERP, SELF);
-        PObj_active_destroy_SET(SELF);
+        PObj_custom_destroy_SET(SELF);
     }
 
     VTABLE PMC *clone() {

Modified: trunk/src/pmc/class.pmc
==============================================================================
--- trunk/src/pmc/class.pmc	Thu Sep  3 00:10:54 2009	(r40935)
+++ trunk/src/pmc/class.pmc	Thu Sep  3 00:21:51 2009	(r40936)
@@ -1222,7 +1222,7 @@
 
         /* Set custom GC mark and destroy on the object. */
         PObj_custom_mark_SET(object);
-        PObj_active_destroy_SET(object);
+        PObj_custom_destroy_SET(object);
 
         /* Flag that it is an object */
         PObj_is_object_SET(object);

Modified: trunk/src/pmc/eventhandler.pmc
==============================================================================
--- trunk/src/pmc/eventhandler.pmc	Thu Sep  3 00:10:54 2009	(r40935)
+++ trunk/src/pmc/eventhandler.pmc	Thu Sep  3 00:21:51 2009	(r40936)
@@ -39,7 +39,7 @@
 
     VTABLE void init() {
         PObj_custom_mark_SET(SELF);
-        PObj_active_destroy_SET(SELF);
+        PObj_custom_destroy_SET(SELF);
     }
 
 /*
@@ -101,7 +101,7 @@
                     INTERP->iglobals, IGLOBALS_INTERPRETER);
 
         PObj_custom_mark_SET(SELF);
-        PObj_active_destroy_SET(SELF);
+        PObj_custom_destroy_SET(SELF);
 
         e->type        = type;
         e->code        = code;

Modified: trunk/src/pmc/exception.pmc
==============================================================================
--- trunk/src/pmc/exception.pmc	Thu Sep  3 00:10:54 2009	(r40935)
+++ trunk/src/pmc/exception.pmc	Thu Sep  3 00:21:51 2009	(r40936)
@@ -84,7 +84,7 @@
 
     VTABLE void init() {
         /* Set flags for custom GC mark and destroy. */
-        PObj_active_destroy_SET(SELF);
+        PObj_custom_destroy_SET(SELF);
         PObj_custom_mark_SET(SELF);
 
         SET_ATTR_severity(INTERP, SELF, EXCEPT_error);
@@ -124,7 +124,7 @@
         }
 
         /* Set flags for custom GC mark. */
-        PObj_active_destroy_SET(SELF);
+        PObj_custom_destroy_SET(SELF);
         PObj_custom_mark_SET(SELF);
 
         /* Set up the core struct and default values for the exception object. */

Modified: trunk/src/pmc/exceptionhandler.pmc
==============================================================================
--- trunk/src/pmc/exceptionhandler.pmc	Thu Sep  3 00:10:54 2009	(r40935)
+++ trunk/src/pmc/exceptionhandler.pmc	Thu Sep  3 00:21:51 2009	(r40936)
@@ -56,7 +56,7 @@
          * context - the stacks can only be deeper in the interpreter - so no
          * mark of context is needed */
         PObj_custom_mark_SET(SELF);
-        PObj_active_destroy_SET(SELF);
+        PObj_custom_destroy_SET(SELF);
     }
 /*
 

Modified: trunk/src/pmc/filehandle.pmc
==============================================================================
--- trunk/src/pmc/filehandle.pmc	Thu Sep  3 00:10:54 2009	(r40935)
+++ trunk/src/pmc/filehandle.pmc	Thu Sep  3 00:21:51 2009	(r40936)
@@ -84,7 +84,7 @@
         data_struct->os_handle     = (PIOHANDLE) PIO_INVALID_HANDLE;
 
         PObj_custom_mark_SET(SELF);
-        PObj_active_destroy_SET(SELF);
+        PObj_custom_destroy_SET(SELF);
     }
 
 /*

Modified: trunk/src/pmc/fixedbooleanarray.pmc
==============================================================================
--- trunk/src/pmc/fixedbooleanarray.pmc	Thu Sep  3 00:10:54 2009	(r40935)
+++ trunk/src/pmc/fixedbooleanarray.pmc	Thu Sep  3 00:21:51 2009	(r40936)
@@ -45,7 +45,7 @@
 */
 
     VTABLE void init() {
-        PObj_active_destroy_SET(SELF);
+        PObj_custom_destroy_SET(SELF);
     }
 
 /*
@@ -97,7 +97,7 @@
             SET_ATTR_bit_array(INTERP, dest, clone_bit_array);
         }
 
-        PObj_active_destroy_SET(dest);
+        PObj_custom_destroy_SET(dest);
         return dest;
     }
 

Modified: trunk/src/pmc/fixedfloatarray.pmc
==============================================================================
--- trunk/src/pmc/fixedfloatarray.pmc	Thu Sep  3 00:10:54 2009	(r40935)
+++ trunk/src/pmc/fixedfloatarray.pmc	Thu Sep  3 00:21:51 2009	(r40936)
@@ -73,7 +73,7 @@
         dest_float_array  = (FLOATVAL*)mem_sys_allocate(mem_size);
         mem_sys_memcopy(dest_float_array, self_float_array, mem_size);
         SET_ATTR_float_array(INTERP, dest, dest_float_array);
-        PObj_active_destroy_SET(dest);
+        PObj_custom_destroy_SET(dest);
 
         return dest;
     }
@@ -290,7 +290,7 @@
         SET_ATTR_size(INTERP, SELF, new_size);
         SET_ATTR_float_array(INTERP, SELF,
                 mem_allocate_n_typed(new_size, FLOATVAL));
-        PObj_active_destroy_SET(SELF);
+        PObj_custom_destroy_SET(SELF);
     }
 
 /*

Modified: trunk/src/pmc/fixedintegerarray.pmc
==============================================================================
--- trunk/src/pmc/fixedintegerarray.pmc	Thu Sep  3 00:10:54 2009	(r40935)
+++ trunk/src/pmc/fixedintegerarray.pmc	Thu Sep  3 00:21:51 2009	(r40936)
@@ -40,7 +40,7 @@
 */
 
     VTABLE void init() {
-        PObj_active_destroy_SET(SELF);
+        PObj_custom_destroy_SET(SELF);
     }
 
 /*
@@ -190,7 +190,7 @@
             SET_ATTR_int_array(INTERP, dest, dest_int_array);
 
             mem_sys_memcopy(dest_int_array, int_array, size * sizeof (INTVAL));
-            PObj_active_destroy_SET(dest);
+            PObj_custom_destroy_SET(dest);
         }
 
         return dest;
@@ -432,7 +432,7 @@
         GET_ATTR_int_array(INTERP, SELF, int_array);
         SET_ATTR_int_array(INTERP, SELF,
                 mem_realloc_n_typed(int_array, size, INTVAL));
-        PObj_active_destroy_SET(SELF);
+        PObj_custom_destroy_SET(SELF);
     }
 
 /*
@@ -640,7 +640,7 @@
         Parrot_FixedIntegerArray_attributes *attrs =
             mem_allocate_zeroed_typed(Parrot_FixedIntegerArray_attributes);
         PMC_data(SELF) = attrs;
-        PObj_active_destroy_SET(SELF);
+        PObj_custom_destroy_SET(SELF);
 
         if (info->extra_flags == EXTRA_IS_NULL) {
             IMAGE_IO * const io = info->image_io;

Modified: trunk/src/pmc/lexinfo.pmc
==============================================================================
--- trunk/src/pmc/lexinfo.pmc	Thu Sep  3 00:10:54 2009	(r40935)
+++ trunk/src/pmc/lexinfo.pmc	Thu Sep  3 00:21:51 2009	(r40936)
@@ -71,7 +71,7 @@
             (hash_hash_key_fn)Parrot_str_to_hashval); /*        hash    */
 
         SELF.set_pointer(hash);
-        PObj_active_destroy_SET(SELF);
+        PObj_custom_destroy_SET(SELF);
     }
 
 /*

Modified: trunk/src/pmc/managedstruct.pmc
==============================================================================
--- trunk/src/pmc/managedstruct.pmc	Thu Sep  3 00:10:54 2009	(r40935)
+++ trunk/src/pmc/managedstruct.pmc	Thu Sep  3 00:21:51 2009	(r40936)
@@ -46,7 +46,7 @@
 */
 
     VTABLE void init() {
-        PObj_active_destroy_SET(SELF);
+        PObj_custom_destroy_SET(SELF);
     }
 
 /*

Modified: trunk/src/pmc/object.pmc
==============================================================================
--- trunk/src/pmc/object.pmc	Thu Sep  3 00:10:54 2009	(r40935)
+++ trunk/src/pmc/object.pmc	Thu Sep  3 00:21:51 2009	(r40936)
@@ -714,7 +714,7 @@
     VTABLE void thawfinish(visit_info *info) {
         /* Set custom GC mark and destroy on the object. */
         PObj_custom_mark_SET(SELF);
-        PObj_active_destroy_SET(SELF);
+        PObj_custom_destroy_SET(SELF);
 
         /* Flag that it is an object */
         PObj_is_object_SET(SELF);

Modified: trunk/src/pmc/packfileannotation.pmc
==============================================================================
--- trunk/src/pmc/packfileannotation.pmc	Thu Sep  3 00:10:54 2009	(r40935)
+++ trunk/src/pmc/packfileannotation.pmc	Thu Sep  3 00:21:51 2009	(r40936)
@@ -42,7 +42,7 @@
         Parrot_PackfileAnnotation_attributes * attrs =
                 mem_allocate_zeroed_typed(Parrot_PackfileAnnotation_attributes);
 
-        PObj_active_destroy_SET(SELF);
+        PObj_custom_destroy_SET(SELF);
         PMC_data(SELF) = attrs;
     }
 

Modified: trunk/src/pmc/parrotinterpreter.pmc
==============================================================================
--- trunk/src/pmc/parrotinterpreter.pmc	Thu Sep  3 00:10:54 2009	(r40935)
+++ trunk/src/pmc/parrotinterpreter.pmc	Thu Sep  3 00:21:51 2009	(r40936)
@@ -242,7 +242,7 @@
         if (!PMC_interp(SELF)) {
             create_interp(SELF, INTERP);
         }
-        PObj_active_destroy_SET(SELF);
+        PObj_custom_destroy_SET(SELF);
     }
 
 /*
@@ -268,7 +268,7 @@
         if (!PMC_interp(SELF)) {
             create_interp(SELF, p);
         }
-        PObj_active_destroy_SET(SELF);
+        PObj_custom_destroy_SET(SELF);
     }
 
 
@@ -309,7 +309,7 @@
             Parrot_ParrotInterpreter_attributes *attrs =
                 mem_allocate_zeroed_typed(Parrot_ParrotInterpreter_attributes);
             PMC_data(SELF) = attrs;
-            PObj_active_destroy_SET(SELF);
+            PObj_custom_destroy_SET(SELF);
         }
         PMC_interp(SELF) = (struct parrot_interp_t *)value;
     }
@@ -722,7 +722,7 @@
                 Parrot_ParrotInterpreter_attributes *attrs =
                     mem_allocate_zeroed_typed(Parrot_ParrotInterpreter_attributes);
                 PMC_data(SELF) = attrs;
-                PObj_active_destroy_SET(SELF);
+                PObj_custom_destroy_SET(SELF);
             }
 
             PMC_interp(SELF) = INTERP;

Modified: trunk/src/pmc/parrotlibrary.pmc
==============================================================================
--- trunk/src/pmc/parrotlibrary.pmc	Thu Sep  3 00:10:54 2009	(r40935)
+++ trunk/src/pmc/parrotlibrary.pmc	Thu Sep  3 00:21:51 2009	(r40936)
@@ -46,7 +46,7 @@
 */
 
     VTABLE void init() {
-        PObj_active_destroy_SET(SELF);
+        PObj_custom_destroy_SET(SELF);
     }
 
 /*

Modified: trunk/src/pmc/parrotrunningthread.pmc
==============================================================================
--- trunk/src/pmc/parrotrunningthread.pmc	Thu Sep  3 00:10:54 2009	(r40935)
+++ trunk/src/pmc/parrotrunningthread.pmc	Thu Sep  3 00:21:51 2009	(r40936)
@@ -50,7 +50,7 @@
             mem_allocate_zeroed_typed(Parrot_ParrotRunningThread_attributes);
         attrs->tid = -1;
         PMC_data(SELF) = attrs;
-        PObj_active_destroy_SET(SELF);
+        PObj_custom_destroy_SET(SELF);
     }
 
 /*

Modified: trunk/src/pmc/resizablebooleanarray.pmc
==============================================================================
--- trunk/src/pmc/resizablebooleanarray.pmc	Thu Sep  3 00:10:54 2009	(r40935)
+++ trunk/src/pmc/resizablebooleanarray.pmc	Thu Sep  3 00:21:51 2009	(r40936)
@@ -392,7 +392,7 @@
 
         SET_ATTR_bit_array(INTERP, dest, dest_bit_array);
 
-        PObj_active_destroy_SET(dest);
+        PObj_custom_destroy_SET(dest);
         return dest;
     }
 

Modified: trunk/src/pmc/scheduler.pmc
==============================================================================
--- trunk/src/pmc/scheduler.pmc	Thu Sep  3 00:10:54 2009	(r40935)
+++ trunk/src/pmc/scheduler.pmc	Thu Sep  3 00:21:51 2009	(r40936)
@@ -52,7 +52,7 @@
 
         /* Set flags for custom GC mark and destroy. */
         PObj_custom_mark_SET(SELF);
-        PObj_active_destroy_SET(SELF);
+        PObj_custom_destroy_SET(SELF);
 
         /* Set up the core struct. */
         core_struct->id          = 0;

Modified: trunk/src/pmc/sockaddr.pmc
==============================================================================
--- trunk/src/pmc/sockaddr.pmc	Thu Sep  3 00:10:54 2009	(r40935)
+++ trunk/src/pmc/sockaddr.pmc	Thu Sep  3 00:21:51 2009	(r40936)
@@ -47,7 +47,7 @@
             (Parrot_Sockaddr_attributes *) PMC_data(SELF);
 
         pdata_struct->pointer = mem_allocate_zeroed_typed(struct sockaddr_in);
-        PObj_active_destroy_SET(SELF);
+        PObj_custom_destroy_SET(SELF);
     }
 
 /*

Modified: trunk/src/pmc/timer.pmc
==============================================================================
--- trunk/src/pmc/timer.pmc	Thu Sep  3 00:10:54 2009	(r40935)
+++ trunk/src/pmc/timer.pmc	Thu Sep  3 00:21:51 2009	(r40936)
@@ -79,7 +79,7 @@
 
         /* Set flags for custom GC mark and destroy. */
         PObj_custom_mark_SET(SELF);
-        PObj_active_destroy_SET(SELF);
+        PObj_custom_destroy_SET(SELF);
 
         /* Set up the core struct. */
         core_struct->id          = 0;


More information about the parrot-commits mailing list