diff --git a/arrays/arrays.c b/arrays/arrays.c index 48c23e7..021e974 100644 --- a/arrays/arrays.c +++ b/arrays/arrays.c @@ -3,13 +3,13 @@ #include #include -typedef struct Array { - int capacity; // How many elements can this array hold? - int count; // How many states does the array currently hold? - char **elements; // The string elements contained in the array +typedef struct Array +{ + int capacity; // How many elements can this array hold? + int count; // How many states does the array currently hold? + char **elements; // The string elements contained in the array } Array; - /************************************ * * CREATE, DESTROY, RESIZE FUNCTIONS @@ -19,45 +19,66 @@ typedef struct Array { /***** * Allocate memory for a new array *****/ -Array *create_array (int capacity) { +Array *create_array(int capacity) +{ // Allocate memory for the Array struct + Array *newArray = malloc(sizeof(Array)); // Set initial values for capacity and count - + newArray->capacity = capacity; + newArray->count = 0; // Allocate memory for elements + newArray->elements = calloc(capacity, sizeof(char *)); + return newArray; } - /***** * Free memory for an array and all of its stored elements *****/ -void destroy_array(Array *arr) { +void destroy_array(Array *arr) +{ // Free all elements + if (arr->elements != NULL) + { + free(arr->elements); + } // Free array - + if (arr != NULL) + { + free(arr); + } } /***** * Create a new elements array with double capacity and copy elements * from old to new *****/ -void resize_array(Array *arr) { +void resize_array(Array *arr) +{ // Create a new element storage with double capacity + char **doubleCapacity = calloc((arr->capacity * 2), sizeof(char *)); // Copy elements into the new storage + for (int i = 0; i < arr->count; i++) + { + doubleCapacity[i] = arr->elements[i]; + } // Free the old elements array (but NOT the strings they point to) + if (arr->elements != NULL) + { + free(arr->elements); + } // Update the elements and capacity to new values - + arr->elements = doubleCapacity; // set elements array with newly, expanded array + arr->capacity *= 2; } - - /************************************ * * ARRAY FUNCTIONS @@ -69,43 +90,70 @@ void resize_array(Array *arr) { * * Throw an error if the index is out of range. *****/ -char *arr_read(Array *arr, int index) { +char *arr_read(Array *arr, int index) +{ // Throw an error if the index is greater than the current count - + if (index > arr->count) + { + fprintf(stderr, "Index, out of range"); + exit(1); + } // Otherwise, return the element at the given index + return arr->elements[index]; } - /***** * Insert an element to the array at the given index *****/ -void arr_insert(Array *arr, char *element, int index) { +void arr_insert(Array *arr, char *element, int index) +{ // Throw an error if the index is greater than the current count + if (index > arr->count) + { + fprintf(stderr, "Index out of range"); + exit(1); + } // Resize the array if the number of elements is over capacity + if (arr->count >= arr->capacity) + { + resize_array(arr); + } // Move every element after the insert index to the right one position + for (int i = arr->count; i > index; i--) + { + arr->elements[i] = arr->elements[i - 1]; // repointing the new address to previous element's address + } // Copy the element and add it to the array + char *new_element = element; + arr->elements[index] = new_element; // Increment count by 1 - + arr->count += 1; } /***** * Append an element to the end of the array *****/ -void arr_append(Array *arr, char *element) { +void arr_append(Array *arr, char *element) +{ // Resize the array if the number of elements is over capacity // or throw an error if resize isn't implemented yet. + if (arr->count >= arr->capacity) + { + resize_array(arr); + } // Copy the element and add it to the end of the array + arr->elements[arr->count] = element; // Increment count by 1 - + arr->count++; } /***** @@ -114,33 +162,56 @@ void arr_append(Array *arr, char *element) { * * Throw an error if the value is not found. *****/ -void arr_remove(Array *arr, char *element) { - - // Search for the first occurence of the element and remove it. +void arr_remove(Array *arr, char *element) +{ + int found; + for (int i = 0; i < arr->count; i++) + { // loop over to find matching element + if (arr->elements[i] == element) + { + found = i; + arr->elements[i] = NULL; // WITHOUT -> ERROR: 0x1063a9fa8: pointer being freed was not allocated + // Don't forget to free its memory! + free(arr->elements[i]); + + // Shift over every element after the removed element to the left one position + for (int j = found; j < arr->count; j++) + { + arr->elements[j] = arr->elements[j + 1]; + } + arr->count--; + break; + } + else if (i == arr->count) + { + fprintf(stderr, "Value is not found."); + exit(1); + } + } // Don't forget to free its memory! // Shift over every element after the removed element to the left one position // Decrement count by 1 - } - /***** * Utility function to print an array. *****/ -void arr_print(Array *arr) { +void arr_print(Array *arr) +{ printf("["); - for (int i = 0 ; i < arr->count ; i++) { + for (int i = 0; i < arr->count; i++) + { printf("%s", arr->elements[i]); - if (i != arr->count - 1) { + if (i != arr->count - 1) + { printf(","); } } printf("]\n"); } - #ifndef TESTING int main(void) {