summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2019-02-10 16:57:00 +0100
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2019-02-13 16:59:59 +0100
commit46885653bc0467f88042bb110fdc973b2258f69c (patch)
treec716b93474cbc0847c1e082298ae7314a0f16b26
parent37d2d378ec2e2d1f9a3941372ef4d818996291c7 (diff)
eo: remove class functions from eo
As in the previous commit explained, we want to get rid of class functions in eo, and make them just c functions right away. This commit removes the class parameter from the eo_class_function_set call, and adjusts the tests to not depend on class functions anymore. Class functions are now not tested anymore, tests that used them as a way to test *things* are adjusted to test them now with object functions, tests that just tested the working of class functions are dropped. This fixes T7675. Reviewed-by: Cedric BAIL <cedric.bail@free.fr> Differential Revision: https://phab.enlightenment.org/D7902
-rw-r--r--src/benchmarks/eo/class_simple.c2
-rw-r--r--src/benchmarks/eo/eo_bench_eo_do.c2
-rw-r--r--src/bin/eolian/sources.c2
-rw-r--r--src/lib/elementary/efl_ui_table.c4
-rw-r--r--src/lib/elementary/elc_combobox.c2
-rw-r--r--src/lib/eo/Eo.h2
-rw-r--r--src/lib/eo/eo.c11
-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.c2
-rw-r--r--src/tests/eo/composite_objects/composite_objects_simple.c2
-rw-r--r--src/tests/eo/constructors/constructors_mixin.c2
-rw-r--r--src/tests/eo/constructors/constructors_simple.c2
-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.c19
-rw-r--r--src/tests/eo/function_overrides/function_overrides_inherit3.c2
-rw-r--r--src/tests/eo/function_overrides/function_overrides_simple.c2
-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.c2
-rw-r--r--src/tests/eo/mixin/mixin_inherit.c2
-rw-r--r--src/tests/eo/mixin/mixin_mixin.c2
-rw-r--r--src/tests/eo/mixin/mixin_mixin2.c2
-rw-r--r--src/tests/eo/mixin/mixin_mixin3.c2
-rw-r--r--src/tests/eo/mixin/mixin_simple.c2
-rw-r--r--src/tests/eo/signals/signals_simple.c2
-rw-r--r--src/tests/eo/suite/eo_test_call_errors.c2
-rw-r--r--src/tests/eo/suite/eo_test_class_behaviour_errors.c2
-rw-r--r--src/tests/eo/suite/eo_test_class_errors.c6
-rw-r--r--src/tests/eo/suite/eo_test_class_simple.c31
-rw-r--r--src/tests/eo/suite/eo_test_class_simple.h2
-rw-r--r--src/tests/eo/suite/eo_test_class_singleton.c2
-rw-r--r--src/tests/eo/suite/eo_test_domain.c2
-rw-r--r--src/tests/eo/suite/eo_test_general.c24
-rw-r--r--src/tests/eo/suite/eo_test_init.c7
-rw-r--r--src/tests/eo/suite/eo_test_threaded_calls.c2
-rw-r--r--src/tests/eolian/data/class_simple_ref.c2
-rw-r--r--src/tests/eolian/data/function_as_argument_ref.c2
-rw-r--r--src/tests/eolian/data/override_ref.c2
-rw-r--r--src/tests/eolian/data/owning.eo.c2
44 files changed, 72 insertions, 104 deletions
diff --git a/src/benchmarks/eo/class_simple.c b/src/benchmarks/eo/class_simple.c
index 3d153ce..63378d6 100644
--- a/src/benchmarks/eo/class_simple.c
+++ b/src/benchmarks/eo/class_simple.c
@@ -38,7 +38,7 @@ _class_initializer(Efl_Class *klass)
38 EFL_OBJECT_OP_FUNC(simple_other_call, _other_call), 38 EFL_OBJECT_OP_FUNC(simple_other_call, _other_call),
39 ); 39 );
40 40
41 return efl_class_functions_set(klass, &ops, NULL, NULL); 41 return efl_class_functions_set(klass, &ops, NULL);
42} 42}
43 43
44static const Efl_Class_Description class_desc = { 44static const Efl_Class_Description class_desc = {
diff --git a/src/benchmarks/eo/eo_bench_eo_do.c b/src/benchmarks/eo/eo_bench_eo_do.c
index cb95185..2783b91 100644
--- a/src/benchmarks/eo/eo_bench_eo_do.c
+++ b/src/benchmarks/eo/eo_bench_eo_do.c
@@ -65,7 +65,7 @@ _class_initializer(Efl_Class *klass)
65 EFL_OBJECT_OP_FUNC(simple_a_set, _a_set), 65 EFL_OBJECT_OP_FUNC(simple_a_set, _a_set),
66 ); 66 );
67 67
68 return efl_class_functions_set(klass, &ops, NULL, NULL); 68 return efl_class_functions_set(klass, &ops, NULL);
69} 69}
70 70
71static void 71static void
diff --git a/src/bin/eolian/sources.c b/src/bin/eolian/sources.c
index 493ec1a..76f8c64 100644
--- a/src/bin/eolian/sources.c
+++ b/src/bin/eolian/sources.c
@@ -907,7 +907,7 @@ _gen_initializer(const Eolian_Class *cl, Eina_Strbuf *buf)
907 eina_strbuf_append(buf, "#endif\n\n"); 907 eina_strbuf_append(buf, "#endif\n\n");
908 } 908 }
909 909
910 eina_strbuf_append(buf, " return efl_class_functions_set(klass, opsp, NULL, NULL);\n"); 910 eina_strbuf_append(buf, " return efl_class_functions_set(klass, opsp, NULL);\n");
911 911
912 eina_strbuf_free(ops); 912 eina_strbuf_free(ops);
913 913
diff --git a/src/lib/elementary/efl_ui_table.c b/src/lib/elementary/efl_ui_table.c
index 78b17a7..3a90eb0 100644
--- a/src/lib/elementary/efl_ui_table.c
+++ b/src/lib/elementary/efl_ui_table.c
@@ -83,11 +83,11 @@ static void _custom_table_calc(Eo *obj, Custom_Table_Data *pd);
83static Eina_Bool 83static Eina_Bool
84_custom_table_initializer(Efl_Class *klass) 84_custom_table_initializer(Efl_Class *klass)
85{ 85{
86 EFL_OPS_DEFINE(class_ops, 86 EFL_OPS_DEFINE(ops,
87 EFL_OBJECT_OP_FUNC(efl_canvas_group_calculate, _custom_table_calc) 87 EFL_OBJECT_OP_FUNC(efl_canvas_group_calculate, _custom_table_calc)
88 ); 88 );
89 89
90 return efl_class_functions_set(klass, NULL, &class_ops, NULL); 90 return efl_class_functions_set(klass, &ops, NULL);
91}; 91};
92 92
93static const Efl_Class_Description custom_table_class_desc = { 93static const Efl_Class_Description custom_table_class_desc = {
diff --git a/src/lib/elementary/elc_combobox.c b/src/lib/elementary/elc_combobox.c
index 6ca7675..2b231aa 100644
--- a/src/lib/elementary/elc_combobox.c
+++ b/src/lib/elementary/elc_combobox.c
@@ -616,7 +616,7 @@ _elm_combobox_class_initializer(Efl_Class *klass)
616 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_combobox) 616 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_combobox)
617 ); 617 );
618 618
619 return efl_class_functions_set(klass, &ops, NULL, NULL); 619 return efl_class_functions_set(klass, &ops, NULL);
620} 620}
621 621
622static const Efl_Class_Description _elm_combobox_class_desc = { 622static const Efl_Class_Description _elm_combobox_class_desc = {
diff --git a/src/lib/eo/Eo.h b/src/lib/eo/Eo.h
index 2fd2c1b..df5dc33 100644
--- a/src/lib/eo/Eo.h
+++ b/src/lib/eo/Eo.h
@@ -897,7 +897,7 @@ EAPI const Efl_Class *efl_class_new(const Efl_Class_Description *desc, const Efl
897 * efl_property_reflection_set() or efl_property_reflection_get() is called. 897 * efl_property_reflection_set() or efl_property_reflection_get() is called.
898 * @see #EFL_DEFINE_CLASS 898 * @see #EFL_DEFINE_CLASS
899 */ 899 */
900EAPI Eina_Bool efl_class_functions_set(const Efl_Class *klass_id, const Efl_Object_Ops *object_ops, const Efl_Object_Ops *class_ops, const Efl_Object_Property_Reflection_Ops *reflection_table); 900EAPI Eina_Bool efl_class_functions_set(const Efl_Class *klass_id, const Efl_Object_Ops *object_ops, const Efl_Object_Property_Reflection_Ops *reflection_table);
901 901
902/** 902/**
903 * @brief Override Eo functions of this object. 903 * @brief Override Eo functions of this object.
diff --git a/src/lib/eo/eo.c b/src/lib/eo/eo.c
index 95823f7..0611643 100644
--- a/src/lib/eo/eo.c
+++ b/src/lib/eo/eo.c
@@ -819,7 +819,7 @@ _eo_class_funcs_set(Eo_Vtable *vtable, const Efl_Object_Ops *ops, const _Efl_Cla
819} 819}
820 820
821EAPI Eina_Bool 821EAPI Eina_Bool
822efl_class_functions_set(const Efl_Class *klass_id, const Efl_Object_Ops *object_ops, const Efl_Object_Ops *class_ops, const Efl_Object_Property_Reflection_Ops *reflection_table) 822efl_class_functions_set(const Efl_Class *klass_id, const Efl_Object_Ops *object_ops, const Efl_Object_Property_Reflection_Ops *reflection_table)
823{ 823{
824 EO_CLASS_POINTER_GOTO(klass_id, klass, err_klass); 824 EO_CLASS_POINTER_GOTO(klass_id, klass, err_klass);
825 Efl_Object_Ops empty_ops = { 0 }; 825 Efl_Object_Ops empty_ops = { 0 };
@@ -830,11 +830,9 @@ efl_class_functions_set(const Efl_Class *klass_id, const Efl_Object_Ops *object_
830 830
831 if (!object_ops) object_ops = &empty_ops; 831 if (!object_ops) object_ops = &empty_ops;
832 832
833 if (!class_ops) class_ops = &empty_ops;
834
835 klass->reflection = reflection_table; 833 klass->reflection = reflection_table;
836 834
837 klass->ops_count = object_ops->count + class_ops->count; 835 klass->ops_count = object_ops->count;
838 836
839 klass->base_id = _eo_ops_last_id; 837 klass->base_id = _eo_ops_last_id;
840 _eo_ops_last_id += klass->ops_count + 1; 838 _eo_ops_last_id += klass->ops_count + 1;
@@ -851,8 +849,7 @@ efl_class_functions_set(const Efl_Class *klass_id, const Efl_Object_Ops *object_
851 _vtable_copy_all(&klass->vtable, &(*mro_itr)->vtable); 849 _vtable_copy_all(&klass->vtable, &(*mro_itr)->vtable);
852 } 850 }
853 851
854 return _eo_class_funcs_set(&klass->vtable, object_ops, klass, klass, 0, EINA_FALSE) && 852 return _eo_class_funcs_set(&klass->vtable, object_ops, klass, klass, 0, EINA_FALSE);
855 _eo_class_funcs_set(&klass->vtable, class_ops, klass, klass, object_ops->count, EINA_FALSE);
856 853
857err_funcs: 854err_funcs:
858 ERR("Class %s already had its functions set..", klass->desc->name); 855 ERR("Class %s already had its functions set..", klass->desc->name);
@@ -1693,7 +1690,7 @@ efl_class_new(const Efl_Class_Description *desc, const Efl_Class *parent_id, ...
1693 /* If functions haven't been set, invoke it with an empty ops structure. */ 1690 /* If functions haven't been set, invoke it with an empty ops structure. */
1694 if (!klass->functions_set) 1691 if (!klass->functions_set)
1695 { 1692 {
1696 efl_class_functions_set(_eo_class_id_get(klass), NULL, NULL, NULL); 1693 efl_class_functions_set(_eo_class_id_get(klass), NULL, NULL);
1697 } 1694 }
1698 1695
1699 /* Mark which classes we implement */ 1696 /* Mark which classes we implement */
diff --git a/src/tests/eo/access/access_inherit.c b/src/tests/eo/access/access_inherit.c
index a77e3b4..2f830bd 100644
--- a/src/tests/eo/access/access_inherit.c
+++ b/src/tests/eo/access/access_inherit.c
@@ -25,7 +25,7 @@ _class_initializer(Efl_Class *klass)
25 EFL_OBJECT_OP_FUNC(inherit_prot_print, _prot_print), 25 EFL_OBJECT_OP_FUNC(inherit_prot_print, _prot_print),
26 ); 26 );
27 27
28 return efl_class_functions_set(klass, &ops, NULL, NULL); 28 return efl_class_functions_set(klass, &ops, NULL);
29} 29}
30 30
31static const Efl_Class_Description class_desc = { 31static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/access/access_simple.c b/src/tests/eo/access/access_simple.c
index 0ea01db..5b75d0c 100644
--- a/src/tests/eo/access/access_simple.c
+++ b/src/tests/eo/access/access_simple.c
@@ -39,7 +39,7 @@ _class_initializer(Efl_Class *klass)
39 EFL_OBJECT_OP_FUNC(simple_a_set, _a_set), 39 EFL_OBJECT_OP_FUNC(simple_a_set, _a_set),
40 ); 40 );
41 41
42 return efl_class_functions_set(klass, &ops, NULL, NULL); 42 return efl_class_functions_set(klass, &ops, NULL);
43} 43}
44 44
45static const Efl_Class_Description class_desc = { 45static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/composite_objects/composite_objects_comp.c b/src/tests/eo/composite_objects/composite_objects_comp.c
index 7d6fbe4..b0b271d 100644
--- a/src/tests/eo/composite_objects/composite_objects_comp.c
+++ b/src/tests/eo/composite_objects/composite_objects_comp.c
@@ -44,7 +44,7 @@ _class_initializer(Efl_Class *klass)
44 EFL_OBJECT_OP_FUNC(simple_a_get, _a_get), 44 EFL_OBJECT_OP_FUNC(simple_a_get, _a_get),
45 ); 45 );
46 46
47 return efl_class_functions_set(klass, &ops, NULL, NULL); 47 return efl_class_functions_set(klass, &ops, NULL);
48} 48}
49 49
50static const Efl_Class_Description class_desc = { 50static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/composite_objects/composite_objects_simple.c b/src/tests/eo/composite_objects/composite_objects_simple.c
index c2626ec..b9bc70f 100644
--- a/src/tests/eo/composite_objects/composite_objects_simple.c
+++ b/src/tests/eo/composite_objects/composite_objects_simple.c
@@ -172,7 +172,7 @@ _class_initializer(Efl_Class *klass)
172 EFL_OBJECT_OP_FUNC(simple_a_get, _a_get), 172 EFL_OBJECT_OP_FUNC(simple_a_get, _a_get),
173 ); 173 );
174 174
175 return efl_class_functions_set(klass, &ops, NULL, NULL); 175 return efl_class_functions_set(klass, &ops, NULL);
176} 176}
177 177
178static const Efl_Class_Description class_desc = { 178static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/constructors/constructors_mixin.c b/src/tests/eo/constructors/constructors_mixin.c
index 6257d9a..c3cbdc5 100644
--- a/src/tests/eo/constructors/constructors_mixin.c
+++ b/src/tests/eo/constructors/constructors_mixin.c
@@ -46,7 +46,7 @@ _class_initializer(Efl_Class *klass)
46 EFL_OBJECT_OP_FUNC(efl_destructor, _destructor), 46 EFL_OBJECT_OP_FUNC(efl_destructor, _destructor),
47 ); 47 );
48 48
49 return efl_class_functions_set(klass, &ops, NULL, NULL); 49 return efl_class_functions_set(klass, &ops, NULL);
50} 50}
51 51
52static const Efl_Class_Description class_desc = { 52static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/constructors/constructors_simple.c b/src/tests/eo/constructors/constructors_simple.c
index 69ecb0d..cdce5d1 100644
--- a/src/tests/eo/constructors/constructors_simple.c
+++ b/src/tests/eo/constructors/constructors_simple.c
@@ -98,7 +98,7 @@ _class_initializer(Efl_Class *klass)
98 EFL_OBJECT_OP_FUNC(simple_b_get, _b_get), 98 EFL_OBJECT_OP_FUNC(simple_b_get, _b_get),
99 ); 99 );
100 100
101 return efl_class_functions_set(klass, &ops, NULL, NULL); 101 return efl_class_functions_set(klass, &ops, NULL);
102} 102}
103 103
104static const Efl_Class_Description class_desc = { 104static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/constructors/constructors_simple2.c b/src/tests/eo/constructors/constructors_simple2.c
index 477de99..71f8ae1 100644
--- a/src/tests/eo/constructors/constructors_simple2.c
+++ b/src/tests/eo/constructors/constructors_simple2.c
@@ -23,7 +23,7 @@ _class_initializer(Efl_Class *klass)
23 EFL_OBJECT_OP_FUNC(efl_constructor, _constructor), 23 EFL_OBJECT_OP_FUNC(efl_constructor, _constructor),
24 ); 24 );
25 25
26 return efl_class_functions_set(klass, &ops, NULL, NULL); 26 return efl_class_functions_set(klass, &ops, NULL);
27} 27}
28 28
29static const Efl_Class_Description class_desc = { 29static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/constructors/constructors_simple3.c b/src/tests/eo/constructors/constructors_simple3.c
index 80cc34f..7bab6da 100644
--- a/src/tests/eo/constructors/constructors_simple3.c
+++ b/src/tests/eo/constructors/constructors_simple3.c
@@ -21,7 +21,7 @@ _class_initializer(Efl_Class *klass)
21 EFL_OBJECT_OP_FUNC(efl_constructor, _constructor), 21 EFL_OBJECT_OP_FUNC(efl_constructor, _constructor),
22 ); 22 );
23 23
24 return efl_class_functions_set(klass, &ops, NULL, NULL); 24 return efl_class_functions_set(klass, &ops, NULL);
25} 25}
26 26
27static const Efl_Class_Description class_desc = { 27static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/constructors/constructors_simple5.c b/src/tests/eo/constructors/constructors_simple5.c
index abcb492..73bc8fe 100644
--- a/src/tests/eo/constructors/constructors_simple5.c
+++ b/src/tests/eo/constructors/constructors_simple5.c
@@ -21,7 +21,7 @@ _class_initializer(Efl_Class *klass)
21 EFL_OBJECT_OP_FUNC(efl_destructor, _destructor), 21 EFL_OBJECT_OP_FUNC(efl_destructor, _destructor),
22 ); 22 );
23 23
24 return efl_class_functions_set(klass, &ops, NULL, NULL); 24 return efl_class_functions_set(klass, &ops, NULL);
25} 25}
26 26
27static const Efl_Class_Description class_desc = { 27static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/constructors/constructors_simple6.c b/src/tests/eo/constructors/constructors_simple6.c
index 671679e..021f1f9 100644
--- a/src/tests/eo/constructors/constructors_simple6.c
+++ b/src/tests/eo/constructors/constructors_simple6.c
@@ -21,7 +21,7 @@ _class_initializer(Efl_Class *klass)
21 EFL_OBJECT_OP_FUNC(efl_destructor, _destructor), 21 EFL_OBJECT_OP_FUNC(efl_destructor, _destructor),
22 ); 22 );
23 23
24 return efl_class_functions_set(klass, &ops, NULL, NULL); 24 return efl_class_functions_set(klass, &ops, NULL);
25} 25}
26 26
27static const Efl_Class_Description class_desc = { 27static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/constructors/constructors_simple7.c b/src/tests/eo/constructors/constructors_simple7.c
index c81d849..22c6537 100644
--- a/src/tests/eo/constructors/constructors_simple7.c
+++ b/src/tests/eo/constructors/constructors_simple7.c
@@ -25,7 +25,7 @@ _class_initializer(Efl_Class *klass)
25 EFL_OBJECT_OP_FUNC(efl_constructor, _constructor), 25 EFL_OBJECT_OP_FUNC(efl_constructor, _constructor),
26 ); 26 );
27 27
28 return efl_class_functions_set(klass, &ops, NULL, NULL); 28 return efl_class_functions_set(klass, &ops, NULL);
29} 29}
30 30
31static const Efl_Class_Description class_desc = { 31static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/function_overrides/function_overrides_inherit2.c b/src/tests/eo/function_overrides/function_overrides_inherit2.c
index 7f6b304..e4aa147 100644
--- a/src/tests/eo/function_overrides/function_overrides_inherit2.c
+++ b/src/tests/eo/function_overrides/function_overrides_inherit2.c
@@ -42,20 +42,6 @@ _print2(Eo *obj EINA_UNUSED, void *class_data EINA_UNUSED)
42 return EINA_TRUE; 42 return EINA_TRUE;
43} 43}
44 44
45static Eina_Bool
46_class_print(Efl_Class *klass, void *data EINA_UNUSED)
47{
48 Eina_Bool called = EINA_FALSE;
49 printf("Print %s-%s\n", efl_class_name_get(klass), efl_class_name_get(MY_CLASS));
50 called = simple_class_print(efl_super(klass, MY_CLASS));
51 fail_if(!called);
52
53 called = simple_class_print2(efl_super(klass, MY_CLASS));
54 fail_if(!called);
55
56 return EINA_TRUE;
57}
58
59EAPI EFL_FUNC_BODY(inherit2_print, Eina_Bool, EINA_FALSE); 45EAPI EFL_FUNC_BODY(inherit2_print, Eina_Bool, EINA_FALSE);
60EAPI EFL_FUNC_BODY(inherit2_print2, Eina_Bool, EINA_FALSE); 46EAPI EFL_FUNC_BODY(inherit2_print2, Eina_Bool, EINA_FALSE);
61 47
@@ -67,11 +53,8 @@ _class_initializer(Efl_Class *klass)
67 EFL_OBJECT_OP_FUNC(inherit2_print2, _print2), 53 EFL_OBJECT_OP_FUNC(inherit2_print2, _print2),
68 EFL_OBJECT_OP_FUNC(simple_a_set, _a_set), 54 EFL_OBJECT_OP_FUNC(simple_a_set, _a_set),
69 ); 55 );
70 EFL_OPS_DEFINE(cops,
71 EFL_OBJECT_OP_FUNC(simple_class_print, _class_print),
72 );
73 56
74 return efl_class_functions_set(klass, &ops, &cops, NULL); 57 return efl_class_functions_set(klass, &ops, NULL);
75} 58}
76 59
77static const Efl_Class_Description class_desc = { 60static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/function_overrides/function_overrides_inherit3.c b/src/tests/eo/function_overrides/function_overrides_inherit3.c
index 54485e2..e3f3407 100644
--- a/src/tests/eo/function_overrides/function_overrides_inherit3.c
+++ b/src/tests/eo/function_overrides/function_overrides_inherit3.c
@@ -23,7 +23,7 @@ _class_initializer(Efl_Class *klass)
23 EFL_OBJECT_OP_FUNC(simple_a_set, _a_set), 23 EFL_OBJECT_OP_FUNC(simple_a_set, _a_set),
24 ); 24 );
25 25
26 return efl_class_functions_set(klass, &ops, NULL, NULL); 26 return efl_class_functions_set(klass, &ops, NULL);
27} 27}
28 28
29static const Efl_Class_Description class_desc = { 29static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/function_overrides/function_overrides_simple.c b/src/tests/eo/function_overrides/function_overrides_simple.c
index fd65f66..fbd5681 100644
--- a/src/tests/eo/function_overrides/function_overrides_simple.c
+++ b/src/tests/eo/function_overrides/function_overrides_simple.c
@@ -66,7 +66,7 @@ _class_initializer(Efl_Class *klass)
66 EFL_OBJECT_OP_FUNC(simple_class_print2, _class_print2), 66 EFL_OBJECT_OP_FUNC(simple_class_print2, _class_print2),
67 ); 67 );
68 68
69 return efl_class_functions_set(klass, &ops, NULL, NULL); 69 return efl_class_functions_set(klass, &ops, NULL);
70} 70}
71 71
72static const Efl_Class_Description class_desc = { 72static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/interface/interface_interface.c b/src/tests/eo/interface/interface_interface.c
index 3fd8802..dd5b293 100644
--- a/src/tests/eo/interface/interface_interface.c
+++ b/src/tests/eo/interface/interface_interface.c
@@ -17,7 +17,7 @@ _class_initializer(Efl_Class *klass)
17 EFL_OBJECT_OP_FUNC(interface_ab_sum_get, NULL), 17 EFL_OBJECT_OP_FUNC(interface_ab_sum_get, NULL),
18 ); 18 );
19 19
20 return efl_class_functions_set(klass, &ops, NULL, NULL); 20 return efl_class_functions_set(klass, &ops, NULL);
21} 21}
22 22
23static const Efl_Class_Description class_desc = { 23static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/interface/interface_interface2.c b/src/tests/eo/interface/interface_interface2.c
index c6e3d1b..4b18105 100644
--- a/src/tests/eo/interface/interface_interface2.c
+++ b/src/tests/eo/interface/interface_interface2.c
@@ -18,7 +18,7 @@ _class_initializer(Efl_Class *klass)
18 EFL_OBJECT_OP_FUNC(interface2_ab_sum_get2, NULL), 18 EFL_OBJECT_OP_FUNC(interface2_ab_sum_get2, NULL),
19 ); 19 );
20 20
21 return efl_class_functions_set(klass, &ops, NULL, NULL); 21 return efl_class_functions_set(klass, &ops, NULL);
22} 22}
23 23
24static const Efl_Class_Description class_desc = { 24static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/interface/interface_simple.c b/src/tests/eo/interface/interface_simple.c
index d960f83..0d20eea 100644
--- a/src/tests/eo/interface/interface_simple.c
+++ b/src/tests/eo/interface/interface_simple.c
@@ -68,7 +68,7 @@ _class_initializer(Efl_Class *klass)
68 EFL_OBJECT_OP_FUNC(interface2_ab_sum_get2, _ab_sum_get2), 68 EFL_OBJECT_OP_FUNC(interface2_ab_sum_get2, _ab_sum_get2),
69 ); 69 );
70 70
71 return efl_class_functions_set(klass, &ops, NULL, NULL); 71 return efl_class_functions_set(klass, &ops, NULL);
72} 72}
73 73
74static const Efl_Class_Description class_desc = { 74static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/mixin/mixin_inherit.c b/src/tests/eo/mixin/mixin_inherit.c
index 6d58143..964fbe2 100644
--- a/src/tests/eo/mixin/mixin_inherit.c
+++ b/src/tests/eo/mixin/mixin_inherit.c
@@ -26,7 +26,7 @@ _class_initializer(Efl_Class *klass)
26 EFL_OBJECT_OP_FUNC(simple_a_get, _a_get), 26 EFL_OBJECT_OP_FUNC(simple_a_get, _a_get),
27 ); 27 );
28 28
29 return efl_class_functions_set(klass, &ops, NULL, NULL); 29 return efl_class_functions_set(klass, &ops, NULL);
30} 30}
31 31
32static const Efl_Class_Description class_desc = { 32static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/mixin/mixin_mixin.c b/src/tests/eo/mixin/mixin_mixin.c
index 4e61c21..06bff56 100644
--- a/src/tests/eo/mixin/mixin_mixin.c
+++ b/src/tests/eo/mixin/mixin_mixin.c
@@ -41,7 +41,7 @@ _class_initializer(Efl_Class *klass)
41 EFL_OBJECT_OP_FUNC(mixin_ab_sum_get, _ab_sum_get), 41 EFL_OBJECT_OP_FUNC(mixin_ab_sum_get, _ab_sum_get),
42 ); 42 );
43 43
44 return efl_class_functions_set(klass, &ops, NULL, NULL); 44 return efl_class_functions_set(klass, &ops, NULL);
45} 45}
46 46
47static const Efl_Class_Description class_desc = { 47static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/mixin/mixin_mixin2.c b/src/tests/eo/mixin/mixin_mixin2.c
index 6b378c2..48ea26a 100644
--- a/src/tests/eo/mixin/mixin_mixin2.c
+++ b/src/tests/eo/mixin/mixin_mixin2.c
@@ -55,7 +55,7 @@ _class_initializer(Efl_Class *klass)
55 EFL_OBJECT_OP_FUNC(mixin_ab_sum_get, _ab_sum_get), 55 EFL_OBJECT_OP_FUNC(mixin_ab_sum_get, _ab_sum_get),
56 ); 56 );
57 57
58 return efl_class_functions_set(klass, &ops, NULL, NULL); 58 return efl_class_functions_set(klass, &ops, NULL);
59} 59}
60 60
61static const Efl_Class_Description class_desc = { 61static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/mixin/mixin_mixin3.c b/src/tests/eo/mixin/mixin_mixin3.c
index 9f4cedc..8036249 100644
--- a/src/tests/eo/mixin/mixin_mixin3.c
+++ b/src/tests/eo/mixin/mixin_mixin3.c
@@ -54,7 +54,7 @@ _class_initializer(Efl_Class *klass)
54 EFL_OBJECT_OP_FUNC(mixin_ab_sum_get, _ab_sum_get), 54 EFL_OBJECT_OP_FUNC(mixin_ab_sum_get, _ab_sum_get),
55 ); 55 );
56 56
57 return efl_class_functions_set(klass, &ops, NULL, NULL); 57 return efl_class_functions_set(klass, &ops, NULL);
58} 58}
59 59
60static const Efl_Class_Description class_desc = { 60static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/mixin/mixin_simple.c b/src/tests/eo/mixin/mixin_simple.c
index 21060b2..9bc8435 100644
--- a/src/tests/eo/mixin/mixin_simple.c
+++ b/src/tests/eo/mixin/mixin_simple.c
@@ -47,7 +47,7 @@ _class_initializer(Efl_Class *klass)
47 EFL_OBJECT_OP_FUNC(simple_b_get, _b_get), 47 EFL_OBJECT_OP_FUNC(simple_b_get, _b_get),
48 ); 48 );
49 49
50 return efl_class_functions_set(klass, &ops, NULL, NULL); 50 return efl_class_functions_set(klass, &ops, NULL);
51} 51}
52 52
53static const Efl_Class_Description class_desc = { 53static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/signals/signals_simple.c b/src/tests/eo/signals/signals_simple.c
index ae158e3..0e016dc 100644
--- a/src/tests/eo/signals/signals_simple.c
+++ b/src/tests/eo/signals/signals_simple.c
@@ -79,7 +79,7 @@ _class_initializer(Efl_Class *klass)
79 EFL_OBJECT_OP_FUNC(simple_a_set, _a_set), 79 EFL_OBJECT_OP_FUNC(simple_a_set, _a_set),
80 ); 80 );
81 81
82 return efl_class_functions_set(klass, &ops, NULL, NULL); 82 return efl_class_functions_set(klass, &ops, NULL);
83} 83}
84 84
85static const Efl_Class_Description class_desc = { 85static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/suite/eo_test_call_errors.c b/src/tests/eo/suite/eo_test_call_errors.c
index 97a8e76..5a737a4 100644
--- a/src/tests/eo/suite/eo_test_call_errors.c
+++ b/src/tests/eo/suite/eo_test_call_errors.c
@@ -89,7 +89,7 @@ _errorcase_class_initializer(Efl_Class *klass)
89 EFL_OBJECT_OP_FUNC(simple_error_test, _test), 89 EFL_OBJECT_OP_FUNC(simple_error_test, _test),
90 ); 90 );
91 91
92 return efl_class_functions_set(klass, &ops, NULL, NULL); 92 return efl_class_functions_set(klass, &ops, NULL);
93} 93}
94 94
95static const Efl_Class_Description errorcase_class_desc = { 95static const Efl_Class_Description errorcase_class_desc = {
diff --git a/src/tests/eo/suite/eo_test_class_behaviour_errors.c b/src/tests/eo/suite/eo_test_class_behaviour_errors.c
index 0f670be..0236225 100644
--- a/src/tests/eo/suite/eo_test_class_behaviour_errors.c
+++ b/src/tests/eo/suite/eo_test_class_behaviour_errors.c
@@ -29,7 +29,7 @@ _destructor_unref_class_initializer(Efl_Class *klass2)
29 EFL_OBJECT_OP_FUNC(efl_destructor, _destructor_unref), 29 EFL_OBJECT_OP_FUNC(efl_destructor, _destructor_unref),
30 ); 30 );
31 31
32 return efl_class_functions_set(klass2, &ops, NULL, NULL); 32 return efl_class_functions_set(klass2, &ops, NULL);
33} 33}
34 34
35EFL_START_TEST(efl_destructor_unref) 35EFL_START_TEST(efl_destructor_unref)
diff --git a/src/tests/eo/suite/eo_test_class_errors.c b/src/tests/eo/suite/eo_test_class_errors.c
index d2dca61..a505219 100644
--- a/src/tests/eo/suite/eo_test_class_errors.c
+++ b/src/tests/eo/suite/eo_test_class_errors.c
@@ -203,7 +203,7 @@ _null_class_initializer(Efl_Class *klass)
203 EFL_OBJECT_OP_FUNC(NULL, _null_fct), 203 EFL_OBJECT_OP_FUNC(NULL, _null_fct),
204 ); 204 );
205 205
206 return efl_class_functions_set(klass, &ops, NULL, NULL); 206 return efl_class_functions_set(klass, &ops, NULL);
207} 207}
208 208
209EFL_START_TEST(eo_null_api) 209EFL_START_TEST(eo_null_api)
@@ -240,7 +240,7 @@ _redefined_class_initializer(Efl_Class *klass)
240 EFL_OBJECT_OP_FUNC(null_fct, NULL), 240 EFL_OBJECT_OP_FUNC(null_fct, NULL),
241 ); 241 );
242 242
243 return efl_class_functions_set(klass, &ops, NULL, NULL); 243 return efl_class_functions_set(klass, &ops, NULL);
244} 244}
245 245
246EFL_START_TEST(eo_api_redefined) 246EFL_START_TEST(eo_api_redefined)
@@ -277,7 +277,7 @@ _dich_func_class_initializer(Efl_Class *klass)
277 EFL_OBJECT_OP_FUNC(simple_a_set, NULL), 277 EFL_OBJECT_OP_FUNC(simple_a_set, NULL),
278 ); 278 );
279 279
280 return efl_class_functions_set(klass, &ops, NULL, NULL); 280 return efl_class_functions_set(klass, &ops, NULL);
281} 281}
282 282
283EFL_START_TEST(eo_dich_func_override) 283EFL_START_TEST(eo_dich_func_override)
diff --git a/src/tests/eo/suite/eo_test_class_simple.c b/src/tests/eo/suite/eo_test_class_simple.c
index 8d82b1e..fef3dd3 100644
--- a/src/tests/eo/suite/eo_test_class_simple.c
+++ b/src/tests/eo/suite/eo_test_class_simple.c
@@ -58,14 +58,6 @@ _a_print(Eo *obj EINA_UNUSED, void *class_data)
58 return EINA_TRUE; 58 return EINA_TRUE;
59} 59}
60 60
61static Eina_Bool
62_class_hi_print(Efl_Class *klass, void *data EINA_UNUSED)
63{
64 printf("Hi Print %s\n", efl_class_name_get(klass));
65
66 return EINA_TRUE;
67}
68
69EFL_FUNC_BODYV(simple_part_get, Eo *, NULL, EFL_FUNC_CALL(name), const char *name); 61EFL_FUNC_BODYV(simple_part_get, Eo *, NULL, EFL_FUNC_CALL(name), const char *name);
70 62
71static Eo * 63static Eo *
@@ -102,7 +94,6 @@ _dbg_info_get(Eo *eo_obj, void *_pd EINA_UNUSED, Efl_Dbg_Info *root)
102EFL_VOID_FUNC_BODYV(simple_a_set, EFL_FUNC_CALL(a), int a); 94EFL_VOID_FUNC_BODYV(simple_a_set, EFL_FUNC_CALL(a), int a);
103EFL_FUNC_BODY(simple_a_get, int, 0); 95EFL_FUNC_BODY(simple_a_get, int, 0);
104EFL_FUNC_BODY(simple_a_print, Eina_Bool, EINA_FALSE); 96EFL_FUNC_BODY(simple_a_print, Eina_Bool, EINA_FALSE);
105EFL_FUNC_BODY_CONST(simple_class_hi_print, Eina_Bool, EINA_FALSE);
106EFL_VOID_FUNC_BODY(simple_pure_virtual); 97EFL_VOID_FUNC_BODY(simple_pure_virtual);
107EFL_VOID_FUNC_BODY(simple_no_implementation); 98EFL_VOID_FUNC_BODY(simple_no_implementation);
108 99
@@ -118,9 +109,6 @@ _class_initializer(Efl_Class *klass)
118 EFL_OBJECT_OP_FUNC(simple_pure_virtual, NULL), 109 EFL_OBJECT_OP_FUNC(simple_pure_virtual, NULL),
119 EFL_OBJECT_OP_FUNC(efl_dbg_info_get, _dbg_info_get), 110 EFL_OBJECT_OP_FUNC(efl_dbg_info_get, _dbg_info_get),
120 ); 111 );
121 EFL_OPS_DEFINE(cops,
122 EFL_OBJECT_OP_FUNC(simple_class_hi_print, _class_hi_print),
123 );
124 static const Efl_Object_Property_Reflection reflection_table[] = { 112 static const Efl_Object_Property_Reflection reflection_table[] = {
125 {"simple_a", _a_set_reflect, _a_get_reflect}, 113 {"simple_a", _a_set_reflect, _a_get_reflect},
126 }; 114 };
@@ -128,7 +116,7 @@ _class_initializer(Efl_Class *klass)
128 reflection_table, EINA_C_ARRAY_LENGTH(reflection_table) 116 reflection_table, EINA_C_ARRAY_LENGTH(reflection_table)
129 }; 117 };
130 118
131 return efl_class_functions_set(klass, &ops, &cops, &ref_ops); 119 return efl_class_functions_set(klass, &ops, &ref_ops);
132} 120}
133 121
134static const Efl_Class_Description class_desc = { 122static const Efl_Class_Description class_desc = {
@@ -142,24 +130,13 @@ static const Efl_Class_Description class_desc = {
142}; 130};
143 131
144EFL_DEFINE_CLASS(simple_class_get, &class_desc, EO_CLASS, NULL) 132EFL_DEFINE_CLASS(simple_class_get, &class_desc, EO_CLASS, NULL)
145
146
147static int
148_beef_get(Eo *obj EINA_UNUSED, void *class_data EINA_UNUSED)
149{
150 return 0xBEEF;
151}
152
153EFL_FUNC_BODY_CONST(simple2_class_beef_get, int, 0); 133EFL_FUNC_BODY_CONST(simple2_class_beef_get, int, 0);
154 134
155static Eina_Bool 135static Eina_Bool
156_class_initializer2(Efl_Class *klass) 136_class_initializer2(Efl_Class *klass)
157{ 137{
158 EFL_OPS_DEFINE(cops,
159 EFL_OBJECT_OP_FUNC(simple2_class_beef_get, _beef_get),
160 );
161 138
162 return efl_class_functions_set(klass, NULL, &cops, NULL); 139 return efl_class_functions_set(klass, NULL, NULL);
163} 140}
164 141
165static const Efl_Class_Description class_desc2 = { 142static const Efl_Class_Description class_desc2 = {
@@ -178,7 +155,7 @@ EFL_DEFINE_CLASS(simple2_class_get, &class_desc2, EO_CLASS, NULL)
178static Eina_Bool 155static Eina_Bool
179_class_initializer3(Efl_Class *klass) 156_class_initializer3(Efl_Class *klass)
180{ 157{
181 return efl_class_functions_set(klass, NULL, NULL, NULL); 158 return efl_class_functions_set(klass, NULL, NULL);
182} 159}
183 160
184static const Efl_Class_Description class_desc3 = { 161static const Efl_Class_Description class_desc3 = {
@@ -209,7 +186,7 @@ _searchable_class_initializer(Efl_Class *klass)
209 EFL_OBJECT_OP_FUNC(efl_provider_find, _interface_get) 186 EFL_OBJECT_OP_FUNC(efl_provider_find, _interface_get)
210 ); 187 );
211 188
212 return efl_class_functions_set(klass, &ops, NULL, NULL); 189 return efl_class_functions_set(klass, &ops, NULL);
213} 190}
214 191
215static const Efl_Class_Description class_desc_searchable = { 192static const Efl_Class_Description class_desc_searchable = {
diff --git a/src/tests/eo/suite/eo_test_class_simple.h b/src/tests/eo/suite/eo_test_class_simple.h
index 9023119..57e6c8f 100644
--- a/src/tests/eo/suite/eo_test_class_simple.h
+++ b/src/tests/eo/suite/eo_test_class_simple.h
@@ -24,8 +24,6 @@ extern const Efl_Event_Description _EV_A_CHANGED2;
24#define SIMPLE_CLASS simple_class_get() 24#define SIMPLE_CLASS simple_class_get()
25const Efl_Class *simple_class_get(void); 25const Efl_Class *simple_class_get(void);
26 26
27EAPI int simple2_class_beef_get(const Efl_Class *obj);
28
29#define SIMPLE2_CLASS simple2_class_get() 27#define SIMPLE2_CLASS simple2_class_get()
30const Efl_Class *simple2_class_get(void); 28const Efl_Class *simple2_class_get(void);
31 29
diff --git a/src/tests/eo/suite/eo_test_class_singleton.c b/src/tests/eo/suite/eo_test_class_singleton.c
index d8f325a..a38a52b 100644
--- a/src/tests/eo/suite/eo_test_class_singleton.c
+++ b/src/tests/eo/suite/eo_test_class_singleton.c
@@ -32,7 +32,7 @@ _class_initializer(Efl_Class *klass)
32 EFL_OBJECT_OP_FUNC(efl_constructor, _singleton_efl_constructor), 32 EFL_OBJECT_OP_FUNC(efl_constructor, _singleton_efl_constructor),
33 ); 33 );
34 34
35 return efl_class_functions_set(klass, &ops, NULL, NULL); 35 return efl_class_functions_set(klass, &ops, NULL);
36} 36}
37 37
38static const Efl_Class_Description class_desc = { 38static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/suite/eo_test_domain.c b/src/tests/eo/suite/eo_test_domain.c
index 23af220..114f570 100644
--- a/src/tests/eo/suite/eo_test_domain.c
+++ b/src/tests/eo/suite/eo_test_domain.c
@@ -64,7 +64,7 @@ _class_initializer(Efl_Class *klass)
64 EFL_OBJECT_OP_FUNC(domain_a_get, _a_get), 64 EFL_OBJECT_OP_FUNC(domain_a_get, _a_get),
65 EFL_OBJECT_OP_FUNC(domain_recursive, _recursive) 65 EFL_OBJECT_OP_FUNC(domain_recursive, _recursive)
66 ); 66 );
67 return efl_class_functions_set(klass, &ops, NULL, NULL); 67 return efl_class_functions_set(klass, &ops, NULL);
68} 68}
69 69
70static const Efl_Class_Description class_desc = { 70static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/suite/eo_test_general.c b/src/tests/eo/suite/eo_test_general.c
index b19bbc8..c483fc4 100644
--- a/src/tests/eo/suite/eo_test_general.c
+++ b/src/tests/eo/suite/eo_test_general.c
@@ -66,6 +66,18 @@ _simple_obj_override_a_double_set(Eo *obj, void *class_data EINA_UNUSED, int a)
66 simple_a_set(efl_super(obj, EFL_OBJECT_OVERRIDE_CLASS), 2 * a); 66 simple_a_set(efl_super(obj, EFL_OBJECT_OVERRIDE_CLASS), 2 * a);
67} 67}
68 68
69EAPI int test_class_beef_get(const Efl_Object *obj);
70
71EFL_FUNC_BODY_CONST(test_class_beef_get, int, 0)
72
73static int
74_simple_obj_override_beef_get(Eo *obj, void *class_data EINA_UNUSED)
75{
76 test_class_beef_get(efl_super(obj, EFL_OBJECT_OVERRIDE_CLASS));
77
78 return 1337;
79}
80
69EFL_START_TEST(efl_object_override_tests) 81EFL_START_TEST(efl_object_override_tests)
70{ 82{
71 83
@@ -105,7 +117,7 @@ EFL_START_TEST(efl_object_override_tests)
105 /* Try introducing a new function */ 117 /* Try introducing a new function */
106 EFL_OPS_DEFINE( 118 EFL_OPS_DEFINE(
107 overrides3, 119 overrides3,
108 EFL_OBJECT_OP_FUNC(simple2_class_beef_get, _simple_obj_override_a_double_set)); 120 EFL_OBJECT_OP_FUNC(test_class_beef_get, _simple_obj_override_beef_get));
109 fail_if(efl_object_override(obj, &overrides3)); 121 fail_if(efl_object_override(obj, &overrides3));
110 fail_if(!efl_object_override(obj, NULL)); 122 fail_if(!efl_object_override(obj, NULL));
111 fail_if(efl_object_override(obj, &overrides3)); 123 fail_if(efl_object_override(obj, &overrides3));
@@ -472,7 +484,7 @@ _class_initializer(Efl_Class *klass)
472 EFL_OBJECT_OP_FUNC(efl_destructor, _man_des), 484 EFL_OBJECT_OP_FUNC(efl_destructor, _man_des),
473 ); 485 );
474 486
475 return efl_class_functions_set(klass, &ops, NULL, NULL); 487 return efl_class_functions_set(klass, &ops, NULL);
476} 488}
477 489
478EFL_START_TEST(eo_man_free) 490EFL_START_TEST(eo_man_free)
@@ -1049,7 +1061,7 @@ _multi_class_initializer(Efl_Class *klass)
1049 EFL_OBJECT_OP_FUNC(resolve_a_print, _a_print), 1061 EFL_OBJECT_OP_FUNC(resolve_a_print, _a_print),
1050 ); 1062 );
1051 1063
1052 return efl_class_functions_set(klass, &ops, NULL, NULL); 1064 return efl_class_functions_set(klass, &ops, NULL);
1053} 1065}
1054 1066
1055EFL_START_TEST(efl_func_resolve) 1067EFL_START_TEST(efl_func_resolve)
@@ -1215,7 +1227,7 @@ _add_failures_class_initializer(Efl_Class *klass)
1215 EFL_OBJECT_OP_FUNC(efl_finalize, _efl_add_failures_finalize), 1227 EFL_OBJECT_OP_FUNC(efl_finalize, _efl_add_failures_finalize),
1216 ); 1228 );
1217 1229
1218 return efl_class_functions_set(klass, &ops, NULL, NULL); 1230 return efl_class_functions_set(klass, &ops, NULL);
1219} 1231}
1220 1232
1221EFL_START_TEST(efl_add_failures) 1233EFL_START_TEST(efl_add_failures)
@@ -1628,14 +1640,14 @@ static Eina_Bool
1628_cast_inherit_class_initializer_1(Efl_Class *klass) 1640_cast_inherit_class_initializer_1(Efl_Class *klass)
1629{ 1641{
1630 EFL_OPS_DEFINE(ops, EFL_OBJECT_OP_FUNC(inherit_value, _inherit_value_1), ); 1642 EFL_OPS_DEFINE(ops, EFL_OBJECT_OP_FUNC(inherit_value, _inherit_value_1), );
1631 return efl_class_functions_set(klass, &ops, NULL, NULL); 1643 return efl_class_functions_set(klass, &ops, NULL);
1632} 1644}
1633 1645
1634static Eina_Bool 1646static Eina_Bool
1635_cast_inherit_class_initializer_2(Efl_Class *klass) 1647_cast_inherit_class_initializer_2(Efl_Class *klass)
1636{ 1648{
1637 EFL_OPS_DEFINE(ops, EFL_OBJECT_OP_FUNC(inherit_value, _inherit_value_2), ); 1649 EFL_OPS_DEFINE(ops, EFL_OBJECT_OP_FUNC(inherit_value, _inherit_value_2), );
1638 return efl_class_functions_set(klass, &ops, NULL, NULL); 1650 return efl_class_functions_set(klass, &ops, NULL);
1639} 1651}
1640 1652
1641EFL_START_TEST(efl_cast_test) 1653EFL_START_TEST(efl_cast_test)
diff --git a/src/tests/eo/suite/eo_test_init.c b/src/tests/eo/suite/eo_test_init.c
index cee4921..4cd2bf2 100644
--- a/src/tests/eo/suite/eo_test_init.c
+++ b/src/tests/eo/suite/eo_test_init.c
@@ -23,10 +23,9 @@ EFL_START_TEST(eo_test_init_shutdown)
23 /* XXX-1: Essential for the next test to assign the wrong op. */ 23 /* XXX-1: Essential for the next test to assign the wrong op. */
24 obj = efl_add_ref(SIMPLE_CLASS, NULL); 24 obj = efl_add_ref(SIMPLE_CLASS, NULL);
25 simple_a_set(obj, 1); 25 simple_a_set(obj, 1);
26 /* XXX-1: Essential for the next test to cache the op. */
26 ck_assert_int_eq(1, simple_a_get(obj)); 27 ck_assert_int_eq(1, simple_a_get(obj));
27 28
28 /* XXX-1: Essential for the next test to cache the op. */
29 ck_assert_int_eq(0xBEEF, simple2_class_beef_get(SIMPLE2_CLASS));
30 efl_unref(obj); 29 efl_unref(obj);
31 fail_if(efl_object_shutdown()); 30 fail_if(efl_object_shutdown());
32 31
@@ -34,7 +33,9 @@ EFL_START_TEST(eo_test_init_shutdown)
34 ck_assert_str_eq("Efl.Object", efl_class_name_get(EFL_OBJECT_CLASS)); 33 ck_assert_str_eq("Efl.Object", efl_class_name_get(EFL_OBJECT_CLASS));
35 34
36 /* XXX-1: Verify that the op was not cached. */ 35 /* XXX-1: Verify that the op was not cached. */
37 ck_assert_int_eq(0xBEEF, simple2_class_beef_get(SIMPLE2_CLASS)); 36 obj = efl_add_ref(SIMPLE_CLASS, NULL);
37 simple_a_set(obj, 1);
38 ck_assert_int_eq(1, simple_a_get(obj));
38} 39}
39EFL_END_TEST 40EFL_END_TEST
40 41
diff --git a/src/tests/eo/suite/eo_test_threaded_calls.c b/src/tests/eo/suite/eo_test_threaded_calls.c
index df55e44..411eb45 100644
--- a/src/tests/eo/suite/eo_test_threaded_calls.c
+++ b/src/tests/eo/suite/eo_test_threaded_calls.c
@@ -69,7 +69,7 @@ _class_initializer(Efl_Class *klass)
69 EFL_OBJECT_OP_FUNC(thread_test_try_swap_stack, _try_swap_stack), 69 EFL_OBJECT_OP_FUNC(thread_test_try_swap_stack, _try_swap_stack),
70 ); 70 );
71 71
72 return efl_class_functions_set(klass, &ops, NULL, NULL); 72 return efl_class_functions_set(klass, &ops, NULL);
73} 73}
74 74
75static const Efl_Class_Description class_desc = { 75static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eolian/data/class_simple_ref.c b/src/tests/eolian/data/class_simple_ref.c
index ba1e647..431f083 100644
--- a/src/tests/eolian/data/class_simple_ref.c
+++ b/src/tests/eolian/data/class_simple_ref.c
@@ -45,7 +45,7 @@ _class_simple_class_initializer(Efl_Class *klass)
45 ); 45 );
46 opsp = &ops; 46 opsp = &ops;
47 47
48 return efl_class_functions_set(klass, opsp, NULL, NULL); 48 return efl_class_functions_set(klass, opsp, NULL);
49} 49}
50 50
51static const Efl_Class_Description _class_simple_class_desc = { 51static const Efl_Class_Description _class_simple_class_desc = {
diff --git a/src/tests/eolian/data/function_as_argument_ref.c b/src/tests/eolian/data/function_as_argument_ref.c
index 0728dd4..edb394e 100644
--- a/src/tests/eolian/data/function_as_argument_ref.c
+++ b/src/tests/eolian/data/function_as_argument_ref.c
@@ -28,7 +28,7 @@ _function_as_argument_class_initializer(Efl_Class *klass)
28 ); 28 );
29 opsp = &ops; 29 opsp = &ops;
30 30
31 return efl_class_functions_set(klass, opsp, NULL, NULL); 31 return efl_class_functions_set(klass, opsp, NULL);
32} 32}
33 33
34static const Efl_Class_Description _function_as_argument_class_desc = { 34static const Efl_Class_Description _function_as_argument_class_desc = {
diff --git a/src/tests/eolian/data/override_ref.c b/src/tests/eolian/data/override_ref.c
index 2a6c28b..729f37e 100644
--- a/src/tests/eolian/data/override_ref.c
+++ b/src/tests/eolian/data/override_ref.c
@@ -81,7 +81,7 @@ _override_class_initializer(Efl_Class *klass)
81 ); 81 );
82 opsp = &ops; 82 opsp = &ops;
83 83
84 return efl_class_functions_set(klass, opsp, NULL, NULL); 84 return efl_class_functions_set(klass, opsp, NULL);
85} 85}
86 86
87static const Efl_Class_Description _override_class_desc = { 87static const Efl_Class_Description _override_class_desc = {
diff --git a/src/tests/eolian/data/owning.eo.c b/src/tests/eolian/data/owning.eo.c
index bf7e78b..7e50483 100644
--- a/src/tests/eolian/data/owning.eo.c
+++ b/src/tests/eolian/data/owning.eo.c
@@ -56,7 +56,7 @@ _owning_class_initializer(Efl_Class *klass)
56 ); 56 );
57 opsp = &ops; 57 opsp = &ops;
58 58
59 return efl_class_functions_set(klass, opsp, NULL, NULL); 59 return efl_class_functions_set(klass, opsp, NULL);
60} 60}
61 61
62static const Efl_Class_Description _owning_class_desc = { 62static const Efl_Class_Description _owning_class_desc = {