From e5b96f7555634de5e3b62d4df1a0a0d1a21799b9 Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Sat, 17 Oct 2015 20:00:46 -0700 Subject: Use chk_manage_vec for static slots arrays. * struct.c (make_struct_type): Use chk_manage_vec for initial allocation of static slot array. (static_slot_ensure): Use chk_manage_vec to grow the array when adding a slot. The function will automatically double the array in power of two step sizes. --- struct.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'struct.c') diff --git a/struct.c b/struct.c index 62a2885b..87f1ebb7 100644 --- a/struct.c +++ b/struct.c @@ -225,6 +225,7 @@ val make_struct_type(val name, val super, val id = num_fast(++struct_id_counter); val iter; cnum sl, stsl; + val nullptr = 0; st->name = name; st->id = c_num(id); @@ -261,7 +262,8 @@ val make_struct_type(val name, val super, } stsl -= STATIC_SLOT_BASE; - st->stslot = coerce(val *, chk_calloc(stsl, sizeof *st->stslot)); + st->stslot = coerce(val *, chk_manage_vec(0, 0, stsl, sizeof (val), + coerce(mem_t *, &nullptr))); st->nslots = sl; st->nstslots = stsl; @@ -689,9 +691,10 @@ val static_slot_ensure(val stype, val sym, val newval, val no_error_p) uw_throwf(error_s, lit("~a: ~s is an instance slot of ~s"), self, sym, stype, nao); - st->stslot = coerce(val *, chk_realloc(coerce(mem_t *, st->stslot), - sizeof *st->stslot * (st->nstslots + 1))); - st->stslot[st->nstslots] = newval; + st->stslot = coerce(val *, chk_manage_vec(coerce(mem_t *, st->stslot), + st->nstslots, st->nstslots + 1, + sizeof (val), + coerce(mem_t *, &newval))); set(mkloc(st->slots, stype), append2(st->slots, cons(sym, nil))); sethash(slot_hash, cons(sym, num_fast(st->id)), num(st->nstslots++ + STATIC_SLOT_BASE)); -- cgit v1.2.3