From 16d4699b6ba33685f1318636ffe4990c7db4fdc6 Mon Sep 17 00:00:00 2001 From: Marius Vollmer Date: Sun, 25 Nov 2001 15:21:07 +0000 Subject: Replaced SCM_NEWCELL and SCM_NEWCELL2 with scm_alloc_cell and scm_alloc_double_cell, respectively. --- libguile/goops.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) (limited to 'libguile/goops.c') diff --git a/libguile/goops.c b/libguile/goops.c index b813dad05..305f577b3 100644 --- a/libguile/goops.c +++ b/libguile/goops.c @@ -1301,20 +1301,15 @@ static void clear_method_cache (SCM); static SCM wrap_init (SCM class, SCM *m, long n) { - SCM z; long i; /* Set all slots to unbound */ for (i = 0; i < n; i++) m[i] = SCM_GOOPS_UNBOUND; - SCM_NEWCELL2 (z); - SCM_SET_STRUCT_GC_CHAIN (z, 0); - SCM_SET_CELL_WORD_1 (z, m); - SCM_SET_CELL_WORD_0 (z, (scm_t_bits) SCM_STRUCT_DATA (class) - | scm_tc3_struct); - - return z; + return scm_alloc_double_cell ((((scm_t_bits) SCM_STRUCT_DATA (class)) + | scm_tc3_struct), + (scm_t_bits) m, 0, 0); } SCM_DEFINE (scm_sys_allocate_instance, "%allocate-instance", 2, 0, 0, @@ -2589,12 +2584,9 @@ scm_add_slot (SCM class, char *slot_name, SCM slot_class, SCM scm_wrap_object (SCM class, void *data) { - SCM z; - SCM_NEWCELL2 (z); - SCM_SETCDR (z, SCM_PACK ((scm_t_bits) data)); - SCM_SET_STRUCT_GC_CHAIN (z, 0); - SCM_SETCAR (z, SCM_UNPACK (SCM_CDR (class)) | scm_tc3_struct); - return z; + return scm_alloc_double_cell (SCM_UNPACK (SCM_CDR (class)) | scm_tc3_struct, + (scm_t_bits) data, + 0, 0); } SCM scm_components; -- cgit v1.2.3