bu5hm4n pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=3555029f9f9e60959d049cd3cc118ec05badfd4b
commit 3555029f9f9e60959d049cd3cc118ec05badfd4b Author: Marcel Hollerbach <[email protected]> Date: Wed Feb 27 10:04:56 2019 +0100 eolian_gen: fix generation of legacy class functions we forgot to generate the legacy function. This no now added back. ref D8029 Reviewed-by: YeongJong Lee <[email protected]> Differential Revision: https://phab.enlightenment.org/D8037 --- src/bin/eolian/sources.c | 65 ++++++++++++++++++++++++++++-------------------- 1 file changed, 38 insertions(+), 27 deletions(-) diff --git a/src/bin/eolian/sources.c b/src/bin/eolian/sources.c index e7a461255d..fe0413de99 100644 --- a/src/bin/eolian/sources.c +++ b/src/bin/eolian/sources.c @@ -436,6 +436,39 @@ _gen_reflect_set(Eina_Strbuf *buf, const char *cnamel, const Eolian_Type *valt, eina_strbuf_append(buf, "}\n\n"); } +static void +_emit_class_function(Eina_Strbuf *buf, const Eolian_Function *fid, const Eolian_Type *rtp, Eina_Strbuf *params_full, + const char *ocnamel, const char *func_suffix, Eina_Strbuf *params, const char *function_name) +{ + eina_strbuf_append(buf, "EOAPI "); + if (rtp) + eina_strbuf_append(buf, eolian_type_c_type_get(rtp, EOLIAN_C_TYPE_RETURN)); + else + eina_strbuf_append(buf, "void"); + eina_strbuf_append(buf, " "); + eina_strbuf_append(buf, function_name); + eina_strbuf_append(buf, "("); + if (eina_strbuf_length_get(params_full) == 0) + eina_strbuf_append(buf, "void"); + else + eina_strbuf_append_buffer(buf, params_full); + eina_strbuf_append(buf, ")\n"); + eina_strbuf_append(buf, "{\n"); + eina_strbuf_append_printf(buf, " %s();\n", eolian_class_c_get_function_name_get(eolian_function_class_get(fid))); + if (rtp) + eina_strbuf_append(buf, " return "); + else + eina_strbuf_append(buf, " "); + eina_strbuf_append_printf(buf, "_%s", ocnamel); + eina_strbuf_append_char(buf, '_'); + eina_strbuf_append(buf, eolian_function_name_get(fid)); + eina_strbuf_append(buf, func_suffix); + eina_strbuf_append(buf, "("); + eina_strbuf_append_buffer(buf, params); + eina_strbuf_append(buf, ");\n"); + eina_strbuf_append(buf, "}\n"); +} + static void _gen_func(const Eolian_Class *cl, const Eolian_Function *fid, Eolian_Function_Type ftype, Eina_Strbuf *buf, @@ -901,33 +934,11 @@ _gen_func(const Eolian_Class *cl, const Eolian_Function *fid, } if (impl_same_class && eolian_function_is_class(fid)) { - eina_strbuf_append(buf, "EOAPI "); - if (rtp) - eina_strbuf_append(buf, eolian_type_c_type_get(rtp, EOLIAN_C_TYPE_RETURN)); - else - eina_strbuf_append(buf, "void"); - eina_strbuf_append(buf, " "); - eina_strbuf_append(buf, eolian_function_full_c_name_get(fid, ftype, EINA_FALSE)); - eina_strbuf_append(buf, "("); - if (eina_strbuf_length_get(params_full) == 0) - eina_strbuf_append(buf, "void"); - else - eina_strbuf_append_buffer(buf, params_full); - eina_strbuf_append(buf, ")\n"); - eina_strbuf_append(buf, "{\n"); - eina_strbuf_append_printf(buf, " %s();\n", eolian_class_c_get_function_name_get(cl)); - if (rtp) - eina_strbuf_append(buf, " return "); - else - eina_strbuf_append(buf, " "); - eina_strbuf_append_printf(buf, "_%s", ocnamel); - eina_strbuf_append_char(buf, '_'); - eina_strbuf_append(buf, eolian_function_name_get(fid)); - eina_strbuf_append(buf, func_suffix); - eina_strbuf_append(buf, "("); - eina_strbuf_append_buffer(buf, params); - eina_strbuf_append(buf, ");\n"); - eina_strbuf_append(buf, "}\n"); + const char *legacy_name = eolian_function_full_c_name_get(fid, ftype, EINA_TRUE); + + _emit_class_function(buf, fid, rtp, params_full, ocnamel, func_suffix, params, eolian_function_full_c_name_get(fid, ftype, EINA_FALSE)); + if (legacy_name) + _emit_class_function(buf, fid, rtp, params_full, ocnamel, func_suffix, params, legacy_name); } free(cname); --
