refactor: arena uses Allocator

src/lae_arena.c

@@ -10,9 +10,11 @@ struct Arena {
     uint8_t *buffer;
     size_t capacity;
     size_t offset;
+
+    Allocator allocator;
 };
 
-ArenaErr arena_init(Arena **arena, size_t capacity) {
+ArenaErr arena_init(Arena **arena, Allocator allocator, size_t capacity) {
     if (arena == NULL) {
         return ARENA_NULL_ARG;
     }
@@ -21,13 +23,14 @@ ArenaErr arena_init(Arena **arena, size_t capacity) {
         return ARENA_INVALID_SIZE;
     }
 
-    Arena *new_arena = malloc(sizeof(Arena));
+    Arena *new_arena = allocator.alloc(allocator.ctx, sizeof(Arena));
     if (new_arena == NULL) {
         return ARENA_BAD_ALLOC;
     }
 
-    void *buffer = malloc(capacity);
+    void *buffer = allocator.alloc(allocator.ctx, capacity);
     if (buffer == NULL) {
+        allocator.free(allocator.ctx, new_arena, capacity);
         return ARENA_BAD_ALLOC;
     }
 
@@ -35,6 +38,7 @@ ArenaErr arena_init(Arena **arena, size_t capacity) {
         .buffer = buffer,
         .capacity = capacity,
         .offset = 0,
+        .allocator = allocator,
     };
 
     *arena = new_arena;
@@ -47,11 +51,12 @@ ArenaErr arena_destroy(Arena **arena) {
         return ARENA_NULL_ARG;
     }
 
-    free((*arena)->buffer);
-    (*arena)->buffer = NULL;
-    (*arena)->offset = 0;
-    (*arena)->capacity = 0;
-    free(*arena);
+    Arena *tmp = *arena;
+    tmp->allocator.free(tmp->allocator.ctx, tmp->buffer, tmp->capacity);
+    tmp->buffer = NULL;
+    tmp->offset = 0;
+    tmp->capacity = 0;
+    tmp->allocator.free(tmp->allocator.ctx, *arena, sizeof(Arena));
     *arena = NULL;
 
     return ARENA_OK;
@@ -146,7 +151,7 @@ ArenaErr arena_ensure_capacity(Arena *arena, size_t size, size_t alignment) {
             new_capacity = required;
         }
 
-        ArenaErr err = arena_realloc(arena, new_capacity);
+        ArenaErr err = arena_resize(arena, new_capacity);
         if (err != ARENA_OK) {
             return err;
         }
@@ -154,7 +159,7 @@ ArenaErr arena_ensure_capacity(Arena *arena, size_t size, size_t alignment) {
 }
 
 ArenaPointer
-arena_push(Arena *arena, void *data, size_t size, size_t alignment) {
+arena_push_data(Arena *arena, void *data, size_t size, size_t alignment) {
     if (arena == NULL || data == NULL) {
         return (ArenaPointer){.is_valid = false, .err = ARENA_NULL_ARG};
     }
@@ -182,7 +187,7 @@ arena_push(Arena *arena, void *data, size_t size, size_t alignment) {
     return pointer;
 }
 
-ArenaErr arena_realloc(Arena *arena, size_t new_capacity) {
+ArenaErr arena_resize(Arena *arena, size_t new_capacity) {
     if (arena == NULL) {
         return ARENA_NULL_ARG;
     }
@@ -191,7 +196,11 @@ ArenaErr arena_realloc(Arena *arena, size_t new_capacity) {
         return ARENA_INVALID_SIZE;
     }
 
-    uint8_t *tmp = realloc(arena->buffer, new_capacity);
+    uint8_t *tmp = arena->allocator.realloc(
+        arena->allocator.ctx,
+        arena->buffer,
+        arena->capacity,
+        new_capacity);
     if (tmp == NULL) {
         return ARENA_BAD_ALLOC;
     }