Eo: Add eo_do_part.

This is a convenience macro to be used by the common pattern of getting
a part and then immediately calling functions on it. For example,
  without this macro, you'd have to write code like:

Eo *part;
eo_do(obj, part = efl_part_name_get("partname"));
eo_do(part, a_set(7));

while using the helper function trims it to:

eo_do_part(obj, efl_part_name_get("partname"), a_set(7));

@feature

diff --git a/src/lib/eo/Eo.h b/src/lib/eo/Eo.h
index c1ff0908699f86f67cea6de6e61eb13cc7c4e661..0825f90531078397fbb7054ca7634da81c20ad9e 100644 (file)
--- a/src/lib/eo/Eo.h
+++ b/src/lib/eo/Eo.h
@@ -605,6 +605,13 @@ EAPI Eo * _eo_add_end(void);
 
 #define eo_do_super_ret(eoid, clsid, ret_tmp, func) _eo_do_common_ret(eoid, clsid, EINA_TRUE, ret_tmp, func)
 
+#define eo_do_part(eoid, part_func, ...) \
+  do { \
+       Eo *__eo_part = eoid; \
+       eo_do(eoid, __eo_part = part_func); \
+       eo_do(__eo_part, __VA_ARGS__); \
+  } while (0)
+
 /*****************************************************************************/
 
 /**

diff --git a/src/tests/eo/suite/eo_test_class_simple.c b/src/tests/eo/suite/eo_test_class_simple.c
index cbefee7d1dcbcc2c204c094fe402bc342752daa6..4bc3904acb98523db251cffc80d590ac896619bc 100644 (file)
--- a/src/tests/eo/suite/eo_test_class_simple.c
+++ b/src/tests/eo/suite/eo_test_class_simple.c
@@ -45,6 +45,15 @@ _class_hi_print(Eo_Class *klass, void *data EINA_UNUSED)
    return EINA_TRUE;
 }
 
+EO_FUNC_BODYV(simple_part_get, Eo *, NULL, EO_FUNC_CALL(name), const char *name);
+
+static Eo *
+_part_get(Eo *obj, void *class_data EINA_UNUSED, const char *name EINA_UNUSED)
+{
+   /* A normal part get will do something saner, we just create objects. */
+   return eo_add(SIMPLE_CLASS, obj);
+}
+
 EO_VOID_FUNC_BODYV(simple_recursive, EO_FUNC_CALL(n), int n);
 
 static void
@@ -83,6 +92,7 @@ static Eo_Op_Description op_descs[] = {
      EO_OP_FUNC(simple_a_print, _a_print, "Print property a"),
      EO_OP_CLASS_FUNC(simple_class_hi_print, _class_hi_print, "Print property a"),
      EO_OP_FUNC(simple_recursive, _recursive, "Recursive function"),
+     EO_OP_FUNC(simple_part_get, _part_get, "Part getter"),
      EO_OP_FUNC(simple_pure_virtual, NULL, "Pure Virtual function"),
      EO_OP_SENTINEL
 };

diff --git a/src/tests/eo/suite/eo_test_class_simple.h b/src/tests/eo/suite/eo_test_class_simple.h
index 7d774b761f9e5a3bd5fa259158f5e16ad58351eb..2fce59137234b5f0a28e2547b44d4f0ad9cd8428 100644 (file)
--- a/src/tests/eo/suite/eo_test_class_simple.h
+++ b/src/tests/eo/suite/eo_test_class_simple.h
@@ -13,6 +13,7 @@ EAPI Eina_Bool simple_class_hi_print(void);
 EAPI void simple_recursive(int n);
 EAPI void simple_pure_virtual(void);
 EAPI void simple_no_implementation(void);
+EAPI Eo *simple_part_get(const char *name);
 
 extern const Eo_Event_Description _EV_A_CHANGED;
 #define EV_A_CHANGED (&(_EV_A_CHANGED))

diff --git a/src/tests/eo/suite/eo_test_general.c b/src/tests/eo/suite/eo_test_general.c
index 684a05c94d577d3a3eb661691164b19a2ce5b9dc..b0dc77a3e99516c1aac2d916d104ad772bbc6d92 100644 (file)
--- a/src/tests/eo/suite/eo_test_general.c
+++ b/src/tests/eo/suite/eo_test_general.c
@@ -939,6 +939,39 @@ START_TEST(eo_add_failures)
 }
 END_TEST
 
+START_TEST(eo_parts)
+{
+   int a = 0;
+
+   eo_init();
+
+   Eo *obj = eo_add(SIMPLE_CLASS, NULL);
+
+   eo_do(obj, simple_a_set(3), a = simple_a_get());
+   ck_assert_int_eq(a, 3);
+
+   eo_do_part(obj, simple_part_get("test"),
+         simple_a_set(7),
+         a = simple_a_get()
+         );
+   ck_assert_int_eq(a, 7);
+
+   eo_do(obj, simple_a_set(3), a = simple_a_get());
+   ck_assert_int_eq(a, 3);
+
+   /* Faking a call, just asserting NULL as the part to check default values. */
+   eo_do_part(obj, NULL,
+         simple_a_set(7),
+         a = simple_a_get()
+         );
+   ck_assert_int_eq(a, 0);
+
+   eo_del(obj);
+
+   eo_shutdown();
+}
+END_TEST
+
 void eo_test_general(TCase *tc)
 {
    tcase_add_test(tc, eo_simple);
@@ -956,4 +989,5 @@ void eo_test_general(TCase *tc)
    tcase_add_test(tc, eo_add_do_and_custom);
    tcase_add_test(tc, eo_pointers_indirection);
    tcase_add_test(tc, eo_add_failures);
+   tcase_add_test(tc, eo_parts);
 }