diff --git a/Include/Fledasty/Core/DynamicArray.h b/Include/Fledasty/Core/DynamicArray.h index e8e7ebc..8f5028b 100644 --- a/Include/Fledasty/Core/DynamicArray.h +++ b/Include/Fledasty/Core/DynamicArray.h @@ -40,8 +40,10 @@ FledastyError fledasty_dynamic_array_initialize(FledastyDynamicArray *new_dynami FledastyError fledasty_dynamic_array_destroy(FledastyDynamicArray *current_dynamic_array); 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); +FledastyError fledasty_dynamic_array_insert_after_value(FledastyDynamicArray *current_dynamic_array, void *after_value, void *value); void *fledasty_dynamic_array_get(const FledastyDynamicArray *current_dynamic_array, const size_t index); diff --git a/Src/Core/DynamicArray.c b/Src/Core/DynamicArray.c index 5fc324a..308d86c 100644 --- a/Src/Core/DynamicArray.c +++ b/Src/Core/DynamicArray.c @@ -143,6 +143,38 @@ FledastyError fledasty_dynamic_array_insert_before_value(FledastyDynamicArray *c return FLEDASTY_ERROR_NONE; } +FledastyError fledasty_dynamic_array_insert_after_value(FledastyDynamicArray *current_dynamic_array, void *after_value, void *value) { + if (current_dynamic_array == NULL || after_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, after_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; + } + } + + byte_index += current_dynamic_array->element_byte_size; + 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 d7e7da7..b30b229 100644 --- a/Tests/Main.c +++ b/Tests/Main.c @@ -77,8 +77,11 @@ int main() { 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); + int insert_at_value = 11; + fledasty_dynamic_array_insert_before_value(&test_dynamic_array, &insert_at_value, &insert_value); + insert_value = 90; + insert_at_value = 35; + fledasty_dynamic_array_insert_after_value(&test_dynamic_array, &insert_at_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);