michaelh/zephyr
1
0
Fork 0
Code Releases Activity

sys/util.h: Add IS_EMPTY and LIST_DROP_EMPTY macros

Browse source 
IS_EMPTY macro allows to check if defined name is empty, i.e.
does not contain replacement list.
LIST_DROP_EMPTY macro may be used to process __VA_ARGS__ type lists,
e.g. a,b,,c , and remove empty elements.

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
This commit is contained in:
Dominik Ermel 2020-04-30 07:35:21 +00:00 • committed by Carles Cufí
commit 6ba69f19d4
2 changed files with 128 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

35
tests/unit/util/main.c
View file

@ -288,6 +288,37 @@ static void test_FOR_EACH_IDX_FIXED_ARG(void)
zassert_equal(a2, 3, "Unexpected value %d", a2);
}
static void test_IS_EMPTY(void)
{
#define test_IS_EMPTY_REAL_EMPTY
#define test_IS_EMPTY_NOT_EMPTY XXX_DO_NOT_REPLACE_XXX
zassert_true(IS_EMPTY(test_IS_EMPTY_REAL_EMPTY),
"Expected to be empty");
zassert_false(IS_EMPTY(test_IS_EMPTY_NOT_EMPTY),
"Expected to be non-empty");
}
static void test_LIST_DROP_EMPTY(void)
{
/*
* The real definition should be:
* #define TEST_BROKEN_LIST ,Henry,,Dorsett,Case,
* but checkpatch complains, so below equivalent is defined.
*/
#define TEST_BROKEN_LIST EMPTY, Henry, EMPTY, Dorsett, Case,
#define TEST_FIXED_LIST LIST_DROP_EMPTY(TEST_BROKEN_LIST)
#define TEST_MKSTR(a) #a,
static const char *const arr[] = {
FOR_EACH(TEST_MKSTR, TEST_FIXED_LIST)
};
zassert_equal(sizeof(arr) / sizeof(char *), 3,
"Failed to cleanup list");
zassert_equal(strcmp(arr[0], "Henry"), 0, "Failed at 0");
zassert_equal(strcmp(arr[1], "Dorsett"), 0, "Failed at 1");
zassert_equal(strcmp(arr[2], "Case"), 0, "Failed at 0");
}
void test_main(void)
{
ztest_test_suite(test_lib_sys_util_tests,
@ -303,7 +334,9 @@ void test_main(void)
ztest_unit_test(test_FOR_EACH),
ztest_unit_test(test_FOR_EACH_FIXED_ARG),
ztest_unit_test(test_FOR_EACH_IDX),
ztest_unit_test(test_FOR_EACH_IDX_FIXED_ARG)
ztest_unit_test(test_FOR_EACH_IDX_FIXED_ARG),
ztest_unit_test(test_IS_EMPTY),
ztest_unit_test(test_LIST_DROP_EMPTY)
);
ztest_run_test_suite(test_lib_sys_util_tests);