Extend macros num range (#51)

* Extend macros num range

Signed-off-by: jparisu <javierparis@eprosima.com>

* uncrustify

Signed-off-by: jparisu <javierparis@eprosima.com>

---------

Signed-off-by: jparisu <javierparis@eprosima.com>

Author: jparisu

cpp_utils/include/cpp_utils/macros/recursive_macros.hpp

@@ -30,36 +30,37 @@ namespace utils {
 /////////////////////////
 
 /**
- * @brief Get 11th macro.
+ * @brief Get 20th macro.
  *
  * @note This macro is used in \c COUNT_ARGUMENT macro.
  */
-#define _ELEVENTH_ARGUMENT(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, ...) \
-    a11
+#define _TWENTIETH_ARGUMENT(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20, \
+            ...) \
+    a20
 
 /**
- * @brief Count number of arguments in a variadic macro with maximum 9 variables
+ * @brief Count number of arguments in a variadic macro with maximum 18 variables
  *
  * @note This is an auxiliary macro that encapsulates the funtionality of \c COUNT_ARGUMENTS so that macro
  * could be changed to a higher value without breaking API.
  *
  * @note \c dummy value is required to non argument calls.
  */
-#define _COUNT_ARGUMENTS__UP_TO_NINE(...)  \
-    _ELEVENTH_ARGUMENT(dummy, ## __VA_ARGS__, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0)
+#define _COUNT_ARGUMENTS__UP_TO_EIGHTEEN(...)  \
+    _TWENTIETH_ARGUMENT(dummy, ## __VA_ARGS__, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0)
 
 /**
  * @brief Count number of arguments in a variadic macro
  *
- * @warning This macro only allows up to 9 values.
+ * @warning This macro only allows up to 18 values.
  *
- * @note if more arguments required, change \c _ELEVENTH_ARGUMENT for a higher one.
+ * @note if more arguments required, change \c _TWENTIETH_ARGUMENT for a higher one.
  *
  * @example
  * COUNT_ARGUMENTS(el1, el2, el3)  =  3
  */
 #define COUNT_ARGUMENTS(...) \
-    _COUNT_ARGUMENTS__UP_TO_NINE(__VA_ARGS__)
+    _COUNT_ARGUMENTS__UP_TO_EIGHTEEN(__VA_ARGS__)
 
 
 /////////////////////////
@@ -80,33 +81,42 @@ namespace utils {
 #define _FE_7(ACTION, X, ...) ACTION(X) _FE_6(ACTION, __VA_ARGS__)
 #define _FE_8(ACTION, X, ...) ACTION(X) _FE_7(ACTION, __VA_ARGS__)
 #define _FE_9(ACTION, X, ...) ACTION(X) _FE_8(ACTION, __VA_ARGS__)
+#define _FE_10(ACTION, X, ...) ACTION(X) _FE_9(ACTION, __VA_ARGS__)
+#define _FE_11(ACTION, X, ...) ACTION(X) _FE_10(ACTION, __VA_ARGS__)
+#define _FE_12(ACTION, X, ...) ACTION(X) _FE_11(ACTION, __VA_ARGS__)
+#define _FE_13(ACTION, X, ...) ACTION(X) _FE_12(ACTION, __VA_ARGS__)
+#define _FE_14(ACTION, X, ...) ACTION(X) _FE_13(ACTION, __VA_ARGS__)
+#define _FE_15(ACTION, X, ...) ACTION(X) _FE_14(ACTION, __VA_ARGS__)
+#define _FE_16(ACTION, X, ...) ACTION(X) _FE_15(ACTION, __VA_ARGS__)
+#define _FE_17(ACTION, X, ...) ACTION(X) _FE_16(ACTION, __VA_ARGS__)
+#define _FE_18(ACTION, X, ...) ACTION(X) _FE_17(ACTION, __VA_ARGS__)
 //... repeat as needed
 
 /**
- * @brief Get the 9th argument
+ * @brief Get the 18th argument
  *
  * @note this is useful for \c APPLY_MACRO_FOR_EACH macro.
  */
-#define _GET_NINTH_ARGUMENT(_1, _2, _3, _4, _5, _6, _7, _8, _9, NAME, ...) \
+#define _GET_EIGHTEENTH_ARGUMENT(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, NAME, \
+            ...) \
     NAME
 
-#define _APPLY_MACRO_FOR_EACH__UP_TO_NINE(action, ...) \
-    _GET_NINTH_ARGUMENT(__VA_ARGS__, _FE_9, _FE_8, _FE_7, _FE_6, _FE_5, _FE_4, _FE_3, _FE_2, _FE_1)(action, __VA_ARGS__)
+#define _APPLY_MACRO_FOR_EACH__UP_TO_EIGHTEEN(action, ...) \
+    _GET_EIGHTEENTH_ARGUMENT(__VA_ARGS__, _FE_18, _FE_17, _FE_16, _FE_15, _FE_14, _FE_13, _FE_12, _FE_11, _FE_10, _FE_9, \
+            _FE_8, _FE_7, _FE_6, _FE_5, _FE_4, _FE_3, _FE_2, _FE_1)(action, __VA_ARGS__)
 
 /**
  * @brief Execute \c action (must be a macro) for every argument after it.
  *
- * @warning This macro only allows up to 9 values.
+ * @warning This macro only allows up to 18 values.
  *
- * @note if more arguments required, change \c _APPLY_MACRO_FOR_EACH__UP_TO_NINE for a higher one.
+ * @note if more arguments required, change \c _APPLY_MACRO_FOR_EACH__UP_TO_EIGHTEEN for a higher one.
  *
  * @example
  * APPLY_MACRO_FOR_EACH(print, el1, el2, el3)  =>  print(el1); print(el2); print(el3);
  */
 #define APPLY_MACRO_FOR_EACH(action, ...) \
-    _APPLY_MACRO_FOR_EACH__UP_TO_NINE(action, __VA_ARGS__)
+    _APPLY_MACRO_FOR_EACH__UP_TO_EIGHTEEN(action, __VA_ARGS__)
 
 } /* namespace utils */
 } /* namespace eprosima */
-
-