From f02f41656b715cfaf05920575a1666d62d2f22e9 Mon Sep 17 00:00:00 2001 From: Wenzel Jakob Date: Fri, 29 Apr 2016 14:32:10 +0200 Subject: [PATCH] support longer argument lists in expansion of variadic DOC() macro --- tools/mkdoc.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/mkdoc.py b/tools/mkdoc.py index 683432073..25fed0326 100644 --- a/tools/mkdoc.py +++ b/tools/mkdoc.py @@ -232,7 +232,7 @@ if __name__ == '__main__': #define __EXPAND(x) x #define __COUNT(_1, _2, _3, _4, _5, COUNT, ...) COUNT -#define __VA_SIZE(...) __EXPAND(__COUNT(__VA_ARGS__, 5, 4, 3, 2, 1)) +#define __VA_SIZE(...) __EXPAND(__COUNT(__VA_ARGS__, 7, 6, 5, 4, 3, 2, 1)) #define __CAT1(a, b) a ## b #define __CAT2(a, b) __CAT1(a, b) #define __DOC1(n1) __doc_##n1 @@ -240,6 +240,8 @@ if __name__ == '__main__': #define __DOC3(n1, n2, n3) __doc_##n1##_##n2##_##n3 #define __DOC4(n1, n2, n3, n4) __doc_##n1##_##n2##_##n3##_##n4 #define __DOC5(n1, n2, n3, n4, n5) __doc_##n1##_##n2##_##n3##_##n4##_##n5 +#define __DOC6(n1, n2, n3, n4, n5, n6) __doc_##n1##_##n2##_##n3##_##n4##_##n5##_##n6 +#define __DOC7(n1, n2, n3, n4, n5, n6, n7) __doc_##n1##_##n2##_##n3##_##n4##_##n5##_##n6##_##n7 #define DOC(...) __EXPAND(__EXPAND(__CAT2(__DOC, __VA_SIZE(__VA_ARGS__)))(__VA_ARGS__)) #if defined(__GNUG__)