eo: fix reflection

Summary:
the DFS tree walk was accidently stopped by a too early return
statement. We should only return if we found a reflection entry, if not,
then we should continue our search

Depends on D7996

Reviewers: cedric, zmike, q66, segfaultxavi

Reviewed By: cedric, zmike

Subscribers: #reviewers, #committers

Tags: #efl

Differential Revision: https://phab.enlightenment.org/D7997

4 files changed, 252 insertions, 1 deletions

diff --git a/src/lib/eo/eo.c b/src/lib/eo/eo.c
index 76bebef023..a5da8c0289 100644
--- a/src/lib/eo/eo.c
+++ b/src/lib/eo/eo.c
@@ -3630,7 +3630,10 @@ _efl_class_reflection_find(const _Efl_Class *klass, const char *property_name)
 
    for (; *klass_iter; klass_iter++)
      {
-        return _efl_class_reflection_find(*klass_iter, property_name);
+        const Efl_Object_Property_Reflection *ref;
+
+        ref = _efl_class_reflection_find(*klass_iter, property_name);
+        if (ref) return ref;
      }
 
    return NULL;
diff --git a/src/tests/eo/suite/eo_test_reflection.c b/src/tests/eo/suite/eo_test_reflection.c
index 9175785f14..c5a5b16929 100644
--- a/src/tests/eo/suite/eo_test_reflection.c
+++ b/src/tests/eo/suite/eo_test_reflection.c
@@ -8,6 +8,7 @@
 
 #include "eo_suite.h"
 #include "eo_test_class_simple.h"
+#include "eo_test_reflection_complex_class_structure.h"
 
 
 EFL_START_TEST(eo_test_reflection_invalid)
@@ -66,9 +67,25 @@ EFL_START_TEST(eo_test_reflection_simple)
 }
 EFL_END_TEST
 
+EFL_START_TEST(eo_test_reflection_complex_class_structure)
+{
+   const int numb = 42;
+   Eina_Value numb_val = eina_value_int_init(numb);
+   Eo *simple = efl_new(COMPLEX_CLASS_CLASS);
+
+   efl_property_reflection_set(simple, "m_test", numb_val);
+   efl_property_reflection_set(simple, "i_test", numb_val);
+
+   ck_assert_int_eq(complex_mixin_m_test_get(simple), numb);
+   ck_assert_int_eq(complex_interface_i_test_get(simple), numb);
+}
+EFL_END_TEST
+
 void eo_test_reflection(TCase *tc)
 {
    tcase_add_test(tc, eo_test_reflection_simple);
    tcase_add_test(tc, eo_test_reflection_inherited);
    tcase_add_test(tc, eo_test_reflection_invalid);
+   tcase_add_test(tc, eo_test_reflection_complex_class_structure);
 }
