diff options
author | Daniel Kolesa <d.kolesa@samsung.com> | 2019-09-26 16:56:13 +0200 |
---|---|---|
committer | Daniel Kolesa <d.kolesa@samsung.com> | 2019-09-26 16:56:13 +0200 |
commit | b0ee540ec9a52824c79f42bff4fc6e06e0492f96 (patch) | |
tree | 8b60cbbc5d93f771b09695d74de849eeb6722c7f | |
parent | cdff7852e03840fddb28e6ac451be80cfd877b94 (diff) |
eolian: rename param direction enum and fields for consistency
-rw-r--r-- | src/bin/eolian/docs.c | 6 | ||||
-rw-r--r-- | src/bin/eolian/headers.c | 4 | ||||
-rw-r--r-- | src/bin/eolian/sources.c | 12 | ||||
-rw-r--r-- | src/bin/eolian_js/main.cc | 14 | ||||
-rw-r--r-- | src/bindings/luajit/eolian.lua | 12 | ||||
-rw-r--r-- | src/lib/eolian/Eolian.h | 12 | ||||
-rw-r--r-- | src/lib/eolian/database_function_parameter_api.c | 4 | ||||
-rw-r--r-- | src/lib/eolian/eo_parser.c | 14 | ||||
-rw-r--r-- | src/lib/eolian/eolian_database.h | 2 | ||||
-rw-r--r-- | src/lib/eolian_cxx/grammar/klass_def.hpp | 10 | ||||
-rw-r--r-- | src/scripts/gendoc/doc_macros.include | 6 | ||||
-rw-r--r-- | src/scripts/pyolian/eolian.py | 4 | ||||
-rw-r--r-- | src/scripts/pyolian/eolian_lib.py | 2 | ||||
-rwxr-xr-x | src/scripts/pyolian/generator.py | 2 | ||||
-rwxr-xr-x | src/scripts/pyolian/test_eolian.py | 2 | ||||
-rw-r--r-- | 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, | |||
623 | const Eolian_Documentation *adoc = eolian_parameter_documentation_get(par); | 623 | const Eolian_Documentation *adoc = eolian_parameter_documentation_get(par); |
624 | curl = _indent_line(buf, indent); | 624 | curl = _indent_line(buf, indent); |
625 | 625 | ||
626 | Eolian_Parameter_Dir dir = EOLIAN_OUT_PARAM; | 626 | Eolian_Parameter_Direction dir = EOLIAN_PARAMETER_OUT; |
627 | if (!force_out) | 627 | if (!force_out) |
628 | dir = eolian_parameter_direction_get(par); | 628 | dir = eolian_parameter_direction_get(par); |
629 | 629 | ||
630 | switch (dir) | 630 | switch (dir) |
631 | { | 631 | { |
632 | case EOLIAN_OUT_PARAM: | 632 | case EOLIAN_PARAMETER_OUT: |
633 | eina_strbuf_append(buf, " * @param[out] "); | 633 | eina_strbuf_append(buf, " * @param[out] "); |
634 | curl += sizeof(" * @param[out] ") - 1; | 634 | curl += sizeof(" * @param[out] ") - 1; |
635 | break; | 635 | break; |
636 | case EOLIAN_INOUT_PARAM: | 636 | case EOLIAN_PARAMETER_INOUT: |
637 | eina_strbuf_append(buf, " * @param[in,out] "); | 637 | eina_strbuf_append(buf, " * @param[in,out] "); |
638 | curl += sizeof(" * @param[in,out] ") - 1; | 638 | curl += sizeof(" * @param[in,out] ") - 1; |
639 | break; | 639 | 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 @@ | |||
2 | #include "docs.h" | 2 | #include "docs.h" |
3 | 3 | ||
4 | static const char * | 4 | static const char * |
5 | _get_add_star(Eolian_Function_Type ftype, Eolian_Parameter_Dir pdir) | 5 | _get_add_star(Eolian_Function_Type ftype, Eolian_Parameter_Direction pdir) |
6 | { | 6 | { |
7 | if (ftype == EOLIAN_PROP_GET) | 7 | if (ftype == EOLIAN_PROP_GET) |
8 | return "*"; | 8 | return "*"; |
9 | if ((pdir == EOLIAN_OUT_PARAM) || (pdir == EOLIAN_INOUT_PARAM)) | 9 | if ((pdir == EOLIAN_PARAMETER_OUT) || (pdir == EOLIAN_PARAMETER_INOUT)) |
10 | return "*"; | 10 | return "*"; |
11 | return ""; | 11 | return ""; |
12 | } | 12 | } |
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; | |||
9 | static Eina_Hash *_funcs_params_init_set = NULL; | 9 | static Eina_Hash *_funcs_params_init_set = NULL; |
10 | 10 | ||
11 | static const char * | 11 | static const char * |
12 | _get_add_star(Eolian_Function_Type ftype, Eolian_Parameter_Dir pdir) | 12 | _get_add_star(Eolian_Function_Type ftype, Eolian_Parameter_Direction pdir) |
13 | { | 13 | { |
14 | if (ftype == EOLIAN_PROP_GET) | 14 | if (ftype == EOLIAN_PROP_GET) |
15 | return "*"; | 15 | return "*"; |
16 | if ((pdir == EOLIAN_OUT_PARAM) || (pdir == EOLIAN_INOUT_PARAM)) | 16 | if ((pdir == EOLIAN_PARAMETER_OUT) || (pdir == EOLIAN_PARAMETER_INOUT)) |
17 | return "*"; | 17 | return "*"; |
18 | return ""; | 18 | return ""; |
19 | } | 19 | } |
@@ -307,7 +307,7 @@ _gen_function_param_fallback(Eina_Iterator *itr, Eina_Strbuf *fallback_free_owne | |||
307 | inner_type = eolian_type_base_type_get(type); | 307 | inner_type = eolian_type_base_type_get(type); |
308 | 308 | ||
309 | //check if they should be freed or just ignored | 309 | //check if they should be freed or just ignored |
310 | if (!eolian_parameter_is_move(pr) || eolian_parameter_direction_get(pr) == EOLIAN_OUT_PARAM) | 310 | if (!eolian_parameter_is_move(pr) || eolian_parameter_direction_get(pr) == EOLIAN_PARAMETER_OUT) |
311 | { | 311 | { |
312 | eina_strbuf_append_printf(fallback_free_ownership, " (void)%s;\n", eolian_parameter_name_get(pr)); | 312 | eina_strbuf_append_printf(fallback_free_ownership, " (void)%s;\n", eolian_parameter_name_get(pr)); |
313 | continue; | 313 | continue; |
@@ -317,7 +317,7 @@ _gen_function_param_fallback(Eina_Iterator *itr, Eina_Strbuf *fallback_free_owne | |||
317 | 317 | ||
318 | eina_strbuf_reset(param_call); | 318 | eina_strbuf_reset(param_call); |
319 | 319 | ||
320 | if (eolian_parameter_direction_get(pr) == EOLIAN_INOUT_PARAM) | 320 | if (eolian_parameter_direction_get(pr) == EOLIAN_PARAMETER_INOUT) |
321 | eina_strbuf_append_char(param_call, '*'); | 321 | eina_strbuf_append_char(param_call, '*'); |
322 | eina_strbuf_append(param_call, eolian_parameter_name_get(pr)); | 322 | eina_strbuf_append(param_call, eolian_parameter_name_get(pr)); |
323 | 323 | ||
@@ -638,7 +638,7 @@ _gen_func(const Eolian_Class *cl, const Eolian_Function *fid, | |||
638 | Eolian_Function_Parameter *pr; | 638 | Eolian_Function_Parameter *pr; |
639 | EINA_ITERATOR_FOREACH(itr, pr) | 639 | EINA_ITERATOR_FOREACH(itr, pr) |
640 | { | 640 | { |
641 | Eolian_Parameter_Dir pd = eolian_parameter_direction_get(pr); | 641 | Eolian_Parameter_Direction pd = eolian_parameter_direction_get(pr); |
642 | const Eolian_Expression *dfv = eolian_parameter_default_value_get(pr); | 642 | const Eolian_Expression *dfv = eolian_parameter_default_value_get(pr); |
643 | const char *prn = eolian_parameter_name_get(pr); | 643 | const char *prn = eolian_parameter_name_get(pr); |
644 | const Eolian_Type *pt = eolian_parameter_type_get(pr); | 644 | const Eolian_Type *pt = eolian_parameter_type_get(pr); |
@@ -1267,7 +1267,7 @@ _gen_params(const Eolian_Function *fid, Eolian_Function_Type ftype, | |||
1267 | Eolian_Function_Parameter *pr; | 1267 | Eolian_Function_Parameter *pr; |
1268 | EINA_ITERATOR_FOREACH(itr, pr) | 1268 | EINA_ITERATOR_FOREACH(itr, pr) |
1269 | { | 1269 | { |
1270 | Eolian_Parameter_Dir pd = eolian_parameter_direction_get(pr); | 1270 | Eolian_Parameter_Direction pd = eolian_parameter_direction_get(pr); |
1271 | const char *prn = eolian_parameter_name_get(pr); | 1271 | const char *prn = eolian_parameter_name_get(pr); |
1272 | const Eolian_Type *pt = eolian_parameter_type_get(pr); | 1272 | const Eolian_Type *pt = eolian_parameter_type_get(pr); |
1273 | const Eolian_Typedecl *ptd = eolian_type_typedecl_get(pt); | 1273 | 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 | |||
341 | for (auto parameter : full_params) | 341 | for (auto parameter : full_params) |
342 | { | 342 | { |
343 | auto tp = ::eolian_parameter_type_get(parameter); | 343 | auto tp = ::eolian_parameter_type_get(parameter); |
344 | bool add_pointer = eolian_parameter_direction_get(parameter) != EOLIAN_IN_PARAM; | 344 | bool add_pointer = eolian_parameter_direction_get(parameter) != EOLIAN_PARAMETER_IN; |
345 | if (!_type_is_generatable(tp, add_pointer, EOLIAN_C_TYPE_PARAM)) | 345 | if (!_type_is_generatable(tp, add_pointer, EOLIAN_C_TYPE_PARAM)) |
346 | return false; | 346 | return false; |
347 | 347 | ||
@@ -868,8 +868,8 @@ int main(int argc, char** argv) | |||
868 | { | 868 | { |
869 | switch (eolian_parameter_direction_get(parameter)) | 869 | switch (eolian_parameter_direction_get(parameter)) |
870 | { | 870 | { |
871 | case EOLIAN_IN_PARAM: | 871 | case EOLIAN_PARAMETER_IN: |
872 | case EOLIAN_INOUT_PARAM: | 872 | case EOLIAN_PARAMETER_INOUT: |
873 | ss << ", " << i; | 873 | ss << ", " << i; |
874 | default: break; | 874 | default: break; |
875 | } | 875 | } |
@@ -899,8 +899,8 @@ int main(int argc, char** argv) | |||
899 | { | 899 | { |
900 | switch (eolian_parameter_direction_get(parameter)) | 900 | switch (eolian_parameter_direction_get(parameter)) |
901 | { | 901 | { |
902 | case EOLIAN_OUT_PARAM: | 902 | case EOLIAN_PARAMETER_OUT: |
903 | case EOLIAN_INOUT_PARAM: | 903 | case EOLIAN_PARAMETER_INOUT: |
904 | ss << ", " << i; | 904 | ss << ", " << i; |
905 | default: break; | 905 | default: break; |
906 | } | 906 | } |
@@ -958,8 +958,8 @@ int main(int argc, char** argv) | |||
958 | { | 958 | { |
959 | switch(eolian_parameter_direction_get(parameter)) | 959 | switch(eolian_parameter_direction_get(parameter)) |
960 | { | 960 | { |
961 | case EOLIAN_OUT_PARAM: | 961 | case EOLIAN_PARAMETER_OUT: |
962 | case EOLIAN_INOUT_PARAM: | 962 | case EOLIAN_PARAMETER_INOUT: |
963 | param += "*"; | 963 | param += "*"; |
964 | default: break; | 964 | default: break; |
965 | } | 965 | } |
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 [[ | |||
67 | 67 | ||
68 | typedef enum | 68 | typedef enum |
69 | { | 69 | { |
70 | EOLIAN_UNKNOWN_PARAM = 0, | 70 | EOLIAN_PARAMETER_UNKNOWN = 0, |
71 | EOLIAN_IN_PARAM, | 71 | EOLIAN_PARAMETER_IN, |
72 | EOLIAN_OUT_PARAM, | 72 | EOLIAN_PARAMETER_OUT, |
73 | EOLIAN_INOUT_PARAM | 73 | EOLIAN_PARAMETER_INOUT |
74 | } Eolian_Parameter_Dir; | 74 | } Eolian_Parameter_Direction; |
75 | 75 | ||
76 | typedef enum | 76 | typedef enum |
77 | { | 77 | { |
@@ -357,7 +357,7 @@ ffi.cdef [[ | |||
357 | Eina_Iterator *eolian_property_keys_get(const Eolian_Function *foo_id, Eolian_Function_Type ftype); | 357 | Eina_Iterator *eolian_property_keys_get(const Eolian_Function *foo_id, Eolian_Function_Type ftype); |
358 | Eina_Iterator *eolian_property_values_get(const Eolian_Function *foo_id, Eolian_Function_Type ftype); | 358 | Eina_Iterator *eolian_property_values_get(const Eolian_Function *foo_id, Eolian_Function_Type ftype); |
359 | Eina_Iterator *eolian_function_parameters_get(const Eolian_Function *function_id); | 359 | Eina_Iterator *eolian_function_parameters_get(const Eolian_Function *function_id); |
360 | Eolian_Parameter_Dir eolian_parameter_direction_get(const Eolian_Function_Parameter *param); | 360 | Eolian_Parameter_Direction eolian_parameter_direction_get(const Eolian_Function_Parameter *param); |
361 | const Eolian_Type *eolian_parameter_type_get(const Eolian_Function_Parameter *param); | 361 | const Eolian_Type *eolian_parameter_type_get(const Eolian_Function_Parameter *param); |
362 | const Eolian_Expression *eolian_parameter_default_value_get(const Eolian_Function_Parameter *param); | 362 | const Eolian_Expression *eolian_parameter_default_value_get(const Eolian_Function_Parameter *param); |
363 | const Eolian_Documentation *eolian_parameter_documentation_get(const Eolian_Function_Parameter *param); | 363 | 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 | |||
242 | 242 | ||
243 | typedef enum | 243 | typedef enum |
244 | { | 244 | { |
245 | EOLIAN_UNKNOWN_PARAM = 0, | 245 | EOLIAN_PARAMETER_UNKNOWN = 0, |
246 | EOLIAN_IN_PARAM, | 246 | EOLIAN_PARAMETER_IN, |
247 | EOLIAN_OUT_PARAM, | 247 | EOLIAN_PARAMETER_OUT, |
248 | EOLIAN_INOUT_PARAM | 248 | EOLIAN_PARAMETER_INOUT |
249 | } Eolian_Parameter_Dir; | 249 | } Eolian_Parameter_Direction; |
250 | 250 | ||
251 | typedef enum | 251 | typedef enum |
252 | { | 252 | { |
@@ -1747,7 +1747,7 @@ EAPI Eina_Iterator *eolian_property_values_get(const Eolian_Function *foo_id, Eo | |||
1747 | * | 1747 | * |
1748 | * @ingroup Eolian | 1748 | * @ingroup Eolian |
1749 | */ | 1749 | */ |
1750 | EAPI Eolian_Parameter_Dir eolian_parameter_direction_get(const Eolian_Function_Parameter *param); | 1750 | EAPI Eolian_Parameter_Direction eolian_parameter_direction_get(const Eolian_Function_Parameter *param); |
1751 | 1751 | ||
1752 | /* | 1752 | /* |
1753 | * @brief Get type of a parameter | 1753 | * @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 @@ | |||
5 | #include <Eina.h> | 5 | #include <Eina.h> |
6 | #include "eolian_database.h" | 6 | #include "eolian_database.h" |
7 | 7 | ||
8 | EAPI Eolian_Parameter_Dir | 8 | EAPI Eolian_Parameter_Direction |
9 | eolian_parameter_direction_get(const Eolian_Function_Parameter *param) | 9 | eolian_parameter_direction_get(const Eolian_Function_Parameter *param) |
10 | { | 10 | { |
11 | EINA_SAFETY_ON_NULL_RETURN_VAL(param, EOLIAN_UNKNOWN_PARAM); | 11 | EINA_SAFETY_ON_NULL_RETURN_VAL(param, EOLIAN_PARAMETER_UNKNOWN); |
12 | return param->param_dir; | 12 | return param->param_dir; |
13 | } | 13 | } |
14 | 14 | ||
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, | |||
1079 | has_move = EINA_FALSE, | 1079 | has_move = EINA_FALSE, |
1080 | has_by_ref = EINA_FALSE; | 1080 | has_by_ref = EINA_FALSE; |
1081 | Eolian_Function_Parameter *par = calloc(1, sizeof(Eolian_Function_Parameter)); | 1081 | Eolian_Function_Parameter *par = calloc(1, sizeof(Eolian_Function_Parameter)); |
1082 | par->param_dir = EOLIAN_IN_PARAM; | 1082 | par->param_dir = EOLIAN_PARAMETER_IN; |
1083 | FILL_BASE(par->base, ls, ls->line_number, ls->column, FUNCTION_PARAMETER); | 1083 | FILL_BASE(par->base, ls, ls->line_number, ls->column, FUNCTION_PARAMETER); |
1084 | *params = eina_list_append(*params, par); | 1084 | *params = eina_list_append(*params, par); |
1085 | eolian_object_ref(&par->base); | 1085 | eolian_object_ref(&par->base); |
1086 | if (allow_inout && (ls->t.kw == KW_at_in)) | 1086 | if (allow_inout && (ls->t.kw == KW_at_in)) |
1087 | { | 1087 | { |
1088 | par->param_dir = EOLIAN_IN_PARAM; | 1088 | par->param_dir = EOLIAN_PARAMETER_IN; |
1089 | eo_lexer_get(ls); | 1089 | eo_lexer_get(ls); |
1090 | } | 1090 | } |
1091 | else if (allow_inout && ls->t.kw == KW_at_out) | 1091 | else if (allow_inout && ls->t.kw == KW_at_out) |
1092 | { | 1092 | { |
1093 | par->param_dir = EOLIAN_OUT_PARAM; | 1093 | par->param_dir = EOLIAN_PARAMETER_OUT; |
1094 | eo_lexer_get(ls); | 1094 | eo_lexer_get(ls); |
1095 | } | 1095 | } |
1096 | else if (allow_inout && ls->t.kw == KW_at_inout) | 1096 | else if (allow_inout && ls->t.kw == KW_at_inout) |
1097 | { | 1097 | { |
1098 | par->param_dir = EOLIAN_INOUT_PARAM; | 1098 | par->param_dir = EOLIAN_PARAMETER_INOUT; |
1099 | eo_lexer_get(ls); | 1099 | eo_lexer_get(ls); |
1100 | } | 1100 | } |
1101 | else par->param_dir = EOLIAN_IN_PARAM; | 1101 | else par->param_dir = EOLIAN_PARAMETER_IN; |
1102 | check(ls, TOK_VALUE); | 1102 | check(ls, TOK_VALUE); |
1103 | par->base.name = eina_stringshare_ref(ls->t.value.s); | 1103 | par->base.name = eina_stringshare_ref(ls->t.value.s); |
1104 | eo_lexer_get(ls); | 1104 | eo_lexer_get(ls); |
1105 | check_next(ls, ':'); | 1105 | check_next(ls, ':'); |
1106 | if ((ls->klass && ls->klass->base.is_beta) || func->base.is_beta) | 1106 | if ((ls->klass && ls->klass->base.is_beta) || func->base.is_beta) |
1107 | { | 1107 | { |
1108 | if (par->param_dir == EOLIAN_OUT_PARAM || par->param_dir == EOLIAN_INOUT_PARAM) | 1108 | if (par->param_dir == EOLIAN_PARAMETER_OUT || par->param_dir == EOLIAN_PARAMETER_INOUT) |
1109 | { | 1109 | { |
1110 | /* void is allowed for out/inout for beta-api for now to make a voidptr */ | 1110 | /* void is allowed for out/inout for beta-api for now to make a voidptr */ |
1111 | par->type = eo_lexer_type_release(ls, parse_type_void(ls, EINA_TRUE, EINA_TRUE)); | 1111 | 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, | |||
1114 | } | 1114 | } |
1115 | par->type = eo_lexer_type_release(ls, parse_type(ls, EINA_TRUE, EINA_TRUE)); | 1115 | par->type = eo_lexer_type_release(ls, parse_type(ls, EINA_TRUE, EINA_TRUE)); |
1116 | type_done: | 1116 | type_done: |
1117 | if ((is_vals || (par->param_dir == EOLIAN_OUT_PARAM)) && (ls->t.token == '(')) | 1117 | if ((is_vals || (par->param_dir == EOLIAN_PARAMETER_OUT)) && (ls->t.token == '(')) |
1118 | { | 1118 | { |
1119 | int line = ls->line_number, col = ls->column; | 1119 | int line = ls->line_number, col = ls->column; |
1120 | ls->expr_mode = EINA_TRUE; | 1120 | 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 | |||
255 | Eolian_Type *type; | 255 | Eolian_Type *type; |
256 | Eolian_Expression *value; | 256 | Eolian_Expression *value; |
257 | Eolian_Documentation *doc; | 257 | Eolian_Documentation *doc; |
258 | Eolian_Parameter_Dir param_dir; | 258 | Eolian_Parameter_Direction param_dir; |
259 | Eina_Bool optional :1; /* True if this argument is optional */ | 259 | Eina_Bool optional :1; /* True if this argument is optional */ |
260 | Eina_Bool by_ref :1; | 260 | Eina_Bool by_ref :1; |
261 | Eina_Bool move :1; | 261 | 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 | |||
685 | eina::optional<expression_def>{}) | 685 | eina::optional<expression_def>{}) |
686 | , unit(_unit) | 686 | , unit(_unit) |
687 | { | 687 | { |
688 | Eolian_Parameter_Dir direction = ::eolian_parameter_direction_get(param); | 688 | Eolian_Parameter_Direction direction = ::eolian_parameter_direction_get(param); |
689 | switch(direction) | 689 | switch(direction) |
690 | { | 690 | { |
691 | case EOLIAN_UNKNOWN_PARAM: | 691 | case EOLIAN_PARAMETER_UNKNOWN: |
692 | case EOLIAN_IN_PARAM: | 692 | case EOLIAN_PARAMETER_IN: |
693 | this->direction = parameter_direction::in; | 693 | this->direction = parameter_direction::in; |
694 | break; | 694 | break; |
695 | case EOLIAN_INOUT_PARAM: | 695 | case EOLIAN_PARAMETER_INOUT: |
696 | this->direction = parameter_direction::inout; | 696 | this->direction = parameter_direction::inout; |
697 | break; | 697 | break; |
698 | case EOLIAN_OUT_PARAM: | 698 | case EOLIAN_PARAMETER_OUT: |
699 | this->direction = parameter_direction::out; | 699 | this->direction = parameter_direction::out; |
700 | break; | 700 | break; |
701 | } | 701 | } |
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#! | |||
236 | #!#### PARAM_DIRECTION_TAG(param) ############################################ | 236 | #!#### PARAM_DIRECTION_TAG(param) ############################################ |
237 | #!############################################################################## | 237 | #!############################################################################## |
238 | <!--(macro PARAM_DIRECTION_TAG)--> | 238 | <!--(macro PARAM_DIRECTION_TAG)--> |
239 | <!--(if param.direction == Eolian_Parameter_Dir.IN)--> | 239 | <!--(if param.direction == Eolian_Parameter_Direction.IN)--> |
240 | ''in'' #! | 240 | ''in'' #! |
241 | <!--(elif param.direction == Eolian_Parameter_Dir.OUT)--> | 241 | <!--(elif param.direction == Eolian_Parameter_Direction.OUT)--> |
242 | ''out'' #! | 242 | ''out'' #! |
243 | <!--(elif param.direction == Eolian_Parameter_Dir.INOUT)--> | 243 | <!--(elif param.direction == Eolian_Parameter_Direction.INOUT)--> |
244 | ''inout'' #! | 244 | ''inout'' #! |
245 | <!--(end)--> | 245 | <!--(end)--> |
246 | <!--(end)--> | 246 | <!--(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): | |||
45 | METHOD = 4 | 45 | METHOD = 4 |
46 | FUNCTION_POINTER = 5 | 46 | FUNCTION_POINTER = 5 |
47 | 47 | ||
48 | class Eolian_Parameter_Dir(IntEnum): | 48 | class Eolian_Parameter_Direction(IntEnum): |
49 | UNKNOWN = 0 | 49 | UNKNOWN = 0 |
50 | IN = 1 | 50 | IN = 1 |
51 | OUT = 2 | 51 | OUT = 2 |
@@ -946,7 +946,7 @@ class Function_Parameter(Object): | |||
946 | 946 | ||
947 | @cached_property | 947 | @cached_property |
948 | def direction(self): | 948 | def direction(self): |
949 | return Eolian_Parameter_Dir(lib.eolian_parameter_direction_get(self)) | 949 | return Eolian_Parameter_Direction(lib.eolian_parameter_direction_get(self)) |
950 | 950 | ||
951 | @cached_property | 951 | @cached_property |
952 | def documentation(self): | 952 | 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 | |||
371 | 371 | ||
372 | ### Eolian_Function_Parameter ############################################### | 372 | ### Eolian_Function_Parameter ############################################### |
373 | 373 | ||
374 | # EAPI Eolian_Parameter_Dir eolian_parameter_direction_get(const Eolian_Function_Parameter *param); | 374 | # EAPI Eolian_Parameter_Direction eolian_parameter_direction_get(const Eolian_Function_Parameter *param); |
375 | lib.eolian_parameter_direction_get.argtypes = (c_void_p,) | 375 | lib.eolian_parameter_direction_get.argtypes = (c_void_p,) |
376 | lib.eolian_parameter_direction_get.restype = c_int | 376 | lib.eolian_parameter_direction_get.restype = c_int |
377 | 377 | ||
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): | |||
130 | 'Documentation_Token': eolian.Documentation_Token, | 130 | 'Documentation_Token': eolian.Documentation_Token, |
131 | # Eolian Enums | 131 | # Eolian Enums |
132 | 'Eolian_Function_Type': eolian.Eolian_Function_Type, | 132 | 'Eolian_Function_Type': eolian.Eolian_Function_Type, |
133 | 'Eolian_Parameter_Dir': eolian.Eolian_Parameter_Dir, | 133 | 'Eolian_Parameter_Direction': eolian.Eolian_Parameter_Direction, |
134 | 'Eolian_Class_Type': eolian.Eolian_Class_Type, | 134 | 'Eolian_Class_Type': eolian.Eolian_Class_Type, |
135 | 'Eolian_Object_Scope': eolian.Eolian_Object_Scope, | 135 | 'Eolian_Object_Scope': eolian.Eolian_Object_Scope, |
136 | 'Eolian_Typedecl_Type': eolian.Eolian_Typedecl_Type, | 136 | '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): | |||
382 | cls = eolian_db.class_by_name_get('Efl.Loop_Timer') | 382 | cls = eolian_db.class_by_name_get('Efl.Loop_Timer') |
383 | f = cls.function_by_name_get('timer_delay') | 383 | f = cls.function_by_name_get('timer_delay') |
384 | p = list(f.parameters)[0] | 384 | p = list(f.parameters)[0] |
385 | self.assertEqual(p.direction, eolian.Eolian_Parameter_Dir.IN) | 385 | self.assertEqual(p.direction, eolian.Eolian_Parameter_Direction.IN) |
386 | self.assertEqual(p.name, 'add') | 386 | self.assertEqual(p.name, 'add') |
387 | self.assertIsNone(p.default_value) | 387 | self.assertIsNone(p.default_value) |
388 | self.assertFalse(p.is_optional) | 388 | 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) | |||
622 | /* Function parameters */ | 622 | /* Function parameters */ |
623 | fail_if(!(iter = eolian_function_parameters_get(fid))); | 623 | fail_if(!(iter = eolian_function_parameters_get(fid))); |
624 | fail_if(!(eina_iterator_next(iter, (void**)¶m))); | 624 | fail_if(!(eina_iterator_next(iter, (void**)¶m))); |
625 | fail_if(eolian_parameter_direction_get(param) != EOLIAN_IN_PARAM); | 625 | fail_if(eolian_parameter_direction_get(param) != EOLIAN_PARAMETER_IN); |
626 | fail_if(strcmp(eolian_type_short_name_get(eolian_parameter_type_get(param)), "int")); | 626 | fail_if(strcmp(eolian_type_short_name_get(eolian_parameter_type_get(param)), "int")); |
627 | fail_if(strcmp(eolian_parameter_name_get(param), "a")); | 627 | fail_if(strcmp(eolian_parameter_name_get(param), "a")); |
628 | fail_if(!(eina_iterator_next(iter, (void**)¶m))); | 628 | fail_if(!(eina_iterator_next(iter, (void**)¶m))); |
629 | fail_if(eolian_parameter_direction_get(param) != EOLIAN_INOUT_PARAM); | 629 | fail_if(eolian_parameter_direction_get(param) != EOLIAN_PARAMETER_INOUT); |
630 | ptype = eolian_type_short_name_get(eolian_parameter_type_get(param)); | 630 | ptype = eolian_type_short_name_get(eolian_parameter_type_get(param)); |
631 | fail_if(strcmp(ptype, "char")); | 631 | fail_if(strcmp(ptype, "char")); |
632 | fail_if(strcmp(eolian_parameter_name_get(param), "b")); | 632 | fail_if(strcmp(eolian_parameter_name_get(param), "b")); |
633 | fail_if(!(eina_iterator_next(iter, (void**)¶m))); | 633 | fail_if(!(eina_iterator_next(iter, (void**)¶m))); |
634 | fail_if(eolian_parameter_direction_get(param) != EOLIAN_OUT_PARAM); | 634 | fail_if(eolian_parameter_direction_get(param) != EOLIAN_PARAMETER_OUT); |
635 | fail_if(eolian_type_builtin_type_get(eolian_parameter_type_get(param)) != EOLIAN_TYPE_BUILTIN_DOUBLE); | 635 | fail_if(eolian_type_builtin_type_get(eolian_parameter_type_get(param)) != EOLIAN_TYPE_BUILTIN_DOUBLE); |
636 | fail_if(strcmp(eolian_type_short_name_get(eolian_parameter_type_get(param)), "double")); | 636 | fail_if(strcmp(eolian_type_short_name_get(eolian_parameter_type_get(param)), "double")); |
637 | fail_if(strcmp(eolian_parameter_name_get(param), "c")); | 637 | fail_if(strcmp(eolian_parameter_name_get(param), "c")); |
@@ -641,7 +641,7 @@ EFL_START_TEST(eolian_simple_parsing) | |||
641 | fail_if(v.type != EOLIAN_EXPR_DOUBLE); | 641 | fail_if(v.type != EOLIAN_EXPR_DOUBLE); |
642 | fail_if(v.value.d != 1337.6); | 642 | fail_if(v.value.d != 1337.6); |
643 | fail_if(!(eina_iterator_next(iter, (void**)¶m))); | 643 | fail_if(!(eina_iterator_next(iter, (void**)¶m))); |
644 | fail_if(eolian_parameter_direction_get(param) != EOLIAN_IN_PARAM); | 644 | fail_if(eolian_parameter_direction_get(param) != EOLIAN_PARAMETER_IN); |
645 | fail_if(strcmp(eolian_type_short_name_get(eolian_parameter_type_get(param)), "int")); | 645 | fail_if(strcmp(eolian_type_short_name_get(eolian_parameter_type_get(param)), "int")); |
646 | fail_if(!eolian_parameter_is_by_ref(param)); | 646 | fail_if(!eolian_parameter_is_by_ref(param)); |
647 | fail_if(strcmp(eolian_parameter_name_get(param), "d")); | 647 | fail_if(strcmp(eolian_parameter_name_get(param), "d")); |
@@ -1339,7 +1339,7 @@ EFL_START_TEST(eolian_function_types) | |||
1339 | fail_if(!(eina_iterator_next(iter, (void**)¶m))); | 1339 | fail_if(!(eina_iterator_next(iter, (void**)¶m))); |
1340 | fail_if(strcmp(eolian_parameter_name_get(param), "c")); | 1340 | fail_if(strcmp(eolian_parameter_name_get(param), "c")); |
1341 | fail_if(!(type = eolian_parameter_type_get(param))); | 1341 | fail_if(!(type = eolian_parameter_type_get(param))); |
1342 | fail_if(eolian_parameter_direction_get(param) != EOLIAN_IN_PARAM); | 1342 | fail_if(eolian_parameter_direction_get(param) != EOLIAN_PARAMETER_IN); |
1343 | fail_if(eolian_parameter_is_move(param)); | 1343 | fail_if(eolian_parameter_is_move(param)); |
1344 | fail_if(!(type_name = eolian_parameter_c_type_get(param, EINA_FALSE))); | 1344 | fail_if(!(type_name = eolian_parameter_c_type_get(param, EINA_FALSE))); |
1345 | fail_if(strcmp(type_name, "const char *")); | 1345 | fail_if(strcmp(type_name, "const char *")); |
@@ -1347,7 +1347,7 @@ EFL_START_TEST(eolian_function_types) | |||
1347 | /*out own string */ | 1347 | /*out own string */ |
1348 | fail_if(!(eina_iterator_next(iter, (void**)¶m))); | 1348 | fail_if(!(eina_iterator_next(iter, (void**)¶m))); |
1349 | fail_if(strcmp(eolian_parameter_name_get(param), "d")); | 1349 | fail_if(strcmp(eolian_parameter_name_get(param), "d")); |
1350 | fail_if(eolian_parameter_direction_get(param) != EOLIAN_OUT_PARAM); | 1350 | fail_if(eolian_parameter_direction_get(param) != EOLIAN_PARAMETER_OUT); |
1351 | fail_if(!(type = eolian_parameter_type_get(param))); | 1351 | fail_if(!(type = eolian_parameter_type_get(param))); |
1352 | fail_if(!eolian_parameter_is_move(param)); | 1352 | fail_if(!eolian_parameter_is_move(param)); |
1353 | fail_if(!(type_name = eolian_parameter_c_type_get(param, EINA_FALSE))); | 1353 | fail_if(!(type_name = eolian_parameter_c_type_get(param, EINA_FALSE))); |
@@ -1369,7 +1369,7 @@ EFL_START_TEST(eolian_function_types) | |||
1369 | fail_if(!(eina_iterator_next(iter, (void**)¶m))); | 1369 | fail_if(!(eina_iterator_next(iter, (void**)¶m))); |
1370 | fail_if(strcmp(eolian_parameter_name_get(param), "cb")); | 1370 | fail_if(strcmp(eolian_parameter_name_get(param), "cb")); |
1371 | fail_if(!(type = eolian_parameter_type_get(param))); | 1371 | fail_if(!(type = eolian_parameter_type_get(param))); |
1372 | fail_if(eolian_parameter_direction_get(param) != EOLIAN_IN_PARAM); | 1372 | fail_if(eolian_parameter_direction_get(param) != EOLIAN_PARAMETER_IN); |
1373 | fail_if(eolian_parameter_is_move(param)); | 1373 | fail_if(eolian_parameter_is_move(param)); |
1374 | fail_if(!(type_name = eolian_type_short_name_get(type))); | 1374 | fail_if(!(type_name = eolian_type_short_name_get(type))); |
1375 | fail_if(strcmp(type_name, "VoidFunc")); | 1375 | fail_if(strcmp(type_name, "VoidFunc")); |
@@ -1378,7 +1378,7 @@ EFL_START_TEST(eolian_function_types) | |||
1378 | 1378 | ||
1379 | fail_if(!(eina_iterator_next(iter, (void**)¶m))); | 1379 | fail_if(!(eina_iterator_next(iter, (void**)¶m))); |
1380 | fail_if(strcmp(eolian_parameter_name_get(param), "another_cb")); | 1380 | fail_if(strcmp(eolian_parameter_name_get(param), "another_cb")); |
1381 | fail_if(eolian_parameter_direction_get(param) != EOLIAN_IN_PARAM); | 1381 | fail_if(eolian_parameter_direction_get(param) != EOLIAN_PARAMETER_IN); |
1382 | fail_if(!(type = eolian_parameter_type_get(param))); | 1382 | fail_if(!(type = eolian_parameter_type_get(param))); |
1383 | fail_if(eolian_parameter_is_move(param)); | 1383 | fail_if(eolian_parameter_is_move(param)); |
1384 | fail_if(eolian_type_type_get(type) != EOLIAN_TYPE_REGULAR); | 1384 | fail_if(eolian_type_type_get(type) != EOLIAN_TYPE_REGULAR); |
@@ -1420,7 +1420,7 @@ EFL_START_TEST(eolian_function_as_arguments) | |||
1420 | fail_if(!(eina_iterator_next(iter, (void**)¶m))); | 1420 | fail_if(!(eina_iterator_next(iter, (void**)¶m))); |
1421 | fail_if(strcmp(eolian_parameter_name_get(param), "cb")); | 1421 | fail_if(strcmp(eolian_parameter_name_get(param), "cb")); |
1422 | fail_if(!(type = eolian_parameter_type_get(param))); | 1422 | fail_if(!(type = eolian_parameter_type_get(param))); |
1423 | fail_if(eolian_parameter_direction_get(param) != EOLIAN_IN_PARAM); | 1423 | fail_if(eolian_parameter_direction_get(param) != EOLIAN_PARAMETER_IN); |
1424 | fail_if(eolian_parameter_is_move(param)); | 1424 | fail_if(eolian_parameter_is_move(param)); |
1425 | fail_if(!(type_name = eolian_type_short_name_get(type))); | 1425 | fail_if(!(type_name = eolian_type_short_name_get(type))); |
1426 | fail_if(strcmp(type_name, "SimpleFunc")); | 1426 | fail_if(strcmp(type_name, "SimpleFunc")); |