[svn:parrot] r21148 - in trunk/src: . stm

Author: paultcochrane
Date: Sat Sep  8 15:04:06 2007
New Revision: 21148

Modified:
   trunk/src/hash.c
   trunk/src/pmc_freeze.c
   trunk/src/stm/backend.c

Log:
Mopped up remaining instances of io->vtable->whatever() which needed to be
changed to VTABLE_whatever()


Modified: trunk/src/hash.c
==============================================================================
--- trunk/src/hash.c    (original)
+++ trunk/src/hash.c    Sat Sep  8 15:04:06 2007
@@ -318,13 +318,13 @@
         switch (hash->key_type) {
             case Hash_key_type_STRING:
                 {
-                STRING * const s_key = io->vtable->shift_string(interp, io);
+                STRING * const s_key = VTABLE_shift_string(interp, io);
                 b = parrot_hash_put(interp, hash, s_key, NULL);
                 }
                 break;
             case Hash_key_type_int:
                 {
-                const INTVAL i_key = io->vtable->shift_integer(interp, io);
+                const INTVAL i_key = VTABLE_shift_integer(interp, io);
                 b = parrot_hash_put(interp, hash, (void*)i_key, NULL);
                 }
                 break;
@@ -339,7 +339,7 @@
                 (info->visit_pmc_now)(interp, NULL, info);
                 break;
             case enum_hash_int:
-                i        = io->vtable->shift_integer(interp, io);
+                i        = VTABLE_shift_integer(interp, io);
                 b->value = (void *)i;
                 break;
             default:
@@ -361,10 +361,10 @@
         while (b) {
             switch (hash->key_type) {
                 case Hash_key_type_STRING:
-                    io->vtable->push_string(interp, io, (STRING *)b->key);
+                    VTABLE_push_string(interp, io, (STRING *)b->key);
                     break;
                 case Hash_key_type_int:
-                    io->vtable->push_integer(interp, io, (INTVAL)b->key);
+                    VTABLE_push_integer(interp, io, (INTVAL)b->key);
                     break;
                 default:
                     real_exception(interp, NULL, 1, "unimplemented key type");
@@ -375,7 +375,7 @@
                     (info->visit_pmc_now)(interp, (PMC *)b->value, info);
                     break;
                 case enum_hash_int:
-                    io->vtable->push_integer(interp, io, (INTVAL)b->value);
+                    VTABLE_push_integer(interp, io, (INTVAL)b->value);
                     break;
                 default:
                     real_exception(interp, NULL, 1, "unimplemented value 
type");

Modified: trunk/src/pmc_freeze.c
==============================================================================
--- trunk/src/pmc_freeze.c      (original)
+++ trunk/src/pmc_freeze.c      Sat Sep  8 15:04:06 2007
@@ -922,7 +922,7 @@
 
     if (PMC_IS_NULL(pmc)) {
         /* NULL + seen bit */
-        io->vtable->push_pmc(interp, io, (PMC*) 1);
+        VTABLE_push_pmc(interp, io, (PMC*) 1);
         return;
     }
     type = pmc->vtable->base_type;
@@ -932,8 +932,8 @@
     if (seen) {
         if (info->extra_flags) {
             id |= 3;
-            io->vtable->push_pmc(interp, io, (PMC*)id);
-            io->vtable->push_integer(interp, io, info->extra_flags);
+            VTABLE_push_pmc(interp, io, (PMC*)id);
+            VTABLE_push_integer(interp, io, info->extra_flags);
             return;
         }
         id |= 1;         /* mark bit 0 if this PMC is known */
@@ -941,9 +941,9 @@
     else if (type == info->last_type) {
         id |= 2;         /* mark bit 1 and don't write type */
     }
-    io->vtable->push_pmc(interp, io, (PMC*)id);
+    VTABLE_push_pmc(interp, io, (PMC*)id);
     if (! (id & 3)) {    /* else write type */
-        io->vtable->push_integer(interp, io, type);
+        VTABLE_push_integer(interp, io, type);
         info->last_type = type;
     }
 }
@@ -978,10 +978,10 @@
     int seen = 0;
 
     info->extra_flags = EXTRA_IS_NULL;
-    n = io->vtable->shift_pmc(interp, io);
+    n = VTABLE_shift_pmc(interp, io);
     if (((UINTVAL) n & 3) == 3) {
         /* pmc has extra data */
-        info->extra_flags = io->vtable->shift_integer(interp, io);
+        info->extra_flags = VTABLE_shift_integer(interp, io);
     }
     else if ((UINTVAL) n & 1) {     /* seen PMCs have bit 0 set */
         seen = 1;
@@ -990,7 +990,7 @@
         *type = info->last_type;
     }
     else {                       /* type follows */
-        info->last_type = *type = io->vtable->shift_integer(interp, io);
+        info->last_type = *type = VTABLE_shift_integer(interp, io);
         if (*type <= 0)
             real_exception(interp, NULL, 1, "Unknown PMC type to thaw %d", 
(int) *type);
         if (*type >= interp->n_vtable_max ||

Modified: trunk/src/stm/backend.c
==============================================================================
--- trunk/src/stm/backend.c     (original)
+++ trunk/src/stm/backend.c     Sat Sep  8 15:04:06 2007
@@ -246,13 +246,13 @@
 Parrot_freeze_STM_PMC_handle(PARROT_INTERP, NOTNULL(IMAGE_IO *io),
             NOTNULL(Parrot_STM_PMC_handle handle))
 {
-    io->vtable->push_pmc(interp, io, (PMC*) handle);
+    VTABLE_push_pmc(interp, io, (PMC*) handle);
 }
 
 Parrot_STM_PMC_handle
 Parrot_thaw_STM_PMC_handle(PARROT_INTERP, NOTNULL(IMAGE_IO *io))
 {
-    Parrot_STM_PMC_handle handle = (Parrot_STM_PMC_handle) 
io->vtable->shift_pmc(interp, io);
+    Parrot_STM_PMC_handle handle = (Parrot_STM_PMC_handle) 
VTABLE_shift_pmc(interp, io);
     return handle;
 }