diff options
Diffstat (limited to 'vec.c')
| -rw-r--r-- | vec.c | 17 |
1 files changed, 9 insertions, 8 deletions
@@ -4,14 +4,14 @@ #include "types.h" #include "vec.h" -Vec *_Vec_new(Arena *a, size tsize, size cap, size align) { +Vec _Vec_new(Arena *a, size tsize, size cap, size align) { assert(cap > 0); - Vec *v = new(a, Vec, 1); - v->tsize = tsize; - v->cap = cap; - v->align = align; - v->len = 0; - v->data = alloc(a, cap, tsize, align); + Vec v = {0}; + v.tsize = tsize; + v.cap = cap; + v.align = align; + v.len = 0; + v.data = alloc(a, cap, tsize, align); return v; } @@ -20,9 +20,10 @@ void Vec_push(Arena *a, Vec *v, void *data) { void *cpy = alloc(a, v->cap * 2, v->tsize, v->align); memcpy(cpy, v->data, v->len * v->tsize); v->cap *= 2; + v->data = cpy; } memcpy(v->data + v->len * v->tsize, data, v->tsize); v->len++; } -void *_Vec_get(Vec *v, size pos) { return v->data + v->tsize * pos; } +void *_Vec_get(Vec v, size pos) { return v.data + v.tsize * pos; } |
