q66 pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=b0ee540ec9a52824c79f42bff4fc6e06e0492f96
commit b0ee540ec9a52824c79f42bff4fc6e06e0492f96 Author: Daniel Kolesa <[email protected]> Date: Thu Sep 26 16:56:13 2019 +0200 eolian: rename param direction enum and fields for consistency --- src/bin/eolian/docs.c | 6 +++--- src/bin/eolian/headers.c | 4 ++-- src/bin/eolian/sources.c | 12 ++++++------ src/bin/eolian_js/main.cc | 14 +++++++------- src/bindings/luajit/eolian.lua | 12 ++++++------ src/lib/eolian/Eolian.h | 12 ++++++------ src/lib/eolian/database_function_parameter_api.c | 4 ++-- src/lib/eolian/eo_parser.c | 14 +++++++------- src/lib/eolian/eolian_database.h | 2 +- src/lib/eolian_cxx/grammar/klass_def.hpp | 10 +++++----- src/scripts/gendoc/doc_macros.include | 6 +++--- src/scripts/pyolian/eolian.py | 4 ++-- src/scripts/pyolian/eolian_lib.py | 2 +- src/scripts/pyolian/generator.py | 2 +- src/scripts/pyolian/test_eolian.py | 2 +- src/tests/eolian/eolian_parsing.c | 18 +++++++++--------- 16 files changed, 62 insertions(+), 62 deletions(-) diff --git a/src/bin/eolian/docs.c b/src/bin/eolian/docs.c index 6b016eb4ee..31a80a28b6 100644 --- a/src/bin/eolian/docs.c +++ b/src/bin/eolian/docs.c @@ -623,17 +623,17 @@ eo_gen_docs_func_gen(const Eolian_State *state, const Eolian_Function *fid, const Eolian_Documentation *adoc = eolian_parameter_documentation_get(par); curl = _indent_line(buf, indent); - Eolian_Parameter_Dir dir = EOLIAN_OUT_PARAM; + Eolian_Parameter_Direction dir = EOLIAN_PARAMETER_OUT; if (!force_out) dir = eolian_parameter_direction_get(par); switch (dir) { - case EOLIAN_OUT_PARAM: + case EOLIAN_PARAMETER_OUT: eina_strbuf_append(buf, " * @param[out] "); curl += sizeof(" * @param[out] ") - 1; break; - case EOLIAN_INOUT_PARAM: + case EOLIAN_PARAMETER_INOUT: eina_strbuf_append(buf, " * @param[in,out] "); curl += sizeof(" * @param[in,out] ") - 1; break; diff --git a/src/bin/eolian/headers.c b/src/bin/eolian/headers.c index 0973038d88..3a84e0ac0b 100644 --- a/src/bin/eolian/headers.c +++ b/src/bin/eolian/headers.c @@ -2,11 +2,11 @@ #include "docs.h" static const char * -_get_add_star(Eolian_Function_Type ftype, Eolian_Parameter_Dir pdir) +_get_add_star(Eolian_Function_Type ftype, Eolian_Parameter_Direction pdir) { if (ftype == EOLIAN_PROP_GET) return "*"; - if ((pdir == EOLIAN_OUT_PARAM) || (pdir == EOLIAN_INOUT_PARAM)) + if ((pdir == EOLIAN_PARAMETER_OUT) || (pdir == EOLIAN_PARAMETER_INOUT)) return "*"; return ""; } diff --git a/src/bin/eolian/sources.c b/src/bin/eolian/sources.c index 37a8ef05c8..58be274e4f 100644 --- a/src/bin/eolian/sources.c +++ b/src/bin/eolian/sources.c @@ -9,11 +9,11 @@ static Eina_Hash *_funcs_params_init_get = NULL; static Eina_Hash *_funcs_params_init_set = NULL; static const char * -_get_add_star(Eolian_Function_Type ftype, Eolian_Parameter_Dir pdir) +_get_add_star(Eolian_Function_Type ftype, Eolian_Parameter_Direction pdir) { if (ftype == EOLIAN_PROP_GET) return "*"; - if ((pdir == EOLIAN_OUT_PARAM) || (pdir == EOLIAN_INOUT_PARAM)) + if ((pdir == EOLIAN_PARAMETER_OUT) || (pdir == EOLIAN_PARAMETER_INOUT)) return "*"; return ""; } @@ -307,7 +307,7 @@ _gen_function_param_fallback(Eina_Iterator *itr, Eina_Strbuf *fallback_free_owne inner_type = eolian_type_base_type_get(type); //check if they should be freed or just ignored - if (!eolian_parameter_is_move(pr) || eolian_parameter_direction_get(pr) == EOLIAN_OUT_PARAM) + if (!eolian_parameter_is_move(pr) || eolian_parameter_direction_get(pr) == EOLIAN_PARAMETER_OUT) { eina_strbuf_append_printf(fallback_free_ownership, " (void)%s;\n", eolian_parameter_name_get(pr)); continue; @@ -317,7 +317,7 @@ _gen_function_param_fallback(Eina_Iterator *itr, Eina_Strbuf *fallback_free_owne eina_strbuf_reset(param_call); - if (eolian_parameter_direction_get(pr) == EOLIAN_INOUT_PARAM) + if (eolian_parameter_direction_get(pr) == EOLIAN_PARAMETER_INOUT) eina_strbuf_append_char(param_call, '*'); eina_strbuf_append(param_call, eolian_parameter_name_get(pr)); @@ -638,7 +638,7 @@ _gen_func(const Eolian_Class *cl, const Eolian_Function *fid, Eolian_Function_Parameter *pr; EINA_ITERATOR_FOREACH(itr, pr) { - Eolian_Parameter_Dir pd = eolian_parameter_direction_get(pr); + Eolian_Parameter_Direction pd = eolian_parameter_direction_get(pr); const Eolian_Expression *dfv = eolian_parameter_default_value_get(pr); const char *prn = eolian_parameter_name_get(pr); const Eolian_Type *pt = eolian_parameter_type_get(pr); @@ -1267,7 +1267,7 @@ _gen_params(const Eolian_Function *fid, Eolian_Function_Type ftype, Eolian_Function_Parameter *pr; EINA_ITERATOR_FOREACH(itr, pr) { - Eolian_Parameter_Dir pd = eolian_parameter_direction_get(pr); + Eolian_Parameter_Direction pd = eolian_parameter_direction_get(pr); const char *prn = eolian_parameter_name_get(pr); const Eolian_Type *pt = eolian_parameter_type_get(pr); const Eolian_Typedecl *ptd = eolian_type_typedecl_get(pt); diff --git a/src/bin/eolian_js/main.cc b/src/bin/eolian_js/main.cc index 378f2bbe4d..940b23f24c 100644 --- a/src/bin/eolian_js/main.cc +++ b/src/bin/eolian_js/main.cc @@ -341,7 +341,7 @@ _function_is_generatable(const Eolian_Function *function, Eolian_Function_Type f for (auto parameter : full_params) { auto tp = ::eolian_parameter_type_get(parameter); - bool add_pointer = eolian_parameter_direction_get(parameter) != EOLIAN_IN_PARAM; + bool add_pointer = eolian_parameter_direction_get(parameter) != EOLIAN_PARAMETER_IN; if (!_type_is_generatable(tp, add_pointer, EOLIAN_C_TYPE_PARAM)) return false; @@ -868,8 +868,8 @@ int main(int argc, char** argv) { switch (eolian_parameter_direction_get(parameter)) { - case EOLIAN_IN_PARAM: - case EOLIAN_INOUT_PARAM: + case EOLIAN_PARAMETER_IN: + case EOLIAN_PARAMETER_INOUT: ss << ", " << i; default: break; } @@ -899,8 +899,8 @@ int main(int argc, char** argv) { switch (eolian_parameter_direction_get(parameter)) { - case EOLIAN_OUT_PARAM: - case EOLIAN_INOUT_PARAM: + case EOLIAN_PARAMETER_OUT: + case EOLIAN_PARAMETER_INOUT: ss << ", " << i; default: break; } @@ -958,8 +958,8 @@ int main(int argc, char** argv) { switch(eolian_parameter_direction_get(parameter)) { - case EOLIAN_OUT_PARAM: - case EOLIAN_INOUT_PARAM: + case EOLIAN_PARAMETER_OUT: + case EOLIAN_PARAMETER_INOUT: param += "*"; default: break; } diff --git a/src/bindings/luajit/eolian.lua b/src/bindings/luajit/eolian.lua index bcb71d7678..86fc2ddd5c 100644 --- a/src/bindings/luajit/eolian.lua +++ b/src/bindings/luajit/eolian.lua @@ -67,11 +67,11 @@ ffi.cdef [[ typedef enum { - EOLIAN_UNKNOWN_PARAM = 0, - EOLIAN_IN_PARAM, - EOLIAN_OUT_PARAM, - EOLIAN_INOUT_PARAM - } Eolian_Parameter_Dir; + EOLIAN_PARAMETER_UNKNOWN = 0, + EOLIAN_PARAMETER_IN, + EOLIAN_PARAMETER_OUT, + EOLIAN_PARAMETER_INOUT + } Eolian_Parameter_Direction; typedef enum { @@ -357,7 +357,7 @@ ffi.cdef [[ Eina_Iterator *eolian_property_keys_get(const Eolian_Function *foo_id, Eolian_Function_Type ftype); Eina_Iterator *eolian_property_values_get(const Eolian_Function *foo_id, Eolian_Function_Type ftype); Eina_Iterator *eolian_function_parameters_get(const Eolian_Function *function_id); - Eolian_Parameter_Dir eolian_parameter_direction_get(const Eolian_Function_Parameter *param); + Eolian_Parameter_Direction eolian_parameter_direction_get(const Eolian_Function_Parameter *param); const Eolian_Type *eolian_parameter_type_get(const Eolian_Function_Parameter *param); const Eolian_Expression *eolian_parameter_default_value_get(const Eolian_Function_Parameter *param); const Eolian_Documentation *eolian_parameter_documentation_get(const Eolian_Function_Parameter *param); diff --git a/src/lib/eolian/Eolian.h b/src/lib/eolian/Eolian.h index e76ac6fa84..db0421634a 100644 --- a/src/lib/eolian/Eolian.h +++ b/src/lib/eolian/Eolian.h @@ -242,11 +242,11 @@ typedef enum typedef enum { - EOLIAN_UNKNOWN_PARAM = 0, - EOLIAN_IN_PARAM, - EOLIAN_OUT_PARAM, - EOLIAN_INOUT_PARAM -} Eolian_Parameter_Dir; + EOLIAN_PARAMETER_UNKNOWN = 0, + EOLIAN_PARAMETER_IN, + EOLIAN_PARAMETER_OUT, + EOLIAN_PARAMETER_INOUT +} Eolian_Parameter_Direction; typedef enum { @@ -1747,7 +1747,7 @@ EAPI Eina_Iterator *eolian_property_values_get(const Eolian_Function *foo_id, Eo * * @ingroup Eolian */ -EAPI Eolian_Parameter_Dir eolian_parameter_direction_get(const Eolian_Function_Parameter *param); +EAPI Eolian_Parameter_Direction eolian_parameter_direction_get(const Eolian_Function_Parameter *param); /* * @brief Get type of a parameter diff --git a/src/lib/eolian/database_function_parameter_api.c b/src/lib/eolian/database_function_parameter_api.c index 341b287978..f3b03388d8 100644 --- a/src/lib/eolian/database_function_parameter_api.c +++ b/src/lib/eolian/database_function_parameter_api.c @@ -5,10 +5,10 @@ #include <Eina.h> #include "eolian_database.h" -EAPI Eolian_Parameter_Dir +EAPI Eolian_Parameter_Direction eolian_parameter_direction_get(const Eolian_Function_Parameter *param) { - EINA_SAFETY_ON_NULL_RETURN_VAL(param, EOLIAN_UNKNOWN_PARAM); + EINA_SAFETY_ON_NULL_RETURN_VAL(param, EOLIAN_PARAMETER_UNKNOWN); return param->param_dir; } diff --git a/src/lib/eolian/eo_parser.c b/src/lib/eolian/eo_parser.c index 519841a7ab..706d6c1c37 100644 --- a/src/lib/eolian/eo_parser.c +++ b/src/lib/eolian/eo_parser.c @@ -1079,33 +1079,33 @@ parse_param(Eo_Lexer *ls, Eina_List **params, Eina_Bool allow_inout, has_move = EINA_FALSE, has_by_ref = EINA_FALSE; Eolian_Function_Parameter *par = calloc(1, sizeof(Eolian_Function_Parameter)); - par->param_dir = EOLIAN_IN_PARAM; + par->param_dir = EOLIAN_PARAMETER_IN; FILL_BASE(par->base, ls, ls->line_number, ls->column, FUNCTION_PARAMETER); *params = eina_list_append(*params, par); eolian_object_ref(&par->base); if (allow_inout && (ls->t.kw == KW_at_in)) { - par->param_dir = EOLIAN_IN_PARAM; + par->param_dir = EOLIAN_PARAMETER_IN; eo_lexer_get(ls); } else if (allow_inout && ls->t.kw == KW_at_out) { - par->param_dir = EOLIAN_OUT_PARAM; + par->param_dir = EOLIAN_PARAMETER_OUT; eo_lexer_get(ls); } else if (allow_inout && ls->t.kw == KW_at_inout) { - par->param_dir = EOLIAN_INOUT_PARAM; + par->param_dir = EOLIAN_PARAMETER_INOUT; eo_lexer_get(ls); } - else par->param_dir = EOLIAN_IN_PARAM; + else par->param_dir = EOLIAN_PARAMETER_IN; check(ls, TOK_VALUE); par->base.name = eina_stringshare_ref(ls->t.value.s); eo_lexer_get(ls); check_next(ls, ':'); if ((ls->klass && ls->klass->base.is_beta) || func->base.is_beta) { - if (par->param_dir == EOLIAN_OUT_PARAM || par->param_dir == EOLIAN_INOUT_PARAM) + if (par->param_dir == EOLIAN_PARAMETER_OUT || par->param_dir == EOLIAN_PARAMETER_INOUT) { /* void is allowed for out/inout for beta-api for now to make a voidptr */ par->type = eo_lexer_type_release(ls, parse_type_void(ls, EINA_TRUE, EINA_TRUE)); @@ -1114,7 +1114,7 @@ parse_param(Eo_Lexer *ls, Eina_List **params, Eina_Bool allow_inout, } par->type = eo_lexer_type_release(ls, parse_type(ls, EINA_TRUE, EINA_TRUE)); type_done: - if ((is_vals || (par->param_dir == EOLIAN_OUT_PARAM)) && (ls->t.token == '(')) + if ((is_vals || (par->param_dir == EOLIAN_PARAMETER_OUT)) && (ls->t.token == '(')) { int line = ls->line_number, col = ls->column; ls->expr_mode = EINA_TRUE; diff --git a/src/lib/eolian/eolian_database.h b/src/lib/eolian/eolian_database.h index 895a7ff14a..2aedd51432 100644 --- a/src/lib/eolian/eolian_database.h +++ b/src/lib/eolian/eolian_database.h @@ -255,7 +255,7 @@ struct _Eolian_Function_Parameter Eolian_Type *type; Eolian_Expression *value; Eolian_Documentation *doc; - Eolian_Parameter_Dir param_dir; + Eolian_Parameter_Direction param_dir; Eina_Bool optional :1; /* True if this argument is optional */ Eina_Bool by_ref :1; Eina_Bool move :1; diff --git a/src/lib/eolian_cxx/grammar/klass_def.hpp b/src/lib/eolian_cxx/grammar/klass_def.hpp index 2dcd4bb5ba..d9c50e1df3 100644 --- a/src/lib/eolian_cxx/grammar/klass_def.hpp +++ b/src/lib/eolian_cxx/grammar/klass_def.hpp @@ -685,17 +685,17 @@ struct parameter_def eina::optional<expression_def>{}) , unit(_unit) { - Eolian_Parameter_Dir direction = ::eolian_parameter_direction_get(param); + Eolian_Parameter_Direction direction = ::eolian_parameter_direction_get(param); switch(direction) { - case EOLIAN_UNKNOWN_PARAM: - case EOLIAN_IN_PARAM: + case EOLIAN_PARAMETER_UNKNOWN: + case EOLIAN_PARAMETER_IN: this->direction = parameter_direction::in; break; - case EOLIAN_INOUT_PARAM: + case EOLIAN_PARAMETER_INOUT: this->direction = parameter_direction::inout; break; - case EOLIAN_OUT_PARAM: + case EOLIAN_PARAMETER_OUT: this->direction = parameter_direction::out; break; } diff --git a/src/scripts/gendoc/doc_macros.include b/src/scripts/gendoc/doc_macros.include index 483c3d4e91..64b5311e5a 100644 --- a/src/scripts/gendoc/doc_macros.include +++ b/src/scripts/gendoc/doc_macros.include @@ -236,11 +236,11 @@ interface#! #!#### PARAM_DIRECTION_TAG(param) ############################################ #!############################################################################## <!--(macro PARAM_DIRECTION_TAG)--> - <!--(if param.direction == Eolian_Parameter_Dir.IN)--> + <!--(if param.direction == Eolian_Parameter_Direction.IN)--> ''in'' #! - <!--(elif param.direction == Eolian_Parameter_Dir.OUT)--> + <!--(elif param.direction == Eolian_Parameter_Direction.OUT)--> ''out'' #! - <!--(elif param.direction == Eolian_Parameter_Dir.INOUT)--> + <!--(elif param.direction == Eolian_Parameter_Direction.INOUT)--> ''inout'' #! <!--(end)--> <!--(end)--> diff --git a/src/scripts/pyolian/eolian.py b/src/scripts/pyolian/eolian.py index e18fbf6899..bed0beab62 100644 --- a/src/scripts/pyolian/eolian.py +++ b/src/scripts/pyolian/eolian.py @@ -45,7 +45,7 @@ class Eolian_Function_Type(IntEnum): METHOD = 4 FUNCTION_POINTER = 5 -class Eolian_Parameter_Dir(IntEnum): +class Eolian_Parameter_Direction(IntEnum): UNKNOWN = 0 IN = 1 OUT = 2 @@ -946,7 +946,7 @@ class Function_Parameter(Object): @cached_property def direction(self): - return Eolian_Parameter_Dir(lib.eolian_parameter_direction_get(self)) + return Eolian_Parameter_Direction(lib.eolian_parameter_direction_get(self)) @cached_property def documentation(self): diff --git a/src/scripts/pyolian/eolian_lib.py b/src/scripts/pyolian/eolian_lib.py index 09f88c3783..f219eecfd7 100644 --- a/src/scripts/pyolian/eolian_lib.py +++ b/src/scripts/pyolian/eolian_lib.py @@ -371,7 +371,7 @@ lib.eolian_property_values_get.restype = c_void_p ### Eolian_Function_Parameter ############################################### -# EAPI Eolian_Parameter_Dir eolian_parameter_direction_get(const Eolian_Function_Parameter *param); +# EAPI Eolian_Parameter_Direction eolian_parameter_direction_get(const Eolian_Function_Parameter *param); lib.eolian_parameter_direction_get.argtypes = (c_void_p,) lib.eolian_parameter_direction_get.restype = c_int diff --git a/src/scripts/pyolian/generator.py b/src/scripts/pyolian/generator.py index a86e03240c..5d119d3511 100755 --- a/src/scripts/pyolian/generator.py +++ b/src/scripts/pyolian/generator.py @@ -130,7 +130,7 @@ class Template(pyratemp.Template): 'Documentation_Token': eolian.Documentation_Token, # Eolian Enums 'Eolian_Function_Type': eolian.Eolian_Function_Type, - 'Eolian_Parameter_Dir': eolian.Eolian_Parameter_Dir, + 'Eolian_Parameter_Direction': eolian.Eolian_Parameter_Direction, 'Eolian_Class_Type': eolian.Eolian_Class_Type, 'Eolian_Object_Scope': eolian.Eolian_Object_Scope, 'Eolian_Typedecl_Type': eolian.Eolian_Typedecl_Type, diff --git a/src/scripts/pyolian/test_eolian.py b/src/scripts/pyolian/test_eolian.py index 2a45c57829..7e2d1402c0 100755 --- a/src/scripts/pyolian/test_eolian.py +++ b/src/scripts/pyolian/test_eolian.py @@ -382,7 +382,7 @@ class TestEolianFunction(unittest.TestCase): cls = eolian_db.class_by_name_get('Efl.Loop_Timer') f = cls.function_by_name_get('timer_delay') p = list(f.parameters)[0] - self.assertEqual(p.direction, eolian.Eolian_Parameter_Dir.IN) + self.assertEqual(p.direction, eolian.Eolian_Parameter_Direction.IN) self.assertEqual(p.name, 'add') self.assertIsNone(p.default_value) self.assertFalse(p.is_optional) diff --git a/src/tests/eolian/eolian_parsing.c b/src/tests/eolian/eolian_parsing.c index fac90f4d9a..d0dc4819d6 100644 --- a/src/tests/eolian/eolian_parsing.c +++ b/src/tests/eolian/eolian_parsing.c @@ -622,16 +622,16 @@ EFL_START_TEST(eolian_simple_parsing) /* Function parameters */ fail_if(!(iter = eolian_function_parameters_get(fid))); fail_if(!(eina_iterator_next(iter, (void**)¶m))); - fail_if(eolian_parameter_direction_get(param) != EOLIAN_IN_PARAM); + fail_if(eolian_parameter_direction_get(param) != EOLIAN_PARAMETER_IN); fail_if(strcmp(eolian_type_short_name_get(eolian_parameter_type_get(param)), "int")); fail_if(strcmp(eolian_parameter_name_get(param), "a")); fail_if(!(eina_iterator_next(iter, (void**)¶m))); - fail_if(eolian_parameter_direction_get(param) != EOLIAN_INOUT_PARAM); + fail_if(eolian_parameter_direction_get(param) != EOLIAN_PARAMETER_INOUT); ptype = eolian_type_short_name_get(eolian_parameter_type_get(param)); fail_if(strcmp(ptype, "char")); fail_if(strcmp(eolian_parameter_name_get(param), "b")); fail_if(!(eina_iterator_next(iter, (void**)¶m))); - fail_if(eolian_parameter_direction_get(param) != EOLIAN_OUT_PARAM); + fail_if(eolian_parameter_direction_get(param) != EOLIAN_PARAMETER_OUT); fail_if(eolian_type_builtin_type_get(eolian_parameter_type_get(param)) != EOLIAN_TYPE_BUILTIN_DOUBLE); fail_if(strcmp(eolian_type_short_name_get(eolian_parameter_type_get(param)), "double")); fail_if(strcmp(eolian_parameter_name_get(param), "c")); @@ -641,7 +641,7 @@ EFL_START_TEST(eolian_simple_parsing) fail_if(v.type != EOLIAN_EXPR_DOUBLE); fail_if(v.value.d != 1337.6); fail_if(!(eina_iterator_next(iter, (void**)¶m))); - fail_if(eolian_parameter_direction_get(param) != EOLIAN_IN_PARAM); + fail_if(eolian_parameter_direction_get(param) != EOLIAN_PARAMETER_IN); fail_if(strcmp(eolian_type_short_name_get(eolian_parameter_type_get(param)), "int")); fail_if(!eolian_parameter_is_by_ref(param)); fail_if(strcmp(eolian_parameter_name_get(param), "d")); @@ -1339,7 +1339,7 @@ EFL_START_TEST(eolian_function_types) fail_if(!(eina_iterator_next(iter, (void**)¶m))); fail_if(strcmp(eolian_parameter_name_get(param), "c")); fail_if(!(type = eolian_parameter_type_get(param))); - fail_if(eolian_parameter_direction_get(param) != EOLIAN_IN_PARAM); + fail_if(eolian_parameter_direction_get(param) != EOLIAN_PARAMETER_IN); fail_if(eolian_parameter_is_move(param)); fail_if(!(type_name = eolian_parameter_c_type_get(param, EINA_FALSE))); fail_if(strcmp(type_name, "const char *")); @@ -1347,7 +1347,7 @@ EFL_START_TEST(eolian_function_types) /*out own string */ fail_if(!(eina_iterator_next(iter, (void**)¶m))); fail_if(strcmp(eolian_parameter_name_get(param), "d")); - fail_if(eolian_parameter_direction_get(param) != EOLIAN_OUT_PARAM); + fail_if(eolian_parameter_direction_get(param) != EOLIAN_PARAMETER_OUT); fail_if(!(type = eolian_parameter_type_get(param))); fail_if(!eolian_parameter_is_move(param)); fail_if(!(type_name = eolian_parameter_c_type_get(param, EINA_FALSE))); @@ -1369,7 +1369,7 @@ EFL_START_TEST(eolian_function_types) fail_if(!(eina_iterator_next(iter, (void**)¶m))); fail_if(strcmp(eolian_parameter_name_get(param), "cb")); fail_if(!(type = eolian_parameter_type_get(param))); - fail_if(eolian_parameter_direction_get(param) != EOLIAN_IN_PARAM); + fail_if(eolian_parameter_direction_get(param) != EOLIAN_PARAMETER_IN); fail_if(eolian_parameter_is_move(param)); fail_if(!(type_name = eolian_type_short_name_get(type))); fail_if(strcmp(type_name, "VoidFunc")); @@ -1378,7 +1378,7 @@ EFL_START_TEST(eolian_function_types) fail_if(!(eina_iterator_next(iter, (void**)¶m))); fail_if(strcmp(eolian_parameter_name_get(param), "another_cb")); - fail_if(eolian_parameter_direction_get(param) != EOLIAN_IN_PARAM); + fail_if(eolian_parameter_direction_get(param) != EOLIAN_PARAMETER_IN); fail_if(!(type = eolian_parameter_type_get(param))); fail_if(eolian_parameter_is_move(param)); fail_if(eolian_type_type_get(type) != EOLIAN_TYPE_REGULAR); @@ -1420,7 +1420,7 @@ EFL_START_TEST(eolian_function_as_arguments) fail_if(!(eina_iterator_next(iter, (void**)¶m))); fail_if(strcmp(eolian_parameter_name_get(param), "cb")); fail_if(!(type = eolian_parameter_type_get(param))); - fail_if(eolian_parameter_direction_get(param) != EOLIAN_IN_PARAM); + fail_if(eolian_parameter_direction_get(param) != EOLIAN_PARAMETER_IN); fail_if(eolian_parameter_is_move(param)); fail_if(!(type_name = eolian_type_short_name_get(type))); fail_if(strcmp(type_name, "SimpleFunc")); --
