Add checks of missing oplist in the last _DEF macros

m-funcobj.h

@@ -83,7 +83,6 @@
  * FIXME: How to factorize reasonnably well between the definitions?
  */
 
-
 /* Specialization of the OPLIST in function if there is at least one member or not */
 #define FUNC_OBJ_INS_NO_ATTR_OPLIST(name, ...)                          \
   (NAME(name), TYPE(M_C(name, _t)),                                     \
@@ -195,8 +194,39 @@
 
 /* Specialization of the definition a function object instance of name 'name'
  * with mandatory member attribute.
+ * First inject oplist in member attributes.
  */
 #define FUNC_OBJ_INS_ATTR_DEF(name, base_name, param_list, callback_core, ...) \
+  FUNCOBJI_INS_ATTR_DEF_P2(name, base_name, param_list, callback_core, FUNCOBJI_INJECT_GLOBAL(__VA_ARGS__) )
+
+/* Inject the oplist within the list of arguments */
+#define FUNCOBJI_INJECT_GLOBAL(...)               \
+  M_MAP_C(FUNCOBJI_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 FUNCOBJI_INJECT_OPLIST_A( duo_or_trio )   \
+  FUNCOBJI_INJECT_OPLIST_B duo_or_trio
+#define FUNCOBJI_INJECT_OPLIST_B( f, ... )                                \
+  M_IF_NARGS_EQ1(__VA_ARGS__)( (f, __VA_ARGS__, M_GLOBAL_OPLIST_OR_DEF(__VA_ARGS__)()), (f, __VA_ARGS__) )
+
+// Test if all third argument of all arguments is an oplist
+#define FUNCOBJI_IF_ALL_OPLIST(...)                               \
+  M_IF(M_REDUCE(FUNCOBJI_IS_OPLIST_P, M_AND, __VA_ARGS__))
+// Test if the third argument is an oplist
+#define FUNCOBJI_IS_OPLIST_P(a)                   \
+  M_OPLIST_P(M_RET_ARG3 a)
+
+/* Validate the oplist before going further */
+#define FUNCOBJI_INS_ATTR_DEF_P2(name, base_name, param_list, callback_core, ...) \
+  FUNCOBJI_IF_ALL_OPLIST(__VA_ARGS__)(FUNCOBJI_INS_ATTR_DEF_P3, FUNCOBJI_INS_ATTR_DEF_FAILURE)(name, base_name, param_list, callback_core, __VA_ARGS__)
+
+/* Stop processing with a compilation failure */
+#define FUNCOBJI_INS_ATTR_DEF_FAILURE(name, base_name, param_list, callback_core, ...) \
+  M_STATIC_FAILURE(M_LIB_NOT_AN_OPLIST, "(FUNC_OBJ_INS_DEF): at least one of the given argument is not a valid oplist: " #__VA_ARGS__)
+
+/* Expand the Function Object with members */
+#define FUNCOBJI_INS_ATTR_DEF_P3(name, base_name, param_list, callback_core, ...) \
   typedef struct M_C(name, _s) {                                        \
     M_C(base_name, _callback_t) callback;                               \
     M_MAP(FUNC_OBJ_INS_ATTR_STRUCT, __VA_ARGS__)                        \
@@ -245,6 +275,7 @@
     , /* END OF INIT METHOD */ )                                        \
 
 
+
 /* Helper macros */
 #define FUNC_OBJ_BASE_TYPE(name, num, type)     \
   typedef type M_C4(name, _param_, num, _t);