kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

eolian gen: better checks for whether to add space after type

This commit is contained in:
Daniel Kolesa 2016-10-14 15:31:23 +02:00
parent 7af39bc447
commit 2515556673
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/eolian/headers.c
View File

@ -131,7 +131,7 @@ _gen_func(const Eolian_Function *fid, Eolian_Function_Type ftype,
if (!first)
eina_strbuf_append(buf, ", ");
eina_strbuf_append(buf, prtn);
if (!strchr(prtn, '*'))
if (prtn[strlen(prtn) - 1] != '*')
eina_strbuf_append_char(buf, ' ');
eina_strbuf_append(buf,
_get_add_star(ftype, eolian_parameter_direction_get(pr)));

12
src/bin/eolian/sources.c
View File

@ -135,7 +135,7 @@ _gen_func(const Eolian_Class *cl, const Eolian_Function *fid,
eina_strbuf_append_printf(params_full, ", %s", ptn);
eina_strbuf_append_printf(params_full_imp, ", %s", ptn);
if (!strchr(ptn, '*'))
if (ptn[strlen(ptn) - 1] != '*')
{
eina_strbuf_append_char(params_full, ' ');
eina_strbuf_append_char(params_full_imp, ' ');
@ -167,7 +167,7 @@ _gen_func(const Eolian_Class *cl, const Eolian_Function *fid,
const Eolian_Type *pt = eolian_parameter_type_get(pr);
Eina_Stringshare *ptn = eolian_type_c_type_get(pt);
Eina_Bool had_star = !!strchr(ptn, '*');
Eina_Bool had_star = ptn[strlen(ptn) - 1] == '*';
const char *add_star = _get_add_star(ftype, pd);
if (eina_strbuf_length_get(params))
@ -267,7 +267,7 @@ _gen_func(const Eolian_Class *cl, const Eolian_Function *fid,
{
/* T _class_name[_orig_class]_func_name_suffix */
eina_strbuf_append(buf, rtpn);
if (!strchr(rtpn, '*'))
if (rtpn[strlen(rtpn) - 1] != '*')
eina_strbuf_append_char(buf, ' ');
eina_strbuf_append_char(buf, '_');
eina_strbuf_append(buf, cnamel);
@ -296,7 +296,7 @@ _gen_func(const Eolian_Class *cl, const Eolian_Function *fid,
/* generation of intermediate __eolian_... */
eina_strbuf_append(buf, "static ");
eina_strbuf_append(buf, rtpn);
if (!strchr(rtpn, '*'))
if (rtpn[strlen(rtpn) - 1] != '*')
eina_strbuf_append_char(buf, ' ');
eina_strbuf_append(buf, "__eolian_");
eina_strbuf_append(buf, cnamel);
@ -794,7 +794,7 @@ _gen_params(const Eolian_Function *fid, Eolian_Function_Type ftype,
eina_strbuf_append(params, prn);
eina_strbuf_append_printf(params_full, ", %s", ptn);
if (!strchr(ptn, '*'))
if (ptn[strlen(ptn) - 1] != '*')
eina_strbuf_append_char(params_full, ' ');
eina_strbuf_append(params_full, prn);
@ -819,7 +819,7 @@ _gen_params(const Eolian_Function *fid, Eolian_Function_Type ftype,
const Eolian_Type *pt = eolian_parameter_type_get(pr);
Eina_Stringshare *ptn = eolian_type_c_type_get(pt);
Eina_Bool had_star = !!strchr(ptn, '*');
Eina_Bool had_star = ptn[strlen(ptn) - 1] == '*';
const char *add_star = _get_add_star(ftype, pd);
eina_strbuf_append(params, ", ");