From c51fd33b504655f82625a27f5d5b6d0d668bd860 Mon Sep 17 00:00:00 2001 From: Mineplay Date: Thu, 24 Apr 2025 18:26:33 -0500 Subject: [PATCH] feat(dynamic array): implemented insert before value function for dynamic array --- Include/Fledasty/Core/DynamicArray.h | 6 ++++- Include/Fledasty/Core/Queue.h | 3 ++- Include/Fledasty/Core/Stack.h | 3 ++- Include/Fledasty/Utils/Error.h | 1 + Src/Core/DynamicArray.c | 37 +++++++++++++++++++++++++++- Tests/Main.c | 8 ++++++ 6 files changed, 54 insertions(+), 4 deletions(-) diff --git a/Include/Fledasty/Core/DynamicArray.h b/Include/Fledasty/Core/DynamicArray.h index ccac3cd..e8e7ebc 100644 --- a/Include/Fledasty/Core/DynamicArray.h +++ b/Include/Fledasty/Core/DynamicArray.h @@ -25,6 +25,7 @@ #define FLEDASTY_DYNAMIC_ARRAY #include +#include #include "../Utils/Error.h" @@ -40,7 +41,10 @@ FledastyError fledasty_dynamic_array_destroy(FledastyDynamicArray *current_dynam FledastyError fledasty_dynamic_array_append(FledastyDynamicArray *current_dynamic_array, void *value); FledastyError fledasty_dynamic_array_insert_at_index(FledastyDynamicArray *current_dynamic_array, const size_t index, void *value); +FledastyError fledasty_dynamic_array_insert_before_value(FledastyDynamicArray *current_dynamic_array, void *before_value, void *value); -void *fledasty_dynamic_array_get(FledastyDynamicArray *current_dynamic_array, const size_t index); +void *fledasty_dynamic_array_get(const FledastyDynamicArray *current_dynamic_array, const size_t index); + +inline static bool fledasty_dynamic_array_is_empty(const FledastyDynamicArray *current_dynamic_array) { return current_dynamic_array->size == 0; } #endif \ No newline at end of file diff --git a/Include/Fledasty/Core/Queue.h b/Include/Fledasty/Core/Queue.h index 2775230..d4919a6 100644 --- a/Include/Fledasty/Core/Queue.h +++ b/Include/Fledasty/Core/Queue.h @@ -24,6 +24,7 @@ #define FLEDASTY_QUEUE #include +#include #include "../Utils/Error.h" @@ -42,6 +43,6 @@ FledastyError fledasty_queue_push(FledastyQueue *current_queue, void *value); void *fledasty_queue_peek(const FledastyQueue *current_queue); void *fledasty_queue_pop(FledastyQueue *current_queue); -static inline size_t fledasty_queue_is_empty(const FledastyQueue *current_queue) { return current_queue->size == 0; } +static inline bool fledasty_queue_is_empty(const FledastyQueue *current_queue) { return current_queue->size == 0; } #endif \ No newline at end of file diff --git a/Include/Fledasty/Core/Stack.h b/Include/Fledasty/Core/Stack.h index fc0d237..da54a65 100644 --- a/Include/Fledasty/Core/Stack.h +++ b/Include/Fledasty/Core/Stack.h @@ -24,6 +24,7 @@ #define FLEDASTY_STACK #include +#include #include "../Utils/Error.h" @@ -41,6 +42,6 @@ FledastyError fledasty_stack_push(FledastyStack *current_stack, void *value); void *fledasty_stack_peek(const FledastyStack *current_stack); void *fledasty_stack_pop(FledastyStack *current_stack); -static inline size_t fledasty_stack_is_empty(const FledastyStack *current_stack) { return current_stack->size == 0; } +static inline bool fledasty_stack_is_empty(const FledastyStack *current_stack) { return current_stack->size == 0; } #endif \ No newline at end of file diff --git a/Include/Fledasty/Utils/Error.h b/Include/Fledasty/Utils/Error.h index b1b545c..0e955ef 100644 --- a/Include/Fledasty/Utils/Error.h +++ b/Include/Fledasty/Utils/Error.h @@ -28,6 +28,7 @@ typedef enum { FLEDASTY_ERROR_FAILED_ALLOCATION = 1, FLEDASTY_ERROR_INVALID_POINTER = 2, FLEDASTY_ERROR_INDEX_OUT_OF_RANGE = 3, + FLEDASTY_ERROR_VALUE_NOT_FOUND = 4, } FledastyError; #endif \ No newline at end of file diff --git a/Src/Core/DynamicArray.c b/Src/Core/DynamicArray.c index 6c1ab8e..5fc324a 100644 --- a/Src/Core/DynamicArray.c +++ b/Src/Core/DynamicArray.c @@ -98,6 +98,10 @@ FledastyError fledasty_dynamic_array_insert_at_index(FledastyDynamicArray *curre if (current_dynamic_array->size == current_dynamic_array->capacity) { current_dynamic_array->capacity += current_dynamic_array->capacity; current_dynamic_array->buffer = (unsigned char*)hallocy_realloc(current_dynamic_array->buffer, current_dynamic_array->capacity * current_dynamic_array->element_byte_size); + + if (current_dynamic_array->buffer == NULL) { + return FLEDASTY_ERROR_FAILED_ALLOCATION; + } } unsigned char *insert_pointer = current_dynamic_array->buffer + (index * current_dynamic_array->element_byte_size); @@ -108,7 +112,38 @@ FledastyError fledasty_dynamic_array_insert_at_index(FledastyDynamicArray *curre return FLEDASTY_ERROR_NONE; } -void *fledasty_dynamic_array_get(FledastyDynamicArray *current_dynamic_array, const size_t index) { +FledastyError fledasty_dynamic_array_insert_before_value(FledastyDynamicArray *current_dynamic_array, void *before_value, void *value) { + if (current_dynamic_array == NULL || before_value == NULL || value == NULL) { + return FLEDASTY_ERROR_INVALID_POINTER; + } + + size_t byte_index = 0; + size_t byte_size = current_dynamic_array->size * current_dynamic_array->element_byte_size; + while (byte_index < byte_size && !hallocy_compare_memory(current_dynamic_array->buffer + byte_index, before_value, current_dynamic_array->element_byte_size)) { + byte_index += current_dynamic_array->element_byte_size; + } + + if (byte_index == byte_size) { + return FLEDASTY_ERROR_VALUE_NOT_FOUND; + } + + if (current_dynamic_array->size == current_dynamic_array->capacity) { + current_dynamic_array->capacity += current_dynamic_array->capacity; + current_dynamic_array->buffer = (unsigned char*)hallocy_realloc(current_dynamic_array->buffer, current_dynamic_array->capacity * current_dynamic_array->element_byte_size); + + if (current_dynamic_array->buffer == NULL) { + return FLEDASTY_ERROR_FAILED_ALLOCATION; + } + } + + hallocy_move_memory(current_dynamic_array->buffer + (byte_index + current_dynamic_array->element_byte_size), current_dynamic_array->buffer + byte_index, byte_size - byte_index); + hallocy_copy_memory(current_dynamic_array->buffer + byte_index, value, current_dynamic_array->element_byte_size); + current_dynamic_array->size += 1; + + return FLEDASTY_ERROR_NONE; +} + +void *fledasty_dynamic_array_get(const FledastyDynamicArray *current_dynamic_array, const size_t index) { if (current_dynamic_array == NULL || index >= current_dynamic_array->size) { return NULL; } diff --git a/Tests/Main.c b/Tests/Main.c index 042beed..d7e7da7 100644 --- a/Tests/Main.c +++ b/Tests/Main.c @@ -76,11 +76,19 @@ int main() { int insert_value = 18; fledasty_dynamic_array_insert_at_index(&test_dynamic_array, 1, &insert_value); + insert_value = 35; + int before_value = 11; + fledasty_dynamic_array_insert_before_value(&test_dynamic_array, &before_value, &insert_value); + for (int i = 0; i < test_dynamic_array.size; i += 1) { int *dynamic_array_data = (int*)fledasty_dynamic_array_get(&test_dynamic_array, i); printf("Dynamic array get: %d\n", *dynamic_array_data); } + if (fledasty_dynamic_array_is_empty(&test_dynamic_array)) { + printf("Dynamic array is empty\n"); + } + fledasty_dynamic_array_destroy(&test_dynamic_array); printf("Done\n"); return 0;