aboutsummaryrefslogtreecommitdiffstats
path: root/src/bin/eolian
diff options
context:
space:
mode:
authorDaniel Kolesa <d.kolesa@osg.samsung.com>2018-03-07 13:08:49 +0100
committerDaniel Kolesa <d.kolesa@osg.samsung.com>2018-03-07 13:08:49 +0100
commit434b0a399d09b7a6a6c72d744c2b5fd32fab6e22 (patch)
treed8ef3af4e11acd5b266a4f98f8d96fb4899fc224 /src/bin/eolian
parentefl_ui_focus_manager_calc: performe refocus after the node is deleted (diff)
downloadefl-434b0a399d09b7a6a6c72d744c2b5fd32fab6e22.tar.gz
eolian: remove old class retrieval APIs
Diffstat (limited to 'src/bin/eolian')
-rw-r--r--src/bin/eolian/docs.c4
-rw-r--r--src/bin/eolian/main.c18
-rw-r--r--src/bin/eolian/types.c4
-rw-r--r--src/bin/eolian/types.h2
4 files changed, 14 insertions, 14 deletions
diff --git a/src/bin/eolian/docs.c b/src/bin/eolian/docs.c
index 09e63bf9ac..173fce910a 100644
--- a/src/bin/eolian/docs.c
+++ b/src/bin/eolian/docs.c
@@ -68,7 +68,7 @@ _generate_ref(const Eolian_Unit *src, const char *refn, Eina_Strbuf *wbuf,
return;
}
- const Eolian_Class *cl = eolian_class_get_by_name(src, bname);
+ const Eolian_Class *cl = eolian_unit_class_by_name_get(src, bname);
const Eolian_Function *fn = NULL;
/* match methods and properties; we're only figuring out existence */
Eolian_Function_Type ftype = EOLIAN_UNRESOLVED;
@@ -84,7 +84,7 @@ _generate_ref(const Eolian_Unit *src, const char *refn, Eina_Strbuf *wbuf,
while ((mname != refn) && (*mname != '.')) --mname;
if (mname == refn) goto noref;
bname = eina_stringshare_add_length(refn, mname - refn);
- cl = eolian_class_get_by_name(src, bname);
+ cl = eolian_unit_class_by_name_get(src, bname);
eina_stringshare_del(bname);
}
if (cl)
diff --git a/src/bin/eolian/main.c b/src/bin/eolian/main.c
index 7369d9e885..3bc76458df 100644
--- a/src/bin/eolian/main.c
+++ b/src/bin/eolian/main.c
@@ -328,7 +328,7 @@ _write_header(const Eolian_State *eos, const Eolian_Unit *src, const char *ofnam
buf, EINA_TRUE, legacy);
buf = _include_guard(ifname, "TYPES", buf);
- Eina_Strbuf *cltd = eo_gen_class_typedef_gen(src, ifname);
+ Eina_Strbuf *cltd = eo_gen_class_typedef_gen(eos, ifname);
if (cltd)
{
cltd = _include_guard(ifname, "CLASS_TYPE", cltd);
@@ -337,7 +337,7 @@ _write_header(const Eolian_State *eos, const Eolian_Unit *src, const char *ofnam
eina_strbuf_free(cltd);
}
- const Eolian_Class *cl = eolian_class_get_by_file(src, ifname);
+ const Eolian_Class *cl = eolian_state_class_by_file_get(eos, ifname);
eo_gen_header_gen(src, cl, buf, legacy);
if (cl || !legacy)
{
@@ -363,7 +363,7 @@ _write_stub_header(const Eolian_State *eos, const Eolian_Unit *src, const char *
eo_gen_types_header_gen(src, eolian_declarations_get_by_file(eos, ifname),
buf, EINA_FALSE, EINA_FALSE);
- Eina_Strbuf *cltd = eo_gen_class_typedef_gen(src, ifname);
+ Eina_Strbuf *cltd = eo_gen_class_typedef_gen(eos, ifname);
if (cltd)
{
eina_strbuf_prepend_char(buf, '\n');
@@ -379,13 +379,13 @@ _write_stub_header(const Eolian_State *eos, const Eolian_Unit *src, const char *
}
static Eina_Bool
-_write_source(const Eolian_State *eos, const Eolian_Unit *src, const char *ofname,
+_write_source(const Eolian_State *eos, const char *ofname,
const char *ifname, Eina_Bool eot)
{
INF("generating source: %s", ofname);
Eina_Strbuf *buf = eina_strbuf_new();
- const Eolian_Class *cl = eolian_class_get_by_file(src, ifname);
+ const Eolian_Class *cl = eolian_state_class_by_file_get(eos, ifname);
eo_gen_types_source_gen(eolian_declarations_get_by_file(eos, ifname), buf);
eo_gen_source_gen(cl, buf);
if (cl || (eot && eina_strbuf_length_get(buf)))
@@ -402,11 +402,11 @@ _write_source(const Eolian_State *eos, const Eolian_Unit *src, const char *ofnam
}
static Eina_Bool
-_write_impl(const Eolian_Unit *src, const char *ofname, const char *ifname)
+_write_impl(const Eolian_State *eos, const char *ofname, const char *ifname)
{
INF("generating impl: %s", ofname);
- const Eolian_Class *cl = eolian_class_get_by_file(src, ifname);
+ const Eolian_Class *cl = eolian_state_class_by_file_get(eos, ifname);
if (!cl)
return EINA_FALSE;
@@ -573,9 +573,9 @@ main(int argc, char **argv)
if (succ && (gen_what & GEN_H_STUB))
succ = _write_stub_header(eos, src, outs[_get_bit_pos(GEN_H_STUB)], eobn);
if (succ && (gen_what & GEN_C))
- succ = _write_source(eos, src, outs[_get_bit_pos(GEN_C)], eobn, !strcmp(ext, ".eot"));
+ succ = _write_source(eos, outs[_get_bit_pos(GEN_C)], eobn, !strcmp(ext, ".eot"));
if (succ && (gen_what & GEN_C_IMPL))
- succ = _write_impl(src, outs[_get_bit_pos(GEN_C_IMPL)], eobn);
+ succ = _write_impl(eos, outs[_get_bit_pos(GEN_C_IMPL)], eobn);
if (!succ)
goto end;
diff --git a/src/bin/eolian/types.c b/src/bin/eolian/types.c
index 8040911a87..6578eace52 100644
--- a/src/bin/eolian/types.c
+++ b/src/bin/eolian/types.c
@@ -304,9 +304,9 @@ void eo_gen_types_source_gen(Eina_Iterator *itr, Eina_Strbuf *buf)
eina_iterator_free(itr);
}
-Eina_Strbuf *eo_gen_class_typedef_gen(const Eolian_Unit *src, const char *eof)
+Eina_Strbuf *eo_gen_class_typedef_gen(const Eolian_State *eos, const char *eof)
{
- const Eolian_Class *cl = eolian_class_get_by_file(src, eof);
+ const Eolian_Class *cl = eolian_state_class_by_file_get(eos, eof);
if (!cl)
return NULL;
char *clfn = eo_gen_c_full_name_get(eolian_class_full_name_get(cl));
diff --git a/src/bin/eolian/types.h b/src/bin/eolian/types.h
index 35d5905a74..2b8bfe298d 100644
--- a/src/bin/eolian/types.h
+++ b/src/bin/eolian/types.h
@@ -3,6 +3,6 @@
void eo_gen_types_header_gen(const Eolian_Unit *src, Eina_Iterator *itr, Eina_Strbuf *buf, Eina_Bool full, Eina_Bool legacy);
void eo_gen_types_source_gen(Eina_Iterator *itr, Eina_Strbuf *buf);
-Eina_Strbuf *eo_gen_class_typedef_gen(const Eolian_Unit *src, const char *eof);
+Eina_Strbuf *eo_gen_class_typedef_gen(const Eolian_State *eos, const char *eof);
#endif