Arrays - Evan Carlstrom

arrays/arrays.c

@@ -9,6 +9,7 @@ typedef struct Array {
   char **elements;  // The string elements contained in the array
 } Array;
 
+/* initial commit, re-watching first part of video due to this morning's power outage */
 
 /************************************
  *
@@ -21,11 +22,15 @@ typedef struct Array {
  *****/
 Array *create_array (int capacity) {
   // Allocate memory for the Array struct
-
+  Array *arr = malloc(sizeof(Array));
   // Set initial values for capacity and count
-
+  /* using arrow to retrieve the structure member as per last week's questions */
+  arr->capacity = capacity;
+  arr->count = 0; /* initialize counter to 0 as normal */
   // Allocate memory for elements
+  arr->elements = calloc(capacity, sizeof(char *));
 
+  return arr;
 }
 
 
@@ -35,9 +40,9 @@ Array *create_array (int capacity) {
 void destroy_array(Array *arr) {
 
   // Free all elements
-
+  free(arr->elements);
   // Free array
-
+  free(arr);
 }
 
 /*****
@@ -72,8 +77,14 @@ void resize_array(Array *arr) {
 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.\n");
+    exit(0);
+  }
   // Otherwise, return the element at the given index
+  else {
+    return arr->elements[index]; /* not sure this else is necessary, can probably just do return outside of any inner block */
+  }
 }
 
 
@@ -101,11 +112,15 @@ 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.
-
+  /* will redo this with resizing when resize_array has been completed */
+  if(arr->capacity == arr->count) {
+    fprintf(stderr, "Array is full! Please free some space.\n");
+    exit(1);
+  }
   // Copy the element and add it to the end of the array
-
+  arr->elements[arr->count] = element;
   // Increment count by 1
-
+  arr->count++;
 }
 
 /*****

arrays/tests/arrays_tests.c

@@ -79,4 +79,4 @@ char *all_tests()
     return NULL;
 }
 
-RUN_TESTS(all_tests);
+RUN_TESTS(day_1_array_tests);