michaelh/zephyr
1
0
Fork 0
Code Releases Activity

sys/util.h: allow UTIL_LISTIFY to pass args to repeat macro

Browse source 
Change UTIL_LISTIFY to support passing arguments to the F macro.

Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
This commit is contained in:
Kumar Gala 2020-03-11 15:27:36 -05:00 • committed by Kumar Gala
commit 28a88fc638
2 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
include/sys/util.h
View file

@ -738,10 +738,10 @@ u8_t u8_to_dec(char *buf, u8_t buflen, u8_t value);
* @arg LEN: The length of the sequence. Must be defined and less than * @arg LEN: The length of the sequence. Must be defined and less than
* 20. * 20.
* *
* @arg F(i, F_ARG): A macro function that accepts two arguments. * @arg F(i, ...): A macro function that accepts at least two arguments.
* F is called repeatedly, the first argument * F is called repeatedly, the first argument is the index in the sequence,
* is the index in the sequence, and the second argument is the third * the variable list of arguments passed to UTIL_LISTIFY are passed through
* argument given to UTIL_LISTIFY. * to F.
* *
* Example: * Example:
* *
@ -753,7 +753,7 @@ u8_t u8_to_dec(char *buf, u8_t buflen, u8_t value);
* @note Calling UTIL_LISTIFY with undefined arguments has undefined * @note Calling UTIL_LISTIFY with undefined arguments has undefined
* behavior. * behavior.
*/ */
#define UTIL_LISTIFY(LEN, F, F_ARG) UTIL_EVAL(UTIL_REPEAT(LEN, F, F_ARG)) #define UTIL_LISTIFY(LEN, F, ...) UTIL_EVAL(UTIL_REPEAT(LEN, F, __VA_ARGS__))
/**@brief Implementation details for NUM_VAR_ARGS */ /**@brief Implementation details for NUM_VAR_ARGS */
#define NUM_VA_ARGS_LESS_1_IMPL( \ #define NUM_VA_ARGS_LESS_1_IMPL( \

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

@ -138,15 +138,19 @@ void test_UTIL_LISTIFY(void)
i += x; \ i += x; \
} while (0); } while (0);
#define DEFINE(x, _) int a##x; #define DEFINE(x, y) int a##x = x * y;
#define MARK_UNUSED(x, _) ARG_UNUSED(a##x); #define MARK_UNUSED(x, _) ARG_UNUSED(a##x);
UTIL_LISTIFY(4, DEFINE, _) UTIL_LISTIFY(4, DEFINE, 2)
UTIL_LISTIFY(4, MARK_UNUSED, _) UTIL_LISTIFY(4, MARK_UNUSED, _)
UTIL_LISTIFY(4, INC, _) UTIL_LISTIFY(4, INC, _)
zassert_equal(i, 0 + 1 + 2 + 3, NULL); zassert_equal(i, 0 + 1 + 2 + 3, NULL);
zassert_equal(a0, 0, NULL);
zassert_equal(a1, 2, NULL);
zassert_equal(a2, 4, NULL);
zassert_equal(a3, 6, NULL);
} }
static int inc_func(void) static int inc_func(void)