From f596a97da66befa9fe893da062482821e35f7c5d Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Wed, 7 Mar 2018 13:25:28 +0100 Subject: [PATCH] eolian: remove old variable retrieval APIs --- src/bindings/luajit/eolian.lua | 92 ++++++++++++++++++------------- src/lib/eolian/Eolian.h | 18 ------ src/lib/eolian/database_expr.c | 2 +- src/lib/eolian/eolian_database.c | 39 ------------- src/tests/eolian/eolian_parsing.c | 14 ++--- 5 files changed, 62 insertions(+), 103 deletions(-) diff --git a/src/bindings/luajit/eolian.lua b/src/bindings/luajit/eolian.lua index 6faa91c8ba..759e3aee2a 100644 --- a/src/bindings/luajit/eolian.lua +++ b/src/bindings/luajit/eolian.lua @@ -471,12 +471,6 @@ ffi.cdef [[ Eolian_Unary_Operator eolian_expression_unary_operator_get(const Eolian_Expression *expr); const Eolian_Expression *eolian_expression_unary_expression_get(const Eolian_Expression *expr); Eolian_Value_t eolian_expression_value_get(const Eolian_Expression *expr); - const Eolian_Variable *eolian_variable_global_get_by_name(const Eolian_Unit *unit, const char *name); - const Eolian_Variable *eolian_variable_constant_get_by_name(const Eolian_Unit *unit, const char *name); - Eina_Iterator *eolian_variable_globals_get_by_file(const Eolian_Unit *unit, const char *fname); - Eina_Iterator *eolian_variable_constants_get_by_file(const Eolian_Unit *unit, const char *fname); - Eina_Iterator *eolian_variable_all_constants_get(const Eolian_Unit *unit); - Eina_Iterator *eolian_variable_all_globals_get(const Eolian_Unit *unit); Eolian_Variable_Type eolian_variable_type_get(const Eolian_Variable *var); const Eolian_Documentation *eolian_variable_documentation_get(const Eolian_Variable *var); const char *eolian_variable_file_get(const Eolian_Variable *var); @@ -623,6 +617,38 @@ ffi.metatype("Eolian_State", { classes_get = function(self) return Ptr_Iterator("const Eolian_Class*", eolian.eolian_state_classes_get(self)) + end, + + global_by_name_get = function(unit, name) + local v = eolian.eolian_state_global_by_name_get(self, name) + if v == nil then return nil end + return v + end, + + constant_by_name_get = function(unit, name) + local v = eolian.eolian_state_constant_by_name_get(self, name) + if v == nil then return nil end + return v + end, + + globals_by_file_get = function(unit, fname) + return Ptr_Iterator("const Eolian_Variable*", + eolian.eolian_state_globals_by_file_get(self, fname)) + end, + + constants_by_file_get = function(unit, fname) + return Ptr_Iterator("const Eolian_Variable*", + eolian.eolian_state_constants_by_file_get(self, fname)) + end, + + constants_get = function(self) + return Ptr_Iterator("const Eolian_Variable *", + eolian.eolian_state_constants_get(self)) + end, + + globals_get = function(self) + return Ptr_Iterator("const Eolian_Variable *", + eolian.eolian_state_globals_get(self)) end }, __gc = function(self) @@ -652,6 +678,28 @@ ffi.metatype("Eolian_Unit", { classes_get = function(self) return Ptr_Iterator("const Eolian_Class*", eolian.eolian_unit_classes_get(self)) + end, + + global_by_name_get = function(unit, name) + local v = eolian.eolian_unit_global_by_name_get(self, name) + if v == nil then return nil end + return v + end, + + constant_by_name_get = function(unit, name) + local v = eolian.eolian_unit_constant_by_name_get(self, name) + if v == nil then return nil end + return v + end, + + constants_get = function(self) + return Ptr_Iterator("const Eolian_Variable *", + eolian.eolian_unit_constants_get(self)) + end, + + globals_get = function(self) + return Ptr_Iterator("const Eolian_Variable *", + eolian.eolian_unit_globals_get(self)) end } }) @@ -1604,38 +1652,6 @@ M.Expression = ffi.metatype("Eolian_Expression", { } }) -M.variable_global_get_by_name = function(unit, name) - local v = eolian.eolian_variable_global_get_by_name(unit, name) - if v == nil then return nil end - return v -end - -M.variable_constant_get_by_name = function(unit, name) - local v = eolian.eolian_variable_constant_get_by_name(unit, name) - if v == nil then return nil end - return v -end - -M.variable_globals_get_by_file = function(unit, fname) - return Ptr_Iterator("const Eolian_Variable*", - eolian.eolian_variable_globals_get_by_file(unit, fname)) -end - -M.variable_constants_get_by_file = function(unit, fname) - return Ptr_Iterator("const Eolian_Variable*", - eolian.eolian_variable_constants_get_by_file(unit, fname)) -end - -M.variable_all_constants_get = function(unit) - return Ptr_Iterator("const Eolian_Variable *", - eolian.eolian_variable_all_constants_get(unit)) -end - -M.variable_all_globals_get = function(unit) - return Ptr_Iterator("const Eolian_Variable *", - eolian.eolian_variable_all_globals_get(unit)) -end - M.Variable = ffi.metatype("Eolian_Variable", { __index = { type_get = function(self) diff --git a/src/lib/eolian/Eolian.h b/src/lib/eolian/Eolian.h index 5d8cebf867..1a75d00675 100644 --- a/src/lib/eolian/Eolian.h +++ b/src/lib/eolian/Eolian.h @@ -2772,24 +2772,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_Variable *eolian_variable_global_get_by_name(const Eolian_Unit *unit, const char *name); - -/* DEPRECATED */ -EAPI const Eolian_Variable *eolian_variable_constant_get_by_name(const Eolian_Unit *unit, const char *name); - -/* DEPRECATED */ -EAPI Eina_Iterator *eolian_variable_globals_get_by_file(const Eolian_Unit *unit, const char *fname); - -/* DEPRECATED */ -EAPI Eina_Iterator *eolian_variable_constants_get_by_file(const Eolian_Unit *unit, const char *fname); - -/* DEPRECATED */ -EAPI Eina_Iterator *eolian_variable_all_constants_get(const Eolian_Unit *unit); - -/* DEPRECATED */ -EAPI Eina_Iterator *eolian_variable_all_globals_get(const Eolian_Unit *unit); - /* DEPRECATED */ EAPI const Eolian_Typedecl *eolian_typedecl_alias_get_by_name(const Eolian_Unit *unit, const char *name); diff --git a/src/lib/eolian/database_expr.c b/src/lib/eolian/database_expr.c index 77322fab73..40cc05ccb1 100644 --- a/src/lib/eolian/database_expr.c +++ b/src/lib/eolian/database_expr.c @@ -505,7 +505,7 @@ eval_exp(const Eolian_Unit *unit, Eolian_Expression *expr, return eval_exp(NULL, expr->expr, mask, out); } - const Eolian_Variable *var = eolian_variable_constant_get_by_name + const Eolian_Variable *var = eolian_unit_constant_by_name_get (unit, expr->value.s); Eolian_Expression *exp = NULL; diff --git a/src/lib/eolian/eolian_database.c b/src/lib/eolian/eolian_database.c index ded663d2c0..36ce4f11c0 100644 --- a/src/lib/eolian/eolian_database.c +++ b/src/lib/eolian/eolian_database.c @@ -1079,45 +1079,6 @@ eolian_unit_globals_get(const Eolian_Unit *unit) return (unit ? eina_hash_iterator_data_new(unit->globals) : NULL); } -EAPI const Eolian_Variable * -eolian_variable_global_get_by_name(const Eolian_Unit *unit, const char *name) -{ - return eolian_unit_global_by_name_get(unit, name); -} - -EAPI const Eolian_Variable * -eolian_variable_constant_get_by_name(const Eolian_Unit *unit, const char *name) -{ - return eolian_unit_constant_by_name_get(unit, name); -} - -EAPI Eina_Iterator * -eolian_variable_globals_get_by_file(const Eolian_Unit *unit, const char *fname) -{ - if (!unit) return NULL; - return eolian_state_globals_by_file_get(unit->state, fname); -} - -EAPI Eina_Iterator * -eolian_variable_constants_get_by_file(const Eolian_Unit *unit, - const char *fname) -{ - if (!unit) return NULL; - return eolian_state_constants_by_file_get(unit->state, fname); -} - -EAPI Eina_Iterator * -eolian_variable_all_constants_get(const Eolian_Unit *unit) -{ - return eolian_unit_constants_get(unit); -} - -EAPI Eina_Iterator * -eolian_variable_all_globals_get(const Eolian_Unit *unit) -{ - return eolian_unit_globals_get(unit); -} - EAPI const Eolian_Typedecl * eolian_unit_alias_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 bec687f042..9665f945a8 100644 --- a/src/tests/eolian/eolian_parsing.c +++ b/src/tests/eolian/eolian_parsing.c @@ -804,7 +804,7 @@ START_TEST(eolian_var) fail_if(!eolian_class_function_get_by_name(class, "foo", EOLIAN_METHOD)); /* regular constant */ - fail_if(!(var = eolian_variable_constant_get_by_name(unit, "Foo"))); + fail_if(!(var = eolian_unit_constant_by_name_get(unit, "Foo"))); fail_if(eolian_variable_type_get(var) != EOLIAN_VAR_CONSTANT); fail_if(eolian_variable_is_extern(var)); fail_if(!(type = eolian_variable_base_type_get(var))); @@ -816,7 +816,7 @@ START_TEST(eolian_var) fail_if(v.value.i != 5); /* regular global */ - fail_if(!(var = eolian_variable_global_get_by_name(unit, "Bar"))); + fail_if(!(var = eolian_unit_global_by_name_get(unit, "Bar"))); fail_if(eolian_variable_type_get(var) != EOLIAN_VAR_GLOBAL); fail_if(eolian_variable_is_extern(var)); fail_if(!(type = eolian_variable_base_type_get(var))); @@ -828,7 +828,7 @@ START_TEST(eolian_var) fail_if(((int)v.value.f) != 10); /* no-value global */ - fail_if(!(var = eolian_variable_global_get_by_name(unit, "Baz"))); + fail_if(!(var = eolian_unit_global_by_name_get(unit, "Baz"))); fail_if(eolian_variable_type_get(var) != EOLIAN_VAR_GLOBAL); fail_if(eolian_variable_is_extern(var)); fail_if(!(type = eolian_variable_base_type_get(var))); @@ -837,7 +837,7 @@ START_TEST(eolian_var) fail_if(eolian_variable_value_get(var)); /* extern global */ - fail_if(!(var = eolian_variable_global_get_by_name(unit, "Bah"))); + fail_if(!(var = eolian_unit_global_by_name_get(unit, "Bah"))); fail_if(eolian_variable_type_get(var) != EOLIAN_VAR_GLOBAL); fail_if(!eolian_variable_is_extern(var)); fail_if(!(type = eolian_variable_base_type_get(var))); @@ -931,7 +931,7 @@ START_TEST(eolian_enum) fail_if(strcmp(cname, "NAME_SPACED_PANTS")); eina_stringshare_del(cname); - fail_if(!(var = eolian_variable_constant_get_by_name(unit, "Bah"))); + fail_if(!(var = eolian_unit_constant_by_name_get(unit, "Bah"))); fail_if(eolian_variable_type_get(var) != EOLIAN_VAR_CONSTANT); fail_if(eolian_variable_is_extern(var)); fail_if(!(type = eolian_variable_base_type_get(var))); @@ -942,7 +942,7 @@ START_TEST(eolian_enum) fail_if(v.type != EOLIAN_EXPR_INT); fail_if(v.value.i != (1 << 0)); - fail_if(!(var = eolian_variable_constant_get_by_name(unit, "Pants"))); + fail_if(!(var = eolian_unit_constant_by_name_get(unit, "Pants"))); fail_if(eolian_variable_type_get(var) != EOLIAN_VAR_CONSTANT); fail_if(!(exp = eolian_variable_value_get(var))); v = eolian_expression_eval(exp, EOLIAN_MASK_ALL); @@ -1337,7 +1337,7 @@ START_TEST(eolian_docs) fail_if(strcmp(eolian_documentation_since_get(doc), "2.0")); - fail_if(!(var = eolian_variable_global_get_by_name(unit, "pants"))); + fail_if(!(var = eolian_unit_global_by_name_get(unit, "pants"))); fail_if(!(doc = eolian_variable_documentation_get(var))); fail_if(strcmp(eolian_documentation_summary_get(doc), "Docs for var."));