q66 pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=c6e0b7f44e1414695a5d5aba78420d7ca59165f6
commit c6e0b7f44e1414695a5d5aba78420d7ca59165f6 Author: Daniel Kolesa <[email protected]> Date: Thu Mar 8 22:54:12 2018 +0100 eolian: remove obsolete file_get APIs --- src/lib/eolian/Eolian.h | 40 ------------------------------------- src/lib/eolian/database_class_api.c | 6 ------ src/lib/eolian/database_type_api.c | 14 ------------- src/lib/eolian/database_var_api.c | 7 ------- src/tests/eolian/eolian_parsing.c | 12 +++++------ 5 files changed, 6 insertions(+), 73 deletions(-) diff --git a/src/lib/eolian/Eolian.h b/src/lib/eolian/Eolian.h index 05aa1ea22d..d5ba7e0ff6 100644 --- a/src/lib/eolian/Eolian.h +++ b/src/lib/eolian/Eolian.h @@ -1173,16 +1173,6 @@ EAPI Eina_Iterator *eolian_unit_structs_get(const Eolian_Unit *unit); EAPI Eina_Iterator *eolian_unit_enums_get(const Eolian_Unit *unit); /* - * @brief Returns the name of the file containing the given class. - * - * @param[in] klass the class. - * @return the name of the file on success or NULL otherwise. - * - * @ingroup Eolian - */ -EAPI Eina_Stringshare *eolian_class_file_get(const Eolian_Class *klass); - -/* * @brief Returns the full name of the given class. * * @param[in] class the class. @@ -2190,16 +2180,6 @@ EAPI Eina_Stringshare *eolian_typedecl_enum_legacy_prefix_get(const Eolian_Typed EAPI const Eolian_Documentation *eolian_typedecl_documentation_get(const Eolian_Typedecl *tp); /* - * @brief Get the filename of a type declaration. - * - * @param[in] tp the type declaration. - * @return the filename. - * - * @ingroup Eolian - */ -EAPI Eina_Stringshare *eolian_typedecl_file_get(const Eolian_Typedecl *tp); - -/* * @brief Get the base type of an alias declaration. * * @param[in] tp the type declaration. @@ -2321,16 +2301,6 @@ EAPI Eolian_Type_Type eolian_type_type_get(const Eolian_Type *tp); EAPI Eolian_Type_Builtin_Type eolian_type_builtin_type_get(const Eolian_Type *tp); /* - * @brief Get the filename of a type. - * - * @param[in] tp the type. - * @return the filename. - * - * @ingroup Eolian - */ -EAPI Eina_Stringshare *eolian_type_file_get(const Eolian_Type *tp); - -/* * @brief Get the base type of a type. * * Only applies to "complex" ordinary types, i.e. this is the first inner @@ -2660,16 +2630,6 @@ EAPI Eolian_Variable_Type eolian_variable_type_get(const Eolian_Variable *var); EAPI const Eolian_Documentation *eolian_variable_documentation_get(const Eolian_Variable *var); /* - * @brief Get the filename of a variable. - * - * @param[in] var the variable. - * @return the filename or NULL. - * - * @ingroup Eolian - */ -EAPI Eina_Stringshare *eolian_variable_file_get(const Eolian_Variable *var); - -/* * @brief Get the base type of a variable. * * @param[in] var the variable. diff --git a/src/lib/eolian/database_class_api.c b/src/lib/eolian/database_class_api.c index 42125ade63..2306757381 100644 --- a/src/lib/eolian/database_class_api.c +++ b/src/lib/eolian/database_class_api.c @@ -7,12 +7,6 @@ #include "eolian_priv.h" EAPI Eina_Stringshare * -eolian_class_file_get(const Eolian_Class *cl) -{ - return cl ? cl->base.file : NULL; -} - -EAPI Eina_Stringshare * eolian_class_full_name_get(const Eolian_Class *cl) { return cl ? cl->base.name : NULL; diff --git a/src/lib/eolian/database_type_api.c b/src/lib/eolian/database_type_api.c index c5f35083fb..f54dace8f0 100644 --- a/src/lib/eolian/database_type_api.c +++ b/src/lib/eolian/database_type_api.c @@ -153,20 +153,6 @@ eolian_typedecl_documentation_get(const Eolian_Typedecl *tp) return tp->doc; } -EAPI Eina_Stringshare * -eolian_type_file_get(const Eolian_Type *tp) -{ - EINA_SAFETY_ON_NULL_RETURN_VAL(tp, NULL); - return tp->base.file; -} - -EAPI Eina_Stringshare * -eolian_typedecl_file_get(const Eolian_Typedecl *tp) -{ - EINA_SAFETY_ON_NULL_RETURN_VAL(tp, NULL); - return tp->base.file; -} - EAPI const Eolian_Type * eolian_type_base_type_get(const Eolian_Type *tp) { diff --git a/src/lib/eolian/database_var_api.c b/src/lib/eolian/database_var_api.c index 208e339de9..87a7e38b5d 100644 --- a/src/lib/eolian/database_var_api.c +++ b/src/lib/eolian/database_var_api.c @@ -19,13 +19,6 @@ eolian_variable_documentation_get(const Eolian_Variable *var) return var->doc; } -EAPI Eina_Stringshare * -eolian_variable_file_get(const Eolian_Variable *var) -{ - EINA_SAFETY_ON_NULL_RETURN_VAL(var, NULL); - return var->base.file; -} - EAPI const Eolian_Type * eolian_variable_base_type_get(const Eolian_Variable *var) { diff --git a/src/tests/eolian/eolian_parsing.c b/src/tests/eolian/eolian_parsing.c index 331f6d6d0e..6eb3fa9aa6 100644 --- a/src/tests/eolian/eolian_parsing.c +++ b/src/tests/eolian/eolian_parsing.c @@ -359,7 +359,7 @@ START_TEST(eolian_typedef) fail_if(strcmp(type_name, "int")); /* File */ - fail_if(!(file = eolian_typedecl_file_get(tdl))); + fail_if(!(file = eolian_object_file_get((const Eolian_Object *)tdl))); fail_if(strcmp(file, "typedef.eo")); /* Lowest alias base */ @@ -552,7 +552,7 @@ START_TEST(eolian_simple_parsing) fail_if(!(unit = eolian_state_file_parse(eos, TESTS_SRC_DIR"/data/class_simple.eo"))); 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")); + fail_if(strcmp(eolian_object_file_get((const Eolian_Object *)class), "class_simple.eo")); /* Class */ fail_if(eolian_class_type_get(class) != EOLIAN_CLASS_REGULAR); @@ -696,7 +696,7 @@ START_TEST(eolian_struct) /* named struct */ fail_if(!(tdl = eolian_unit_struct_by_name_get(unit, "Named"))); fail_if(!(type_name = eolian_typedecl_name_get(tdl))); - fail_if(!(file = eolian_typedecl_file_get(tdl))); + fail_if(!(file = eolian_object_file_get((const Eolian_Object *)tdl))); fail_if(eolian_typedecl_type_get(tdl) != EOLIAN_TYPEDECL_STRUCT); fail_if(strcmp(type_name, "Named")); fail_if(strcmp(file, "struct.eo")); @@ -715,7 +715,7 @@ START_TEST(eolian_struct) /* referencing */ fail_if(!(tdl = eolian_unit_struct_by_name_get(unit, "Another"))); fail_if(!(type_name = eolian_typedecl_name_get(tdl))); - fail_if(!(file = eolian_typedecl_file_get(tdl))); + fail_if(!(file = eolian_object_file_get((const Eolian_Object *)tdl))); fail_if(eolian_typedecl_type_get(tdl) != EOLIAN_TYPEDECL_STRUCT); fail_if(strcmp(type_name, "Another")); fail_if(strcmp(file, "struct.eo")); @@ -1109,10 +1109,10 @@ START_TEST(eolian_import) fail_if(!(class = eolian_unit_class_by_name_get(unit, "Import"))); fail_if(!(tdl = eolian_unit_alias_by_name_get(unit, "Imported"))); - fail_if(strcmp(eolian_typedecl_file_get(tdl), "import_types.eot")); + fail_if(strcmp(eolian_object_file_get((const Eolian_Object *)tdl), "import_types.eot")); fail_if(!(tdl = eolian_unit_struct_by_name_get(unit, "Imported_Struct"))); - fail_if(strcmp(eolian_typedecl_file_get(tdl), "import_types.eot")); + fail_if(strcmp(eolian_object_file_get((const Eolian_Object *)tdl), "import_types.eot")); eolian_state_free(eos); eolian_shutdown(); --
