diff options
| -rw-r--r-- | include/moslib/ds/array.h | 20 | ||||
| -rw-r--r-- | src/ds/array.c | 4 | ||||
| -rw-r--r-- | tests/ds/array_tests.c | 12 |
3 files changed, 18 insertions, 18 deletions
diff --git a/include/moslib/ds/array.h b/include/moslib/ds/array.h index 8f080a3..8f76901 100644 --- a/include/moslib/ds/array.h +++ b/include/moslib/ds/array.h @@ -95,10 +95,10 @@ // // It works the same way but deleted n consecutive items instead of 1. // -// You can also remove from the front or the back: +// You can also remove from the left or the right: // -// size_t deleted = arr_del_front(array, n); -// size_t deleted = arr_del_back(array, n); +// size_t deleted = arr_del_left(array, n); +// size_t deleted = arr_del_right(array, n); // // They work like arr_del_n without needing to specify the indices. // @@ -175,8 +175,8 @@ #define arr_pop mos_arr_pop #define arr_del mos_arr_del #define arr_del_n mos_arr_del_n -#define arr_del_front mos_arr_del_front -#define arr_del_back mos_arr_del_back +#define arr_del_left mos_arr_del_left +#define arr_del_right mos_arr_del_right #define arr_prev mos_arr_prev #define arr_next mos_arr_next #define arr_len mos_arr_len @@ -376,7 +376,7 @@ // // Returns: // the popped item -#define mos_arr_pop(arr) (mos_arr_del_back(arr, 1), (arr)[mos_arr_len(arr)]) +#define mos_arr_pop(arr) (mos_arr_del_right(arr, 1), (arr)[mos_arr_len(arr)]) // Delete an item at specific index from the array // Moves items after deleted one to the left @@ -421,7 +421,7 @@ // // Returns: // count of deleted items -#define mos_arr_del_front(arr, n) mos_arr_del_front_fn(arr, n, sizeof(*(arr))) +#define mos_arr_del_left(arr, n) mos_arr_del_left_fn(arr, n, sizeof(*(arr))) // Delete n last items from the array // @@ -434,7 +434,7 @@ // // Returns: // count of deleted items -#define mos_arr_del_back(arr, n) mos_arr_del_back_fn(arr, n) +#define mos_arr_del_right(arr, n) mos_arr_del_right_fn(arr, n) // Get the pointer to the previous item in the array from the pointer to the current one // If pointer is NULL - gets the last item from the array @@ -537,8 +537,8 @@ extern size_t mos_arr_put_n_fn(void *p_arr, size_t i, void *items, size_t n, siz extern size_t mos_arr_concat_fn(void *p_arr, void *arr2, size_t el_size, size_t init_cap); extern size_t mos_arr_del_fn(void *arr, size_t i, size_t el_size); extern size_t mos_arr_del_n_fn(void *arr, size_t i, size_t n, size_t el_size); -extern size_t mos_arr_del_front_fn(void *arr, size_t n, size_t el_size); -extern size_t mos_arr_del_back_fn(void *arr, size_t n); +extern size_t mos_arr_del_left_fn(void *arr, size_t n, size_t el_size); +extern size_t mos_arr_del_right_fn(void *arr, size_t n); extern size_t mos_arr_set_len_fn(void *p_arr, size_t len, size_t el_size, size_t init_cap); extern size_t mos_arr_set_cap_fn(void *p_arr, size_t cap, size_t el_size); diff --git a/src/ds/array.c b/src/ds/array.c index a817d80..cdaf152 100644 --- a/src/ds/array.c +++ b/src/ds/array.c @@ -123,11 +123,11 @@ size_t mos_arr_del_n_fn(void *arr, size_t i, size_t n, size_t el_size) { return new_n; } -size_t mos_arr_del_front_fn(void *arr, size_t n, size_t el_size) { +size_t mos_arr_del_left_fn(void *arr, size_t n, size_t el_size) { return mos_arr_del_n_fn(arr, 0, n, el_size); } -size_t mos_arr_del_back_fn(void *arr, size_t n) { +size_t mos_arr_del_right_fn(void *arr, size_t n) { if (!arr) return 0; diff --git a/tests/ds/array_tests.c b/tests/ds/array_tests.c index 619772a..602efb3 100644 --- a/tests/ds/array_tests.c +++ b/tests/ds/array_tests.c @@ -131,14 +131,14 @@ Test deleting_items() { test_assert(deleted == 5, "del_n deleted wrong number of items"); test_assert(arr_len(arr) == 2 && arr[0] == 1 && arr[1] == 8, "deleted wrong items"); - deleted = arr_del_front(arr, 10); - test_assert(deleted == 2, "del_front deleted wrong number of items"); - deleted = arr_del_back(arr, 10); - test_assert(deleted == 0, "del_back deleted wrong number of items"); + deleted = arr_del_left(arr, 10); + test_assert(deleted == 2, "del_left deleted wrong number of items"); + deleted = arr_del_right(arr, 10); + test_assert(deleted == 0, "del_right deleted wrong number of items"); arr_append_n(arr, items, 9); - arr_del_front(arr, 2); - arr_del_back(arr, 6); + arr_del_left(arr, 2); + arr_del_right(arr, 6); test_assert(arr_len(arr) == 1 && arr[0] == 3, "wrong array after deletions"); } |