summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2013-11-11 13:27:36 +0000
committerTom Hacohen <tom@stosb.com>2013-11-11 13:27:36 +0000
commit803e95f195177fee9a8712e96cdae7fc4f1f6bac (patch)
tree90938a00f692a8ebecd49dc759c23fd6a2533f5a
parent00ac9f0acc3d8400b6917a737329a2d4ec079e86 (diff)
Eo2: Change the order of EO2_OP_FUNC* to put EAPI first.devs/jeyzu/eo2-next
This looks cleaner and more aligned. Also, it makes more sense as the internal function is bound to the EAPI and not the other way around.
-rw-r--r--eo2test/TODO2
-rw-r--r--src/lib/eo/Eo.h10
-rw-r--r--src/lib/eo/eo2_base_class.c48
-rw-r--r--src/tests/eo/access/access_inherit.c2
-rw-r--r--src/tests/eo/access/access_simple.c2
-rw-r--r--src/tests/eo/composite_objects/composite_objects_comp.c4
-rw-r--r--src/tests/eo/composite_objects/composite_objects_simple.c4
-rw-r--r--src/tests/eo/constructors/constructors_mixin.c6
-rw-r--r--src/tests/eo/constructors/constructors_simple.c14
-rw-r--r--src/tests/eo/constructors/constructors_simple2.c2
-rw-r--r--src/tests/eo/constructors/constructors_simple3.c2
-rw-r--r--src/tests/eo/constructors/constructors_simple5.c2
-rw-r--r--src/tests/eo/constructors/constructors_simple6.c2
-rw-r--r--src/tests/eo/constructors/constructors_simple7.c2
-rw-r--r--src/tests/eo/function_overrides/function_overrides_inherit2.c8
-rw-r--r--src/tests/eo/function_overrides/function_overrides_inherit3.c2
-rw-r--r--src/tests/eo/function_overrides/function_overrides_simple.c8
-rw-r--r--src/tests/eo/interface/interface_interface.c2
-rw-r--r--src/tests/eo/interface/interface_interface2.c2
-rw-r--r--src/tests/eo/interface/interface_simple.c12
-rw-r--r--src/tests/eo/mixin/mixin_inherit.c2
-rw-r--r--src/tests/eo/mixin/mixin_mixin.c6
-rw-r--r--src/tests/eo/mixin/mixin_mixin2.c6
-rw-r--r--src/tests/eo/mixin/mixin_mixin3.c6
-rw-r--r--src/tests/eo/mixin/mixin_simple.c8
-rw-r--r--src/tests/eo/signals/signals_simple.c4
-rw-r--r--src/tests/eo/suite/eo_test_class_simple.c10
-rw-r--r--src/tests/eo/suite/eo_test_general.c8
28 files changed, 92 insertions, 94 deletions
diff --git a/eo2test/TODO b/eo2test/TODO
index 9fa0f4f82e..07af5bd718 100644
--- a/eo2test/TODO
+++ b/eo2test/TODO
@@ -17,8 +17,6 @@
17- function name from pointer 17- function name from pointer
18 dladdr backtrace ?? 18 dladdr backtrace ??
19 19
20- Change the order of EO2_OP_FUNC* functions to put the ID first?
21
22- Get rid of some of the EO2_VOID_FUNC_BODY? 20- Get rid of some of the EO2_VOID_FUNC_BODY?
23 21
24- Add line number to errors (like in eo1...) 22- Add line number to errors (like in eo1...)
diff --git a/src/lib/eo/Eo.h b/src/lib/eo/Eo.h
index 61666ed4d6..9a0ec13993 100644
--- a/src/lib/eo/Eo.h
+++ b/src/lib/eo/Eo.h
@@ -448,8 +448,8 @@ typedef struct _Eo_Op_Description Eo_Op_Description;
448 448
449typedef struct _Eo2_Op_Description 449typedef struct _Eo2_Op_Description
450{ 450{
451 void *func; /**< The static function to call for the op. */
452 void *api_func; /**< The EAPI function offering this op. */ 451 void *api_func; /**< The EAPI function offering this op. */
452 void *func; /**< The static function to call for the op. */
453 Eo_Op op; /**< The op. */ 453 Eo_Op op; /**< The op. */
454 Eo_Op_Type op_type; /**< The type of the Op. */ 454 Eo_Op_Type op_type; /**< The type of the Op. */
455 const char *doc; /**< Explanation about the Op. */ 455 const char *doc; /**< Explanation about the Op. */
@@ -697,10 +697,10 @@ EAPI extern Eo2_Hook_Call eo2_hook_call_post;
697// OP ID of an overriding function 697// OP ID of an overriding function
698#define EO2_OP_OVERRIDE ((Eo_Op) -1) 698#define EO2_OP_OVERRIDE ((Eo_Op) -1)
699 699
700#define EO2_OP_FUNC(_private, _api, _doc) {_private, _api, EO_NOOP, EO_OP_TYPE_REGULAR, _doc} 700#define EO2_OP_FUNC(_api, _private, _doc) {_api, _private, EO_NOOP, EO_OP_TYPE_REGULAR, _doc}
701#define EO2_OP_CLASS_FUNC(_private, _api, _doc) {_private, _api, EO_NOOP, EO_OP_TYPE_CLASS, _doc} 701#define EO2_OP_CLASS_FUNC(_api, _private, _doc) {_api, _private, EO_NOOP, EO_OP_TYPE_CLASS, _doc}
702#define EO2_OP_FUNC_OVERRIDE(_private, _api) {_private, _api, EO2_OP_OVERRIDE, EO_OP_TYPE_REGULAR, NULL} 702#define EO2_OP_FUNC_OVERRIDE(_api, _private) {_api, _private, EO2_OP_OVERRIDE, EO_OP_TYPE_REGULAR, NULL}
703#define EO2_OP_CLASS_FUNC_OVERRIDE(_private, _api) {_private, _api, EO2_OP_OVERRIDE, EO_OP_TYPE_CLASS, NULL} 703#define EO2_OP_CLASS_FUNC_OVERRIDE(_api, _private) {_api, _private, EO2_OP_OVERRIDE, EO_OP_TYPE_CLASS, NULL}
704#define EO2_OP_SENTINEL { NULL, NULL, 0, EO_OP_TYPE_INVALID, NULL} 704#define EO2_OP_SENTINEL { NULL, NULL, 0, EO_OP_TYPE_INVALID, NULL}
705 705
706// returns the OP id corresponding to the given api_func 706// returns the OP id corresponding to the given api_func
diff --git a/src/lib/eo/eo2_base_class.c b/src/lib/eo/eo2_base_class.c
index ba863024e0..ad5bc6400d 100644
--- a/src/lib/eo/eo2_base_class.c
+++ b/src/lib/eo/eo2_base_class.c
@@ -926,30 +926,30 @@ _class_constructor(Eo_Class *klass EINA_UNUSED)
926} 926}
927 927
928static Eo2_Op_Description op_descs [] = { 928static Eo2_Op_Description op_descs [] = {
929 EO2_OP_FUNC(_constructor, eo2_constructor, "Constructor."), 929 EO2_OP_FUNC(eo2_constructor, _constructor, "Constructor."),
930 EO2_OP_FUNC(_destructor, eo2_destructor, "Destructor."), 930 EO2_OP_FUNC(eo2_destructor, _destructor, "Destructor."),
931 EO2_OP_FUNC(_parent_set, eo2_parent_set, "Set parent."), 931 EO2_OP_FUNC(eo2_parent_set, _parent_set, "Set parent."),
932 EO2_OP_FUNC(_parent_get, eo2_parent_get, "Get parent."), 932 EO2_OP_FUNC(eo2_parent_get, _parent_get, "Get parent."),
933 EO2_OP_FUNC(_children_iterator_new, eo2_children_iterator_new, "Get Children Iterator."), 933 EO2_OP_FUNC(eo2_children_iterator_new, _children_iterator_new, "Get Children Iterator."),
934 EO2_OP_FUNC(_data_set, eo2_base_data_set, "Set data for key."), 934 EO2_OP_FUNC(eo2_base_data_set, _data_set, "Set data for key."),
935 EO2_OP_FUNC(_data_get, eo2_base_data_get, "Get data for key."), 935 EO2_OP_FUNC(eo2_base_data_get, _data_get, "Get data for key."),
936 EO2_OP_FUNC(_data_del, eo2_base_data_del, "Del key."), 936 EO2_OP_FUNC(eo2_base_data_del, _data_del, "Del key."),
937 EO2_OP_FUNC(_wref_add, eo2_wref_add, "Add a weak ref to the object."), 937 EO2_OP_FUNC(eo2_wref_add, _wref_add, "Add a weak ref to the object."),
938 EO2_OP_FUNC(_wref_del, eo2_wref_del, "Delete the weak ref."), 938 EO2_OP_FUNC(eo2_wref_del, _wref_del, "Delete the weak ref."),
939 EO2_OP_FUNC(_ev_cb_priority_add, eo2_event_callback_priority_add, "Add an event callback with a priority."), 939 EO2_OP_FUNC(eo2_event_callback_priority_add, _ev_cb_priority_add, "Add an event callback with a priority."),
940 EO2_OP_FUNC(_ev_cb_del, eo2_event_callback_del, "Delete an event callback"), 940 EO2_OP_FUNC(eo2_event_callback_del, _ev_cb_del, "Delete an event callback"),
941 EO2_OP_FUNC(_ev_cb_array_priority_add, eo2_event_callback_array_priority_add, "Add an event callback array with a priority."), 941 EO2_OP_FUNC(eo2_event_callback_array_priority_add, _ev_cb_array_priority_add, "Add an event callback array with a priority."),
942 EO2_OP_FUNC(_ev_cb_array_del, eo2_event_callback_array_del, "Delete an event callback array"), 942 EO2_OP_FUNC(eo2_event_callback_array_del, _ev_cb_array_del, "Delete an event callback array"),
943 EO2_OP_FUNC(_ev_cb_call, eo2_event_callback_call, "Call the event callbacks for an event."), 943 EO2_OP_FUNC(eo2_event_callback_call, _ev_cb_call, "Call the event callbacks for an event."),
944 EO2_OP_FUNC(_ev_cb_forwarder_add, eo2_event_callback_forwarder_add, "Add an event forwarder."), 944 EO2_OP_FUNC(eo2_event_callback_forwarder_add, _ev_cb_forwarder_add, "Add an event forwarder."),
945 EO2_OP_FUNC(_ev_cb_forwarder_del, eo2_event_callback_forwarder_del, "Delete an event forwarder."), 945 EO2_OP_FUNC(eo2_event_callback_forwarder_del, _ev_cb_forwarder_del, "Delete an event forwarder."),
946 EO2_OP_FUNC(_ev_freeze, eo2_event_freeze, "Freezes events."), 946 EO2_OP_FUNC(eo2_event_freeze, _ev_freeze, "Freezes events."),
947 EO2_OP_FUNC(_ev_thaw, eo2_event_thaw, "Thaws events."), 947 EO2_OP_FUNC(eo2_event_thaw, _ev_thaw, "Thaws events."),
948 EO2_OP_FUNC(_ev_freeze_get, eo2_event_freeze_get, "Get event freeze counter."), 948 EO2_OP_FUNC(eo2_event_freeze_get, _ev_freeze_get, "Get event freeze counter."),
949 EO2_OP_FUNC(_ev_global_freeze, eo2_event_global_freeze, "Freezes events globally."), 949 EO2_OP_FUNC(eo2_event_global_freeze, _ev_global_freeze, "Freezes events globally."),
950 EO2_OP_FUNC(_ev_global_thaw, eo2_event_global_thaw, "Thaws events globally."), 950 EO2_OP_FUNC(eo2_event_global_thaw, _ev_global_thaw, "Thaws events globally."),
951 EO2_OP_FUNC(_ev_global_freeze_get, eo2_event_global_freeze_get, "Get global event freeze counter."), 951 EO2_OP_FUNC(eo2_event_global_freeze_get, _ev_global_freeze_get, "Get global event freeze counter."),
952 EO2_OP_FUNC(_dbg_info_get, eo2_dbg_info_get, "Get debug info list for obj."), 952 EO2_OP_FUNC(eo2_dbg_info_get, _dbg_info_get, "Get debug info list for obj."),
953 EO2_OP_SENTINEL 953 EO2_OP_SENTINEL
954}; 954};
955 955
diff --git a/src/tests/eo/access/access_inherit.c b/src/tests/eo/access/access_inherit.c
index 303f60f261..6db73134de 100644
--- a/src/tests/eo/access/access_inherit.c
+++ b/src/tests/eo/access/access_inherit.c
@@ -19,7 +19,7 @@ _prot_print(Eo *obj, void *class_data EINA_UNUSED)
19EAPI EO2_VOID_FUNC_BODY(inherit_prot_print); 19EAPI EO2_VOID_FUNC_BODY(inherit_prot_print);
20 20
21static Eo2_Op_Description op_descs[] = { 21static Eo2_Op_Description op_descs[] = {
22 EO2_OP_FUNC(_prot_print, inherit_prot_print, "Print protected var x1."), 22 EO2_OP_FUNC(inherit_prot_print, _prot_print, "Print protected var x1."),
23 EO2_OP_SENTINEL 23 EO2_OP_SENTINEL
24}; 24};
25 25
diff --git a/src/tests/eo/access/access_simple.c b/src/tests/eo/access/access_simple.c
index a7a14a10f7..59997f3a78 100644
--- a/src/tests/eo/access/access_simple.c
+++ b/src/tests/eo/access/access_simple.c
@@ -33,7 +33,7 @@ _a_set(Eo *obj, void *class_data, int a)
33EAPI EO2_VOID_FUNC_BODYV(simple_a_set, EO2_FUNC_CALL(a), int a); 33EAPI EO2_VOID_FUNC_BODYV(simple_a_set, EO2_FUNC_CALL(a), int a);
34 34
35static Eo2_Op_Description op_descs[] = { 35static Eo2_Op_Description op_descs[] = {
36 EO2_OP_FUNC(_a_set, simple_a_set, "Set property A"), 36 EO2_OP_FUNC(simple_a_set, _a_set, "Set property A"),
37 EO2_OP_SENTINEL 37 EO2_OP_SENTINEL
38}; 38};
39 39
diff --git a/src/tests/eo/composite_objects/composite_objects_comp.c b/src/tests/eo/composite_objects/composite_objects_comp.c
index fb874f1b86..9d1ec64eab 100644
--- a/src/tests/eo/composite_objects/composite_objects_comp.c
+++ b/src/tests/eo/composite_objects/composite_objects_comp.c
@@ -37,8 +37,8 @@ _constructor(Eo *obj, void *class_data EINA_UNUSED)
37} 37}
38 38
39static Eo2_Op_Description op_descs[] = { 39static Eo2_Op_Description op_descs[] = {
40 EO2_OP_FUNC_OVERRIDE(_constructor, eo2_constructor), 40 EO2_OP_FUNC_OVERRIDE(eo2_constructor, _constructor),
41 EO2_OP_FUNC_OVERRIDE(_a_get, simple_a_get), 41 EO2_OP_FUNC_OVERRIDE(simple_a_get, _a_get),
42 EO2_OP_SENTINEL 42 EO2_OP_SENTINEL
43}; 43};
44 44
diff --git a/src/tests/eo/composite_objects/composite_objects_simple.c b/src/tests/eo/composite_objects/composite_objects_simple.c
index 3ccef86d27..e44df196fb 100644
--- a/src/tests/eo/composite_objects/composite_objects_simple.c
+++ b/src/tests/eo/composite_objects/composite_objects_simple.c
@@ -31,8 +31,8 @@ EAPI EO2_VOID_FUNC_BODYV(simple_a_set, EO2_FUNC_CALL(a), int a);
31EAPI EO2_FUNC_BODY(simple_a_get, int, 0); 31EAPI EO2_FUNC_BODY(simple_a_get, int, 0);
32 32
33static Eo2_Op_Description op_descs[] = { 33static Eo2_Op_Description op_descs[] = {
34 EO2_OP_FUNC(_a_set, simple_a_set, "Set property A"), 34 EO2_OP_FUNC(simple_a_set, _a_set, "Set property A"),
35 EO2_OP_FUNC(_a_get, simple_a_get, "Get property A"), 35 EO2_OP_FUNC(simple_a_get, _a_get, "Get property A"),
36 EO2_OP_SENTINEL 36 EO2_OP_SENTINEL
37}; 37};
38 38
diff --git a/src/tests/eo/constructors/constructors_mixin.c b/src/tests/eo/constructors/constructors_mixin.c
index a72911733b..62ebf7bb09 100644
--- a/src/tests/eo/constructors/constructors_mixin.c
+++ b/src/tests/eo/constructors/constructors_mixin.c
@@ -37,9 +37,9 @@ _destructor(Eo *obj, void *class_data EINA_UNUSED)
37EAPI EO2_VOID_FUNC_BODYV(mixin_add_and_print, EO2_FUNC_CALL(x), int x); 37EAPI EO2_VOID_FUNC_BODYV(mixin_add_and_print, EO2_FUNC_CALL(x), int x);
38 38
39static Eo2_Op_Description op_descs[] = { 39static Eo2_Op_Description op_descs[] = {
40 EO2_OP_FUNC(_add_and_print_set, mixin_add_and_print, "Add A + B + param and print it"), 40 EO2_OP_FUNC(mixin_add_and_print, _add_and_print_set, "Add A + B + param and print it"),
41 EO2_OP_FUNC_OVERRIDE(_constructor, eo2_constructor), 41 EO2_OP_FUNC_OVERRIDE(eo2_constructor, _constructor),
42 EO2_OP_FUNC_OVERRIDE(_destructor, eo2_destructor), 42 EO2_OP_FUNC_OVERRIDE(eo2_destructor, _destructor),
43 EO2_OP_SENTINEL 43 EO2_OP_SENTINEL
44}; 44};
45 45
diff --git a/src/tests/eo/constructors/constructors_simple.c b/src/tests/eo/constructors/constructors_simple.c
index f5ab9f5123..dfa51bf75e 100644
--- a/src/tests/eo/constructors/constructors_simple.c
+++ b/src/tests/eo/constructors/constructors_simple.c
@@ -83,13 +83,13 @@ _class_destructor(Eo_Class *klass EINA_UNUSED)
83EO2_VOID_FUNC_BODYV(simple_constructor, EO2_FUNC_CALL(a), int a); 83EO2_VOID_FUNC_BODYV(simple_constructor, EO2_FUNC_CALL(a), int a);
84 84
85static Eo2_Op_Description op_descs[] = { 85static Eo2_Op_Description op_descs[] = {
86 EO2_OP_FUNC_OVERRIDE(_constructor, eo2_constructor), 86 EO2_OP_FUNC_OVERRIDE(eo2_constructor, _constructor),
87 EO2_OP_FUNC_OVERRIDE(_destructor, eo2_destructor), 87 EO2_OP_FUNC_OVERRIDE(eo2_destructor, _destructor),
88 EO2_OP_FUNC(_simple_constructor, simple_constructor, "Construct and set A."), 88 EO2_OP_FUNC(simple_constructor, _simple_constructor, "Construct and set A."),
89 EO2_OP_FUNC(_a_set, simple_a_set, "Set property a"), 89 EO2_OP_FUNC(simple_a_set, _a_set, "Set property a"),
90 EO2_OP_FUNC(_a_get, simple_a_get, "Get property a"), 90 EO2_OP_FUNC(simple_a_get, _a_get, "Get property a"),
91 EO2_OP_FUNC(_b_set, simple_b_set, "Set property b"), 91 EO2_OP_FUNC(simple_b_set, _b_set, "Set property b"),
92 EO2_OP_FUNC(_b_get, simple_b_get, "Get property b"), 92 EO2_OP_FUNC(simple_b_get, _b_get, "Get property b"),
93 EO2_OP_SENTINEL 93 EO2_OP_SENTINEL
94}; 94};
95 95
diff --git a/src/tests/eo/constructors/constructors_simple2.c b/src/tests/eo/constructors/constructors_simple2.c
index 3f6d6bdded..b7b4aaef2d 100644
--- a/src/tests/eo/constructors/constructors_simple2.c
+++ b/src/tests/eo/constructors/constructors_simple2.c
@@ -17,7 +17,7 @@ _constructor(Eo *obj, void *class_data EINA_UNUSED)
17} 17}
18 18
19static Eo2_Op_Description op_descs[] = { 19static Eo2_Op_Description op_descs[] = {
20 EO2_OP_FUNC_OVERRIDE(_constructor, eo2_constructor), 20 EO2_OP_FUNC_OVERRIDE(eo2_constructor, _constructor),
21 EO2_OP_SENTINEL 21 EO2_OP_SENTINEL
22}; 22};
23 23
diff --git a/src/tests/eo/constructors/constructors_simple3.c b/src/tests/eo/constructors/constructors_simple3.c
index 1a8a32fac5..233005eecb 100644
--- a/src/tests/eo/constructors/constructors_simple3.c
+++ b/src/tests/eo/constructors/constructors_simple3.c
@@ -15,7 +15,7 @@ _constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED)
15} 15}
16 16
17static Eo2_Op_Description op_descs[] = { 17static Eo2_Op_Description op_descs[] = {
18 EO2_OP_FUNC_OVERRIDE(_constructor, eo2_constructor), 18 EO2_OP_FUNC_OVERRIDE(eo2_constructor, _constructor),
19 EO2_OP_SENTINEL 19 EO2_OP_SENTINEL
20}; 20};
21 21
diff --git a/src/tests/eo/constructors/constructors_simple5.c b/src/tests/eo/constructors/constructors_simple5.c
index ea43291eea..b64b969819 100644
--- a/src/tests/eo/constructors/constructors_simple5.c
+++ b/src/tests/eo/constructors/constructors_simple5.c
@@ -15,7 +15,7 @@ _destructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED)
15} 15}
16 16
17static Eo2_Op_Description op_descs[] = { 17static Eo2_Op_Description op_descs[] = {
18 EO2_OP_FUNC_OVERRIDE(_destructor, eo2_destructor), 18 EO2_OP_FUNC_OVERRIDE(eo2_destructor, _destructor),
19 EO2_OP_SENTINEL 19 EO2_OP_SENTINEL
20}; 20};
21 21
diff --git a/src/tests/eo/constructors/constructors_simple6.c b/src/tests/eo/constructors/constructors_simple6.c
index d78cad88e0..7a23eb31d4 100644
--- a/src/tests/eo/constructors/constructors_simple6.c
+++ b/src/tests/eo/constructors/constructors_simple6.c
@@ -17,7 +17,7 @@ _destructor(Eo *obj, void *class_data EINA_UNUSED)
17} 17}
18 18
19static Eo2_Op_Description op_descs [] = { 19static Eo2_Op_Description op_descs [] = {
20 EO2_OP_FUNC_OVERRIDE(_destructor, eo2_destructor), 20 EO2_OP_FUNC_OVERRIDE(eo2_destructor, _destructor),
21 EO2_OP_SENTINEL 21 EO2_OP_SENTINEL
22}; 22};
23 23
diff --git a/src/tests/eo/constructors/constructors_simple7.c b/src/tests/eo/constructors/constructors_simple7.c
index 90b11c4984..fb4a731261 100644
--- a/src/tests/eo/constructors/constructors_simple7.c
+++ b/src/tests/eo/constructors/constructors_simple7.c
@@ -19,7 +19,7 @@ _constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED)
19} 19}
20 20
21static Eo2_Op_Description op_descs [] = { 21static Eo2_Op_Description op_descs [] = {
22 EO2_OP_FUNC_OVERRIDE(_constructor, eo2_constructor), 22 EO2_OP_FUNC_OVERRIDE(eo2_constructor, _constructor),
23 EO2_OP_SENTINEL 23 EO2_OP_SENTINEL
24}; 24};
25 25
diff --git a/src/tests/eo/function_overrides/function_overrides_inherit2.c b/src/tests/eo/function_overrides/function_overrides_inherit2.c
index f228528719..cf8b1cb0db 100644
--- a/src/tests/eo/function_overrides/function_overrides_inherit2.c
+++ b/src/tests/eo/function_overrides/function_overrides_inherit2.c
@@ -60,10 +60,10 @@ EAPI EO2_FUNC_BODY(inherit2_print, Eina_Bool, EINA_FALSE);
60EAPI EO2_FUNC_BODY(inherit2_print2, Eina_Bool, EINA_FALSE); 60EAPI EO2_FUNC_BODY(inherit2_print2, Eina_Bool, EINA_FALSE);
61 61
62static Eo2_Op_Description op_descs[] = { 62static Eo2_Op_Description op_descs[] = {
63 EO2_OP_FUNC(_print, inherit2_print, "Print hey"), 63 EO2_OP_FUNC(inherit2_print, _print, "Print hey"),
64 EO2_OP_FUNC(_print2, inherit2_print2, "Print hey2"), 64 EO2_OP_FUNC(inherit2_print2, _print2, "Print hey2"),
65 EO2_OP_CLASS_FUNC_OVERRIDE(_class_print, simple_class_print), 65 EO2_OP_CLASS_FUNC_OVERRIDE(simple_class_print, _class_print),
66 EO2_OP_FUNC_OVERRIDE(_a_set, simple_a_set), 66 EO2_OP_FUNC_OVERRIDE(simple_a_set, _a_set),
67 EO2_OP_SENTINEL 67 EO2_OP_SENTINEL
68}; 68};
69 69
diff --git a/src/tests/eo/function_overrides/function_overrides_inherit3.c b/src/tests/eo/function_overrides/function_overrides_inherit3.c
index ad4cb67f8c..68214b7b26 100644
--- a/src/tests/eo/function_overrides/function_overrides_inherit3.c
+++ b/src/tests/eo/function_overrides/function_overrides_inherit3.c
@@ -17,7 +17,7 @@ _a_set(Eo *obj, void *class_data EINA_UNUSED, int a)
17} 17}
18 18
19static Eo2_Op_Description op_descs[] = { 19static Eo2_Op_Description op_descs[] = {
20 EO2_OP_FUNC_OVERRIDE(_a_set, simple_a_set), 20 EO2_OP_FUNC_OVERRIDE(simple_a_set, _a_set),
21 EO2_OP_SENTINEL 21 EO2_OP_SENTINEL
22}; 22};
23 23
diff --git a/src/tests/eo/function_overrides/function_overrides_simple.c b/src/tests/eo/function_overrides/function_overrides_simple.c
index 3de5938aad..1e2ef0e6f7 100644
--- a/src/tests/eo/function_overrides/function_overrides_simple.c
+++ b/src/tests/eo/function_overrides/function_overrides_simple.c
@@ -57,10 +57,10 @@ EAPI EO2_FUNC_BODY(simple_class_print, Eina_Bool, EINA_FALSE);
57EAPI EO2_FUNC_BODY(simple_class_print2, Eina_Bool, EINA_FALSE); 57EAPI EO2_FUNC_BODY(simple_class_print2, Eina_Bool, EINA_FALSE);
58 58
59static Eo2_Op_Description op_descs[] = { 59static Eo2_Op_Description op_descs[] = {
60 EO2_OP_FUNC(_a_set, simple_a_set, "Set property A"), 60 EO2_OP_FUNC(simple_a_set, _a_set, "Set property A"),
61 EO2_OP_FUNC(_a_print, simple_a_print, "Print property A"), 61 EO2_OP_FUNC(simple_a_print, _a_print, "Print property A"),
62 EO2_OP_FUNC(_class_print, simple_class_print, "Print class name."), 62 EO2_OP_FUNC(simple_class_print, _class_print, "Print class name."),
63 EO2_OP_FUNC(_class_print2, simple_class_print2, "Print2 class name."), 63 EO2_OP_FUNC(simple_class_print2, _class_print2, "Print2 class name."),
64 EO2_OP_SENTINEL 64 EO2_OP_SENTINEL
65}; 65};
66 66
diff --git a/src/tests/eo/interface/interface_interface.c b/src/tests/eo/interface/interface_interface.c
index 0afd136b6c..eac93cd2b0 100644
--- a/src/tests/eo/interface/interface_interface.c
+++ b/src/tests/eo/interface/interface_interface.c
@@ -11,7 +11,7 @@
11EO2_FUNC_BODY(interface_ab_sum_get, int, 0); 11EO2_FUNC_BODY(interface_ab_sum_get, int, 0);
12 12
13static Eo2_Op_Description op_descs[] = { 13static Eo2_Op_Description op_descs[] = {
14 EO2_OP_FUNC(NULL, interface_ab_sum_get, "Get the sum of a and b."), 14 EO2_OP_FUNC(interface_ab_sum_get, NULL, "Get the sum of a and b."),
15 EO2_OP_SENTINEL 15 EO2_OP_SENTINEL
16}; 16};
17 17
diff --git a/src/tests/eo/interface/interface_interface2.c b/src/tests/eo/interface/interface_interface2.c
index 27f2e3c35c..198850da05 100644
--- a/src/tests/eo/interface/interface_interface2.c
+++ b/src/tests/eo/interface/interface_interface2.c
@@ -12,7 +12,7 @@
12EO2_FUNC_BODY(interface2_ab_sum_get2, int, 0); 12EO2_FUNC_BODY(interface2_ab_sum_get2, int, 0);
13 13
14static Eo2_Op_Description op_descs[] = { 14static Eo2_Op_Description op_descs[] = {
15 EO2_OP_FUNC(NULL, interface2_ab_sum_get2, "Print the sum of a and b."), 15 EO2_OP_FUNC(interface2_ab_sum_get2, NULL, "Print the sum of a and b."),
16 EO2_OP_SENTINEL 16 EO2_OP_SENTINEL
17}; 17};
18 18
diff --git a/src/tests/eo/interface/interface_simple.c b/src/tests/eo/interface/interface_simple.c
index 16e2b836a5..8a0aa1f06b 100644
--- a/src/tests/eo/interface/interface_simple.c
+++ b/src/tests/eo/interface/interface_simple.c
@@ -55,12 +55,12 @@ _ab_sum_get2(Eo *obj, void *class_data EINA_UNUSED)
55} 55}
56 56
57static Eo2_Op_Description op_descs[] = { 57static Eo2_Op_Description op_descs[] = {
58 EO2_OP_FUNC(_a_set, simple_a_set, "Set property a"), 58 EO2_OP_FUNC(simple_a_set, _a_set, "Set property a"),
59 EO2_OP_FUNC(_a_get, simple_a_get, "Get property a"), 59 EO2_OP_FUNC(simple_a_get, _a_get, "Get property a"),
60 EO2_OP_FUNC(_b_set, simple_b_set, "Set property b"), 60 EO2_OP_FUNC(simple_b_set, _b_set, "Set property b"),
61 EO2_OP_FUNC(_b_get, simple_b_get, "Get property b"), 61 EO2_OP_FUNC(simple_b_get, _b_get, "Get property b"),
62 EO2_OP_FUNC_OVERRIDE(_ab_sum_get, interface_ab_sum_get), 62 EO2_OP_FUNC_OVERRIDE(interface_ab_sum_get, _ab_sum_get),
63 EO2_OP_FUNC_OVERRIDE(_ab_sum_get2, interface2_ab_sum_get2), 63 EO2_OP_FUNC_OVERRIDE(interface2_ab_sum_get2, _ab_sum_get2),
64 EO2_OP_SENTINEL 64 EO2_OP_SENTINEL
65}; 65};
66 66
diff --git a/src/tests/eo/mixin/mixin_inherit.c b/src/tests/eo/mixin/mixin_inherit.c
index 7c8b3b568f..558c54cf04 100644
--- a/src/tests/eo/mixin/mixin_inherit.c
+++ b/src/tests/eo/mixin/mixin_inherit.c
@@ -20,7 +20,7 @@ _a_get(Eo *obj, void *class_data EINA_UNUSED)
20} 20}
21 21
22static Eo2_Op_Description op_descs[] = { 22static Eo2_Op_Description op_descs[] = {
23 EO2_OP_FUNC_OVERRIDE(_a_get, simple_a_get), 23 EO2_OP_FUNC_OVERRIDE(simple_a_get, _a_get),
24 EO2_OP_SENTINEL 24 EO2_OP_SENTINEL
25}; 25};
26 26
diff --git a/src/tests/eo/mixin/mixin_mixin.c b/src/tests/eo/mixin/mixin_mixin.c
index 71983850d5..9b6ac802a1 100644
--- a/src/tests/eo/mixin/mixin_mixin.c
+++ b/src/tests/eo/mixin/mixin_mixin.c
@@ -32,9 +32,9 @@ _destructor(Eo *obj, void *class_data EINA_UNUSED)
32EAPI EO2_FUNC_BODY(mixin_ab_sum_get, int, 0); 32EAPI EO2_FUNC_BODY(mixin_ab_sum_get, int, 0);
33 33
34static Eo2_Op_Description op_descs[] = { 34static Eo2_Op_Description op_descs[] = {
35 EO2_OP_FUNC_OVERRIDE(_constructor, eo2_constructor), 35 EO2_OP_FUNC_OVERRIDE(eo2_constructor, _constructor),
36 EO2_OP_FUNC_OVERRIDE(_destructor, eo2_destructor), 36 EO2_OP_FUNC_OVERRIDE(eo2_destructor, _destructor),
37 EO2_OP_FUNC(_ab_sum_get, mixin_ab_sum_get, "Get the sum of a and b."), 37 EO2_OP_FUNC(mixin_ab_sum_get, _ab_sum_get, "Get the sum of a and b."),
38 EO2_OP_SENTINEL 38 EO2_OP_SENTINEL
39}; 39};
40 40
diff --git a/src/tests/eo/mixin/mixin_mixin2.c b/src/tests/eo/mixin/mixin_mixin2.c
index 417321f12c..80dfa8275b 100644
--- a/src/tests/eo/mixin/mixin_mixin2.c
+++ b/src/tests/eo/mixin/mixin_mixin2.c
@@ -45,9 +45,9 @@ _destructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED)
45} 45}
46 46
47static Eo2_Op_Description op_descs[] = { 47static Eo2_Op_Description op_descs[] = {
48 EO2_OP_FUNC_OVERRIDE(_constructor, eo2_constructor), 48 EO2_OP_FUNC_OVERRIDE(eo2_constructor, _constructor),
49 EO2_OP_FUNC_OVERRIDE(_destructor, eo2_destructor), 49 EO2_OP_FUNC_OVERRIDE(eo2_destructor, _destructor),
50 EO2_OP_FUNC_OVERRIDE(_ab_sum_get, mixin_ab_sum_get), 50 EO2_OP_FUNC_OVERRIDE(mixin_ab_sum_get, _ab_sum_get),
51 EO2_OP_SENTINEL 51 EO2_OP_SENTINEL
52}; 52};
53 53
diff --git a/src/tests/eo/mixin/mixin_mixin3.c b/src/tests/eo/mixin/mixin_mixin3.c
index 1a04b94be1..441fd29e72 100644
--- a/src/tests/eo/mixin/mixin_mixin3.c
+++ b/src/tests/eo/mixin/mixin_mixin3.c
@@ -45,9 +45,9 @@ _destructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED)
45} 45}
46 46
47static Eo2_Op_Description op_descs[] = { 47static Eo2_Op_Description op_descs[] = {
48 EO2_OP_FUNC_OVERRIDE(_constructor, eo2_constructor), 48 EO2_OP_FUNC_OVERRIDE(eo2_constructor, _constructor),
49 EO2_OP_FUNC_OVERRIDE(_destructor, eo2_destructor), 49 EO2_OP_FUNC_OVERRIDE(eo2_destructor, _destructor),
50 EO2_OP_FUNC_OVERRIDE(_ab_sum_get, mixin_ab_sum_get), 50 EO2_OP_FUNC_OVERRIDE(mixin_ab_sum_get, _ab_sum_get),
51 EO2_OP_SENTINEL 51 EO2_OP_SENTINEL
52}; 52};
53 53
diff --git a/src/tests/eo/mixin/mixin_simple.c b/src/tests/eo/mixin/mixin_simple.c
index 8dc515bb87..879728964f 100644
--- a/src/tests/eo/mixin/mixin_simple.c
+++ b/src/tests/eo/mixin/mixin_simple.c
@@ -38,10 +38,10 @@ _GET_SET_FUNC(a)
38_GET_SET_FUNC(b) 38_GET_SET_FUNC(b)
39 39
40static Eo2_Op_Description op_descs[] = { 40static Eo2_Op_Description op_descs[] = {
41 EO2_OP_FUNC(_a_set, simple_a_set, "Set property a"), 41 EO2_OP_FUNC(simple_a_set, _a_set, "Set property a"),
42 EO2_OP_FUNC(_a_get, simple_a_get, "Get property a"), 42 EO2_OP_FUNC(simple_a_get, _a_get, "Get property a"),
43 EO2_OP_FUNC(_b_set, simple_b_set, "Set property b"), 43 EO2_OP_FUNC(simple_b_set, _b_set, "Set property b"),
44 EO2_OP_FUNC(_b_get, simple_b_get, "Get property b"), 44 EO2_OP_FUNC(simple_b_get, _b_get, "Get property b"),
45 EO2_OP_SENTINEL 45 EO2_OP_SENTINEL
46}; 46};
47 47
diff --git a/src/tests/eo/signals/signals_simple.c b/src/tests/eo/signals/signals_simple.c
index 4b7364772a..1de1ad9e34 100644
--- a/src/tests/eo/signals/signals_simple.c
+++ b/src/tests/eo/signals/signals_simple.c
@@ -74,8 +74,8 @@ _constructor(Eo *obj, void *class_data EINA_UNUSED)
74EAPI EO2_VOID_FUNC_BODYV(simple_a_set, EO2_FUNC_CALL(a), int a); 74EAPI EO2_VOID_FUNC_BODYV(simple_a_set, EO2_FUNC_CALL(a), int a);
75 75
76static Eo2_Op_Description op_descs[] = { 76static Eo2_Op_Description op_descs[] = {
77 EO2_OP_FUNC_OVERRIDE(_constructor, eo2_constructor), 77 EO2_OP_FUNC_OVERRIDE(eo2_constructor, _constructor),
78 EO2_OP_FUNC(_a_set, simple_a_set, "Set property a"), 78 EO2_OP_FUNC(simple_a_set, _a_set, "Set property a"),
79 EO2_OP_SENTINEL 79 EO2_OP_SENTINEL
80}; 80};
81 81
diff --git a/src/tests/eo/suite/eo_test_class_simple.c b/src/tests/eo/suite/eo_test_class_simple.c
index 9b55ffb3fa..8690dfc540 100644
--- a/src/tests/eo/suite/eo_test_class_simple.c
+++ b/src/tests/eo/suite/eo_test_class_simple.c
@@ -59,11 +59,11 @@ EO2_FUNC_BODY(simple_a_print, Eina_Bool, EINA_FALSE);
59EO2_FUNC_BODY(simple_class_hi_print, Eina_Bool, EINA_FALSE); 59EO2_FUNC_BODY(simple_class_hi_print, Eina_Bool, EINA_FALSE);
60 60
61static Eo2_Op_Description op_descs[] = { 61static Eo2_Op_Description op_descs[] = {
62 EO2_OP_FUNC_OVERRIDE(_dbg_info_get, eo2_dbg_info_get), 62 EO2_OP_FUNC_OVERRIDE(eo2_dbg_info_get, _dbg_info_get),
63 EO2_OP_FUNC(_a_set, simple_a_set, "Set property a"), 63 EO2_OP_FUNC(simple_a_set, _a_set, "Set property a"),
64 EO2_OP_FUNC(_a_get, simple_a_get, "Get property a"), 64 EO2_OP_FUNC(simple_a_get, _a_get, "Get property a"),
65 EO2_OP_FUNC(_a_print, simple_a_print, "Print property a"), 65 EO2_OP_FUNC(simple_a_print, _a_print, "Print property a"),
66 EO2_OP_CLASS_FUNC(_class_hi_print, simple_class_hi_print, "Print property a"), 66 EO2_OP_CLASS_FUNC(simple_class_hi_print, _class_hi_print, "Print property a"),
67 EO2_OP_SENTINEL 67 EO2_OP_SENTINEL
68}; 68};
69 69
diff --git a/src/tests/eo/suite/eo_test_general.c b/src/tests/eo/suite/eo_test_general.c
index 6900ba4eb4..e1f2acfab7 100644
--- a/src/tests/eo/suite/eo_test_general.c
+++ b/src/tests/eo/suite/eo_test_general.c
@@ -265,8 +265,8 @@ _man_des(Eo *obj, void *data EINA_UNUSED, va_list *list EINA_UNUSED)
265} 265}
266 266
267static Eo2_Op_Description op_descs[] = { 267static Eo2_Op_Description op_descs[] = {
268 EO2_OP_FUNC_OVERRIDE(_man_con, eo2_constructor), 268 EO2_OP_FUNC_OVERRIDE(eo2_constructor, _man_con),
269 EO2_OP_FUNC_OVERRIDE(_man_des, eo2_destructor), 269 EO2_OP_FUNC_OVERRIDE(eo2_destructor, _man_des),
270 EO2_OP_SENTINEL 270 EO2_OP_SENTINEL
271}; 271};
272 272
@@ -676,8 +676,8 @@ EO2_FUNC_BODY(multi_a_print, Eina_Bool, EINA_FALSE);
676EO2_FUNC_BODY(multi_class_hi_print, Eina_Bool, EINA_FALSE); 676EO2_FUNC_BODY(multi_class_hi_print, Eina_Bool, EINA_FALSE);
677 677
678static Eo2_Op_Description _multi_do_op_descs[] = { 678static Eo2_Op_Description _multi_do_op_descs[] = {
679 EO2_OP_FUNC(_a_print, multi_a_print, "Print property a"), 679 EO2_OP_FUNC(multi_a_print, _a_print, "Print property a"),
680 EO2_OP_FUNC(_class_hi_print, multi_class_hi_print, "Print Hi"), 680 EO2_OP_FUNC(multi_class_hi_print, _class_hi_print, "Print Hi"),
681 EO2_OP_SENTINEL 681 EO2_OP_SENTINEL
682}; 682};
683 683