FEATURE: Making BOOST_FUSION_AUTO_ADAPT_STRUCT variadic.

This commit is contained in:
Damien Buhl (alias daminetreg)
2014-03-18 23:33:10 +01:00
parent 166132789a
commit c052b4b452
2 changed files with 35 additions and 2 deletions

View File

@ -11,6 +11,9 @@
#define BOOST_FUSION_ADAPTED_STRUCT_AUTO_ADAPT_STRUCT_HPP #define BOOST_FUSION_ADAPTED_STRUCT_AUTO_ADAPT_STRUCT_HPP
#include <boost/preprocessor/seq/for_each.hpp> #include <boost/preprocessor/seq/for_each.hpp>
#include <boost/preprocessor/seq/pop_front.hpp>
#include <boost/preprocessor/variadic/elem.hpp>
#include <boost/preprocessor/variadic/to_seq.hpp>
#include <boost/typeof/typeof.hpp> #include <boost/typeof/typeof.hpp>
@ -19,10 +22,35 @@
#define BOOST_FUSION_AUTO_ADAPT_STRUCT_TYPE_DEDUCER(r, NAME, ATTRIBUTE) \ #define BOOST_FUSION_AUTO_ADAPT_STRUCT_TYPE_DEDUCER(r, NAME, ATTRIBUTE) \
(BOOST_TYPEOF(NAME::ATTRIBUTE), ATTRIBUTE) (BOOST_TYPEOF(NAME::ATTRIBUTE), ATTRIBUTE)
#define BOOST_FUSION_AUTO_ADAPT_STRUCT(NAME, ATTRIBUTES) \ #define BOOST_FUSION_AUTO_ADAPT_STRUCT(...) \
BOOST_FUSION_AUTO_ADAPT_STRUCT_BASE( \
BOOST_PP_VARIADIC_ELEM(0, __VA_ARGS__), \
BOOST_PP_SEQ_POP_FRONT(BOOST_PP_VARIADIC_TO_SEQ(__VA_ARGS__)))
#define BOOST_FUSION_AUTO_ADAPT_STRUCT_BASE(NAME, ATTRIBUTES) \
BOOST_FUSION_ADAPT_STRUCT(NAME, \ BOOST_FUSION_ADAPT_STRUCT(NAME, \
BOOST_PP_SEQ_FOR_EACH( \ BOOST_PP_SEQ_FOR_EACH( \
BOOST_FUSION_AUTO_ADAPT_STRUCT_TYPE_DEDUCER, NAME, ATTRIBUTES) \ BOOST_FUSION_AUTO_ADAPT_STRUCT_TYPE_DEDUCER, NAME, ATTRIBUTES) \
) )
#define BOOST_FUSION_ADAPT_STRUCT_FILLER_0(X, Y) \
((X, Y)) BOOST_FUSION_ADAPT_STRUCT_FILLER_1
#define BOOST_FUSION_ADAPT_STRUCT_FILLER_1(X, Y) \
((X, Y)) BOOST_FUSION_ADAPT_STRUCT_FILLER_0
#define BOOST_FUSION_ADAPT_STRUCT_FILLER_0_END
#define BOOST_FUSION_ADAPT_STRUCT_FILLER_1_END
#define BOOST_FUSION_ADAPT_STRUCT(NAME, ATTRIBUTES) \
BOOST_FUSION_ADAPT_STRUCT_BASE( \
(0), \
(0)(NAME), \
struct_tag, \
0, \
BOOST_PP_CAT(BOOST_FUSION_ADAPT_STRUCT_FILLER_0(0,0)ATTRIBUTES,_END), \
BOOST_FUSION_ADAPT_STRUCT_C)
#endif #endif

View File

@ -57,10 +57,15 @@ namespace ns
#endif #endif
} }
BOOST_FUSION_AUTO_ADAPT_STRUCT( /*BOOST_FUSION_AUTO_ADAPT_STRUCT(
ns::point, ns::point,
(x) (x)
(y) (y)
)*/
BOOST_FUSION_AUTO_ADAPT_STRUCT(
ns::point,
x, y
) )
#if !BOOST_WORKAROUND(__GNUC__,<4) #if !BOOST_WORKAROUND(__GNUC__,<4)