diff --git a/include/types.h b/include/types.h index 759fb37..22ceafb 100644 --- a/include/types.h +++ b/include/types.h @@ -13,16 +13,21 @@ typedef struct { size_t count; size_t capacity; int* items; -} lsort_int_array; +} lsort_array_i; -lsort_int_array* lsort_create_int_array(); -void lsort_int_array_append(lsort_int_array* array, int number); -int lsort_int_array_swap(lsort_int_array* array, int indexA, int indexB); +lsort_array_i* lsort_create_int_array(); +void lsort_array_i_append(lsort_array_i* array, int number); +int lsort_array_i_swap(lsort_array_i* array, int indexA, int indexB); +typedef struct { + size_t count; + size_t capacity; + lsort_array_i** items; +} lsort_array_i_array; // struct lsort_int_link { // int value; -// lsort_int_array* next; +// lsort_array_i* next; // }; diff --git a/test/test.c b/test/test.c index 29cb4b4..336191b 100644 --- a/test/test.c +++ b/test/test.c @@ -1,23 +1,23 @@ #include "../include/types.h" -int test_int_array_append(lsort_int_array* array) { +int test_array_i_append(lsort_array_i* array) { - lsort_int_array_append(array, 25); - lsort_int_array_append(array, 64); - lsort_int_array_append(array, 34); - lsort_int_array_append(array, 74); - lsort_int_array_append(array, 99); - lsort_int_array_append(array, 23); + lsort_array_i_append(array, 25); + lsort_array_i_append(array, 64); + lsort_array_i_append(array, 34); + lsort_array_i_append(array, 74); + lsort_array_i_append(array, 99); + lsort_array_i_append(array, 23); if (array->items[5] != 23) return 1; return 0; } -int test_int_array_swap(lsort_int_array* array) { - lsort_int_array_swap(array, 0, 5); - lsort_int_array_swap(array, 4, 2); - lsort_int_array_swap(array, 2, 3); +int test_array_i_swap(lsort_array_i* array) { + lsort_array_i_swap(array, 0, 5); + lsort_array_i_swap(array, 4, 2); + lsort_array_i_swap(array, 2, 3); if (array->items[0] != 23 || array->items[5] != 25 || array->items[4] != 34 || array->items[2] != 74 || array->items[3] != 99) return 1; @@ -25,10 +25,10 @@ int test_int_array_swap(lsort_int_array* array) { } int main(void) { - lsort_int_array array = {0}; + lsort_array_i array = {0}; - if (test_int_array_append(&array)) return 1; - if (test_int_array_swap(&array)) return 2; + if (test_array_i_append(&array)) return 1; + if (test_array_i_swap(&array)) return 2; return 0; } diff --git a/types.c b/types.c index 13a4148..556b744 100644 --- a/types.c +++ b/types.c @@ -1,7 +1,7 @@ #include "include/types.h" #include -void lsort_int_array_append(lsort_int_array* array, int item) { +void lsort_array_i_append(lsort_array_i* array, int item) { if (array->count >= array->capacity) { if (array->capacity == 0) array->capacity = 8; else array->capacity *= 2; @@ -11,11 +11,11 @@ void lsort_int_array_append(lsort_int_array* array, int item) { array->items[array->count++] = item; } -int lsort_int_array_swap(lsort_int_array* array, int indexA, int indexB) { +int lsort_array_i_swap(lsort_array_i* array, int indexA, int indexB) { if (indexA > array->count - 1 || indexB > array->count - 1) return 1; int temp = array->items[indexA]; array->items[indexA] = array->items[indexB]; array->items[indexB] = temp; - + return 0; } \ No newline at end of file