diff --git a/Include/Fledasty/Core/DynamicArray.h b/Include/Fledasty/Core/DynamicArray.h index 668f5d5..ccac3cd 100644 --- a/Include/Fledasty/Core/DynamicArray.h +++ b/Include/Fledasty/Core/DynamicArray.h @@ -41,4 +41,6 @@ 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); +void *fledasty_dynamic_array_get(FledastyDynamicArray *current_dynamic_array, const size_t index); + #endif \ No newline at end of file diff --git a/Src/Core/DynamicArray.c b/Src/Core/DynamicArray.c index 7b9e2cb..6c1ab8e 100644 --- a/Src/Core/DynamicArray.c +++ b/Src/Core/DynamicArray.c @@ -101,8 +101,17 @@ FledastyError fledasty_dynamic_array_insert_at_index(FledastyDynamicArray *curre } unsigned char *insert_pointer = current_dynamic_array->buffer + (index * current_dynamic_array->element_byte_size); - hallocy_move_memory(insert_pointer, insert_pointer + current_dynamic_array->element_byte_size, (current_dynamic_array->size - index) * current_dynamic_array->element_byte_size); + hallocy_move_memory(insert_pointer + current_dynamic_array->element_byte_size, insert_pointer, (current_dynamic_array->size - index) * current_dynamic_array->element_byte_size); hallocy_copy_memory(insert_pointer, value, current_dynamic_array->element_byte_size); + current_dynamic_array->size += 1; return FLEDASTY_ERROR_NONE; +} + +void *fledasty_dynamic_array_get(FledastyDynamicArray *current_dynamic_array, const size_t index) { + if (current_dynamic_array == NULL || index >= current_dynamic_array->size) { + return NULL; + } + + return current_dynamic_array->buffer + (index * current_dynamic_array->element_byte_size); } \ No newline at end of file diff --git a/Tests/Main.c b/Tests/Main.c index b3f1792..042beed 100644 --- a/Tests/Main.c +++ b/Tests/Main.c @@ -33,11 +33,11 @@ int main() { } int *peeked_queue_data = (int*)fledasty_queue_peek(&test_queue); - printf("Peeked: %d\n", *peeked_queue_data); + printf("Queue peeked: %d\n", *peeked_queue_data); for (int i = test_queue.size; i > 0; i -= 1) { int *popped_data = (int*)fledasty_queue_pop(&test_queue); - printf("Popped: %d\n", *popped_data); + printf("Queue popped: %d\n", *popped_data); } if (fledasty_queue_is_empty(&test_queue)) { @@ -54,11 +54,11 @@ int main() { } int *peeked_stack_data = (int*)fledasty_stack_peek(&test_stack); - printf("Peeked: %d\n", *peeked_stack_data); + printf("Stack peeked: %d\n", *peeked_stack_data); for (int i = test_stack.size; i > 0; i -= 1) { int *popped_data = (int*)fledasty_stack_pop(&test_stack); - printf("Popped: %d\n", *popped_data); + printf("Stack popped: %d\n", *popped_data); } if (fledasty_stack_is_empty(&test_stack)) { @@ -76,6 +76,11 @@ int main() { int insert_value = 18; fledasty_dynamic_array_insert_at_index(&test_dynamic_array, 1, &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); + } + fledasty_dynamic_array_destroy(&test_dynamic_array); printf("Done\n"); return 0;