Don't use pmc-specific accessors when not necessary

Author: bacek

src/pmc/dispatchersub.pmc

@@ -7,24 +7,24 @@ pmclass DispatcherSub extends Sub auto_attrs dynpmc group nqp {
 
     VTABLE void init() {
         SUPER();
-        SETATTR_DispatcherSub_dispatchees(interp, SELF, PMCNULL);
-        SETATTR_DispatcherSub_dispatch_cache(interp, SELF, PMCNULL);
+        SET_ATTR_dispatchees(interp, SELF, PMCNULL);
+        SET_ATTR_dispatch_cache(interp, SELF, PMCNULL);
     }
 
     VTABLE void mark() {
         PMC *dispatchees;
         SUPER();
-        GETATTR_DispatcherSub_dispatchees(interp, SELF, dispatchees);
+        GET_ATTR_dispatchees(interp, SELF, dispatchees);
         Parrot_gc_mark_PMC_alive(INTERP, dispatchees);
     }
 
     VTABLE PMC * clone() {
         PMC *dispatchees, *dispatch_cache;
         PMC *cloned = SUPER();
-        GETATTR_DispatcherSub_dispatchees(interp, SELF, dispatchees);
-        SETATTR_DispatcherSub_dispatchees(interp, cloned, dispatchees);
-        GETATTR_DispatcherSub_dispatch_cache(interp, SELF, dispatch_cache);
-        SETATTR_DispatcherSub_dispatch_cache(interp, cloned, dispatch_cache);
+        GET_ATTR_dispatchees(interp, SELF, dispatchees);
+        SET_ATTR_dispatchees(interp, cloned, dispatchees);
+        GET_ATTR_dispatch_cache(interp, SELF, dispatch_cache);
+        SET_ATTR_dispatch_cache(interp, cloned, dispatch_cache);
         return cloned;
     }
 

src/pmc/nqpmultisig.pmc

@@ -8,8 +8,8 @@ pmclass NQPMultiSig auto_attrs dynpmc group nqp {
 
     VTABLE void mark() {
         PMC *types, *definednesses;
-        GETATTR_NQPMultiSig_types(interp, SELF, types);
-        GETATTR_NQPMultiSig_definedness_constraints(interp, SELF, definednesses);
+        GET_ATTR_types(interp, SELF, types);
+        GET_ATTR_definedness_constraints(interp, SELF, definednesses);
         Parrot_gc_mark_PMC_alive(interp, types);
         Parrot_gc_mark_PMC_alive(interp, definednesses);
     }

src/pmc/serializationcontext.pmc

@@ -13,79 +13,79 @@ pmclass SerializationContext auto_attrs dynpmc group nqp {
 
     VTABLE void init() {
         PMC *root_objects = Parrot_pmc_new(interp, enum_class_ResizablePMCArray);
-        SETATTR_SerializationContext_root_objects(interp, SELF, root_objects);
+        SET_ATTR_root_objects(interp, SELF, root_objects);
         PObj_custom_mark_SET(SELF);
     }
 
     VTABLE void set_string_native(STRING *handle) {
-        SETATTR_SerializationContext_handle(interp, SELF, handle);
+        SET_ATTR_handle(interp, SELF, handle);
     }
 
     VTABLE void mark() {
         PMC    *root_objects;
         STRING *handle, *description;
-        GETATTR_SerializationContext_root_objects(interp, SELF, root_objects);
+        GET_ATTR_root_objects(interp, SELF, root_objects);
         Parrot_gc_mark_PMC_alive(INTERP, root_objects);
-        GETATTR_SerializationContext_handle(interp, SELF, handle);
+        GET_ATTR_handle(interp, SELF, handle);
         Parrot_gc_mark_STRING_alive(INTERP, handle);
-        GETATTR_SerializationContext_description(interp, SELF, description);
+        GET_ATTR_description(interp, SELF, description);
         Parrot_gc_mark_STRING_alive(INTERP, description);
     }
 
     VTABLE PMC* get_pmc_keyed_int(INTVAL idx) {
         PMC    *root_objects;
-        GETATTR_SerializationContext_root_objects(interp, SELF, root_objects);
+        GET_ATTR_root_objects(interp, SELF, root_objects);
         return VTABLE_get_pmc_keyed_int(interp, root_objects, idx);
     }
 
     VTABLE PMC* get_pmc_keyed(PMC *idx) {
         PMC    *root_objects;
-        GETATTR_SerializationContext_root_objects(interp, SELF, root_objects);
+        GET_ATTR_root_objects(interp, SELF, root_objects);
         return VTABLE_get_pmc_keyed(interp, root_objects, idx);
     }
 
     VTABLE void set_pmc_keyed_int(INTVAL idx, PMC *value) {
         PMC    *root_objects;
-        GETATTR_SerializationContext_root_objects(interp, SELF, root_objects);
+        GET_ATTR_root_objects(interp, SELF, root_objects);
         VTABLE_set_pmc_keyed_int(interp, root_objects, idx, value);
     }
 
     VTABLE void set_pmc_keyed(PMC *idx, PMC *value) {
         PMC    *root_objects;
-        GETATTR_SerializationContext_root_objects(interp, SELF, root_objects);
+        GET_ATTR_root_objects(interp, SELF, root_objects);
         VTABLE_set_pmc_keyed(interp, root_objects, idx, value);
     }
 
     METHOD INTVAL elems() {
         PMC    *root_objects;
         INTVAL elems;
-        GETATTR_SerializationContext_root_objects(interp, SELF, root_objects);
+        GET_ATTR_root_objects(interp, SELF, root_objects);
         elems = VTABLE_elements(interp, root_objects);
         RETURN (INTVAL elems);
     }
 
     METHOD STRING* handle() {
         STRING *handle;
-        GETATTR_SerializationContext_handle(interp, SELF, handle);
+        GET_ATTR_handle(interp, SELF, handle);
         RETURN (STRING* handle);
     }
 
     METHOD set_description(STRING *description) {
-        SETATTR_SerializationContext_description(interp, SELF, description);
+        SET_ATTR_description(interp, SELF, description);
         RETURN (STRING* description);
     }
 
     METHOD STRING* description() {
         STRING *description;
-        GETATTR_SerializationContext_description(interp, SELF, description);
+        GET_ATTR_description(interp, SELF, description);
         RETURN (STRING* description);
     }
 
     METHOD INTVAL slot_index_for(PMC *obj) {
         /* This is kinda stupid, but it'll do for now. */
         PMC    *root_objects;
         INTVAL  i, count;
-        GETATTR_SerializationContext_root_objects(interp, SELF, root_objects);
+        GET_ATTR_root_objects(interp, SELF, root_objects);
         count = VTABLE_elements(interp, root_objects);
         for (i = 0; i < count; i++) {
             if (VTABLE_get_pmc_keyed_int(interp, root_objects, i) == obj) {