+#include "eo_test_reflection_complex_class_structure.c"
diff --git a/src/tests/eo/suite/eo_test_reflection_complex_class_structure.c b/src/tests/eo/suite/eo_test_reflection_complex_class_structure.c
new file mode 100644
index 0000000000..474f0f77c2
--- /dev/null
+++ b/src/tests/eo/suite/eo_test_reflection_complex_class_structure.c
@@ -0,0 +1,211 @@
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <stdio.h>
+
+#include <Eo.h>
+
+#include "eo_suite.h"
+#include "eo_test_class_simple.h"
+#include "eo_test_reflection_complex_class_structure.h"
+
+typedef struct {
+   int i;
+} Complex_Class_Data;
+
+typedef struct {
+   int i;
+} Complex_Mixin_Data;
+
+static void
+_complex_class_complex_interface_i_test_set(Eo *obj EINA_UNUSED, Complex_Class_Data *pd, int i)
+{
+   pd->i = i;
+}
+
+static int
+_complex_class_complex_interface_i_test_get(const Eo *obj EINA_UNUSED, Complex_Class_Data *pd)
+{
+   return pd->i;
+}
+
+static int
+_complex_mixin_m_test_get(const Eo *obj EINA_UNUSED, Complex_Mixin_Data *pd)
+{
+   return pd->i;
+}
+
+static void
+_complex_mixin_m_test_set(Eo *obj EINA_UNUSED, Complex_Mixin_Data *pd, int i)
+{
+   pd->i = i;
+}
+
+static Eina_Bool
+_complex_class_class_initializer(Efl_Class *klass)
+{
+   const Efl_Object_Ops *opsp = NULL;
+
+   const Efl_Object_Property_Reflection_Ops *ropsp = NULL;
+
+#ifndef COMPLEX_CLASS_EXTRA_OPS
+#define COMPLEX_CLASS_EXTRA_OPS
+#endif
+
+   EFL_OPS_DEFINE(ops,
+      EFL_OBJECT_OP_FUNC(complex_interface_i_test_set, _complex_class_complex_interface_i_test_set),
+      EFL_OBJECT_OP_FUNC(complex_interface_i_test_get, _complex_class_complex_interface_i_test_get),
+      COMPLEX_CLASS_EXTRA_OPS
+   );
+   opsp = &ops;
+
+   return efl_class_functions_set(klass, opsp, ropsp);
+}
+
+static const Efl_Class_Description _complex_class_class_desc = {
+   EO_VERSION,
+   "Complex_Class",
+   EFL_CLASS_TYPE_REGULAR,
+   sizeof(Complex_Class_Data),
+   _complex_class_class_initializer,
+   NULL,
+   NULL
+};
+
+EFL_DEFINE_CLASS(complex_class_class_get, &_complex_class_class_desc, EO_CLASS, COMPLEX_INTERFACE_INTERFACE, COMPLEX_MIXIN_MIXIN, NULL);
+
+static Eina_Error
+__eolian_complex_interface_i_test_set_reflect(Eo *obj, Eina_Value val)
+{
+   Eina_Error r = 0;   int cval;
+   if (!eina_value_int_convert(&val, &cval))
+      {
+         r = EINA_ERROR_VALUE_FAILED;
+         goto end;
+      }
+   complex_interface_i_test_set(obj, cval);
+ end:
+   eina_value_flush(&val);
+   return r;
+}
+
+EOAPI EFL_VOID_FUNC_BODYV(complex_interface_i_test_set, EFL_FUNC_CALL(i), int i);
+
+static Eina_Value
+__eolian_complex_interface_i_test_get_reflect(Eo *obj)
+{
+   int val = complex_interface_i_test_get(obj);
+   return eina_value_int_init(val);
+}
+
+EOAPI EFL_FUNC_BODY_CONST(complex_interface_i_test_get, int, 0);
+
+static Eina_Bool
+_complex_interface_class_initializer(Efl_Class *klass)
+{
+   const Efl_Object_Ops *opsp = NULL;
+
+   const Efl_Object_Property_Reflection_Ops *ropsp = NULL;
+
+#ifndef COMPLEX_INTERFACE_EXTRA_OPS
+#define COMPLEX_INTERFACE_EXTRA_OPS
+#endif
+
+   EFL_OPS_DEFINE(ops,
+      EFL_OBJECT_OP_FUNC(complex_interface_i_test_set, NULL),
+      EFL_OBJECT_OP_FUNC(complex_interface_i_test_get, NULL),
+      COMPLEX_INTERFACE_EXTRA_OPS
+   );
+   opsp = &ops;
+
+   static const Efl_Object_Property_Reflection refl_table[] = {
+      {"i_test", __eolian_complex_interface_i_test_set_reflect, __eolian_complex_interface_i_test_get_reflect},
+   };
+   static const Efl_Object_Property_Reflection_Ops rops = {
+      refl_table, EINA_C_ARRAY_LENGTH(refl_table)
+   };
+   ropsp = &rops;
+
+   return efl_class_functions_set(klass, opsp, ropsp);
+}
+
+static const Efl_Class_Description _complex_interface_class_desc = {
+   EO_VERSION,
+   "Complex_Interface",
+   EFL_CLASS_TYPE_INTERFACE,
+   0,
+   _complex_interface_class_initializer,
+   NULL,
+   NULL
+};
+
+EFL_DEFINE_CLASS(complex_interface_interface_get, &_complex_interface_class_desc, NULL, NULL);
+
+static Eina_Error
+__eolian_complex_mixin_m_test_set_reflect(Eo *obj, Eina_Value val)
+{
+   Eina_Error r = 0;   int cval;
+   if (!eina_value_int_convert(&val, &cval))
+      {
+         r = EINA_ERROR_VALUE_FAILED;
+         goto end;
+      }
+   complex_mixin_m_test_set(obj, cval);
+ end:
+   eina_value_flush(&val);
+   return r;
+}
+
+EOAPI EFL_VOID_FUNC_BODYV(complex_mixin_m_test_set, EFL_FUNC_CALL(i), int i);
+
+
+static Eina_Value
+__eolian_complex_mixin_m_test_get_reflect(Eo *obj)
+{
+   int val = complex_mixin_m_test_get(obj);
+   return eina_value_int_init(val);
+}
+
+EOAPI EFL_FUNC_BODY_CONST(complex_mixin_m_test_get, int, 0);
+
+static Eina_Bool
+_complex_mixin_class_initializer(Efl_Class *klass)
+{
+   const Efl_Object_Ops *opsp = NULL;
+
+   const Efl_Object_Property_Reflection_Ops *ropsp = NULL;
+
+#ifndef COMPLEX_MIXIN_EXTRA_OPS
+#define COMPLEX_MIXIN_EXTRA_OPS
+#endif
+
+   EFL_OPS_DEFINE(ops,
+      EFL_OBJECT_OP_FUNC(complex_mixin_m_test_set, _complex_mixin_m_test_set),
+      EFL_OBJECT_OP_FUNC(complex_mixin_m_test_get, _complex_mixin_m_test_get),
+      COMPLEX_MIXIN_EXTRA_OPS
+   );
+   opsp = &ops;
+
+   static const Efl_Object_Property_Reflection refl_table[] = {
+      {"m_test", __eolian_complex_mixin_m_test_set_reflect, __eolian_complex_mixin_m_test_get_reflect},
+   };
+   static const Efl_Object_Property_Reflection_Ops rops = {
+      refl_table, EINA_C_ARRAY_LENGTH(refl_table)
+   };
+   ropsp = &rops;
+
+   return efl_class_functions_set(klass, opsp, ropsp);
+}
+
+static const Efl_Class_Description _complex_mixin_class_desc = {
+   EO_VERSION,
+   "Complex_Mixin",
+   EFL_CLASS_TYPE_MIXIN,
+   sizeof(Complex_Mixin_Data),
+   _complex_mixin_class_initializer,
+   NULL,
+   NULL
+};
+
+EFL_DEFINE_CLASS(complex_mixin_mixin_get, &_complex_mixin_class_desc, NULL, NULL);
diff --git a/src/tests/eo/suite/eo_test_reflection_complex_class_structure.h b/src/tests/eo/suite/eo_test_reflection_complex_class_structure.h
new file mode 100644
index 0000000000..ae615c9428
--- /dev/null
+++ b/src/tests/eo/suite/eo_test_reflection_complex_class_structure.h
@@ -0,0 +1,20 @@
+#ifndef EO_TEST_REFLECTION_COMPLEX_CLASS_STRCUTURE_H
+#define EO_TEST_REFLECTION_COMPLEX_CLASS_STRCUTURE_H
+
+typedef Eo Complex_Mixin;
+#define COMPLEX_MIXIN_MIXIN complex_mixin_mixin_get()
+EWAPI const Efl_Class *complex_mixin_mixin_get(void);
+EOAPI void complex_mixin_m_test_set(Eo *obj, int i);
+EOAPI int complex_mixin_m_test_get(const Eo *obj);
+
+typedef Eo Complex_Interface;
+#define COMPLEX_INTERFACE_INTERFACE complex_interface_interface_get()
+EWAPI const Efl_Class *complex_interface_interface_get(void);
+EOAPI void complex_interface_i_test_set(Eo *obj, int i);
+EOAPI int complex_interface_i_test_get(const Eo *obj);
+
+typedef Eo Complex_Class;
+#define COMPLEX_CLASS_CLASS complex_class_class_get()
+EWAPI const Efl_Class *complex_class_class_get(void);
+
+#endif