From b5575596c187fe6d9143b9e08f5b1068ab01410f Mon Sep 17 00:00:00 2001 From: Mitja Felicijan Date: Wed, 21 Jan 2026 18:37:07 +0100 Subject: Refactor array_foreach_i to array_foreach_idx --- examples/array.c | 4 ++-- nonstd.h | 2 +- tests.c | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/examples/array.c b/examples/array.c index 6f49910..18a31cc 100644 --- a/examples/array.c +++ b/examples/array.c @@ -91,8 +91,8 @@ int main(void) { } printf("\n"); - printf(" Using array_foreach_i: "); - array_foreach_i(values, val, idx) { + printf(" Using array_foreach_idx: "); + array_foreach_idx(values, val, idx) { printf("[%zu]=%d ", idx, val); } printf("\n\n"); diff --git a/nonstd.h b/nonstd.h index 939c030..631f7f1 100644 --- a/nonstd.h +++ b/nonstd.h @@ -203,7 +203,7 @@ NONSTD_DEF stringv sb_as_sv(const stringb *sb); _i_##var < (arr).length && ((var) = (arr).data[_i_##var], 1); \ ++_i_##var) -#define array_foreach_i(arr, var, index) \ +#define array_foreach_idx(arr, var, index) \ for (size_t index = 0; \ index < (arr).length && ((var) = (arr).data[index], 1); ++index) diff --git a/tests.c b/tests.c index ca42275..e865e18 100644 --- a/tests.c +++ b/tests.c @@ -663,7 +663,7 @@ MU_TEST(test_array_foreach) { array_free(arr); } -MU_TEST(test_array_foreach_i) { +MU_TEST(test_array_foreach_idx) { array(int) arr; array_init(arr); array_push(arr, 10); @@ -674,7 +674,7 @@ MU_TEST(test_array_foreach_i) { size_t sum_idx = 0; int val; - array_foreach_i(arr, val, i) { + array_foreach_idx(arr, val, i) { sum_val += val; sum_idx += i; mu_assert_int_eq(val, arr.data[i]); @@ -932,7 +932,7 @@ MU_TEST_SUITE(test_suite_array) { RUN_TEST_WITH_NAME(test_array_reserve); RUN_TEST_WITH_NAME(test_array_clear); RUN_TEST_WITH_NAME(test_array_foreach); - RUN_TEST_WITH_NAME(test_array_foreach_i); + RUN_TEST_WITH_NAME(test_array_foreach_idx); } MU_TEST_SUITE(test_suite_slice) { -- cgit v1.2.3