aboutsummaryrefslogtreecommitdiffstats
path: root/src/bin/eolian
diff options
context:
space:
mode:
authorDaniel Kolesa <d.kolesa@osg.samsung.com>2018-03-12 16:28:28 +0100
committerDaniel Kolesa <d.kolesa@osg.samsung.com>2018-03-12 16:28:28 +0100
commit1f4d919cf953547c4517cea7398e55cad7cf52c3 (patch)
tree743d42b947904efa376d2cff1f121383ac9896b8 /src/bin/eolian
parenteolian: make more name APIs into inline helpers (diff)
downloadefl-1f4d919cf953547c4517cea7398e55cad7cf52c3.tar.gz
eolian: update type/var name APIs
Diffstat (limited to 'src/bin/eolian')
-rw-r--r--src/bin/eolian/sources.c4
-rw-r--r--src/bin/eolian/types.c12
2 files changed, 8 insertions, 8 deletions
diff --git a/src/bin/eolian/sources.c b/src/bin/eolian/sources.c
index 028bca753c..6d8ffe3e0a 100644
--- a/src/bin/eolian/sources.c
+++ b/src/bin/eolian/sources.c
@@ -131,7 +131,7 @@ _append_defval(Eina_Strbuf *buf, const Eolian_Expression *exp, const Eolian_Type
const Eolian_Typedecl *tdcl = eolian_type_typedecl_get(btp);
if (tdcl && (eolian_typedecl_type_get(tdcl) == EOLIAN_TYPEDECL_STRUCT))
{
- char *sn = eo_gen_c_full_name_get(eolian_typedecl_full_name_get(tdcl));
+ char *sn = eo_gen_c_full_name_get(eolian_typedecl_name_get(tdcl));
if (eina_streq(sn, "Eina_Rect"))
eina_strbuf_append(buf, "(EINA_RECT_EMPTY())");
else
@@ -156,7 +156,7 @@ _generate_normal_free(Eina_Strbuf **buf, const Eolian_Type *type, const Eina_Str
const char *free_func = eolian_type_free_func_get(type);
if (!free_func)
{
- printf("No free type %s\n", eolian_type_name_get(type));
+ printf("No free type %s\n", eolian_type_short_name_get(type));
return;
}
diff --git a/src/bin/eolian/types.c b/src/bin/eolian/types.c
index de7d56bf36..044a6a2e15 100644
--- a/src/bin/eolian/types.c
+++ b/src/bin/eolian/types.c
@@ -6,7 +6,7 @@ static Eina_Strbuf *
_type_generate(const Eolian_Unit *src, const Eolian_Typedecl *tp,
Eina_Bool full, Eina_Bool legacy)
{
- char *grp = strdup(eolian_typedecl_full_name_get(tp));
+ char *grp = strdup(eolian_typedecl_name_get(tp));
char *p = strrchr(grp, '.');
if (p) *p = '\0';
Eina_Strbuf *buf = eo_gen_docs_full_gen(src, eolian_typedecl_documentation_get(tp),
@@ -28,7 +28,7 @@ _type_generate(const Eolian_Unit *src, const Eolian_Typedecl *tp,
case EOLIAN_TYPEDECL_STRUCT_OPAQUE:
{
const Eolian_Struct_Type_Field *memb;
- char *fn = eo_gen_c_full_name_get(eolian_typedecl_full_name_get(tp));
+ char *fn = eo_gen_c_full_name_get(eolian_typedecl_name_get(tp));
if (tpt == EOLIAN_TYPEDECL_STRUCT_OPAQUE || !full)
{
eina_strbuf_append_printf(buf, "typedef struct _%s %s", fn, fn);
@@ -118,7 +118,7 @@ _type_generate(const Eolian_Unit *src, const Eolian_Typedecl *tp,
eina_strbuf_append(buf, "\n");
}
eina_iterator_free(membs);
- char *fn = eo_gen_c_full_name_get(eolian_typedecl_full_name_get(tp));
+ char *fn = eo_gen_c_full_name_get(eolian_typedecl_name_get(tp));
eina_strbuf_append_printf(buf, "} %s", fn);
free(fn);
break;
@@ -140,7 +140,7 @@ _type_generate(const Eolian_Unit *src, const Eolian_Typedecl *tp,
}
/* Function name */
- char *fn = eo_gen_c_full_name_get(eolian_typedecl_full_name_get(tp));
+ char *fn = eo_gen_c_full_name_get(eolian_typedecl_name_get(tp));
eina_strbuf_append_printf(buf, "(*%s)", fn);
free(fn);
@@ -162,7 +162,7 @@ _type_generate(const Eolian_Unit *src, const Eolian_Typedecl *tp,
static Eina_Strbuf *
_var_generate(const Eolian_Unit *src, const Eolian_Variable *vr, Eina_Bool legacy)
{
- char *fn = strdup(eolian_variable_full_name_get(vr));
+ char *fn = strdup(eolian_variable_name_get(vr));
char *p = strrchr(fn, '.');
if (p) *p = '\0';
Eina_Strbuf *buf = eo_gen_docs_full_gen(src, eolian_variable_documentation_get(vr),
@@ -280,7 +280,7 @@ void eo_gen_types_source_gen(Eina_Iterator *itr, Eina_Strbuf *buf)
if (!vv)
continue;
- char *fn = strdup(eolian_variable_full_name_get(vr));
+ char *fn = strdup(eolian_variable_name_get(vr));
for (char *p = strchr(fn, '.'); p; p = strchr(p, '.'))
*p = '_';
eina_str_toupper(&fn);