Conner Hoessly

arrays/arrays.c

@@ -21,23 +21,31 @@ typedef struct Array {
  *****/
 Array *create_array (int capacity) {
   // Allocate memory for the Array struct
-
+  Array *newArr = malloc(sizeof(Array)); 
   // Set initial values for capacity and count
-
+  newArr->capacity = capacity;
+  newArr->count = 0;
   // Allocate memory for elements
-
+  newArr->elements = malloc(capacity * sizeof(char *));
+  return newArr;
 }
 
 
 /*****
  * Free memory for an array and all of its stored elements
  *****/
 void destroy_array(Array *arr) {
-
   // Free all elements
 
-  // Free array
+  for(int i = 0; i < arr->count; i++) {
+    if (arr->elements[i] != '\0'){
+      free(arr->elements[i]);
+    }
+  };
 
+  free(arr->elements);
+  // Free array
+  free(arr);
 }
 
 /*****
@@ -47,13 +55,17 @@ void destroy_array(Array *arr) {
 void resize_array(Array *arr) {
 
   // Create a new element storage with double capacity
-
+  arr->capacity *= 2;
+  int **newStorage = malloc(arr->capacity * sizeof(char *));
   // Copy elements into the new storage
+  for(int i = 0; i < arr->count; i++) {
+    newStorage[i] = strdup(arr->elements[i]);
+  }
 
   // Free the old elements array (but NOT the strings they point to)
-
+  free(arr->elements);
   // Update the elements and capacity to new values
-
+  arr->elements = newStorage;
 }
 
 
@@ -72,8 +84,13 @@ void resize_array(Array *arr) {
 char *arr_read(Array *arr, int index) {
 
   // Throw an error if the index is greater or equal to than the current count
+  if(index >= arr->count) {
+    fprintf(stderr, "Index out of range: %d\n", index);
+    exit(0);
+  } 
+    // Otherwise, return the element at the given index
+  return arr->elements[index];
 
-  // Otherwise, return the element at the given index
 }
 
 
@@ -83,14 +100,29 @@ char *arr_read(Array *arr, 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: %d\n", index);
+    exit(0);
+  }
 
   // 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
-
-  // Copy the element and add it to the array
-
-  // Increment count by 1
+   if (arr->count == 0) {
+    arr_append(arr, element);
+  } else {
+    for(int i = arr->count; i > index; i-- ) {
+      arr->elements[i] = arr->elements[i - 1]; 
+    };
+    // Copy the element and add it to the array
+    char *newElement = strdup(element);
+    arr->elements[index] = newElement;
+
+    arr->count += 1;
+  };
 
 }
 
@@ -101,31 +133,55 @@ 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->capacity <= arr->count ) {
+    resize_array(arr);
+  } else {
+    printf("resize not needed yet");
+  }
   // Copy the element and add it to the end of the array
-
+  char *newElement = strdup(element);
+  arr->elements[arr->count] = newElement;
   // Increment count by 1
-
+  arr->count += 1;
 }
 
+
 /*****
  * Remove the first occurence of the given element from the array,
  * then shift every element after that occurence to the left one slot.
  *
  * Throw an error if the value is not found.
  *****/
 void arr_remove(Array *arr, char *element) {
+
+  int found;
 
   // Search for the first occurence of the element and remove it.
   // Don't forget to free its memory!
+  for(int i = 0; i < arr->count; i++){
+    if(strcmp(arr->elements[i], element) == 0){
+      arr->elements[i] = NULL;
+      free(arr->elements[i]);
+      found = i;
+    };  
+  };
 
   // Shift over every element after the removed element to the left one position
 
-  // Decrement count by 1
+  for (found; found < arr->count; found++){
+      if (found == arr->count - 1) {
+        arr->elements[found] = '\0';
+        continue;
+    }
+    arr->elements[found + 1] = arr->elements[found];  
+  };
 
+  // Decrement count by 1
+  arr->count -= 1;
 }
 
 
+
 /*****
  * Utility function to print an array.
  *****/