use Parrot_gc_mark_PMC_alive & Parrot_gc_mark_STRING_alive

(instead of Parrot_gc_mark_PObj_alive)
fperrad · Sep 25, 2009 · d65c92e · d65c92e
1 parent 45ed019
commit d65c92e
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 14 deletions.
diff --git a/src/pmc/luafunction.pmc b/src/pmc/luafunction.pmc
@@ -86,7 +86,7 @@ Marks the function as live.
     VTABLE void mark() {
         SUPER();
         if (f_env(SELF))
-            Parrot_gc_mark_PObj_alive(INTERP, (PObj *)f_env(SELF));
+            Parrot_gc_mark_PMC_alive(INTERP, f_env(SELF));
     }
 
 /*

diff --git a/src/pmc/luastring.pmc b/src/pmc/luastring.pmc
@@ -49,8 +49,8 @@ Initializes the string.
 
 */
     VTABLE void init() {
-        STRING *_str = Parrot_str_new_noinit(INTERP, enum_stringrep_one, 0);
-        SET_ATTR_str_val(INTERP, SELF, _str);
+        STRING *str_val = Parrot_str_new_noinit(INTERP, enum_stringrep_one, 0);
+        SET_ATTR_str_val(INTERP, SELF, str_val);
         PObj_custom_mark_SET(SELF);
     }
 
@@ -89,8 +89,7 @@ Marks the string as live.
     VTABLE void mark() {
         STRING * str_val;
         GET_ATTR_str_val(INTERP, SELF, str_val);
-        if (str_val)
-            Parrot_gc_mark_PObj_alive(INTERP, (PObj *)str_val);
+        Parrot_gc_mark_STRING_alive(INTERP, str_val);
     }
 
 /*
@@ -104,7 +103,6 @@ Creates a copy of the string.
 */
     VTABLE PMC* clone() {
         PMC * const res = pmc_new(INTERP, PMC_type(SELF));
-        PObj_custom_mark_destroy_SETALL(res);
         VTABLE_set_string_native(INTERP, res, Parrot_str_copy(INTERP, SELF.get_string()));
         return res;
     }

diff --git a/src/pmc/luatable.pmc b/src/pmc/luatable.pmc
@@ -357,9 +357,9 @@ static void lua_mark_table(PARROT_INTERP, LuaHash *t, STRING *mode)
     for (i = 0; i < t->size; i++) {
         if (v[i].val) {
             if (mark_key)
-                Parrot_gc_mark_PObj_alive(interp, (PObj *)v[i].key);
+                Parrot_gc_mark_PMC_alive(interp, v[i].key);
             if (mark_val)
-                Parrot_gc_mark_PObj_alive(interp, (PObj *)v[i].val);
+                Parrot_gc_mark_PMC_alive(interp, v[i].val);
         }
     }
 }
@@ -422,7 +422,7 @@ Marks the hash as live.
             lua_mark_table(INTERP, t_val(SELF), mode);
 
         if (meta)
-            Parrot_gc_mark_PObj_alive(INTERP, (PObj *)meta);
+            Parrot_gc_mark_PMC_alive(INTERP, meta);
     }
 
 /*

diff --git a/src/pmc/luathread.pmc b/src/pmc/luathread.pmc
@@ -92,9 +92,9 @@ Marks the Parrot::Coroutine as live.
 */
     VTABLE void mark() {
         if (t_val(SELF))
-            Parrot_gc_mark_PObj_alive(INTERP, (PObj *)t_val(SELF));
+            Parrot_gc_mark_PMC_alive(INTERP, t_val(SELF));
         if (t_env(SELF))
-            Parrot_gc_mark_PObj_alive(INTERP, (PObj *)t_env(SELF));
+            Parrot_gc_mark_PMC_alive(INTERP, t_env(SELF));
     }
 
 /*

diff --git a/src/pmc/luauserdata.pmc b/src/pmc/luauserdata.pmc
@@ -92,11 +92,11 @@ Marks the userdata as live.
 */
     VTABLE void mark() {
         if (u_val(SELF))
-            Parrot_gc_mark_PObj_alive(INTERP, (PObj *)u_val(SELF));
+            Parrot_gc_mark_PMC_alive(INTERP, u_val(SELF));
         if (u_env(SELF))
-            Parrot_gc_mark_PObj_alive(INTERP, (PObj *)u_env(SELF));
+            Parrot_gc_mark_PMC_alive(INTERP, u_env(SELF));
         if (u_mt(SELF))
-            Parrot_gc_mark_PObj_alive(INTERP, (PObj *)u_mt(SELF));
+            Parrot_gc_mark_PMC_alive(INTERP, u_mt(SELF));
     }
 
 /*