[nrf fromlist] sys: util_macro: Add UTIL_CONCAT_OR and UTIL_CONCAT_AND

-Adding macro UTIL_CONCAT_OR that does primitive concatenation of
 variable number of arguments with "||" between them into a single
 token.
-Adding macro UTIL_CONCAT_AND that does primitive concatenation of
 variable number of arguments with "&&" between them into a single
 token.

The reason for adding these macro is that FOR_EACH or similar existing
macros doesn't support end-termination in such a way that the
separator tokens ("||" or "&&") is skipped after the last processed
parameter

Signed-off-by: Frank Audun Kvamtrø <[email protected]>

Author: frkv

include/zephyr/sys/util_internal.h

@@ -90,6 +90,7 @@
 #define IS_ENABLED_ALL_13(a, ...) COND_CODE_1(a, (IS_ENABLED_ALL_12(__VA_ARGS__,)), (0))
 #define IS_ENABLED_ALL_14(a, ...) COND_CODE_1(a, (IS_ENABLED_ALL_13(__VA_ARGS__,)), (0))
 #define IS_ENABLED_ALL_15(a, ...) COND_CODE_1(a, (IS_ENABLED_ALL_14(__VA_ARGS__,)), (0))
+
 /* Implementation of IS_EQ(). Returns 1 if _0 and _1 are the same integer from
  * 0 to 4096, 0 otherwise.
  */
@@ -157,6 +158,48 @@
 #define UTIL_EXPAND(...) __VA_ARGS__
 #define UTIL_REPEAT(...) UTIL_LISTIFY(__VA_ARGS__)
 
