summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelipe Magno de Almeida <felipe@expertisesolutions.com.br>2016-04-11 00:53:03 -0300
committerFelipe Magno de Almeida <felipe@expertisesolutions.com.br>2016-04-11 01:28:50 -0300
commit62841aee3ce838321149b329008a54185341f9f8 (patch)
tree62abd7842778d1fd0c541ba1063d732097dc57f2
parenteff86cd48a9f01ace61aadcfcb8241ec426d6262 (diff)
eolian: Make promise eolian generation use macros for hooks
Modify the way hooks are defined and used by promise generation in Eolian in the Eo API. Instead of passing macro names as parameters to EO_FUNC_BODY macros, just re-define the actual hooks when it is needed.
-rw-r--r--src/bin/eolian/eo_generator.c32
-rw-r--r--src/bindings/eo_cxx/eo_inherit.hh2
-rw-r--r--src/lib/eina/eina_promise.h19
-rw-r--r--src/lib/eo/Eo.h52
-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_simple.c132
-rw-r--r--src/tests/eo/constructors/constructors_mixin.c2
-rw-r--r--src/tests/eo/constructors/constructors_simple.c6
-rw-r--r--src/tests/eo/function_overrides/function_overrides_inherit2.c4
-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.c4
-rw-r--r--src/tests/eo/mixin/mixin_mixin.c2
-rw-r--r--src/tests/eo/mixin/mixin_simple.c4
-rw-r--r--src/tests/eo/signals/signals_simple.c2
-rw-r--r--src/tests/eo/suite/eo_test_class_simple.c18
-rw-r--r--src/tests/eo/suite/eo_test_general.c4
-rw-r--r--src/tests/eo/suite/eo_test_threaded_calls.c6
-rw-r--r--src/tests/eolian/data/class_simple_ref.c10
-rw-r--r--src/tests/eolian/data/override_ref.c16
22 files changed, 174 insertions, 157 deletions
diff --git a/src/bin/eolian/eo_generator.c b/src/bin/eolian/eo_generator.c
index 78e8108fa0..c36702709e 100644
--- a/src/bin/eolian/eo_generator.c
+++ b/src/bin/eolian/eo_generator.c
@@ -546,16 +546,6 @@ eo_bind_func_generate(const Eolian_Class *class, const Eolian_Function *funcid,
546 (ftype == EOLIAN_PROP_GET || 546 (ftype == EOLIAN_PROP_GET ||
547 eolian_function_object_is_const(funcid) || 547 eolian_function_object_is_const(funcid) ||
548 eolian_function_is_class(funcid))?"_CONST":"", func_env.lower_eo_func); 548 eolian_function_is_class(funcid))?"_CONST":"", func_env.lower_eo_func);
549 if(has_promise)
550 {
551 eina_strbuf_append_printf(eo_func_decl,
552 ", _EINA_PROMISE_BEFORE_HOOK(%s, %s%s) _EO_EMPTY_HOOK, _EINA_PROMISE_AFTER_HOOK(%s) _EO_EMPTY_HOOK",
553 promise_value_type, !rettype ? "void" : rettype,
554 eina_strbuf_string_get(impl_full_params),
555 promise_param_name);
556 }
557 else
558 eina_strbuf_append_printf(eo_func_decl, ", _EO_EMPTY_HOOK, _EO_EMPTY_HOOK");
559 if (!ret_is_void) 549 if (!ret_is_void)
560 { 550 {
561 const char *val_str = NULL; 551 const char *val_str = NULL;
@@ -583,7 +573,29 @@ eo_bind_func_generate(const Eolian_Class *class, const Eolian_Function *funcid,
583 eina_strbuf_string_get(full_params)); 573 eina_strbuf_string_get(full_params));
584 } 574 }
585 eina_strbuf_append_printf(eo_func_decl, ");"); 575 eina_strbuf_append_printf(eo_func_decl, ");");
576
577 if(has_promise)
578 {
579 eina_strbuf_append_printf(fbody,
580 "#undef _EO_API_BEFORE_HOOK\n#undef _EO_API_AFTER_HOOK\n#undef _EO_API_CALL_HOOK\n"
581 "#define _EO_API_BEFORE_HOOK _EINA_PROMISE_BEFORE_HOOK(%s, %s%s)\n"
582 "#define _EO_API_AFTER_HOOK _EINA_PROMISE_AFTER_HOOK(%s)\n"
583 "#define _EO_API_CALL_HOOK(x) _EINA_PROMISE_CALL_HOOK(EO_FUNC_CALL(%s))\n\n",
584 promise_value_type, !rettype ? "void" : rettype,
585 eina_strbuf_string_get(impl_full_params),
586 promise_param_name,
587 eina_strbuf_string_get(params));
588 }
589
586 eina_strbuf_append_printf(fbody, "%s\n", eina_strbuf_string_get(eo_func_decl)); 590 eina_strbuf_append_printf(fbody, "%s\n", eina_strbuf_string_get(eo_func_decl));
591
592 if(has_promise)
593 {
594 eina_strbuf_append_printf(fbody, "\n#undef _EO_API_BEFORE_HOOK\n#undef _EO_API_AFTER_HOOK\n#undef _EO_API_CALL_HOOK\n"
595 "#define _EO_API_BEFORE_HOOK\n#define _EO_API_AFTER_HOOK\n"
596 "#define _EO_API_CALL_HOOK(x) x\n");
597 }
598
587 eina_strbuf_free(eo_func_decl); 599 eina_strbuf_free(eo_func_decl);
588 } 600 }
589 601
diff --git a/src/bindings/eo_cxx/eo_inherit.hh b/src/bindings/eo_cxx/eo_inherit.hh
index a73de37198..a05d11fe94 100644
--- a/src/bindings/eo_cxx/eo_inherit.hh
+++ b/src/bindings/eo_cxx/eo_inherit.hh
@@ -30,7 +30,7 @@ Eo_Class const* create_class(eina::index_sequence<S...>);
30/// @param this_ The <em>user data</em> to be passed to the resolved function. 30/// @param this_ The <em>user data</em> to be passed to the resolved function.
31/// @param args An heterogeneous sequence of arguments. 31/// @param args An heterogeneous sequence of arguments.
32/// 32///
33inline EO_VOID_FUNC_BODYV(inherit_constructor, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(this_), void* this_); 33inline EO_VOID_FUNC_BODYV(inherit_constructor, EO_FUNC_CALL(this_), void* this_);
34 34
35} 35}
36 36
diff --git a/src/lib/eina/eina_promise.h b/src/lib/eina/eina_promise.h
index 70584e4d94..9093b92767 100644
--- a/src/lib/eina/eina_promise.h
+++ b/src/lib/eina/eina_promise.h
@@ -443,19 +443,22 @@ EAPI void eina_promise_owner_default_call_then(Eina_Promise_Owner* promise);
443 * @internal 443 * @internal
444 */ 444 */
445#define _EINA_PROMISE_BEFORE_HOOK(PromiseValue, Ret, ...) \ 445#define _EINA_PROMISE_BEFORE_HOOK(PromiseValue, Ret, ...) \
446 Eina_Promise_Owner* __eo_promise = eina_promise_default_add(sizeof(PromiseValue)); \ 446 Eina_Promise_Owner* const __eo_promise = eina_promise_default_add(sizeof(PromiseValue)); \
447 typedef Ret (*_Eo__Promise_func_)(Eo*, void *obj_data, ##__VA_ARGS__); \ 447 typedef Ret (*_Eo_Promise_func_t_)(Eo*, void *obj_data, ##__VA_ARGS__); \
448 _Eo__Promise_func_ const _promise_func = (_Eo__Promise_func_)_func_; \ 448 _Eo_Promise_func_t_ const _eo_promise_func_ = (_Eo_Promise_func_t_)_func_;
449 { \ 449
450 _Eo__Promise_func_ const _func_ = _promise_func; 450/*
451 * @internal
452 */
453#define _EINA_PROMISE_CALL_HOOK(Arguments) \
454 _eo_promise_func_(___call.eo_id, ___call.data, Arguments);
451 455
452 456
453/* 457/*
454 * @internal 458 * @internal
455 */ 459 */
456#define _EINA_PROMISE_AFTER_HOOK(Promise) \ 460#define _EINA_PROMISE_AFTER_HOOK(Promise) \
457 } \ 461 if(Promise) \
458 if(Promise) \ 462 *Promise = eina_promise_owner_promise_get(__eo_promise);
459 *Promise = eina_promise_owner_promise_get(__eo_promise);
460 463
461#endif 464#endif
diff --git a/src/lib/eo/Eo.h b/src/lib/eo/Eo.h
index c132bf3ff1..c2c7d4c168 100644
--- a/src/lib/eo/Eo.h
+++ b/src/lib/eo/Eo.h
@@ -514,70 +514,72 @@ typedef struct _Eo_Call_Cache
514 __FILE__, __LINE__)) return DefRet; \ 514 __FILE__, __LINE__)) return DefRet; \
515 _Eo_##Name##_func _func_ = (_Eo_##Name##_func) ___call.func; \ 515 _Eo_##Name##_func _func_ = (_Eo_##Name##_func) ___call.func; \
516 516
517#define _EO_EMPTY_HOOK() 517#define _EO_API_BEFORE_HOOK
518#define _EO_API_AFTER_HOOK
519#define _EO_API_CALL_HOOK(x) x
518 520
519// to define an EAPI function 521// to define an EAPI function
520#define _EO_FUNC_BODY(Name, ObjType, BeforeHook, AfterHook, Ret, DefRet) \ 522#define _EO_FUNC_BODY(Name, ObjType, Ret, DefRet) \
521 Ret \ 523 Ret \
522 Name(ObjType obj) \ 524 Name(ObjType obj) \
523 { \ 525 { \
524 typedef Ret (*_Eo_##Name##_func)(Eo *, void *obj_data); \ 526 typedef Ret (*_Eo_##Name##_func)(Eo *, void *obj_data); \
525 Ret _r; \ 527 Ret _r; \
526 EO_FUNC_COMMON_OP(obj, Name, DefRet); \ 528 EO_FUNC_COMMON_OP(obj, Name, DefRet); \
527 BeforeHook() \ 529 _EO_API_BEFORE_HOOK \
528 _r = _func_(___call.eo_id, ___call.data); \ 530 _r = _EO_API_CALL_HOOK(_func_(___call.eo_id, ___call.data)); \
529 _eo_call_end(&___call); \ 531 _eo_call_end(&___call); \
530 AfterHook() \ 532 _EO_API_AFTER_HOOK \
531 return _r; \ 533 return _r; \
532 } 534 }
533 535
534#define _EO_VOID_FUNC_BODY(Name, ObjType, BeforeHook, AfterHook) \ 536#define _EO_VOID_FUNC_BODY(Name, ObjType) \
535 void \ 537 void \
536 Name(ObjType obj) \ 538 Name(ObjType obj) \
537 { \ 539 { \
538 typedef void (*_Eo_##Name##_func)(Eo *, void *obj_data); \ 540 typedef void (*_Eo_##Name##_func)(Eo *, void *obj_data); \
539 EO_FUNC_COMMON_OP(obj, Name, ); \ 541 EO_FUNC_COMMON_OP(obj, Name, ); \
540 BeforeHook() \ 542 _EO_API_BEFORE_HOOK \
541 _func_(___call.eo_id, ___call.data); \ 543 _EO_API_CALL_HOOK(_func_(___call.eo_id, ___call.data)); \
542 _eo_call_end(&___call); \ 544 _eo_call_end(&___call); \
543 AfterHook() \ 545 _EO_API_AFTER_HOOK \
544 } 546 }
545 547
546#define _EO_FUNC_BODYV(Name, ObjType, BeforeHook, AfterHook, Ret, DefRet, Arguments, ...) \ 548#define _EO_FUNC_BODYV(Name, ObjType, Ret, DefRet, Arguments, ...) \
547 Ret \ 549 Ret \
548 Name(ObjType obj, __VA_ARGS__) \ 550 Name(ObjType obj, __VA_ARGS__) \
549 { \ 551 { \
550 typedef Ret (*_Eo_##Name##_func)(Eo *, void *obj_data, __VA_ARGS__); \ 552 typedef Ret (*_Eo_##Name##_func)(Eo *, void *obj_data, __VA_ARGS__); \
551 Ret _r; \ 553 Ret _r; \
552 EO_FUNC_COMMON_OP(obj, Name, DefRet); \ 554 EO_FUNC_COMMON_OP(obj, Name, DefRet); \
553 BeforeHook() \ 555 _EO_API_BEFORE_HOOK \
554 _r = _func_(___call.eo_id, ___call.data, Arguments); \ 556 _r = _EO_API_CALL_HOOK(_func_(___call.eo_id, ___call.data, Arguments)); \
555 _eo_call_end(&___call); \ 557 _eo_call_end(&___call); \
556 AfterHook() \ 558 _EO_API_AFTER_HOOK \
557 return _r; \ 559 return _r; \
558 } 560 }
559 561
560#define _EO_VOID_FUNC_BODYV(Name, ObjType, BeforeHook, AfterHook, Arguments, ...) \ 562#define _EO_VOID_FUNC_BODYV(Name, ObjType, Arguments, ...) \
561 void \ 563 void \
562 Name(ObjType obj, __VA_ARGS__) \ 564 Name(ObjType obj, __VA_ARGS__) \
563 { \ 565 { \
564 typedef void (*_Eo_##Name##_func)(Eo *, void *obj_data, __VA_ARGS__); \ 566 typedef void (*_Eo_##Name##_func)(Eo *, void *obj_data, __VA_ARGS__); \
565 EO_FUNC_COMMON_OP(obj, Name, ); \ 567 EO_FUNC_COMMON_OP(obj, Name, ); \
566 BeforeHook() \ 568 _EO_API_BEFORE_HOOK \
567 _func_(___call.eo_id, ___call.data, Arguments); \ 569 _EO_API_CALL_HOOK(_func_(___call.eo_id, ___call.data, Arguments)); \
568 _eo_call_end(&___call); \ 570 _eo_call_end(&___call); \
569 AfterHook() \ 571 _EO_API_AFTER_HOOK \
570 } 572 }
571 573
572#define EO_FUNC_BODY(Name, BeforeHook, AfterHook, Ret, DefRet) _EO_FUNC_BODY(Name, Eo *, BeforeHook, AfterHook, Ret, DefRet) 574#define EO_FUNC_BODY(Name, Ret, DefRet) _EO_FUNC_BODY(Name, Eo *, Ret, DefRet)
573#define EO_VOID_FUNC_BODY(Name, BeforeHook, AfterHook) _EO_VOID_FUNC_BODY(Name, Eo *, BeforeHook, AfterHook) 575#define EO_VOID_FUNC_BODY(Name) _EO_VOID_FUNC_BODY(Name, Eo *)
574#define EO_FUNC_BODYV(Name, BeforeHook, AfterHook, Ret, DefRet, Arguments, ...) _EO_FUNC_BODYV(Name, Eo *, BeforeHook, AfterHook, Ret, DefRet, EO_FUNC_CALL(Arguments), __VA_ARGS__) 576#define EO_FUNC_BODYV(Name, Ret, DefRet, Arguments, ...) _EO_FUNC_BODYV(Name, Eo *, Ret, DefRet, EO_FUNC_CALL(Arguments), __VA_ARGS__)
575#define EO_VOID_FUNC_BODYV(Name, BeforeHook, AfterHook, Arguments, ...) _EO_VOID_FUNC_BODYV(Name, Eo *, BeforeHook, AfterHook, EO_FUNC_CALL(Arguments), __VA_ARGS__) 577#define EO_VOID_FUNC_BODYV(Name, Arguments, ...) _EO_VOID_FUNC_BODYV(Name, Eo *, EO_FUNC_CALL(Arguments), __VA_ARGS__)
576 578
577#define EO_FUNC_BODY_CONST(Name, BeforeHook, AfterHook, Ret, DefRet) _EO_FUNC_BODY(Name, const Eo *, BeforeHook, AfterHook, Ret, DefRet) 579#define EO_FUNC_BODY_CONST(Name, Ret, DefRet) _EO_FUNC_BODY(Name, const Eo *, Ret, DefRet)
578#define EO_VOID_FUNC_BODY_CONST(Name, BeforeHook, AfterHook) _EO_VOID_FUNC_BODY(Name, const Eo *, BeforeHook, AfterHook) 580#define EO_VOID_FUNC_BODY_CONST(Name) _EO_VOID_FUNC_BODY(Name, const Eo *)
579#define EO_FUNC_BODYV_CONST(Name, BeforeHook, AfterHook, Ret, DefRet, Arguments, ...) _EO_FUNC_BODYV(Name, const Eo *, BeforeHook, AfterHook, Ret, DefRet, EO_FUNC_CALL(Arguments), __VA_ARGS__) 581#define EO_FUNC_BODYV_CONST(Name, Ret, DefRet, Arguments, ...) _EO_FUNC_BODYV(Name, const Eo *, Ret, DefRet, EO_FUNC_CALL(Arguments), __VA_ARGS__)
580#define EO_VOID_FUNC_BODYV_CONST(Name, BeforeHook, AfterHook, Arguments, ...) _EO_VOID_FUNC_BODYV(Name, const Eo *, BeforeHook, AfterHook, EO_FUNC_CALL(Arguments), __VA_ARGS__) 582#define EO_VOID_FUNC_BODYV_CONST(Name, Arguments, ...) _EO_VOID_FUNC_BODYV(Name, const Eo *, EO_FUNC_CALL(Arguments), __VA_ARGS__)
581 583
582#ifndef _WIN32 584#ifndef _WIN32
583# define _EO_OP_API_ENTRY(a) (void*)a 585# define _EO_OP_API_ENTRY(a) (void*)a
diff --git a/src/tests/eo/access/access_inherit.c b/src/tests/eo/access/access_inherit.c
index f49f0a5aec..6ab831fe19 100644
--- a/src/tests/eo/access/access_inherit.c
+++ b/src/tests/eo/access/access_inherit.c
@@ -16,7 +16,7 @@ _prot_print(Eo *obj, void *class_data EINA_UNUSED)
16 printf("%s %d\n", __func__, pd->protected_x1); 16 printf("%s %d\n", __func__, pd->protected_x1);
17} 17}
18 18
19EAPI EO_VOID_FUNC_BODY(inherit_prot_print, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK); 19EAPI EO_VOID_FUNC_BODY(inherit_prot_print);
20 20
21static Eo_Op_Description op_descs[] = { 21static Eo_Op_Description op_descs[] = {
22 EO_OP_FUNC(inherit_prot_print, _prot_print), 22 EO_OP_FUNC(inherit_prot_print, _prot_print),
diff --git a/src/tests/eo/access/access_simple.c b/src/tests/eo/access/access_simple.c
index a72949f608..b4f87661a2 100644
--- a/src/tests/eo/access/access_simple.c
+++ b/src/tests/eo/access/access_simple.c
@@ -30,7 +30,7 @@ _a_set(Eo *obj, void *class_data, int a)
30 eo_event_callback_call(obj, EV_A_CHANGED, &pd->a); 30 eo_event_callback_call(obj, EV_A_CHANGED, &pd->a);
31} 31}
32 32
33EAPI EO_VOID_FUNC_BODYV(simple_a_set, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(a), int a); 33EAPI EO_VOID_FUNC_BODYV(simple_a_set, EO_FUNC_CALL(a), int a);
34 34
35static Eo_Op_Description op_descs[] = { 35static Eo_Op_Description op_descs[] = {
36 EO_OP_FUNC(simple_a_set, _a_set), 36 EO_OP_FUNC(simple_a_set, _a_set),
diff --git a/src/tests/eo/composite_objects/composite_objects_simple.c b/src/tests/eo/composite_objects/composite_objects_simple.c
index fb3319adb8..5c64cc0f14 100644
--- a/src/tests/eo/composite_objects/composite_objects_simple.c
+++ b/src/tests/eo/composite_objects/composite_objects_simple.c
@@ -27,73 +27,73 @@ _a_get(Eo *obj EINA_UNUSED, void *class_data)
27 return pd->a; 27 return pd->a;
28} 28}
29 29
30EAPI EO_VOID_FUNC_BODYV(simple_a_set, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(a), int a); 30EAPI EO_VOID_FUNC_BODYV(simple_a_set, EO_FUNC_CALL(a), int a);
31EAPI EO_FUNC_BODY(simple_a_get, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, int, 0); 31EAPI EO_FUNC_BODY(simple_a_get, int, 0);
32 32
33EAPI EO_VOID_FUNC_BODYV(simple_a_set1, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(a), int a); 33EAPI EO_VOID_FUNC_BODYV(simple_a_set1, EO_FUNC_CALL(a), int a);
34EAPI EO_VOID_FUNC_BODYV(simple_a_set2, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(a), int a); 34EAPI EO_VOID_FUNC_BODYV(simple_a_set2, EO_FUNC_CALL(a), int a);
35EAPI EO_VOID_FUNC_BODYV(simple_a_set3, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(a), int a); 35EAPI EO_VOID_FUNC_BODYV(simple_a_set3, EO_FUNC_CALL(a), int a);
36EAPI EO_VOID_FUNC_BODYV(simple_a_set4, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(a), int a); 36EAPI EO_VOID_FUNC_BODYV(simple_a_set4, EO_FUNC_CALL(a), int a);
37EAPI EO_VOID_FUNC_BODYV(simple_a_set5, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(a), int a); 37EAPI EO_VOID_FUNC_BODYV(simple_a_set5, EO_FUNC_CALL(a), int a);
38EAPI EO_VOID_FUNC_BODYV(simple_a_set6, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(a), int a); 38EAPI EO_VOID_FUNC_BODYV(simple_a_set6, EO_FUNC_CALL(a), int a);
39EAPI EO_VOID_FUNC_BODYV(simple_a_set7, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(a), int a); 39EAPI EO_VOID_FUNC_BODYV(simple_a_set7, EO_FUNC_CALL(a), int a);
40EAPI EO_VOID_FUNC_BODYV(simple_a_set8, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(a), int a); 40EAPI EO_VOID_FUNC_BODYV(simple_a_set8, EO_FUNC_CALL(a), int a);
41EAPI EO_VOID_FUNC_BODYV(simple_a_set9, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(a), int a); 41EAPI EO_VOID_FUNC_BODYV(simple_a_set9, EO_FUNC_CALL(a), int a);
42EAPI EO_VOID_FUNC_BODYV(simple_a_set10, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(a), int a); 42EAPI EO_VOID_FUNC_BODYV(simple_a_set10, EO_FUNC_CALL(a), int a);
43EAPI EO_VOID_FUNC_BODYV(simple_a_set11, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(a), int a); 43EAPI EO_VOID_FUNC_BODYV(simple_a_set11, EO_FUNC_CALL(a), int a);
44EAPI EO_VOID_FUNC_BODYV(simple_a_set12, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(a), int a); 44EAPI EO_VOID_FUNC_BODYV(simple_a_set12, EO_FUNC_CALL(a), int a);
45EAPI EO_VOID_FUNC_BODYV(simple_a_set13, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(a), int a); 45EAPI EO_VOID_FUNC_BODYV(simple_a_set13, EO_FUNC_CALL(a), int a);
46EAPI EO_VOID_FUNC_BODYV(simple_a_set14, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(a), int a); 46EAPI EO_VOID_FUNC_BODYV(simple_a_set14, EO_FUNC_CALL(a), int a);
47EAPI EO_VOID_FUNC_BODYV(simple_a_set15, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(a), int a); 47EAPI EO_VOID_FUNC_BODYV(simple_a_set15, EO_FUNC_CALL(a), int a);
48EAPI EO_VOID_FUNC_BODYV(simple_a_set16, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(a), int a); 48EAPI EO_VOID_FUNC_BODYV(simple_a_set16, EO_FUNC_CALL(a), int a);
49EAPI EO_VOID_FUNC_BODYV(simple_a_set17, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(a), int a); 49EAPI EO_VOID_FUNC_BODYV(simple_a_set17, EO_FUNC_CALL(a), int a);
50EAPI EO_VOID_FUNC_BODYV(simple_a_set18, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(a), int a); 50EAPI EO_VOID_FUNC_BODYV(simple_a_set18, EO_FUNC_CALL(a), int a);
51EAPI EO_VOID_FUNC_BODYV(simple_a_set19, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(a), int a); 51EAPI EO_VOID_FUNC_BODYV(simple_a_set19, EO_FUNC_CALL(a), int a);
52EAPI EO_VOID_FUNC_BODYV(simple_a_set20, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(a), int a); 52EAPI EO_VOID_FUNC_BODYV(simple_a_set20, EO_FUNC_CALL(a), int a);
53EAPI EO_VOID_FUNC_BODYV(simple_a_set21, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(a), int a); 53EAPI EO_VOID_FUNC_BODYV(simple_a_set21, EO_FUNC_CALL(a), int a);
54EAPI EO_VOID_FUNC_BODYV(simple_a_set22, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(a), int a); 54EAPI EO_VOID_FUNC_BODYV(simple_a_set22, EO_FUNC_CALL(a), int a);
55EAPI EO_VOID_FUNC_BODYV(simple_a_set23, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(a), int a); 55EAPI EO_VOID_FUNC_BODYV(simple_a_set23, EO_FUNC_CALL(a), int a);
56EAPI EO_VOID_FUNC_BODYV(simple_a_set24, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(a), int a); 56EAPI EO_VOID_FUNC_BODYV(simple_a_set24, EO_FUNC_CALL(a), int a);
57EAPI EO_VOID_FUNC_BODYV(simple_a_set25, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(a), int a); 57EAPI EO_VOID_FUNC_BODYV(simple_a_set25, EO_FUNC_CALL(a), int a);
58EAPI EO_VOID_FUNC_BODYV(simple_a_set26, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(a), int a); 58EAPI EO_VOID_FUNC_BODYV(simple_a_set26, EO_FUNC_CALL(a), int a);
59EAPI EO_VOID_FUNC_BODYV(simple_a_set27, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(a), int a); 59EAPI EO_VOID_FUNC_BODYV(simple_a_set27, EO_FUNC_CALL(a), int a);
60EAPI EO_VOID_FUNC_BODYV(simple_a_set28, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(a), int a); 60EAPI EO_VOID_FUNC_BODYV(simple_a_set28, EO_FUNC_CALL(a), int a);
61EAPI EO_VOID_FUNC_BODYV(simple_a_set29, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(a), int a); 61EAPI EO_VOID_FUNC_BODYV(simple_a_set29, EO_FUNC_CALL(a), int a);
62EAPI EO_VOID_FUNC_BODYV(simple_a_set30, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(a), int a); 62EAPI EO_VOID_FUNC_BODYV(simple_a_set30, EO_FUNC_CALL(a), int a);
63EAPI EO_VOID_FUNC_BODYV(simple_a_set31, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(a), int a); 63EAPI EO_VOID_FUNC_BODYV(simple_a_set31, EO_FUNC_CALL(a), int a);
64EAPI EO_VOID_FUNC_BODYV(simple_a_set32, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(a), int a); 64EAPI EO_VOID_FUNC_BODYV(simple_a_set32, EO_FUNC_CALL(a), int a);
65EAPI EO_VOID_FUNC_BODYV(simple_a_get1, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(a), int a); 65EAPI EO_VOID_FUNC_BODYV(simple_a_get1, EO_FUNC_CALL(a), int a);
66EAPI EO_VOID_FUNC_BODYV(simple_a_get2, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(a), int a); 66EAPI EO_VOID_FUNC_BODYV(simple_a_get2, EO_FUNC_CALL(a), int a);
67EAPI EO_VOID_FUNC_BODYV(simple_a_get3, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(a), int a); 67EAPI EO_VOID_FUNC_BODYV(simple_a_get3, EO_FUNC_CALL(a), int a);
68EAPI EO_VOID_FUNC_BODYV(simple_a_get4, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(a), int a); 68EAPI EO_VOID_FUNC_BODYV(simple_a_get4, EO_FUNC_CALL(a), int a);
69EAPI EO_VOID_FUNC_BODYV(simple_a_get5, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(a), int a); 69EAPI EO_VOID_FUNC_BODYV(simple_a_get5, EO_FUNC_CALL(a), int a);
70EAPI EO_VOID_FUNC_BODYV(simple_a_get6, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(a), int a); 70EAPI EO_VOID_FUNC_BODYV(simple_a_get6, EO_FUNC_CALL(a), int a);
71EAPI EO_VOID_FUNC_BODYV(simple_a_get7, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(a), int a); 71EAPI EO_VOID_FUNC_BODYV(simple_a_get7, EO_FUNC_CALL(a), int a);
72EAPI EO_VOID_FUNC_BODYV(simple_a_get8, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(a), int a); 72EAPI EO_VOID_FUNC_BODYV(simple_a_get8, EO_FUNC_CALL(a), int a);
73EAPI EO_VOID_FUNC_BODYV(simple_a_get9, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(a), int a); 73EAPI EO_VOID_FUNC_BODYV(simple_a_get9, EO_FUNC_CALL(a), int a);
74EAPI EO_VOID_FUNC_BODYV(simple_a_get10, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(a), int a); 74EAPI EO_VOID_FUNC_BODYV(simple_a_get10, EO_FUNC_CALL(a), int a);
75EAPI EO_VOID_FUNC_BODYV(simple_a_get11, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(a), int a); 75EAPI EO_VOID_FUNC_BODYV(simple_a_get11, EO_FUNC_CALL(a), int a);
76EAPI EO_VOID_FUNC_BODYV(simple_a_get12, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(a), int a); 76EAPI EO_VOID_FUNC_BODYV(simple_a_get12, EO_FUNC_CALL(a), int a);
77EAPI EO_VOID_FUNC_BODYV(simple_a_get13, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(a), int a); 77EAPI EO_VOID_FUNC_BODYV(simple_a_get13, EO_FUNC_CALL(a), int a);
78EAPI EO_VOID_FUNC_BODYV(simple_a_get14, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(a), int a); 78EAPI EO_VOID_FUNC_BODYV(simple_a_get14, EO_FUNC_CALL(a), int a);
79EAPI EO_VOID_FUNC_BODYV(simple_a_get15, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(a), int a); 79EAPI EO_VOID_FUNC_BODYV(simple_a_get15, EO_FUNC_CALL(a), int a);
80EAPI EO_VOID_FUNC_BODYV(simple_a_get16, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(a), int a); 80EAPI EO_VOID_FUNC_BODYV(simple_a_get16, EO_FUNC_CALL(a), int a);
81EAPI EO_VOID_FUNC_BODYV(simple_a_get17, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(a), int a); 81EAPI EO_VOID_FUNC_BODYV(simple_a_get17, EO_FUNC_CALL(a), int a);
82EAPI EO_VOID_FUNC_BODYV(simple_a_get18, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(a), int a); 82EAPI EO_VOID_FUNC_BODYV(simple_a_get18, EO_FUNC_CALL(a), int a);
83EAPI EO_VOID_FUNC_BODYV(simple_a_get19, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(a), int a); 83EAPI EO_VOID_FUNC_BODYV(simple_a_get19, EO_FUNC_CALL(a), int a);
84EAPI EO_VOID_FUNC_BODYV(simple_a_get20, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(a), int a); 84EAPI EO_VOID_FUNC_BODYV(simple_a_get20, EO_FUNC_CALL(a), int a);
85EAPI EO_VOID_FUNC_BODYV(simple_a_get21, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(a), int a); 85EAPI EO_VOID_FUNC_BODYV(simple_a_get21, EO_FUNC_CALL(a), int a);
86EAPI EO_VOID_FUNC_BODYV(simple_a_get22, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(a), int a); 86EAPI EO_VOID_FUNC_BODYV(simple_a_get22, EO_FUNC_CALL(a), int a);
87EAPI EO_VOID_FUNC_BODYV(simple_a_get23, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(a), int a); 87EAPI EO_VOID_FUNC_BODYV(simple_a_get23, EO_FUNC_CALL(a), int a);
88EAPI EO_VOID_FUNC_BODYV(simple_a_get24, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(a), int a); 88EAPI EO_VOID_FUNC_BODYV(simple_a_get24, EO_FUNC_CALL(a), int a);
89EAPI EO_VOID_FUNC_BODYV(simple_a_get25, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(a), int a); 89EAPI EO_VOID_FUNC_BODYV(simple_a_get25, EO_FUNC_CALL(a), int a);
90EAPI EO_VOID_FUNC_BODYV(simple_a_get26, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(a), int a); 90EAPI EO_VOID_FUNC_BODYV(simple_a_get26, EO_FUNC_CALL(a), int a);
91EAPI EO_VOID_FUNC_BODYV(simple_a_get27, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(a), int a); 91EAPI EO_VOID_FUNC_BODYV(simple_a_get27, EO_FUNC_CALL(a), int a);
92EAPI EO_VOID_FUNC_BODYV(simple_a_get28, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(a), int a); 92EAPI EO_VOID_FUNC_BODYV(simple_a_get28, EO_FUNC_CALL(a), int a);
93EAPI EO_VOID_FUNC_BODYV(simple_a_get29, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(a), int a); 93EAPI EO_VOID_FUNC_BODYV(simple_a_get29, EO_FUNC_CALL(a), int a);
94EAPI EO_VOID_FUNC_BODYV(simple_a_get30, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(a), int a); 94EAPI EO_VOID_FUNC_BODYV(simple_a_get30, EO_FUNC_CALL(a), int a);
95EAPI EO_VOID_FUNC_BODYV(simple_a_get31, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(a), int a); 95EAPI EO_VOID_FUNC_BODYV(simple_a_get31, EO_FUNC_CALL(a), int a);
96EAPI EO_VOID_FUNC_BODYV(simple_a_get32, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(a), int a); 96EAPI EO_VOID_FUNC_BODYV(simple_a_get32, EO_FUNC_CALL(a), int a);
97 97
98/* XXX: This is fragile, and emulates many IDs in order to go to the next 98/* XXX: This is fragile, and emulates many IDs in order to go to the next
99 * op id chain (assuming chain size is as it is at the moment, 32). 99 * op id chain (assuming chain size is as it is at the moment, 32).
diff --git a/src/tests/eo/constructors/constructors_mixin.c b/src/tests/eo/constructors/constructors_mixin.c
index 4c6058c4ab..b2e523b042 100644
--- a/src/tests/eo/constructors/constructors_mixin.c
+++ b/src/tests/eo/constructors/constructors_mixin.c
@@ -35,7 +35,7 @@ _destructor(Eo *obj, void *class_data EINA_UNUSED)
35 my_init_count--; 35 my_init_count--;
36} 36}
37 37
38EAPI EO_VOID_FUNC_BODYV(mixin_add_and_print, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(x), int x); 38EAPI EO_VOID_FUNC_BODYV(mixin_add_and_print, EO_FUNC_CALL(x), int x);
39 39
40static Eo_Op_Description op_descs[] = { 40static Eo_Op_Description op_descs[] = {
41 EO_OP_FUNC(mixin_add_and_print, _add_and_print_set), 41 EO_OP_FUNC(mixin_add_and_print, _add_and_print_set),
diff --git a/src/tests/eo/constructors/constructors_simple.c b/src/tests/eo/constructors/constructors_simple.c
index 01c07012ca..370ca60f9c 100644
--- a/src/tests/eo/constructors/constructors_simple.c
+++ b/src/tests/eo/constructors/constructors_simple.c
@@ -31,8 +31,8 @@ _##name##_set(Eo *obj EINA_UNUSED, void *class_data, int name) \
31 pd->name = name; \ 31 pd->name = name; \
32 printf("%s %d\n", __func__, pd->name); \ 32 printf("%s %d\n", __func__, pd->name); \
33} \ 33} \
34EO_VOID_FUNC_BODYV(simple_##name##_set, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(name), int name); \ 34EO_VOID_FUNC_BODYV(simple_##name##_set, EO_FUNC_CALL(name), int name); \
35EO_FUNC_BODY(simple_##name##_get, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, int, 0); 35EO_FUNC_BODY(simple_##name##_get, int, 0);
36 36
37_GET_SET_FUNC(a) 37_GET_SET_FUNC(a)
38_GET_SET_FUNC(b) 38_GET_SET_FUNC(b)
@@ -83,7 +83,7 @@ _class_destructor(Eo_Class *klass EINA_UNUSED)
83 free(class_var); 83 free(class_var);
84} 84}
85 85
86EO_VOID_FUNC_BODYV(simple_constructor, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(a), int a); 86EO_VOID_FUNC_BODYV(simple_constructor, EO_FUNC_CALL(a), int a);
87 87
88static Eo_Op_Description op_descs[] = { 88static Eo_Op_Description op_descs[] = {
89 EO_OP_FUNC_OVERRIDE(eo_constructor, _constructor), 89 EO_OP_FUNC_OVERRIDE(eo_constructor, _constructor),
diff --git a/src/tests/eo/function_overrides/function_overrides_inherit2.c b/src/tests/eo/function_overrides/function_overrides_inherit2.c
index b25b99bc6e..b4602aac00 100644
--- a/src/tests/eo/function_overrides/function_overrides_inherit2.c
+++ b/src/tests/eo/function_overrides/function_overrides_inherit2.c
@@ -56,8 +56,8 @@ _class_print(Eo_Class *klass, void *data EINA_UNUSED)
56 return EINA_TRUE; 56 return EINA_TRUE;
57} 57}
58 58
59EAPI EO_FUNC_BODY(inherit2_print, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, Eina_Bool, EINA_FALSE); 59EAPI EO_FUNC_BODY(inherit2_print, Eina_Bool, EINA_FALSE);
60EAPI EO_FUNC_BODY(inherit2_print2, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, Eina_Bool, EINA_FALSE); 60EAPI EO_FUNC_BODY(inherit2_print2, Eina_Bool, EINA_FALSE);
61 61
62static Eo_Op_Description op_descs[] = { 62static Eo_Op_Description op_descs[] = {
63 EO_OP_FUNC(inherit2_print, _print), 63 EO_OP_FUNC(inherit2_print, _print),
diff --git a/src/tests/eo/function_overrides/function_overrides_simple.c b/src/tests/eo/function_overrides/function_overrides_simple.c
index 8824d6e7e7..1e0a6a27f1 100644
--- a/src/tests/eo/function_overrides/function_overrides_simple.c
+++ b/src/tests/eo/function_overrides/function_overrides_simple.c
@@ -51,10 +51,10 @@ _class_print2(Eo_Class *klass, void *class_data EINA_UNUSED)
51 return EINA_TRUE; 51 return EINA_TRUE;
52} 52}
53 53
54EAPI EO_VOID_FUNC_BODYV(simple_a_set, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(a), int a); 54EAPI EO_VOID_FUNC_BODYV(simple_a_set, EO_FUNC_CALL(a), int a);
55EAPI EO_FUNC_BODY(simple_a_print, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, Eina_Bool, EINA_FALSE); 55EAPI EO_FUNC_BODY(simple_a_print, Eina_Bool, EINA_FALSE);
56EAPI EO_FUNC_BODY_CONST(simple_class_print, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, Eina_Bool, EINA_FALSE); 56EAPI EO_FUNC_BODY_CONST(simple_class_print, Eina_Bool, EINA_FALSE);
57EAPI EO_FUNC_BODY_CONST(simple_class_print2, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, Eina_Bool, EINA_FALSE); 57EAPI EO_FUNC_BODY_CONST(simple_class_print2, Eina_Bool, EINA_FALSE);
58 58
59static Eo_Op_Description op_descs[] = { 59static Eo_Op_Description op_descs[] = {
60 EO_OP_FUNC(simple_a_set, _a_set), 60 EO_OP_FUNC(simple_a_set, _a_set),
diff --git a/src/tests/eo/interface/interface_interface.c b/src/tests/eo/interface/interface_interface.c
index cf204b953b..32b00c89f5 100644
--- a/src/tests/eo/interface/interface_interface.c
+++ b/src/tests/eo/interface/interface_interface.c
@@ -8,7 +8,7 @@
8 8
9#define MY_CLASS INTERFACE_CLASS 9#define MY_CLASS INTERFACE_CLASS
10 10
11EO_FUNC_BODY(interface_ab_sum_get, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, int, 0); 11EO_FUNC_BODY(interface_ab_sum_get, int, 0);
12 12
13static Eo_Op_Description op_descs[] = { 13static Eo_Op_Description op_descs[] = {
14 EO_OP_FUNC(interface_ab_sum_get, NULL), 14 EO_OP_FUNC(interface_ab_sum_get, NULL),
diff --git a/src/tests/eo/interface/interface_interface2.c b/src/tests/eo/interface/interface_interface2.c
index ad99c219a5..12cbb9261a 100644
--- a/src/tests/eo/interface/interface_interface2.c
+++ b/src/tests/eo/interface/interface_interface2.c
@@ -9,7 +9,7 @@
9 9
10#define MY_CLASS INTERFACE2_CLASS 10#define MY_CLASS INTERFACE2_CLASS
11 11
12EO_FUNC_BODY(interface2_ab_sum_get2, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, int, 0); 12EO_FUNC_BODY(interface2_ab_sum_get2, int, 0);
13 13
14static Eo_Op_Description op_descs[] = { 14static Eo_Op_Description op_descs[] = {
15 EO_OP_FUNC(interface2_ab_sum_get2, NULL), 15 EO_OP_FUNC(interface2_ab_sum_get2, NULL),
diff --git a/src/tests/eo/interface/interface_simple.c b/src/tests/eo/interface/interface_simple.c
index 2f5a7b9271..589274f6d6 100644
--- a/src/tests/eo/interface/interface_simple.c
+++ b/src/tests/eo/interface/interface_simple.c
@@ -30,8 +30,8 @@ _##name##_set(Eo *obj EINA_UNUSED, void *class_data, int name) \
30 pd->name = name; \ 30 pd->name = name; \
31 printf("%s %d\n", __func__, pd->name); \ 31 printf("%s %d\n", __func__, pd->name); \
32} \ 32} \
33EO_VOID_FUNC_BODYV(simple_##name##_set, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(name), int name); \ 33EO_VOID_FUNC_BODYV(simple_##name##_set, EO_FUNC_CALL(name), int name); \
34EO_FUNC_BODY(simple_##name##_get, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, int, 0); 34EO_FUNC_BODY(simple_##name##_get, int, 0);
35 35
36_GET_SET_FUNC(a) 36_GET_SET_FUNC(a)
37_GET_SET_FUNC(b) 37_GET_SET_FUNC(b)
diff --git a/src/tests/eo/mixin/mixin_mixin.c b/src/tests/eo/mixin/mixin_mixin.c
index d086050767..427293e707 100644
--- a/src/tests/eo/mixin/mixin_mixin.c
+++ b/src/tests/eo/mixin/mixin_mixin.c
@@ -30,7 +30,7 @@ _destructor(Eo *obj, void *class_data EINA_UNUSED)
30 eo_destructor(eo_super(obj, MY_CLASS)); 30 eo_destructor(eo_super(obj, MY_CLASS));
31} 31}
32 32
33EAPI EO_FUNC_BODY(mixin_ab_sum_get, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, int, 0); 33EAPI EO_FUNC_BODY(mixin_ab_sum_get, int, 0);
34 34
35static Eo_Op_Description op_descs[] = { 35static Eo_Op_Description op_descs[] = {
36 EO_OP_FUNC_OVERRIDE(eo_constructor, _constructor), 36 EO_OP_FUNC_OVERRIDE(eo_constructor, _constructor),
diff --git a/src/tests/eo/mixin/mixin_simple.c b/src/tests/eo/mixin/mixin_simple.c
index 8acccad62a..5184e0ec96 100644
--- a/src/tests/eo/mixin/mixin_simple.c
+++ b/src/tests/eo/mixin/mixin_simple.c
@@ -31,8 +31,8 @@ _##name##_set(Eo *obj EINA_UNUSED, void *class_data, int name) \
31 pd->name = name; \ 31 pd->name = name; \
32 printf("%s %d\n", __func__, pd->name); \ 32 printf("%s %d\n", __func__, pd->name); \
33} \ 33} \
34EO_VOID_FUNC_BODYV(simple_##name##_set, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(name), int name); \ 34EO_VOID_FUNC_BODYV(simple_##name##_set, EO_FUNC_CALL(name), int name); \
35EO_FUNC_BODY(simple_##name##_get, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, int, 0); 35EO_FUNC_BODY(simple_##name##_get, int, 0);
36 36
37_GET_SET_FUNC(a) 37_GET_SET_FUNC(a)
38_GET_SET_FUNC(b) 38_GET_SET_FUNC(b)
diff --git a/src/tests/eo/signals/signals_simple.c b/src/tests/eo/signals/signals_simple.c
index 0acfb0634b..458b95c008 100644
--- a/src/tests/eo/signals/signals_simple.c
+++ b/src/tests/eo/signals/signals_simple.c
@@ -69,7 +69,7 @@ _constructor(Eo *obj, void *class_data EINA_UNUSED)
69 return obj; 69 return obj;
70} 70}
71 71
72EAPI EO_VOID_FUNC_BODYV(simple_a_set, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(a), int a); 72EAPI EO_VOID_FUNC_BODYV(simple_a_set, EO_FUNC_CALL(a), int a);
73 73
74static Eo_Op_Description op_descs[] = { 74static Eo_Op_Description op_descs[] = {
75 EO_OP_FUNC_OVERRIDE(eo_constructor, _constructor), 75 EO_OP_FUNC_OVERRIDE(eo_constructor, _constructor),
diff --git a/src/tests/eo/suite/eo_test_class_simple.c b/src/tests/eo/suite/eo_test_class_simple.c
index fbe6f05020..8566ed9929 100644
--- a/src/tests/eo/suite/eo_test_class_simple.c
+++ b/src/tests/eo/suite/eo_test_class_simple.c
@@ -48,7 +48,7 @@ _class_hi_print(Eo_Class *klass, void *data EINA_UNUSED)
48 return EINA_TRUE; 48 return EINA_TRUE;
49} 49}
50 50
51EO_FUNC_BODYV(simple_part_get, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, Eo *, NULL, EO_FUNC_CALL(name), const char *name); 51EO_FUNC_BODYV(simple_part_get, Eo *, NULL, EO_FUNC_CALL(name), const char *name);
52 52
53static Eo * 53static Eo *
54_part_get(Eo *obj, void *class_data EINA_UNUSED, const char *name EINA_UNUSED) 54_part_get(Eo *obj, void *class_data EINA_UNUSED, const char *name EINA_UNUSED)
@@ -57,7 +57,7 @@ _part_get(Eo *obj, void *class_data EINA_UNUSED, const char *name EINA_UNUSED)
57 return eo_add(SIMPLE_CLASS, obj); 57 return eo_add(SIMPLE_CLASS, obj);
58} 58}
59 59
60EO_VOID_FUNC_BODYV(simple_recursive, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(n), int n); 60EO_VOID_FUNC_BODYV(simple_recursive, EO_FUNC_CALL(n), int n);
61 61
62static void 62static void
63_recursive(Eo *obj, void *class_data EINA_UNUSED, int n) 63_recursive(Eo *obj, void *class_data EINA_UNUSED, int n)
@@ -81,12 +81,12 @@ _dbg_info_get(Eo *eo_obj, void *_pd EINA_UNUSED, Eo_Dbg_Info *root)
81 EO_DBG_INFO_APPEND(group, "Test", EINA_VALUE_TYPE_INT, 8); 81 EO_DBG_INFO_APPEND(group, "Test", EINA_VALUE_TYPE_INT, 8);
82} 82}
83 83
84EO_VOID_FUNC_BODYV(simple_a_set, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(a), int a); 84EO_VOID_FUNC_BODYV(simple_a_set, EO_FUNC_CALL(a), int a);
85EO_FUNC_BODY(simple_a_get, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, int, 0); 85EO_FUNC_BODY(simple_a_get, int, 0);
86EO_FUNC_BODY(simple_a_print, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, Eina_Bool, EINA_FALSE); 86EO_FUNC_BODY(simple_a_print, Eina_Bool, EINA_FALSE);
87EO_FUNC_BODY_CONST(simple_class_hi_print, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, Eina_Bool, EINA_FALSE); 87EO_FUNC_BODY_CONST(simple_class_hi_print, Eina_Bool, EINA_FALSE);
88EO_VOID_FUNC_BODY(simple_pure_virtual, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK); 88EO_VOID_FUNC_BODY(simple_pure_virtual);
89EO_VOID_FUNC_BODY(simple_no_implementation, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK); 89EO_VOID_FUNC_BODY(simple_no_implementation);
90 90
91static Eo_Op_Description op_descs[] = { 91static Eo_Op_Description op_descs[] = {
92 EO_OP_FUNC(simple_a_set, _a_set), 92 EO_OP_FUNC(simple_a_set, _a_set),
@@ -119,7 +119,7 @@ _beef_get(Eo *obj EINA_UNUSED, void *class_data EINA_UNUSED)
119 return 0xBEEF; 119 return 0xBEEF;
120} 120}
121 121
122EO_FUNC_BODY_CONST(simple2_class_beef_get, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, int, 0); 122EO_FUNC_BODY_CONST(simple2_class_beef_get, int, 0);
123 123
124static Eo_Op_Description op_descs2[] = { 124static Eo_Op_Description op_descs2[] = {
125 EO_OP_CLASS_FUNC(simple2_class_beef_get, _beef_get), 125 EO_OP_CLASS_FUNC(simple2_class_beef_get, _beef_get),
diff --git a/src/tests/eo/suite/eo_test_general.c b/src/tests/eo/suite/eo_test_general.c
index f54442d9d1..0a9b74c7d5 100644
--- a/src/tests/eo/suite/eo_test_general.c
+++ b/src/tests/eo/suite/eo_test_general.c
@@ -742,8 +742,8 @@ _class_hi_print(Eo_Class *klass EINA_UNUSED, void *class_data EINA_UNUSED)
742 return EINA_TRUE; 742 return EINA_TRUE;
743} 743}
744 744
745EO_FUNC_BODY(multi_a_print, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, Eina_Bool, EINA_FALSE); 745EO_FUNC_BODY(multi_a_print, Eina_Bool, EINA_FALSE);
746EO_FUNC_BODY_CONST(multi_class_hi_print, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, Eina_Bool, EINA_FALSE); 746EO_FUNC_BODY_CONST(multi_class_hi_print, Eina_Bool, EINA_FALSE);
747 747
748static Eo_Op_Description _multi_do_op_descs[] = { 748static Eo_Op_Description _multi_do_op_descs[] = {
749 EO_OP_FUNC(multi_a_print, _a_print), 749 EO_OP_FUNC(multi_a_print, _a_print),
diff --git a/src/tests/eo/suite/eo_test_threaded_calls.c b/src/tests/eo/suite/eo_test_threaded_calls.c
index 247bca567c..3f2231d88d 100644
--- a/src/tests/eo/suite/eo_test_threaded_calls.c
+++ b/src/tests/eo/suite/eo_test_threaded_calls.c
@@ -20,9 +20,9 @@ typedef struct
20#define THREAD_TEST_CLASS thread_test_class_get() 20#define THREAD_TEST_CLASS thread_test_class_get()
21const Eo_Class *thread_test_class_get(void); 21const Eo_Class *thread_test_class_get(void);
22 22
23EO_FUNC_BODY(thread_test_v_get, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, int, 0); 23EO_FUNC_BODY(thread_test_v_get, int, 0);
24EO_VOID_FUNC_BODY(thread_test_try_swap_stack, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK); 24EO_VOID_FUNC_BODY(thread_test_try_swap_stack);
25EO_VOID_FUNC_BODYV(thread_test_constructor, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(v), int v); 25EO_VOID_FUNC_BODYV(thread_test_constructor, EO_FUNC_CALL(v), int v);
26 26
27static int 27static int
28_v_get(Eo *obj EINA_UNUSED, void *class_data) 28_v_get(Eo *obj EINA_UNUSED, void *class_data)
diff --git a/src/tests/eolian/data/class_simple_ref.c b/src/tests/eolian/data/class_simple_ref.c
index 1135ddfa8a..b97639d3c3 100644
--- a/src/tests/eolian/data/class_simple_ref.c
+++ b/src/tests/eolian/data/class_simple_ref.c
@@ -1,15 +1,15 @@
1 1
2Eina_Bool _class_simple_a_set(Eo *obj, Evas_Simple_Data *pd, int value); 2Eina_Bool _class_simple_a_set(Eo *obj, Evas_Simple_Data *pd, int value);
3 3
4EOAPI EO_FUNC_BODYV(evas_obj_simple_a_set, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, Eina_Bool, EINA_TRUE, EO_FUNC_CALL(value), int value); 4EOAPI EO_FUNC_BODYV(evas_obj_simple_a_set, Eina_Bool, EINA_TRUE, EO_FUNC_CALL(value), int value);
5 5
6int _class_simple_a_get(Eo *obj, Evas_Simple_Data *pd); 6int _class_simple_a_get(Eo *obj, Evas_Simple_Data *pd);
7 7
8EOAPI EO_FUNC_BODY_CONST(evas_obj_simple_a_get, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, int, 100); 8EOAPI EO_FUNC_BODY_CONST(evas_obj_simple_a_get, int, 100);
9 9
10void _class_simple_b_set(Eo *obj, Evas_Simple_Data *pd); 10void _class_simple_b_set(Eo *obj, Evas_Simple_Data *pd);
11 11
12EOAPI EO_VOID_FUNC_BODY(evas_obj_simple_b_set, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK); 12EOAPI EO_VOID_FUNC_BODY(evas_obj_simple_b_set);
13 13
14char * _class_simple_foo(Eo *obj, Evas_Simple_Data *pd, int a, char *b, double *c); 14char * _class_simple_foo(Eo *obj, Evas_Simple_Data *pd, int a, char *b, double *c);
15 15
@@ -19,11 +19,11 @@ static char * __eolian_class_simple_foo(Eo *obj, Evas_Simple_Data *pd, int a, ch
19 return _class_simple_foo(obj, pd, a, b, c); 19 return _class_simple_foo(obj, pd, a, b, c);
20} 20}
21 21
22EOAPI EO_FUNC_BODYV(evas_obj_simple_foo, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, char *, NULL, EO_FUNC_CALL(a, b, c), int a, char *b, double *c); 22EOAPI EO_FUNC_BODYV(evas_obj_simple_foo, char *, NULL, EO_FUNC_CALL(a, b, c), int a, char *b, double *c);
23 23
24int _class_simple_bar(Eo *obj, Evas_Simple_Data *pd, int x); 24int _class_simple_bar(Eo *obj, Evas_Simple_Data *pd, int x);
25 25
26EOAPI EO_FUNC_BODYV(evas_obj_simple_bar, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, int, 0, EO_FUNC_CALL(x), int x); 26EOAPI EO_FUNC_BODYV(evas_obj_simple_bar, int, 0, EO_FUNC_CALL(x), int x);
27 27
28static const Eo_Op_Description _class_simple_op_desc[] = { 28static const Eo_Op_Description _class_simple_op_desc[] = {
29 EO_OP_FUNC(evas_obj_simple_a_set, _class_simple_a_set), 29 EO_OP_FUNC(evas_obj_simple_a_set, _class_simple_a_set),
diff --git a/src/tests/eolian/data/override_ref.c b/src/tests/eolian/data/override_ref.c
index c5ad8dd40f..b910f71c85 100644
--- a/src/tests/eolian/data/override_ref.c
+++ b/src/tests/eolian/data/override_ref.c
@@ -1,5 +1,5 @@
1EOAPI EO_VOID_FUNC_BODY(override_a_set, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK); 1EOAPI EO_VOID_FUNC_BODY(override_a_set);
2EOAPI EO_VOID_FUNC_BODY(override_foo, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK); 2EOAPI EO_VOID_FUNC_BODY(override_foo);
3 3
4static void __eolian_override_b_set(Eo *obj EINA_UNUSED, Override_Data *pd, int idx EINA_UNUSED, float a, char b, int c) 4static void __eolian_override_b_set(Eo *obj EINA_UNUSED, Override_Data *pd, int idx EINA_UNUSED, float a, char b, int c)
5{ 5{
@@ -8,7 +8,7 @@ static void __eolian_override_b_set(Eo *obj EINA_UNUSED, Override_Data *pd, int
8 c = pd->c; 8 c = pd->c;
9} 9}
10 10
11EOAPI EO_VOID_FUNC_BODYV(override_b_set, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(idx, a, b, c), int idx, float a, char b, int c); 11EOAPI EO_VOID_FUNC_BODYV(override_b_set, EO_FUNC_CALL(idx, a, b, c), int idx, float a, char b, int c);
12 12
13static void __eolian_override_bar(Eo *obj EINA_UNUSED, Override_Data *pd EINA_UNUSED, int idx EINA_UNUSED, int *a, char **str) 13static void __eolian_override_bar(Eo *obj EINA_UNUSED, Override_Data *pd EINA_UNUSED, int idx EINA_UNUSED, int *a, char **str)
14{ 14{
@@ -16,26 +16,26 @@ static void __eolian_override_bar(Eo *obj EINA_UNUSED, Override_Data *pd EINA_UN
16 if (str) *str = NULL; 16 if (str) *str = NULL;
17} 17}
18 18
19EOAPI EO_VOID_FUNC_BODYV(override_bar, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(idx, a, str), int idx, int *a, char **str); 19EOAPI EO_VOID_FUNC_BODYV(override_bar, EO_FUNC_CALL(idx, a, str), int idx, int *a, char **str);
20 20
21static int __eolian_override_c_get(Eo *obj EINA_UNUSED, Override_Data *pd EINA_UNUSED, int idx EINA_UNUSED) 21static int __eolian_override_c_get(Eo *obj EINA_UNUSED, Override_Data *pd EINA_UNUSED, int idx EINA_UNUSED)
22{ 22{
23 return 50; 23 return 50;
24} 24}
25 25
26EOAPI EO_FUNC_BODYV_CONST(override_c_get, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, int, 50, EO_FUNC_CALL(idx), int idx); 26EOAPI EO_FUNC_BODYV_CONST(override_c_get, int, 50, EO_FUNC_CALL(idx), int idx);
27 27
28void _override_a_get(Eo *obj, Override_Data *pd); 28void _override_a_get(Eo *obj, Override_Data *pd);
29 29
30EOAPI EO_VOID_FUNC_BODY_CONST(override_a_get, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK); 30EOAPI EO_VOID_FUNC_BODY_CONST(override_a_get);
31 31
32void _override_b_get(Eo *obj, Override_Data *pd, int idx, float *a, char *b, int *c); 32void _override_b_get(Eo *obj, Override_Data *pd, int idx, float *a, char *b, int *c);
33 33
34EOAPI EO_VOID_FUNC_BODYV_CONST(override_b_get, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(idx, a, b, c), int idx, float *a, char *b, int *c); 34EOAPI EO_VOID_FUNC_BODYV_CONST(override_b_get, EO_FUNC_CALL(idx, a, b, c), int idx, float *a, char *b, int *c);
35 35
36void _override_c_set(Eo *obj, Override_Data *pd, int idx, int c); 36void _override_c_set(Eo *obj, Override_Data *pd, int idx, int c);
37 37
38EOAPI EO_VOID_FUNC_BODYV(override_c_set, _EO_EMPTY_HOOK, _EO_EMPTY_HOOK, EO_FUNC_CALL(idx, c), int idx, int c); 38EOAPI EO_VOID_FUNC_BODYV(override_c_set, EO_FUNC_CALL(idx, c), int idx, int c);
39 39
40void _override_base_constructor(Eo *obj, Override_Data *pd); 40void _override_base_constructor(Eo *obj, Override_Data *pd);
41 41