[svn:parrot] r35575 - trunk/src

Author: cotto
Date: Wed Jan 14 18:54:04 2009
New Revision: 35575

Modified:
   trunk/src/inter_call.c
   trunk/src/key.c
   trunk/src/oo.c

Log:
[cage] revert r35520,5,6.  There's too much hole and not enough dam for this strategy to be effective.


Modified: trunk/src/inter_call.c
==============================================================================
--- trunk/src/inter_call.c	(original)
+++ trunk/src/inter_call.c	Wed Jan 14 18:54:04 2009
@@ -557,7 +557,7 @@
 
         /* create key needed to iterate the hash */
         st->key              = pmc_new(interp, enum_class_Key);
-        key_set_integer(interp, st->key, 0);
+        PMC_int_val(st->key) = 0;
         PMC_data(st->key)    = (void *)INITBucketIndex;
     }
     else {

Modified: trunk/src/key.c
==============================================================================
--- trunk/src/key.c	(original)
+++ trunk/src/key.c	Wed Jan 14 18:54:04 2009
@@ -440,7 +440,7 @@
             return VTABLE_get_string(interp, reg);
         }
         case KEY_integer_FLAG:
-            return string_from_int(interp, key_integer(interp, key));
+            return string_from_int(interp, PMC_int_val(key));
         case KEY_integer_FLAG | KEY_register_FLAG:
             return string_from_int(interp, REG_INT(interp, PMC_int_val(key)));
         default:
@@ -595,7 +595,7 @@
         switch (PObj_get_FLAGS(key) & KEY_type_FLAGS) {
             case KEY_integer_FLAG:
                 value = string_append(interp, value,
-                    string_from_int(interp, key_integer(interp, key)));
+                    string_from_int(interp, PMC_int_val(key)));
                 break;
             case KEY_string_FLAG:
                 value = string_append(interp, value, quote);

Modified: trunk/src/oo.c
==============================================================================
--- trunk/src/oo.c	(original)
+++ trunk/src/oo.c	Wed Jan 14 18:54:04 2009
@@ -594,8 +594,8 @@
         if (!typeid_exists) {
             PMC    *classname_hash = interp->class_hash;
             /* set entry in name->type hash */
-            PMC    *item      = pmc_new(interp, enum_class_Integer);
-            VTABLE_set_integer_native(interp, item, type);
+            PMC    *item     = pmc_new(interp, enum_class_Integer);
+            PMC_int_val(item) = type;
 
             VTABLE_set_pmc_keyed(interp, classname_hash, name, item);
         }
@@ -969,9 +969,9 @@
         return;
 
     if (PObj_is_class_TEST(_class)) {
-        SLOTTYPE * const class_array = PMC_data_typed(_class, SLOTTYPE *);
-        PMC *const class_name_pmc = get_attrib_num(class_array, PCD_CLASS_NAME);
-        class_name = VTABLE_get_string(interp, class_name_pmc);
+        SLOTTYPE * const class_array    = PMC_data_typed(_class, SLOTTYPE *);
+        PMC *const       class_name_pmc = get_attrib_num(class_array, PCD_CLASS_NAME);
+                         class_name     = PMC_str_val(class_name_pmc);
     }
     else
         class_name = _class->vtable->whoami;

• [svn:parrot] r35575 - trunk/src by cotto