+#define UTIL_OR_CAT(a, b) a || b
+#define UTIL_CONCAT_OR_(...)									\
+	UTIL_CONCAT_OR_N_(NUM_VA_ARGS(__VA_ARGS__), __VA_ARGS__)
+#define UTIL_CONCAT_OR_N_(N, ...) UTIL_CAT(UTIL_CONCAT_OR_, N)(__VA_ARGS__)
+#define UTIL_CONCAT_OR_0
+#define UTIL_CONCAT_OR_1(a, ...) a
+#define UTIL_CONCAT_OR_2(a, ...) UTIL_OR_CAT(a, UTIL_CONCAT_OR_1(__VA_ARGS__))
+#define UTIL_CONCAT_OR_3(a, ...) UTIL_OR_CAT(a, UTIL_CONCAT_OR_2(__VA_ARGS__))
+#define UTIL_CONCAT_OR_4(a, ...) UTIL_OR_CAT(a, UTIL_CONCAT_OR_3(__VA_ARGS__))
+#define UTIL_CONCAT_OR_5(a, ...) UTIL_OR_CAT(a, UTIL_CONCAT_OR_4(__VA_ARGS__))
+#define UTIL_CONCAT_OR_6(a, ...) UTIL_OR_CAT(a, UTIL_CONCAT_OR_5(__VA_ARGS__))
+#define UTIL_CONCAT_OR_7(a, ...) UTIL_OR_CAT(a, UTIL_CONCAT_OR_6(__VA_ARGS__))
+#define UTIL_CONCAT_OR_8(a, ...) UTIL_OR_CAT(a, UTIL_CONCAT_OR_7(__VA_ARGS__))
+#define UTIL_CONCAT_OR_9(a, ...) UTIL_OR_CAT(a, UTIL_CONCAT_OR_8(__VA_ARGS__))
+#define UTIL_CONCAT_OR_10(a, ...) UTIL_OR_CAT(a, UTIL_CONCAT_OR_9(__VA_ARGS__))
+#define UTIL_CONCAT_OR_11(a, ...) UTIL_OR_CAT(a, UTIL_CONCAT_OR_10(__VA_ARGS__))
+#define UTIL_CONCAT_OR_12(a, ...) UTIL_OR_CAT(a, UTIL_CONCAT_OR_11(__VA_ARGS__))
+#define UTIL_CONCAT_OR_13(a, ...) UTIL_OR_CAT(a, UTIL_CONCAT_OR_12(__VA_ARGS__))
+#define UTIL_CONCAT_OR_14(a, ...) UTIL_OR_CAT(a, UTIL_CONCAT_OR_13(__VA_ARGS__))
+#define UTIL_CONCAT_OR_15(a, ...) UTIL_OR_CAT(a, UTIL_CONCAT_OR_14(__VA_ARGS__))
+
+#define UTIL_AND_CAT(a, b) a && b
+#define UTIL_CONCAT_AND_(...)									\
+	UTIL_CONCAT_AND_N_(NUM_VA_ARGS(__VA_ARGS__), __VA_ARGS__)
+#define UTIL_CONCAT_AND_N_(N, ...) UTIL_CAT(UTIL_CONCAT_AND_, N)(__VA_ARGS__)
+#define UTIL_CONCAT_AND_0
+#define UTIL_CONCAT_AND_1(a, ...) a
+#define UTIL_CONCAT_AND_2(a, ...) UTIL_AND_CAT(a, UTIL_CONCAT_AND_1(__VA_ARGS__))
+#define UTIL_CONCAT_AND_3(a, ...) UTIL_AND_CAT(a, UTIL_CONCAT_AND_2(__VA_ARGS__))
+#define UTIL_CONCAT_AND_4(a, ...) UTIL_AND_CAT(a, UTIL_CONCAT_AND_3(__VA_ARGS__))
+#define UTIL_CONCAT_AND_5(a, ...) UTIL_AND_CAT(a, UTIL_CONCAT_AND_4(__VA_ARGS__))
+#define UTIL_CONCAT_AND_6(a, ...) UTIL_AND_CAT(a, UTIL_CONCAT_AND_5(__VA_ARGS__))
+#define UTIL_CONCAT_AND_7(a, ...) UTIL_AND_CAT(a, UTIL_CONCAT_AND_6(__VA_ARGS__))
+#define UTIL_CONCAT_AND_8(a, ...) UTIL_AND_CAT(a, UTIL_CONCAT_AND_7(__VA_ARGS__))
+#define UTIL_CONCAT_AND_9(a, ...) UTIL_AND_CAT(a, UTIL_CONCAT_AND_8(__VA_ARGS__))
+#define UTIL_CONCAT_AND_10(a, ...) UTIL_AND_CAT(a, UTIL_CONCAT_AND_9(__VA_ARGS__))
+#define UTIL_CONCAT_AND_11(a, ...) UTIL_AND_CAT(a, UTIL_CONCAT_AND_10(__VA_ARGS__))
+#define UTIL_CONCAT_AND_12(a, ...) UTIL_AND_CAT(a, UTIL_CONCAT_AND_11(__VA_ARGS__))
+#define UTIL_CONCAT_AND_13(a, ...) UTIL_AND_CAT(a, UTIL_CONCAT_AND_12(__VA_ARGS__))
+#define UTIL_CONCAT_AND_14(a, ...) UTIL_AND_CAT(a, UTIL_CONCAT_AND_13(__VA_ARGS__))
+#define UTIL_CONCAT_AND_15(a, ...) UTIL_AND_CAT(a, UTIL_CONCAT_AND_14(__VA_ARGS__))
+
 #define _CONCAT_0(arg, ...) arg
 #define _CONCAT_1(arg, ...) UTIL_CAT(arg, _CONCAT_0(__VA_ARGS__))
 #define _CONCAT_2(arg, ...) UTIL_CAT(arg, _CONCAT_1(__VA_ARGS__))

include/zephyr/sys/util_macro.h

@@ -485,6 +485,27 @@ extern "C" {
  */
 #define UTIL_X2(y) UTIL_PRIMITIVE_CAT(Z_UTIL_X2_, y)
 
+/**
+ * @brief Concatenates all arguments with "||" between them into a single token
+ *
+ * This macro does primitive concatenation and doesn't try to process the
+ * parameters in preprocessor.
+ *
+ * @param ... Arguments to concatenate with @p || between them
+ * @return A concatenation of all the arguments with @p || between them
+ */
+#define UTIL_CONCAT_OR(...) UTIL_CONCAT_OR_(__VA_ARGS__)
+
+/**
+ * @brief Concatenates all arguments with "&&" between them into a single token
+ *
+ * This macro does primitive concatenation and doens't try to process the
+ * parameters in preprocessor.
+ *
+ * @param ... Arguments to concatenate with @p && between them
+ * @return A concatenation of all the arguments with @p || between them
+ */
+#define UTIL_CONCAT_AND(...) UTIL_CONCAT_AND_(__VA_ARGS__)
 
 /**
  * @brief Generates a sequence of code with configurable separator.