diff --git a/m-tuple.h b/m-tuple.h index 1908640e..37fe80e9 100644 --- a/m-tuple.h +++ b/m-tuple.h @@ -32,17 +32,17 @@ /* Define the tuple type and functions. USAGE: TUPLE_DEF2(name, [(field1, type1[, oplist1]), (field2, type2[, oplist2]), ...] ) */ -#define TUPLE_DEF2(name, ...) \ - M_BEGIN_PROTECTED_CODE \ - TUPLEI_DEF2_P1( (name TUPLEI_INJECT_GLOBAL(__VA_ARGS__)) ) \ +#define TUPLE_DEF2(name, ...) \ + M_BEGIN_PROTECTED_CODE \ + TUPLEI_DEF2_P1( (name TUPLEI_INJECT_GLOBAL(__VA_ARGS__)) ) \ M_END_PROTECTED_CODE /* Define the oplist of a tuple. USAGE: TUPLE_OPLIST(name[, oplist of the first type, ...]) */ -#define TUPLE_OPLIST(...) \ - M_IF_NARGS_EQ1(__VA_ARGS__) \ - (TUPLEI_OPLIST_P1((__VA_ARGS__, M_DEFAULT_OPLIST )), \ +#define TUPLE_OPLIST(...) \ + M_IF_NARGS_EQ1(__VA_ARGS__) \ + (TUPLEI_OPLIST_P1((__VA_ARGS__, M_DEFAULT_OPLIST )), \ TUPLEI_OPLIST_P1((__VA_ARGS__ ))) @@ -52,7 +52,7 @@ (shall be constexpr, but only supported in C++14). */ #ifndef __cplusplus -#define TUPLE_ORDER(name, ...) \ +#define TUPLE_ORDER(name, ...) \ ( (const int[]) {M_MAP2_C(TUPLE_ORDER_CONVERT, name, __VA_ARGS__), 0}) #else #include @@ -68,7 +68,7 @@ namespace m_tuple { } }; } -#define TUPLE_ORDER(name, ...) \ +#define TUPLE_ORDER(name, ...) \ (m_tuple::m_int_array({M_MAP2_C(TUPLE_ORDER_CONVERT, name, __VA_ARGS__), 0}).data) #endif @@ -81,108 +81,96 @@ namespace m_tuple { } while (0) /* Inject the oplist within the list of arguments */ -#define TUPLEI_INJECT_GLOBAL(...) \ +#define TUPLEI_INJECT_GLOBAL(...) \ M_MAP(TUPLEI_INJECT_OPLIST_A, __VA_ARGS__) /* Transform (x, type) into (x, type, oplist) if there is global registered oplist or (x, type, M_DEFAULT_OPLIST) if there is no global one, or keep (x, type, oplist) if oplist was already present */ -#define TUPLEI_INJECT_OPLIST_A( duo_or_trio ) \ +#define TUPLEI_INJECT_OPLIST_A( duo_or_trio ) \ TUPLEI_INJECT_OPLIST_B duo_or_trio -#define TUPLEI_INJECT_OPLIST_B( f, ... ) \ - M_DEFERRED_COMMA \ +#define TUPLEI_INJECT_OPLIST_B( f, ... ) \ + M_DEFERRED_COMMA \ M_IF_NARGS_EQ1(__VA_ARGS__)( (f, __VA_ARGS__, M_GLOBAL_OPLIST_OR_DEF(__VA_ARGS__)()), (f, __VA_ARGS__) ) // Deferred evaluation #define TUPLEI_DEF2_P1(...) TUPLEI_DEF2_P2 __VA_ARGS__ // Test if all third argument of all arguments is an oplist -#define TUPLEI_IF_ALL_OPLIST(...) \ +#define TUPLEI_IF_ALL_OPLIST(...) \ M_IF(M_REDUCE(TUPLEI_IS_OPLIST_P, M_AND, __VA_ARGS__)) // Test if the third argument is an oplist -#define TUPLEI_IS_OPLIST_P(a) \ +#define TUPLEI_IS_OPLIST_P(a) \ M_OPLIST_P(M_RET_ARG3 a) /* Validate the oplist before going further */ -#define TUPLEI_DEF2_P2(name, ...) \ +#define TUPLEI_DEF2_P2(name, ...) \ TUPLEI_IF_ALL_OPLIST(__VA_ARGS__)(TUPLEI_DEF2_P3, TUPLEI_DEF2_FAILURE)(name, __VA_ARGS__) /* Stop processing with a compilation failure */ -#define TUPLEI_DEF2_FAILURE(name, ...) \ +#define TUPLEI_DEF2_FAILURE(name, ...) \ M_STATIC_FAILURE(M_LIB_NOT_AN_OPLIST, "(TUPLE_DEF2): at least one of the given argument is not a valid oplist: " #__VA_ARGS__) /* Define the tuple */ -#define TUPLEI_DEF2_P3(name, ...) \ - TUPLE_DEFINE_TYPE(name, __VA_ARGS__) \ - TUPLE_DEFINE_ENUM(name, __VA_ARGS__) \ - TUPLE_CONTROL_ALL_OPLIST(name, __VA_ARGS__) \ - TUPLEI_IF_ALL(INIT, __VA_ARGS__) \ - (TUPLE_DEFINE_INIT(name, __VA_ARGS__),) \ - TUPLE_DEFINE_INIT_SET(name, __VA_ARGS__) \ - TUPLE_DEFINE_INIT_SET2(name, __VA_ARGS__) \ - TUPLE_DEFINE_SET(name, __VA_ARGS__) \ - TUPLE_DEFINE_SET2(name, __VA_ARGS__) \ - TUPLE_DEFINE_CLEAR(name, __VA_ARGS__) \ - TUPLE_DEFINE_GETTER_FIELD(name, __VA_ARGS__) \ - TUPLE_DEFINE_SETTER_FIELD(name, __VA_ARGS__) \ - TUPLEI_IF_ALL(CMP, __VA_ARGS__) \ - (TUPLE_DEFINE_CMP(name, __VA_ARGS__),) \ - TUPLEI_IF_ALL(CMP, __VA_ARGS__) \ - (TUPLE_DEFINE_CMP_ORDER(name, __VA_ARGS__),) \ - TUPLE_DEFINE_CMP_FIELD(name, __VA_ARGS__) \ - TUPLEI_IF_ALL(HASH, __VA_ARGS__) \ - (TUPLE_DEFINE_HASH(name, __VA_ARGS__),) \ - TUPLEI_IF_ALL(EQUAL, __VA_ARGS__) \ - (TUPLE_DEFINE_EQUAL(name, __VA_ARGS__),) \ - TUPLEI_IF_ALL(GET_STR, __VA_ARGS__) \ - (TUPLE_DEFINE_GET_STR(name, __VA_ARGS__),) \ - TUPLEI_IF_ALL(OUT_STR, __VA_ARGS__) \ - (TUPLE_DEFINE_OUT_STR(name, __VA_ARGS__),) \ - TUPLEI_IF_ALL(IN_STR, __VA_ARGS__) \ - (TUPLE_DEFINE_IN_STR(name, __VA_ARGS__),) \ - TUPLEI_IF_ALL(PARSE_STR, __VA_ARGS__) \ - (TUPLE_DEFINE_PARSE_STR(name, __VA_ARGS__),) \ - TUPLEI_IF_ALL(OUT_SERIAL, __VA_ARGS__) \ - (TUPLE_DEFINE_OUT_SERIAL(name, __VA_ARGS__),) \ - TUPLEI_IF_ALL(IN_SERIAL, __VA_ARGS__) \ - (TUPLE_DEFINE_IN_SERIAL(name, __VA_ARGS__),) \ - TUPLEI_IF_ALL(INIT_MOVE, __VA_ARGS__) \ - (TUPLE_DEFINE_INIT_MOVE(name, __VA_ARGS__),) \ - TUPLEI_IF_ALL(MOVE, __VA_ARGS__) \ - (TUPLE_DEFINE_MOVE(name, __VA_ARGS__),) \ - TUPLEI_IF_ALL(SWAP, __VA_ARGS__) \ - (TUPLE_DEFINE_SWAP(name, __VA_ARGS__),) \ - TUPLEI_IF_ALL(CLEAN, __VA_ARGS__) \ - (TUPLE_DEFINE_CLEAN(name, __VA_ARGS__),) +#define TUPLEI_DEF2_P3(name, ...) \ + TUPLE_DEFINE_TYPE(name, __VA_ARGS__) \ + TUPLE_DEFINE_ENUM(name, __VA_ARGS__) \ + TUPLE_CONTROL_ALL_OPLIST(name, __VA_ARGS__) \ + TUPLEI_IF_ALL(INIT, __VA_ARGS__)(TUPLE_DEFINE_INIT(name, __VA_ARGS__),) \ + TUPLE_DEFINE_INIT_SET(name, __VA_ARGS__) \ + TUPLE_DEFINE_INIT_SET2(name, __VA_ARGS__) \ + TUPLE_DEFINE_SET(name, __VA_ARGS__) \ + TUPLE_DEFINE_SET2(name, __VA_ARGS__) \ + TUPLE_DEFINE_CLEAR(name, __VA_ARGS__) \ + TUPLE_DEFINE_GETTER_FIELD(name, __VA_ARGS__) \ + TUPLE_DEFINE_SETTER_FIELD(name, __VA_ARGS__) \ + TUPLEI_IF_ALL(CMP, __VA_ARGS__)(TUPLE_DEFINE_CMP(name, __VA_ARGS__),) \ + TUPLEI_IF_ALL(CMP, __VA_ARGS__)(TUPLE_DEFINE_CMP_ORDER(name, __VA_ARGS__),) \ + TUPLE_DEFINE_CMP_FIELD(name, __VA_ARGS__) \ + TUPLEI_IF_ALL(HASH, __VA_ARGS__)(TUPLE_DEFINE_HASH(name, __VA_ARGS__),) \ + TUPLEI_IF_ALL(EQUAL, __VA_ARGS__)(TUPLE_DEFINE_EQUAL(name, __VA_ARGS__),) \ + TUPLEI_IF_ALL(GET_STR, __VA_ARGS__)(TUPLE_DEFINE_GET_STR(name, __VA_ARGS__),) \ + TUPLEI_IF_ALL(OUT_STR, __VA_ARGS__)(TUPLE_DEFINE_OUT_STR(name, __VA_ARGS__),) \ + TUPLEI_IF_ALL(IN_STR, __VA_ARGS__)(TUPLE_DEFINE_IN_STR(name, __VA_ARGS__),) \ + TUPLEI_IF_ALL(PARSE_STR, __VA_ARGS__)(TUPLE_DEFINE_PARSE_STR(name, __VA_ARGS__),) \ + TUPLEI_IF_ALL(OUT_SERIAL, __VA_ARGS__)(TUPLE_DEFINE_OUT_SERIAL(name, __VA_ARGS__),) \ + TUPLEI_IF_ALL(IN_SERIAL, __VA_ARGS__)(TUPLE_DEFINE_IN_SERIAL(name, __VA_ARGS__),) \ + TUPLEI_IF_ALL(INIT_MOVE, __VA_ARGS__)(TUPLE_DEFINE_INIT_MOVE(name, __VA_ARGS__),) \ + TUPLEI_IF_ALL(MOVE, __VA_ARGS__)(TUPLE_DEFINE_MOVE(name, __VA_ARGS__),) \ + TUPLEI_IF_ALL(SWAP, __VA_ARGS__)(TUPLE_DEFINE_SWAP(name, __VA_ARGS__),) \ + TUPLEI_IF_ALL(CLEAN, __VA_ARGS__)(TUPLE_DEFINE_CLEAN(name, __VA_ARGS__),) +/* Provide order for _cmp_order */ #define TUPLE_ORDER_CONVERT(name, x) M_C(name, M_C(TUPLE_ORDER_CONVERT_, x)) #define TUPLE_ORDER_CONVERT_ASC(x) M_C3(_,x,_value) #define TUPLE_ORDER_CONVERT_DSC(x) M_C3(_,x,_value)*-1 /* Get the field name, the type, the oplist or the methods based on the tuple (field, type, oplist) */ -#define TUPLE_GET_FIELD(f,t,o) f -#define TUPLE_GET_TYPE(f,t,o) t -#define TUPLE_GET_OPLIST(f,t,o) o -#define TUPLE_GET_INIT(f,t,o) M_GET_INIT o -#define TUPLE_GET_INIT_SET(f,t,o) M_GET_INIT_SET o +#define TUPLE_GET_FIELD(f,t,o) f +#define TUPLE_GET_TYPE(f,t,o) t +#define TUPLE_GET_OPLIST(f,t,o) o +#define TUPLE_GET_INIT(f,t,o) M_GET_INIT o +#define TUPLE_GET_INIT_SET(f,t,o) M_GET_INIT_SET o #define TUPLE_GET_INIT_MOVE(f,t,o) M_GET_INIT_MOVE o -#define TUPLE_GET_MOVE(f,t,o) M_GET_MOVE o -#define TUPLE_GET_SET(f,t,o) M_GET_SET o -#define TUPLE_GET_CLEAR(f,t,o) M_GET_CLEAR o -#define TUPLE_GET_CMP(f,t,o) M_GET_CMP o -#define TUPLE_GET_HASH(f,t,o) M_GET_HASH o -#define TUPLE_GET_EQUAL(f,t,o) M_GET_EQUAL o -#define TUPLE_GET_STR(f,t,o) M_GET_GET_STR o -#define TUPLE_GET_OUT_STR(f,t,o) M_GET_OUT_STR o -#define TUPLE_GET_IN_STR(f,t,o) M_GET_IN_STR o +#define TUPLE_GET_MOVE(f,t,o) M_GET_MOVE o +#define TUPLE_GET_SET(f,t,o) M_GET_SET o +#define TUPLE_GET_CLEAR(f,t,o) M_GET_CLEAR o +#define TUPLE_GET_CMP(f,t,o) M_GET_CMP o +#define TUPLE_GET_HASH(f,t,o) M_GET_HASH o +#define TUPLE_GET_EQUAL(f,t,o) M_GET_EQUAL o +#define TUPLE_GET_STR(f,t,o) M_GET_GET_STR o +#define TUPLE_GET_OUT_STR(f,t,o) M_GET_OUT_STR o +#define TUPLE_GET_IN_STR(f,t,o) M_GET_IN_STR o #define TUPLE_GET_OUT_SERIAL(f,t,o) M_GET_OUT_SERIAL o #define TUPLE_GET_IN_SERIAL(f,t,o) M_GET_IN_SERIAL o #define TUPLE_GET_PARSE_STR(f,t,o) M_GET_PARSE_STR o -#define TUPLE_GET_SWAP(f,t,o) M_GET_SWAP o -#define TUPLE_GET_CLEAN(f,t,o) M_GET_CLEAN o +#define TUPLE_GET_SWAP(f,t,o) M_GET_SWAP o +#define TUPLE_GET_CLEAN(f,t,o) M_GET_CLEAN o +/* Call the method associated to the given operator for the given parameter + of the tuple t=(name, type, oplist) */ #define TUPLE_CALL_INIT(t, ...) M_APPLY_API(TUPLE_GET_INIT t, TUPLE_GET_OPLIST t, __VA_ARGS__) #define TUPLE_CALL_INIT_SET(t, ...) M_APPLY_API(TUPLE_GET_INIT_SET t, TUPLE_GET_OPLIST t, __VA_ARGS__) #define TUPLE_CALL_INIT_MOVE(t, ...) M_APPLY_API(TUPLE_GET_INIT_MOVE t, TUPLE_GET_OPLIST t, __VA_ARGS__) @@ -201,60 +189,71 @@ namespace m_tuple { #define TUPLE_CALL_SWAP(t, ...) M_APPLY_API(TUPLE_GET_SWAP t, TUPLE_GET_OPLIST t, __VA_ARGS__) #define TUPLE_CALL_CLEAN(t, ...) M_APPLY_API(TUPLE_GET_CLEAN t, TUPLE_GET_OPLIST t, __VA_ARGS__) + +/* Define the type of a tuple */ #define TUPLE_DEFINE_TYPE(name, ...) \ typedef struct M_C(name, _s) { \ M_MAP(TUPLE_DEFINE_RECUR_TYPE_ELE , __VA_ARGS__) \ } M_C(name,_t)[1]; \ typedef struct M_C(name, _s) *M_C(name, _ptr); \ typedef const struct M_C(name, _s) *M_C(name, _srcptr); -#define TUPLE_DEFINE_RECUR_TYPE_ELE(a) \ + +#define TUPLE_DEFINE_RECUR_TYPE_ELE(a) \ TUPLE_GET_TYPE a TUPLE_GET_FIELD a ; - +/* Define the basic enumerate, identifying a parameter */ #define TUPLE_DEFINE_ENUM(name, ...) \ typedef enum { \ M_C(name, _first_one_val), \ M_MAP2_C(TUPLE_DEFINE_ENUM_ELE , name, __VA_ARGS__) \ } M_C(name,_field_e); -#define TUPLE_DEFINE_ENUM_ELE(name, a) \ + +#define TUPLE_DEFINE_ENUM_ELE(name, a) \ M_C4(name, _, TUPLE_GET_FIELD a, _value) -#define TUPLE_CONTROL_ALL_OPLIST(name, ...) \ +/* Control that all given oplists of all parameters are really oplists */ +#define TUPLE_CONTROL_ALL_OPLIST(name, ...) \ M_MAP2(TUPLE_CONTROL_OPLIST, name, __VA_ARGS__) + #define TUPLE_CONTROL_OPLIST(name, a) \ M_CHECK_COMPATIBLE_OPLIST(name, TUPLE_GET_FIELD a, \ TUPLE_GET_TYPE a, TUPLE_GET_OPLIST a) - -#define TUPLE_DEFINE_INIT(name, ...) \ - static inline void M_C(name, _init)(M_C(name,_t) my) { \ - M_MAP(TUPLE_DEFINE_INIT_FUNC , __VA_ARGS__) \ +/* Define the INIT method calling the INIT method for all params */ +#define TUPLE_DEFINE_INIT(name, ...) \ + static inline void M_C(name, _init)(M_C(name,_t) my) { \ + M_MAP(TUPLE_DEFINE_INIT_FUNC , __VA_ARGS__) \ } -#define TUPLE_DEFINE_INIT_FUNC(a) \ + +#define TUPLE_DEFINE_INIT_FUNC(a) \ TUPLE_CALL_INIT(a, my -> TUPLE_GET_FIELD a ); - +/* Define the INIT_SET method calling the INIT_SET method for all params */ #define TUPLE_DEFINE_INIT_SET(name, ...) \ static inline void M_C(name, _init_set)(M_C(name,_t) my , M_C(name,_t) const org) { \ TUPLEI_CONTRACT(org); \ M_MAP(TUPLE_DEFINE_INIT_SET_FUNC , __VA_ARGS__) \ } -#define TUPLE_DEFINE_INIT_SET_FUNC(a) \ +#define TUPLE_DEFINE_INIT_SET_FUNC(a) \ TUPLE_CALL_INIT_SET(a, my -> TUPLE_GET_FIELD a , org -> TUPLE_GET_FIELD a ); -/* NOTE: More a _init_with method */ -#define TUPLE_DEFINE_INIT_SET2(name, ...) \ - static inline void M_C(name, _init_set2)(M_C(name,_t) my \ - M_MAP(TUPLE_DEFINE_INIT_SET2_PROTO, __VA_ARGS__) \ - ) { \ - M_MAP(TUPLE_DEFINE_INIT_SET2_FUNC , __VA_ARGS__) \ +/* Define the INIT_WITH method calling the INIT_SET method for all params. */ +/* FIXME: To rename? */ +#define TUPLE_DEFINE_INIT_SET2(name, ...) \ + static inline void M_C(name, _init_set2)(M_C(name,_t) my \ + M_MAP(TUPLE_DEFINE_INIT_SET2_PROTO, __VA_ARGS__) \ + ) { \ + M_MAP(TUPLE_DEFINE_INIT_SET2_FUNC , __VA_ARGS__) \ } -#define TUPLE_DEFINE_INIT_SET2_PROTO(a) \ + +#define TUPLE_DEFINE_INIT_SET2_PROTO(a) \ , TUPLE_GET_TYPE a const TUPLE_GET_FIELD a -#define TUPLE_DEFINE_INIT_SET2_FUNC(a) \ + +#define TUPLE_DEFINE_INIT_SET2_FUNC(a) \ TUPLE_CALL_INIT_SET(a, my -> TUPLE_GET_FIELD a , TUPLE_GET_FIELD a ); +/* Define the SET method calling the SET method for all params. */ #define TUPLE_DEFINE_SET(name, ...) \ static inline void M_C(name, _set)(M_C(name,_t) my , \ M_C(name,_t) const org) { \ @@ -262,54 +261,68 @@ namespace m_tuple { TUPLEI_CONTRACT(org); \ M_MAP(TUPLE_DEFINE_SET_FUNC , __VA_ARGS__) \ } + #define TUPLE_DEFINE_SET_FUNC(a) \ TUPLE_CALL_SET(a, my -> TUPLE_GET_FIELD a , org -> TUPLE_GET_FIELD a ); -#define TUPLE_DEFINE_SET2(name, ...) \ - static inline void M_C(name, _set2)(M_C(name,_t) my \ - M_MAP(TUPLE_DEFINE_SET2_PROTO, __VA_ARGS__) \ - ) { \ +/* Define the SET_WITH method calling the SET method for all params. */ +/* FIXME: To rename? */ +#define TUPLE_DEFINE_SET2(name, ...) \ + static inline void M_C(name, _set2)(M_C(name,_t) my \ + M_MAP(TUPLE_DEFINE_SET2_PROTO, __VA_ARGS__) \ + ) { \ TUPLEI_CONTRACT(my); \ - M_MAP(TUPLE_DEFINE_SET2_FUNC , __VA_ARGS__) \ + M_MAP(TUPLE_DEFINE_SET2_FUNC , __VA_ARGS__) \ } -#define TUPLE_DEFINE_SET2_PROTO(a) \ +#define TUPLE_DEFINE_SET2_PROTO(a) \ , TUPLE_GET_TYPE a const TUPLE_GET_FIELD a + #define TUPLE_DEFINE_SET2_FUNC(a) \ TUPLE_CALL_SET(a, my -> TUPLE_GET_FIELD a , TUPLE_GET_FIELD a ); -#define TUPLE_DEFINE_CLEAR(name, ...) \ - static inline void M_C(name, _clear)(M_C(name,_t) my) { \ - TUPLEI_CONTRACT(my); \ - M_MAP(TUPLE_DEFINE_CLEAR_FUNC , __VA_ARGS__) \ +/* Define the CLEAR method calling the CLEAR method for all params. */ +#define TUPLE_DEFINE_CLEAR(name, ...) \ + static inline void M_C(name, _clear)(M_C(name,_t) my) { \ + TUPLEI_CONTRACT(my); \ + M_MAP(TUPLE_DEFINE_CLEAR_FUNC , __VA_ARGS__) \ } -#define TUPLE_DEFINE_CLEAR_FUNC(a) \ + +#define TUPLE_DEFINE_CLEAR_FUNC(a) \ TUPLE_CALL_CLEAR(a, my -> TUPLE_GET_FIELD a ); -#define TUPLE_DEFINE_GETTER_FIELD(name, ...) \ +/* Define the GET_AT_field & CGET_AT methods for all params. */ +#define TUPLE_DEFINE_GETTER_FIELD(name, ...) \ M_MAP2(TUPLE_DEFINE_GETTER_FIELD_PROTO, name, __VA_ARGS__) + #define TUPLE_DEFINE_GETTER_FIELD_PROTO(name, a) \ static inline TUPLE_GET_TYPE a * M_C3(name, _get_at_, TUPLE_GET_FIELD a) \ (M_C(name,_t) my) { \ TUPLEI_CONTRACT(my); \ - return &(my->TUPLE_GET_FIELD a);} \ + return &(my->TUPLE_GET_FIELD a); \ + } \ static inline TUPLE_GET_TYPE a const * M_C3(name, _cget_at_, TUPLE_GET_FIELD a) \ (M_C(name,_t) const my) { \ TUPLEI_CONTRACT(my); \ - return &(my->TUPLE_GET_FIELD a);} + return &(my->TUPLE_GET_FIELD a); \ + } -#define TUPLE_DEFINE_SETTER_FIELD(name, ...) \ +/* Define the SET_field methods for all params. */ +#define TUPLE_DEFINE_SETTER_FIELD(name, ...) \ M_MAP2(TUPLE_DEFINE_SETTER_FIELD_PROTO, name, __VA_ARGS__) -#define TUPLE_DEFINE_SETTER_FIELD_PROTO(name, a) \ - static inline void M_C3(name, _set_, TUPLE_GET_FIELD a) \ - (M_C(name,_t) my, TUPLE_GET_TYPE a const TUPLE_GET_FIELD a) { \ - TUPLEI_CONTRACT(my); \ - TUPLE_CALL_SET(a, my ->TUPLE_GET_FIELD a, TUPLE_GET_FIELD a);} + +#define TUPLE_DEFINE_SETTER_FIELD_PROTO(name, a) \ + static inline void M_C3(name, _set_, TUPLE_GET_FIELD a) \ + (M_C(name,_t) my, TUPLE_GET_TYPE a const TUPLE_GET_FIELD a) { \ + TUPLEI_CONTRACT(my); \ + TUPLE_CALL_SET(a, my ->TUPLE_GET_FIELD a, TUPLE_GET_FIELD a); \ + } +/* Define the CMP method by calling CMP methods for all params. */ #define TUPLE_DEFINE_CMP(name, ...) \ static inline int M_C(name, _cmp)(M_C(name,_t) const e1 , \ M_C(name,_t) const e2) { \ @@ -319,11 +332,16 @@ namespace m_tuple { M_MAP(TUPLE_DEFINE_CMP_FUNC , __VA_ARGS__) \ return 0; \ } + #define TUPLE_DEFINE_CMP_FUNC(a) \ i = TUPLE_CALL_CMP(a, e1 -> TUPLE_GET_FIELD a , e2 -> TUPLE_GET_FIELD a ); \ if (i != 0) return i; +/* Define the CMP_ORDER method by calling CMP methods for all params + In the right order + FIXME: _cmp_order is not supported by algorithm yet. +*/ #define TUPLE_DEFINE_CMP_ORDER(name, ...) \ static inline int M_C(name, _cmp_order)(M_C(name,_t) const e1 , \ M_C(name,_t) const e2, \ @@ -331,14 +349,16 @@ namespace m_tuple { int i, r; \ TUPLEI_CONTRACT(e1); \ TUPLEI_CONTRACT(e2); \ - while ((i=*order++) != 0) { \ + while (true) { \ + i=*order++; \ switch (i) { \ + case 0: return 0; \ M_MAP2(TUPLE_DEFINE_CMP_ORDER_FUNC , name, __VA_ARGS__) \ default: assert(0); \ } \ } \ - return 0; \ } + #define TUPLE_DEFINE_CMP_ORDER_FUNC(name, a) \ case M_C4(name, _, TUPLE_GET_FIELD a, _value): \ case -M_C4(name, _, TUPLE_GET_FIELD a, _value): \ @@ -347,12 +367,15 @@ namespace m_tuple { break; -#define TUPLE_DEFINE_CMP_FIELD(name, ...) \ +/* Define a CMP_field method for all given params that export a CMP method */ +#define TUPLE_DEFINE_CMP_FIELD(name, ...) \ M_MAP2(TUPLE_MAP_CMP_FIELD, name, __VA_ARGS__) -#define TUPLE_MAP_CMP_FIELD(name, a) \ - M_IF_METHOD(CMP, TUPLE_GET_OPLIST a)( \ - TUPLE_DEFINE_CMP_FIELD_FUNC(name, TUPLE_GET_FIELD a, TUPLE_GET_CMP a), \ - ) + +#define TUPLE_MAP_CMP_FIELD(name, a) \ + M_IF_METHOD(CMP, TUPLE_GET_OPLIST a)( \ + TUPLE_DEFINE_CMP_FIELD_FUNC(name, TUPLE_GET_FIELD a, TUPLE_GET_CMP a), \ + ) + #define TUPLE_DEFINE_CMP_FIELD_FUNC(name, field, func_cmp) \ static inline int M_C3(name, _cmp_, field)(M_C(name,_t) const e1 , \ M_C(name,_t) const e2) { \ @@ -362,6 +385,7 @@ namespace m_tuple { } +/* Define a EQUAL method by calling the EQUAL methods for all params */ #define TUPLE_DEFINE_EQUAL(name, ...) \ static inline bool M_C(name, _equal_p)(M_C(name,_t) const e1 , \ M_C(name,_t) const e2) { \ @@ -371,22 +395,26 @@ namespace m_tuple { M_MAP(TUPLE_DEFINE_EQUAL_FUNC , __VA_ARGS__) \ return true; \ } + #define TUPLE_DEFINE_EQUAL_FUNC(a) \ b = TUPLE_CALL_EQUAL(a, e1 -> TUPLE_GET_FIELD a , e2 -> TUPLE_GET_FIELD a ); \ if (!b) return false; +/* Define a HASH method by calling the HASH methods for all params */ #define TUPLE_DEFINE_HASH(name, ...) \ static inline size_t M_C(name, _hash)(M_C(name,_t) const e1) { \ TUPLEI_CONTRACT(e1); \ M_HASH_DECL(hash); \ M_MAP(TUPLE_DEFINE_HASH_FUNC , __VA_ARGS__) \ - return M_HASH_FINAL (hash); \ + return M_HASH_FINAL (hash); \ } + #define TUPLE_DEFINE_HASH_FUNC(a) \ M_HASH_UP(hash, TUPLE_CALL_HASH(a, e1 -> TUPLE_GET_FIELD a) ); +/* Define a GET_STR method by calling the GET_STR methods for all params */ #define TUPLE_DEFINE_GET_STR(name, ...) \ static inline void M_C(name, _get_str)(string_t str, \ M_C(name,_t) const el, \ @@ -398,12 +426,14 @@ namespace m_tuple { M_MAP(TUPLE_DEFINE_GET_STR_FUNC , __VA_ARGS__) \ string_push_back (str, ')'); \ } + #define TUPLE_DEFINE_GET_STR_FUNC(a) \ if (comma) string_push_back (str, ','); \ comma = true; \ TUPLE_CALL_GET_STR(a, str, el -> TUPLE_GET_FIELD a, true); \ +/* Define a OUT_STR method by calling the OUT_STR methods for all params */ #define TUPLE_DEFINE_OUT_STR(name, ...) \ static inline void M_C(name, _out_str)(FILE *f, \ M_C(name,_t) const el) { \ @@ -414,12 +444,14 @@ namespace m_tuple { M_MAP(TUPLE_DEFINE_OUT_STR_FUNC , __VA_ARGS__) \ fputc (')', f); \ } + #define TUPLE_DEFINE_OUT_STR_FUNC(a) \ if (comma) fputc (',', f); \ comma = true; \ TUPLE_CALL_OUT_STR(a, f, el -> TUPLE_GET_FIELD a); \ +/* Define a IN_STR method by calling the IN_STR methods for all params */ #define TUPLE_DEFINE_IN_STR(name, ...) \ static inline bool M_C(name, _in_str)(M_C(name,_t) el, FILE *f) { \ bool comma = false; \ @@ -431,6 +463,7 @@ namespace m_tuple { c = fgetc(f); \ return (c == ')'); \ } + #define TUPLE_DEFINE_IN_STR_FUNC(a) \ if (comma) { \ c = fgetc (f); \ @@ -441,6 +474,7 @@ namespace m_tuple { return false ; \ +/* Define a PARSE_STR method by calling the PARSE_STR methods for all params */ #define TUPLE_DEFINE_PARSE_STR(name, ...) \ static inline bool M_C(name, _parse_str)(M_C(name,_t) el, \ const char str[], \ @@ -449,7 +483,7 @@ namespace m_tuple { assert (str != NULL); \ bool success = false; \ bool comma = false; \ - int c = *str++; \ + int c = *str++; \ if (c != '(') goto exit; \ M_MAP(TUPLE_DEFINE_PARSE_STR_FUNC , __VA_ARGS__) \ c = *str++; \ @@ -458,6 +492,7 @@ namespace m_tuple { if (endptr) *endptr = str; \ return success; \ } + #define TUPLE_DEFINE_PARSE_STR_FUNC(a) \ if (comma) { \ c = *str++; \ @@ -467,9 +502,13 @@ namespace m_tuple { if (TUPLE_CALL_PARSE_STR(a, el -> TUPLE_GET_FIELD a, str, &str) == false) \ goto exit ; \ -#define TUPLE_STRINGIFY_NAME(a) \ + +/* Return the parameter name as a C string */ +#define TUPLE_STRINGIFY_NAME(a) \ M_APPLY(M_AS_STR, TUPLE_GET_FIELD a) + +/* Define a OUT_SERIAL method by calling the OUT_SERIAL methods for all params */ #define TUPLE_DEFINE_OUT_SERIAL(name, ...) \ static inline m_serial_return_code_t \ M_C(name, _out_serial)(m_serial_write_t f, \ @@ -477,6 +516,7 @@ namespace m_tuple { TUPLEI_CONTRACT(el); \ assert (f != NULL && f->m_interface != NULL); \ const int field_max = M_NARGS(__VA_ARGS__); \ + /* Define a constant static table of all fields names */ \ static const char *const field_name[] = \ { M_REDUCE(TUPLE_STRINGIFY_NAME, M_ID, __VA_ARGS__) }; \ int index = 0; \ @@ -488,12 +528,14 @@ namespace m_tuple { ret |= f->m_interface->write_tuple_end(local, f); \ return ret & M_SERIAL_FAIL; \ } + #define TUPLE_DEFINE_OUT_SERIAL_FUNC(a) \ f->m_interface->write_tuple_id(local, f, field_name, field_max, index); \ TUPLE_CALL_OUT_SERIAL(a, f, el -> TUPLE_GET_FIELD a); \ index++; \ +/* Define a IN_SERIAL method by calling the IN_SERIAL methods for all params */ #define TUPLE_DEFINE_IN_SERIAL(name, ...) \ static inline m_serial_return_code_t \ M_C(name, _in_serial)(M_C(name,_t) el, m_serial_read_t f) { \ @@ -519,69 +561,82 @@ namespace m_tuple { } \ return ret; \ } + #define TUPLE_DEFINE_IN_SERIAL_FUNC(name, a) \ case M_C4(name, _, TUPLE_GET_FIELD a, _value): \ ret = TUPLE_CALL_IN_SERIAL(a, el -> TUPLE_GET_FIELD a, f); \ break; \ +/* Define a INIT_MOVE method by calling the INIT_MOVE methods for all params */ #define TUPLE_DEFINE_INIT_MOVE(name, ...) \ static inline void M_C(name, _init_move)(M_C(name,_t) el, M_C(name,_t) org) { \ TUPLEI_CONTRACT(el); \ M_MAP(TUPLE_DEFINE_INIT_MOVE_FUNC , __VA_ARGS__) \ } + #define TUPLE_DEFINE_INIT_MOVE_FUNC(a) \ TUPLE_CALL_INIT_MOVE(a, el -> TUPLE_GET_FIELD a, org -> TUPLE_GET_FIELD a); +/* Define a MOVE method by calling the MOVE methods for all params */ #define TUPLE_DEFINE_MOVE(name, ...) \ static inline void M_C(name, _move)(M_C(name,_t) el, M_C(name,_t) org) { \ TUPLEI_CONTRACT(el); \ M_MAP(TUPLE_DEFINE_MOVE_FUNC , __VA_ARGS__) \ } -#define TUPLE_DEFINE_MOVE_FUNC(a) \ + +#define TUPLE_DEFINE_MOVE_FUNC(a) \ TUPLE_CALL_MOVE(a, el -> TUPLE_GET_FIELD a, org -> TUPLE_GET_FIELD a); +/* Define a SWAP method by calling the SWAP methods for all params */ #define TUPLE_DEFINE_SWAP(name, ...) \ static inline void M_C(name, _swap)(M_C(name,_t) el1, M_C(name,_t) el2) { \ TUPLEI_CONTRACT(el1); \ TUPLEI_CONTRACT(el2); \ M_MAP(TUPLE_DEFINE_SWAP_FUNC , __VA_ARGS__) \ } + #define TUPLE_DEFINE_SWAP_FUNC(a) \ TUPLE_CALL_SWAP(a, el1 -> TUPLE_GET_FIELD a, el2 -> TUPLE_GET_FIELD a); +/* Define a CLEAN method by calling the CLEAN methods for all params */ #define TUPLE_DEFINE_CLEAN(name, ...) \ static inline void M_C(name, _clean)(M_C(name,_t) el1) { \ TUPLEI_CONTRACT(el1); \ M_MAP(TUPLE_DEFINE_CLEAN_FUNC , __VA_ARGS__) \ } -#define TUPLE_DEFINE_CLEAN_FUNC(a) \ + +#define TUPLE_DEFINE_CLEAN_FUNC(a) \ TUPLE_CALL_CLEAN(a, el1 -> TUPLE_GET_FIELD a); -/* Macros for testing for method presence */ -#define TUPLE_TEST_METHOD2_P(method, f, t, op) \ - M_TEST_METHOD_P(method, op) -#define TUPLE_TEST_METHOD_P(method, trio) \ +/* Macros for testing for the presence of a method in the parameter (name, type, oplist) */ +#define TUPLE_TEST_METHOD_P(method, trio) \ M_APPLY(TUPLE_TEST_METHOD2_P, method, M_OPFLAT trio) +#define TUPLE_TEST_METHOD2_P(method, f, t, op) \ + M_TEST_METHOD_P(method, op) + + +/* Macros for testing for the presence of a method in all the params */ #define TUPLEI_IF_ALL(method, ...) \ M_IF(M_REDUCE2(TUPLE_TEST_METHOD_P, M_AND, method, __VA_ARGS__)) -// deferred +// deferred evaluation #define TUPLEI_OPLIST_P1(arg) TUPLEI_OPLIST_P2 arg /* Validate the oplist before going further */ -#define TUPLEI_OPLIST_P2(name, ...) \ +#define TUPLEI_OPLIST_P2(name, ...) \ M_IF(M_REDUCE(M_OPLIST_P, M_AND, __VA_ARGS__))(TUPLEI_OPLIST_P3, TUPLEI_OPLIST_FAILURE)(name, __VA_ARGS__) /* Prepare a clean compilation failure */ -#define TUPLEI_OPLIST_FAILURE(name, ...) \ +#define TUPLEI_OPLIST_FAILURE(name, ...) \ ((M_LIB_ERROR(ONE_ARGUMENT_OF_TUPLE_OPLIST_IS_NOT_AN_OPLIST, name, __VA_ARGS__))) +/* Define the TUPLE oplist */ #define TUPLEI_OPLIST_P3(name, ...) \ (M_IF_METHOD_ALL(INIT, __VA_ARGS__)(INIT(M_C(name,_init)),), \ INIT_SET(M_C(name, _init_set)), \