q66 pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=434b0a399d09b7a6a6c72d744c2b5fd32fab6e22
commit 434b0a399d09b7a6a6c72d744c2b5fd32fab6e22 Author: Daniel Kolesa <d.kol...@osg.samsung.com> Date: Wed Mar 7 13:08:49 2018 +0100 eolian: remove old class retrieval APIs --- src/bin/eolian/docs.c | 4 +-- src/bin/eolian/main.c | 18 ++++++------- src/bin/eolian/types.c | 4 +-- src/bin/eolian/types.h | 2 +- src/lib/eolian/Eolian.h | 9 ------- src/lib/eolian/database_validate.c | 4 +-- src/lib/eolian/eolian_database.c | 23 ++-------------- src/tests/eolian/eolian_parsing.c | 54 +++++++++++++++++++------------------- 8 files changed, 45 insertions(+), 73 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 diff --git a/src/lib/eolian/Eolian.h b/src/lib/eolian/Eolian.h index 18e40c40cf..5d8cebf867 100644 --- a/src/lib/eolian/Eolian.h +++ b/src/lib/eolian/Eolian.h @@ -2773,15 +2773,6 @@ EAPI char *eolian_doc_token_text_get(const Eolian_Doc_Token *tok); EAPI Eolian_Doc_Ref_Type eolian_doc_token_ref_get(const Eolian_Unit *unit, const Eolian_Doc_Token *tok, const void **data, const void **data2); /* DEPRECATED */ -EAPI const Eolian_Class *eolian_class_get_by_name(const Eolian_Unit *unit, const char *class_name); - -/* DEPRECATED */ -EAPI const Eolian_Class *eolian_class_get_by_file(const Eolian_Unit *unit, const char *file_name); - -/* DEPRECATED */ -EAPI Eina_Iterator *eolian_all_classes_get(const Eolian_Unit *unit); - -/* DEPRECATED */ EAPI const Eolian_Variable *eolian_variable_global_get_by_name(const Eolian_Unit *unit, const char *name); /* DEPRECATED */ diff --git a/src/lib/eolian/database_validate.c b/src/lib/eolian/database_validate.c index bbdf1d501d..02cfb0f47e 100644 --- a/src/lib/eolian/database_validate.c +++ b/src/lib/eolian/database_validate.c @@ -277,7 +277,7 @@ _validate_type(Validate_State *vals, const Eolian_Unit *src, Eolian_Type *tp) } case EOLIAN_TYPE_CLASS: { - tp->klass = (Eolian_Class *)eolian_class_get_by_name(src, tp->full_name); + tp->klass = (Eolian_Class *)eolian_unit_class_by_name_get(src, tp->full_name); if (!tp->klass) { snprintf(buf, sizeof(buf), "undefined class %s " @@ -851,7 +851,7 @@ database_validate(Eolian_State *state, const Eolian_Unit *src) Validate_State vals = { EINA_FALSE }; - Eina_Iterator *iter = eolian_all_classes_get(src); + Eina_Iterator *iter = eolian_unit_classes_get(src); Eina_Hash *nhash = eina_hash_string_small_new(NULL); EINA_ITERATOR_FOREACH(iter, cl) { diff --git a/src/lib/eolian/eolian_database.c b/src/lib/eolian/eolian_database.c index bd525db359..ded663d2c0 100644 --- a/src/lib/eolian/eolian_database.c +++ b/src/lib/eolian/eolian_database.c @@ -385,7 +385,7 @@ _resolve_event(const Eolian_Unit *src, char *name, const void **data, return EOLIAN_DOC_REF_INVALID; *evname++ = '\0'; - const Eolian_Class *cl = eolian_class_get_by_name(src, name); + const Eolian_Class *cl = eolian_unit_class_by_name_get(src, name); if (!cl) return EOLIAN_DOC_REF_INVALID; @@ -499,7 +499,7 @@ eolian_doc_token_ref_get(const Eolian_Unit *unit, const Eolian_Doc_Token *tok, *suffix++ = '\0'; } - const Eolian_Class *cl = eolian_class_get_by_name(unit, name); + const Eolian_Class *cl = eolian_unit_class_by_name_get(unit, name); if (!cl) return EOLIAN_DOC_REF_INVALID; @@ -1047,25 +1047,6 @@ eolian_unit_classes_get(const Eolian_Unit *unit) return (unit ? eina_hash_iterator_data_new(unit->classes) : NULL); } -EAPI const Eolian_Class * -eolian_class_get_by_name(const Eolian_Unit *unit, const char *class_name) -{ - return eolian_unit_class_by_name_get(unit, class_name); -} - -EAPI const Eolian_Class * -eolian_class_get_by_file(const Eolian_Unit *unit, const char *file_name) -{ - if (!unit) return NULL; - return eolian_state_class_by_file_get(unit->state, file_name); -} - -EAPI Eina_Iterator * -eolian_all_classes_get(const Eolian_Unit *unit) -{ - return eolian_unit_classes_get(unit); -} - EAPI const Eolian_Variable * eolian_unit_global_by_name_get(const Eolian_Unit *unit, const char *name) { diff --git a/src/tests/eolian/eolian_parsing.c b/src/tests/eolian/eolian_parsing.c index 5e5142cb7c..bec687f042 100644 --- a/src/tests/eolian/eolian_parsing.c +++ b/src/tests/eolian/eolian_parsing.c @@ -29,10 +29,10 @@ START_TEST(eolian_namespaces) fail_if(!(unit = eolian_state_file_parse(eos, TESTS_SRC_DIR"/data/nmsp1_class1.eo"))); /* Classes existence */ - fail_if(!(class11 = eolian_class_get_by_name(unit, "nmsp1.class1"))); - fail_if(!(class112 = eolian_class_get_by_name(unit, "nmsp1.nmsp11.class2"))); - fail_if(!(class21 = eolian_class_get_by_name(unit, "nmsp2.class1"))); - fail_if(!(class_no = eolian_class_get_by_name(unit, "no_nmsp"))); + fail_if(!(class11 = eolian_unit_class_by_name_get(unit, "nmsp1.class1"))); + fail_if(!(class112 = eolian_unit_class_by_name_get(unit, "nmsp1.nmsp11.class2"))); + fail_if(!(class21 = eolian_unit_class_by_name_get(unit, "nmsp2.class1"))); + fail_if(!(class_no = eolian_unit_class_by_name_get(unit, "no_nmsp"))); /* Check names and namespaces*/ fail_if(strcmp(eolian_class_name_get(class11), "class1")); @@ -112,7 +112,7 @@ START_TEST(eolian_events) fail_if(!(unit = eolian_state_file_parse(eos, TESTS_SRC_DIR"/data/events.eo"))); /* Class */ - fail_if(!(class = eolian_class_get_by_name(unit, "Events"))); + fail_if(!(class = eolian_unit_class_by_name_get(unit, "Events"))); fail_if(strcmp(eolian_class_event_prefix_get(class), "totally_not_events")); /* Events */ @@ -187,8 +187,8 @@ START_TEST(eolian_override) fail_if(!(unit = eolian_state_file_parse(eos, TESTS_SRC_DIR"/data/override.eo"))); /* Class */ - fail_if(!(class = eolian_class_get_by_name(unit, "Override"))); - fail_if(!(base = eolian_class_get_by_name(unit, "Base"))); + fail_if(!(class = eolian_unit_class_by_name_get(unit, "Override"))); + fail_if(!(base = eolian_unit_class_by_name_get(unit, "Base"))); /* Implements */ fail_if(!(iter = eolian_class_implements_get(class))); @@ -242,7 +242,7 @@ START_TEST(eolian_consts) /* Parsing */ fail_if(!eolian_state_directory_add(eos, TESTS_SRC_DIR"/data")); fail_if(!(unit = eolian_state_file_parse(eos, TESTS_SRC_DIR"/data/consts.eo"))); - fail_if(!(class = eolian_class_get_by_name(unit, "Consts"))); + fail_if(!(class = eolian_unit_class_by_name_get(unit, "Consts"))); /* Method */ fail_if(!(fid = eolian_class_function_get_by_name(class, "foo", EOLIAN_METHOD))); @@ -269,8 +269,8 @@ START_TEST(eolian_ctor_dtor) /* Parsing */ fail_if(!eolian_state_directory_add(eos, TESTS_SRC_DIR"/data")); fail_if(!(unit = eolian_state_file_parse(eos, TESTS_SRC_DIR"/data/ctor_dtor.eo"))); - fail_if(!(class = eolian_class_get_by_name(unit, "Ctor_Dtor"))); - fail_if(!(base = eolian_class_get_by_name(unit, "Base"))); + fail_if(!(class = eolian_unit_class_by_name_get(unit, "Ctor_Dtor"))); + fail_if(!(base = eolian_unit_class_by_name_get(unit, "Base"))); /* Class ctor/dtor */ fail_if(!eolian_class_ctor_enable_get(class)); @@ -340,7 +340,7 @@ START_TEST(eolian_typedef) fail_if(!(unit = eolian_state_file_parse(eos, TESTS_SRC_DIR"/data/typedef.eo"))); /* Check that the class Dummy is still readable */ - fail_if(!(class = eolian_class_get_by_name(unit, "Typedef"))); + fail_if(!(class = eolian_unit_class_by_name_get(unit, "Typedef"))); fail_if(!eolian_class_function_get_by_name(class, "foo", EOLIAN_METHOD)); /* Basic type */ @@ -423,7 +423,7 @@ START_TEST(eolian_complex_type) /* Parsing */ fail_if(!eolian_state_directory_add(eos, TESTS_SRC_DIR"/data")); fail_if(!(unit = eolian_state_file_parse(eos, TESTS_SRC_DIR"/data/complex_type.eo"))); - fail_if(!(class = eolian_class_get_by_name(unit, "Complex_Type"))); + fail_if(!(class = eolian_unit_class_by_name_get(unit, "Complex_Type"))); /* Properties return type */ fail_if(!(fid = eolian_class_function_get_by_name(class, "a", EOLIAN_PROPERTY))); @@ -507,7 +507,7 @@ START_TEST(eolian_scope) /* Parsing */ fail_if(!eolian_state_directory_add(eos, TESTS_SRC_DIR"/data")); fail_if(!(unit = eolian_state_file_parse(eos, TESTS_SRC_DIR"/data/scope.eo"))); - fail_if(!(class = eolian_class_get_by_name(unit, "Scope"))); + fail_if(!(class = eolian_unit_class_by_name_get(unit, "Scope"))); /* Property scope */ fail_if(eolian_class_function_get_by_name(class, "a", EOLIAN_PROPERTY)); @@ -550,8 +550,8 @@ START_TEST(eolian_simple_parsing) /* Parsing */ fail_if(!eolian_state_directory_add(eos, TESTS_SRC_DIR"/data")); fail_if(!(unit = eolian_state_file_parse(eos, TESTS_SRC_DIR"/data/class_simple.eo"))); - fail_if(!(class = eolian_class_get_by_name(unit, "Class_Simple"))); - fail_if(eolian_class_get_by_file(unit, "class_simple.eo") != class); + fail_if(!(class = eolian_unit_class_by_name_get(unit, "Class_Simple"))); + fail_if(eolian_state_class_by_file_get(eos, "class_simple.eo") != class); fail_if(strcmp(eolian_class_file_get(class), "class_simple.eo")); /* Class */ @@ -690,7 +690,7 @@ START_TEST(eolian_struct) fail_if(!(unit = eolian_state_file_parse(eos, TESTS_SRC_DIR"/data/struct.eo"))); /* Check that the class Dummy is still readable */ - fail_if(!(class = eolian_class_get_by_name(unit, "Struct"))); + fail_if(!(class = eolian_unit_class_by_name_get(unit, "Struct"))); fail_if(!eolian_class_function_get_by_name(class, "foo", EOLIAN_METHOD)); /* named struct */ @@ -758,7 +758,7 @@ START_TEST(eolian_extern) fail_if(!(unit = eolian_state_file_parse(eos, TESTS_SRC_DIR"/data/extern.eo"))); /* Check that the class Dummy is still readable */ - fail_if(!(class = eolian_class_get_by_name(unit, "Extern"))); + fail_if(!(class = eolian_unit_class_by_name_get(unit, "Extern"))); fail_if(!eolian_class_function_get_by_name(class, "foo", EOLIAN_METHOD)); /* regular type */ @@ -800,7 +800,7 @@ START_TEST(eolian_var) fail_if(!(unit = eolian_state_file_parse(eos, TESTS_SRC_DIR"/data/var.eo"))); /* Check that the class Dummy is still readable */ - fail_if(!(class = eolian_class_get_by_name(unit, "Var"))); + fail_if(!(class = eolian_unit_class_by_name_get(unit, "Var"))); fail_if(!eolian_class_function_get_by_name(class, "foo", EOLIAN_METHOD)); /* regular constant */ @@ -871,7 +871,7 @@ START_TEST(eolian_enum) fail_if(!(unit = eolian_state_file_parse(eos, TESTS_SRC_DIR"/data/enum.eo"))); /* Check that the class Dummy is still readable */ - fail_if(!(class = eolian_class_get_by_name(unit, "Enum"))); + fail_if(!(class = eolian_unit_class_by_name_get(unit, "Enum"))); fail_if(!eolian_class_function_get_by_name(class, "foo", EOLIAN_METHOD)); fail_if(!(tdl = eolian_typedecl_enum_get_by_name(unit, "Foo"))); @@ -965,7 +965,7 @@ START_TEST(eolian_class_funcs) /* Parsing */ fail_if(!eolian_state_directory_add(eos, TESTS_SRC_DIR"/data")); fail_if(!(unit = eolian_state_file_parse(eos, TESTS_SRC_DIR"/data/class_funcs.eo"))); - fail_if(!(class = eolian_class_get_by_name(unit, "Class_Funcs"))); + fail_if(!(class = eolian_unit_class_by_name_get(unit, "Class_Funcs"))); /* Class properties */ fail_if(eolian_class_function_get_by_name(class, "a", EOLIAN_PROPERTY)); @@ -1008,7 +1008,7 @@ START_TEST(eolian_free_func) fail_if(!(unit = eolian_state_file_parse(eos, TESTS_SRC_DIR"/data/free_func.eo"))); /* Check that the class Dummy is still readable */ - fail_if(!(class = eolian_class_get_by_name(unit, "Free_Func"))); + fail_if(!(class = eolian_unit_class_by_name_get(unit, "Free_Func"))); fail_if(!eolian_class_function_get_by_name(class, "foo", EOLIAN_METHOD)); /* regular struct */ @@ -1057,7 +1057,7 @@ START_TEST(eolian_null) fail_if(!eolian_state_directory_add(eos, TESTS_SRC_DIR"/data")); fail_if(!(unit = eolian_state_file_parse(eos, TESTS_SRC_DIR"/data/null.eo"))); - fail_if(!(class = eolian_class_get_by_name(unit, "Null"))); + fail_if(!(class = eolian_unit_class_by_name_get(unit, "Null"))); fail_if(!(func = eolian_class_function_get_by_name(class, "foo", EOLIAN_METHOD))); fail_if(!(iter = eolian_function_parameters_get(func))); @@ -1106,7 +1106,7 @@ START_TEST(eolian_import) fail_if(!eolian_state_directory_add(eos, TESTS_SRC_DIR"/data")); fail_if(!(unit = eolian_state_file_parse(eos, TESTS_SRC_DIR"/data/import.eo"))); - fail_if(!(class = eolian_class_get_by_name(unit, "Import"))); + fail_if(!(class = eolian_unit_class_by_name_get(unit, "Import"))); fail_if(!(tdl = eolian_typedecl_alias_get_by_name(unit, "Imported"))); fail_if(strcmp(eolian_typedecl_file_get(tdl), "import_types.eot")); @@ -1134,7 +1134,7 @@ START_TEST(eolian_decl) fail_if(!eolian_state_directory_add(eos, TESTS_SRC_DIR"/data")); fail_if(!(unit = eolian_state_file_parse(eos, TESTS_SRC_DIR"/data/decl.eo"))); - fail_if(!(class = eolian_class_get_by_name(unit, "Decl"))); + fail_if(!(class = eolian_unit_class_by_name_get(unit, "Decl"))); fail_if(!(itr = eolian_declarations_get_by_file(eos, "decl.eo"))); @@ -1349,7 +1349,7 @@ START_TEST(eolian_docs) "Opaque struct docs. See @Foo for another struct.")); fail_if(eolian_documentation_description_get(doc)); - fail_if(!(class = eolian_class_get_by_name(unit, "Docs"))); + fail_if(!(class = eolian_unit_class_by_name_get(unit, "Docs"))); fail_if(!(doc = eolian_class_documentation_get(class))); fail_if(strcmp(eolian_documentation_summary_get(doc), "Docs for class.")); @@ -1576,7 +1576,7 @@ START_TEST(eolian_function_as_arguments) fail_if(!(unit = eolian_state_file_parse(eos, TESTS_SRC_DIR"/data/function_as_argument.eo"))); - fail_if(!(cls = eolian_class_get_by_name(unit, "Function_As_Argument"))); + fail_if(!(cls = eolian_unit_class_by_name_get(unit, "Function_As_Argument"))); fail_if(!(fid = eolian_class_function_get_by_name(cls, "set_cb", EOLIAN_METHOD))); @@ -1618,7 +1618,7 @@ START_TEST(eolian_parts) fail_if(!(unit = eolian_state_file_parse(eos, TESTS_SRC_DIR"/data/parts.eo"))); - fail_if(!(cls = eolian_class_get_by_name(unit, "Parts"))); + fail_if(!(cls = eolian_unit_class_by_name_get(unit, "Parts"))); fail_if(!(iter = eolian_class_parts_get(cls))); --