laentropia/Arena
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor-consistency #1

Merged
laentropia merged 3 commits from refactor-consistency into main 2026-05-13 20:32:20 -06:00
Conversation 0 Commits 3 Files Changed 3 +46 -55
2 changed files with 46 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit fb832eab06 - Show all commits

4
src/arena.c
View File

@@ -51,7 +51,7 @@ ArenaErr arena_destroy(Arena **arena) {
(*arena)->buffer = NULL; (*arena)->buffer = NULL;
(*arena)->offset = 0; (*arena)->offset = 0;
(*arena)->capacity = 0; (*arena)->capacity = 0;
free(arena); free(*arena);
*arena = NULL; *arena = NULL;
return ARENA_OK; return ARENA_OK;
@@ -77,7 +77,7 @@ ArenaPointer arena_alloc(Arena *arena, size_t size, size_t alignment) {
ArenaErr cap_err = arena_ensure_capacity(arena, size, alignment); ArenaErr cap_err = arena_ensure_capacity(arena, size, alignment);
if(cap_err != ARENA_OK) { if(cap_err != ARENA_OK) {
return (ArenaPointer) {.is_valid = false, .err = cap_err}; return (ArenaPointer) {.is_valid = false, .err = ARENA_OUT_OF_SPACE};
} }
if (arena->offset + padding.val + size > arena->capacity) { if (arena->offset + padding.val + size > arena->capacity) {

97
test/test_arena.c
View File

@@ -14,23 +14,22 @@
static void test_push_3_ints(void **state) { static void test_push_3_ints(void **state) {
(void) state; (void) state;
ArenaResult value = arena_init(sizeof(int) * 3); Arena *arena;
assert_true(value.is_valid); assert_uint_equal(arena_init(&arena, sizeof(int) * 3), ARENA_OK);
Arena arena = value.arena;
int int_to_push = 20; int int_to_push = 20;
ArenaPointer result = arena_push(&arena, &int_to_push, sizeof(int), alignof(int)); ArenaPointer result = arena_push(arena, &int_to_push, sizeof(int), alignof(int));
assert_true(result.is_valid); assert_true(result.is_valid);
assert_int_equal(20, *(int*)arena_unwrap_pointer(result)); assert_int_equal(20, *(int*)arena_unwrap_pointer(result));
assert_int_equal(20, *(int*)arena_unwrap_pointer(result)); assert_int_equal(20, *(int*)arena_unwrap_pointer(result));
int_to_push = 30; int_to_push = 30;
result = arena_push(&arena, &int_to_push, sizeof(int), alignof(int)); result = arena_push(arena, &int_to_push, sizeof(int), alignof(int));
assert_true(result.is_valid); assert_true(result.is_valid);
assert_int_equal(30, *(int*)arena_unwrap_pointer(result)); assert_int_equal(30, *(int*)arena_unwrap_pointer(result));
int_to_push = 40; int_to_push = 40;
result = arena_push(&arena, &int_to_push, sizeof(int), alignof(int)); result = arena_push(arena, &int_to_push, sizeof(int), alignof(int));
assert_true(result.is_valid); assert_true(result.is_valid);
assert_int_equal(40, *(int*)arena_unwrap_pointer(result)); assert_int_equal(40, *(int*)arena_unwrap_pointer(result));
@@ -40,32 +39,34 @@ static void test_push_3_ints(void **state) {
static void test_push_3_ints_2_doubles(void **state) { static void test_push_3_ints_2_doubles(void **state) {
(void) state; (void) state;
ArenaResult value = arena_init((sizeof(int) * 3) + (sizeof(double) * 2)); Arena *arena;
assert_true(value.is_valid); assert_uint_equal(
Arena arena = value.arena; arena_init(&arena, (sizeof(int) * 3) + (sizeof(double) * 2)),
ARENA_OK
);
int int_to_push = 20; int int_to_push = 20;
ArenaPointer result = arena_push(&arena, &int_to_push, sizeof(int), alignof(int)); ArenaPointer result = arena_push(arena, &int_to_push, sizeof(int), alignof(int));
assert_true(result.is_valid); assert_true(result.is_valid);
assert_int_equal(20, *(int*)arena_unwrap_pointer(result)); assert_int_equal(20, *(int*)arena_unwrap_pointer(result));
double double_to_push = 4.57; double double_to_push = 4.57;
result = arena_push(&arena, &double_to_push, sizeof(double), alignof(double)); result = arena_push(arena, &double_to_push, sizeof(double), alignof(double));
assert_true(result.is_valid); assert_true(result.is_valid);
assert_double_equal(4.57, *(double*)arena_unwrap_pointer(result), 1e-6); assert_double_equal(4.57, *(double*)arena_unwrap_pointer(result), 1e-6);
int_to_push = 30; int_to_push = 30;
result = arena_push(&arena, &int_to_push, sizeof(int), alignof(int)); result = arena_push(arena, &int_to_push, sizeof(int), alignof(int));
assert_true(result.is_valid); assert_true(result.is_valid);
assert_int_equal(30, *(int*)arena_unwrap_pointer(result)); assert_int_equal(30, *(int*)arena_unwrap_pointer(result));
int_to_push = 40; int_to_push = 40;
result = arena_push(&arena, &int_to_push, sizeof(int), alignof(int)); result = arena_push(arena, &int_to_push, sizeof(int), alignof(int));
assert_true(result.is_valid); assert_true(result.is_valid);
assert_int_equal(40, *(int*)arena_unwrap_pointer(result)); assert_int_equal(40, *(int*)arena_unwrap_pointer(result));
double_to_push = 267.33; double_to_push = 267.33;
result = arena_push(&arena, &double_to_push, sizeof(double), alignof(double)); result = arena_push(arena, &double_to_push, sizeof(double), alignof(double));
assert_true(result.is_valid); assert_true(result.is_valid);
assert_double_equal(267.33, *(double*)arena_unwrap_pointer(result), 1e-6); assert_double_equal(267.33, *(double*)arena_unwrap_pointer(result), 1e-6);
@@ -75,19 +76,17 @@ static void test_push_3_ints_2_doubles(void **state) {
static void test_init_arena_0_cap(void **state) { static void test_init_arena_0_cap(void **state) {
(void) state; (void) state;
ArenaResult arena = arena_init(0); Arena *arena;
assert_false(arena.is_valid); assert_int_equal(arena_init(&arena, 0), ARENA_INVALID_SIZE);
assert_int_equal(arena.err, ARENA_INVALID_SIZE);
} }
static void test_arena_alloc_size_0(void **state) { static void test_arena_alloc_size_0(void **state) {
(void) state; (void) state;
ArenaResult value = arena_init(64); Arena *arena;
assert_true(value.is_valid); assert_uint_equal(arena_init(&arena, 64), ARENA_OK);
Arena arena = value.arena;
ArenaPointer pointer = arena_alloc(&arena, 0, alignof(int)); ArenaPointer pointer = arena_alloc(arena, 0, alignof(int));
assert_false(pointer.is_valid); assert_false(pointer.is_valid);
assert_int_equal(pointer.err, ARENA_INVALID_SIZE); assert_int_equal(pointer.err, ARENA_INVALID_SIZE);
@@ -97,11 +96,10 @@ static void test_arena_alloc_size_0(void **state) {
static void test_arena_alloc_size_max(void **state) { static void test_arena_alloc_size_max(void **state) {
(void) state; (void) state;
ArenaResult value = arena_init(64); Arena *arena;
assert_true(value.is_valid); assert_uint_equal(arena_init(&arena, 64), ARENA_OK);
Arena arena = value.arena;
ArenaPointer pointer = arena_alloc(&arena, SIZE_MAX, alignof(int)); ArenaPointer pointer = arena_alloc(arena, SIZE_MAX, alignof(int));
assert_false(pointer.is_valid); assert_false(pointer.is_valid);
assert_int_equal(pointer.err, ARENA_OUT_OF_SPACE); assert_int_equal(pointer.err, ARENA_OUT_OF_SPACE);
@@ -111,11 +109,10 @@ static void test_arena_alloc_size_max(void **state) {
static void test_arena_alloc_align_0(void **state) { static void test_arena_alloc_align_0(void **state) {
(void) state; (void) state;
ArenaResult value = arena_init(64); Arena *arena;
assert_true(value.is_valid); assert_uint_equal(arena_init(&arena, 64), ARENA_OK);
Arena arena = value.arena;
ArenaPointer pointer = arena_alloc(&arena, sizeof(int), 0); ArenaPointer pointer = arena_alloc(arena, sizeof(int), 0);
assert_false(pointer.is_valid); assert_false(pointer.is_valid);
assert_int_equal(pointer.err, ARENA_INVALID_ALIGN); assert_int_equal(pointer.err, ARENA_INVALID_ALIGN);
@@ -125,11 +122,10 @@ static void test_arena_alloc_align_0(void **state) {
static void test_arena_alloc_align_max(void **state) { static void test_arena_alloc_align_max(void **state) {
(void) state; (void) state;
ArenaResult value = arena_init(64); Arena *arena;
assert_true(value.is_valid); assert_uint_equal(arena_init(&arena, 64), ARENA_OK);
Arena arena = value.arena;
ArenaPointer pointer = arena_alloc(&arena, sizeof(int), SIZE_MAX); ArenaPointer pointer = arena_alloc(arena, sizeof(int), SIZE_MAX);
assert_false(pointer.is_valid); assert_false(pointer.is_valid);
assert_int_equal(pointer.err, ARENA_INVALID_ALIGN); assert_int_equal(pointer.err, ARENA_INVALID_ALIGN);
@@ -139,11 +135,10 @@ static void test_arena_alloc_align_max(void **state) {
static void test_arena_align_size_0(void **state) { static void test_arena_align_size_0(void **state) {
(void) state; (void) state;
ArenaResult value = arena_init(64); Arena *arena;
assert_true(value.is_valid); assert_uint_equal(arena_init(&arena, 64), ARENA_OK);
Arena arena = value.arena;
ArenaPointer pointer = arena_alloc(&arena, sizeof(int), 0); ArenaPointer pointer = arena_alloc(arena, sizeof(int), 0);
assert_false(pointer.is_valid); assert_false(pointer.is_valid);
assert_int_equal(pointer.err, ARENA_INVALID_ALIGN); assert_int_equal(pointer.err, ARENA_INVALID_ALIGN);
@@ -153,11 +148,10 @@ static void test_arena_align_size_0(void **state) {
static void test_arena_ensure_capacity_size_0(void **state) { static void test_arena_ensure_capacity_size_0(void **state) {
(void) state; (void) state;
ArenaResult value = arena_init(64); Arena *arena;
assert_true(value.is_valid); assert_uint_equal(arena_init(&arena, 64), ARENA_OK);
Arena arena = value.arena;
ArenaErr err = arena_ensure_capacity(&arena, 0, alignof(int)); ArenaErr err = arena_ensure_capacity(arena, 0, alignof(int));
assert_int_equal(err, ARENA_INVALID_SIZE); assert_int_equal(err, ARENA_INVALID_SIZE);
arena_destroy(&arena); arena_destroy(&arena);
@@ -166,11 +160,10 @@ static void test_arena_ensure_capacity_size_0(void **state) {
static void test_arena_ensure_capacity_size_max(void **state) { static void test_arena_ensure_capacity_size_max(void **state) {
(void) state; (void) state;
ArenaResult value = arena_init(64); Arena *arena;
assert_true(value.is_valid); assert_uint_equal(arena_init(&arena, 64), ARENA_OK);
Arena arena = value.arena;
ArenaErr err = arena_ensure_capacity(&arena, SIZE_MAX, alignof(int)); ArenaErr err = arena_ensure_capacity(arena, SIZE_MAX, alignof(int));
assert_int_equal(err, ARENA_INVALID_SIZE); assert_int_equal(err, ARENA_INVALID_SIZE);
arena_destroy(&arena); arena_destroy(&arena);
@@ -179,11 +172,10 @@ static void test_arena_ensure_capacity_size_max(void **state) {
static void test_arena_ensure_capacity_align_0(void **state) { static void test_arena_ensure_capacity_align_0(void **state) {
(void) state; (void) state;
ArenaResult value = arena_init(64); Arena *arena;
assert_true(value.is_valid); assert_uint_equal(arena_init(&arena, 64), ARENA_OK);
Arena arena = value.arena;
ArenaErr err = arena_ensure_capacity(&arena, sizeof(int), 0); ArenaErr err = arena_ensure_capacity(arena, sizeof(int), 0);
assert_int_equal(err, ARENA_INVALID_ALIGN); assert_int_equal(err, ARENA_INVALID_ALIGN);
arena_destroy(&arena); arena_destroy(&arena);
@@ -192,11 +184,10 @@ static void test_arena_ensure_capacity_align_0(void **state) {
static void test_arena_ensure_capacity_align_max(void **state) { static void test_arena_ensure_capacity_align_max(void **state) {
(void) state; (void) state;
ArenaResult value = arena_init(64); Arena *arena;
assert_true(value.is_valid); assert_uint_equal(arena_init(&arena, 64), ARENA_OK);
Arena arena = value.arena;
ArenaErr err = arena_ensure_capacity(&arena, sizeof(int), SIZE_MAX); ArenaErr err = arena_ensure_capacity(arena, sizeof(int), SIZE_MAX);
assert_int_equal(err, ARENA_INVALID_ALIGN); assert_int_equal(err, ARENA_INVALID_ALIGN);
arena_destroy(&arena); arena_destroy(&arena);