aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Kolesa <d.kolesa@osg.samsung.com>2018-03-14 17:20:49 +0100
committerDaniel Kolesa <d.kolesa@osg.samsung.com>2018-03-14 17:20:49 +0100
commitab43e61ef6547160e350c8e7fbcdf001bbffa917 (patch)
treec834190de33603eca2012726401bb89fcd374c54
parentpyolian: remove unneeded bindings in eolian_state (diff)
downloadefl-ab43e61ef6547160e350c8e7fbcdf001bbffa917.tar.gz
eolian: turn some state APIs into inlines over unit APIs
-rw-r--r--src/lib/eolian/Eolian.h371
-rw-r--r--src/lib/eolian/eolian_database.c84
2 files changed, 202 insertions, 253 deletions
diff --git a/src/lib/eolian/Eolian.h b/src/lib/eolian/Eolian.h
index b6f4fa852f..eaf469eb25 100644
--- a/src/lib/eolian/Eolian.h
+++ b/src/lib/eolian/Eolian.h
@@ -198,6 +198,7 @@ typedef struct _Eolian_Unit Eolian_Unit;
#endif
#define EOLIAN_OBJECT(expr) EOLIAN_CAST(Eolian_Object, expr)
+#define EOLIAN_UNIT(expr) EOLIAN_CAST(Eolian_Unit, expr)
typedef enum
{
@@ -772,412 +773,444 @@ EAPI const Eolian_Unit *eolian_state_unit_by_file_get(const Eolian_State *state,
EAPI Eina_Iterator *eolian_state_units_get(const Eolian_State *state);
/*
- * @brief Get an object in a state by name.
+ * @brief Get the children (dependencies) of a unit.
*
- * Only objects declared directly within the file can be retrieved, i.e.
- * classes, typedecls and variables.
+ * The iterator is obviously again to `const Eolian_Unit *`.
*
- * @param[in] state The state.
- * @param[in] name The fully namespaced object name.
+ * @param[in] unit The unit.
*
* @ingroup Eolian
*/
-EAPI const Eolian_Object *eolian_state_object_by_name_get(const Eolian_State *state, const char *name);
+EAPI Eina_Iterator *eolian_unit_children_get(const Eolian_Unit *unit);
/*
- * @brief Get a list of objects from a file.
+ * @brief Get the file name a unit is associated with.
*
- * The list follows declaration order in the file. Only objects declared
- * directly within the file can be retrieved, i.e. classes, typedecls and
- * variables.
+ * This will be `NULL` if not associated with a file (like the master unit
+ * within `Eolian_State`).
*
- * @param[in] state The state.
- * @param[in] file_name The file name.
+ * @param[in] unit The unit.
*
* @ingroup Eolian
*/
-EAPI Eina_Iterator *eolian_state_objects_by_file_get(const Eolian_State *state, const char *file_name);
+EAPI const char *eolian_unit_file_get(const Eolian_Unit *unit);
/*
- * @brief Get all objects in the state.
+ * @brief Get an object in a unit by name.
*
- * The order is not necessarily the declaration order. Only objects declared
- * directly within the file can be retrieved, i.e. classes, typedecls and
- * variables.
+ * Only objects declared directly within the file can be retrieved, i.e.
+ * classes, typedecls and variables.
*
- * @param[in] state The state.
+ * @param[in] unit The unit.
+ * @param[in] name The fully namespaced object name.
*
* @ingroup Eolian
*/
-EAPI Eina_Iterator *eolian_state_objects_get(const Eolian_State *state);
+EAPI const Eolian_Object *eolian_unit_object_by_name_get(const Eolian_Unit *unit, const char *name);
/*
- * @brief Get a class within a state by name.
+ * @brief Get all objects in the unit.
*
- * @param[in] state The state.
- * @param[in] class_name The full name of the class.
+ * The order is not necessarily the declaration order. Only objects declared
+ * directly within the file can be retrieved, i.e. classes, typedecls and
+ * variables.
+ *
+ * @param[in] unit The unit.
*
* @ingroup Eolian
*/
-EAPI const Eolian_Class *eolian_state_class_by_name_get(const Eolian_State *state, const char *class_name);
+EAPI Eina_Iterator *eolian_unit_objects_get(const Eolian_Unit *unit);
/*
- * @brief Get a class within a state by file name (class_name.eo).
+ * @brief Get a class within a unit by name.
*
- * @param[in] state The state.
- * @param[in] file_name The full name of the class.
+ * @param[in] unit The unit.
+ * @param[in] class_name The full name of the class.
*
* @ingroup Eolian
*/
-EAPI const Eolian_Class *eolian_state_class_by_file_get(const Eolian_State *state, const char *file_name);
+EAPI const Eolian_Class *eolian_unit_class_by_name_get(const Eolian_Unit *unit, const char *class_name);
/*
- * @brief Get an iterator to all the classes stored into a state.
+ * @brief Get an iterator to all the classes stored into a unit.
*
- * @param[in] state The Eolian state.
+ * @param[in] unit The Eolian unit.
*
* @ingroup Eolian
*/
-EAPI Eina_Iterator *eolian_state_classes_get(const Eolian_State *state);
+EAPI Eina_Iterator *eolian_unit_classes_get(const Eolian_Unit *unit);
/*
- * @brief Get a global variable in a state by name.
+ * @brief Get a global variable in a unit by name.
*
- * @param[in] state The state.
+ * @param[in] unit The unit.
* @param[in] name the name of the variable
*
* @ingroup Eolian
*/
-EAPI const Eolian_Variable *eolian_state_global_by_name_get(const Eolian_State *state, const char *name);
+EAPI const Eolian_Variable *eolian_unit_global_by_name_get(const Eolian_Unit *unit, const char *name);
/*
- * @brief Get a constant variable in a state by name.
+ * @brief Get a constant variable in a unit by name.
*
- * @param[in] state The state.
+ * @param[in] unit The unit.
* @param[in] name the name of the variable
*
* @ingroup Eolian
*/
-EAPI const Eolian_Variable *eolian_state_constant_by_name_get(const Eolian_State *state, const char *name);
+EAPI const Eolian_Variable *eolian_unit_constant_by_name_get(const Eolian_Unit *unit, const char *name);
/*
- * @brief Get an iterator to all global variables contained in a file.
+ * @brief Get an iterator to all constant variables in the Eolian database.
*
- * @param[in] state The state.
- * @param[in] file_name The file name.
+ * @return the iterator or NULL
*
* Thanks to internal caching, this is an O(1) operation.
*
* @ingroup Eolian
*/
-EAPI Eina_Iterator *eolian_state_globals_by_file_get(const Eolian_State *state, const char *file_name);
+EAPI Eina_Iterator *eolian_unit_constants_get(const Eolian_Unit *unit);
/*
- * @brief Get an iterator to all constant variables contained in a file.
+ * @brief Get an iterator to all global variables in the Eolian database.
*
- * @param[in] state The state.
- * @param[in] file_name The file name.
* @return the iterator or NULL
*
* Thanks to internal caching, this is an O(1) operation.
*
* @ingroup Eolian
*/
-EAPI Eina_Iterator *eolian_state_constants_by_file_get(const Eolian_State *state, const char *file_name);
+EAPI Eina_Iterator *eolian_unit_globals_get(const Eolian_Unit *unit);
/*
- * @brief Get an iterator to all constant variables in the Eolian database.
- *
- * @return the iterator or NULL
+ * @brief Get an alias type declaration within a unit by name.
*
- * Thanks to internal caching, this is an O(1) operation.
+ * @param[in] unit The unit.
+ * @param[in] name The name of the alias.
*
* @ingroup Eolian
*/
-EAPI Eina_Iterator *eolian_state_constants_get(const Eolian_State *state);
+EAPI const Eolian_Typedecl *eolian_unit_alias_by_name_get(const Eolian_Unit *unit, const char *name);
/*
- * @brief Get an iterator to all global variables in the Eolian database.
- *
- * @return the iterator or NULL
+ * @brief Get a struct declaration within a unit by name.
*
- * Thanks to internal caching, this is an O(1) operation.
+ * @param[in] unit The unit.
+ * @param[in] name The name of the alias.
*
* @ingroup Eolian
*/
-EAPI Eina_Iterator *eolian_state_globals_get(const Eolian_State *state);
+EAPI const Eolian_Typedecl *eolian_unit_struct_by_name_get(const Eolian_Unit *unit, const char *name);
/*
- * @brief Get an alias type declaration within a state by name.
+ * @brief Get an enum declaration within a unit by name.
*
- * @param[in] state The state.
+ * @param[in] unit The unit.
* @param[in] name The name of the alias.
*
* @ingroup Eolian
*/
-EAPI const Eolian_Typedecl *eolian_state_alias_by_name_get(const Eolian_State *state, const char *name);
+EAPI const Eolian_Typedecl *eolian_unit_enum_by_name_get(const Eolian_Unit *unit, const char *name);
/*
- * @brief Get a struct declaration within a state by name.
+ * @brief Get an iterator to all aliases in the Eolian database.
*
- * @param[in] state The state.
- * @param[in] name The name of the alias.
+ * @param[in] unit The unit.
+ *
+ * Thanks to internal caching, this is an O(1) operation.
*
* @ingroup Eolian
*/
-EAPI const Eolian_Typedecl *eolian_state_struct_by_name_get(const Eolian_State *state, const char *name);
+EAPI Eina_Iterator *eolian_unit_aliases_get(const Eolian_Unit *unit);
/*
- * @brief Get an enum declaration within a state by name.
+ * @brief Get an iterator to all structs in the Eolian database.
*
- * @param[in] state The state.
- * @param[in] name The name of the alias.
+ * @param[in] unit The unit.
+ *
+ * Thanks to internal caching, this is an O(1) operation.
*
* @ingroup Eolian
*/
-EAPI const Eolian_Typedecl *eolian_state_enum_by_name_get(const Eolian_State *state, const char *name);
+EAPI Eina_Iterator *eolian_unit_structs_get(const Eolian_Unit *unit);
/*
- * @brief Get an iterator to all aliases contained in a file.
+ * @brief Get an iterator to all enums in the Eolian database.
*
- * @param[in] state The state.
- * @param[in] file_name The file name.
+ * @param[in] unit The unit.
*
* Thanks to internal caching, this is an O(1) operation.
*
* @ingroup Eolian
*/
-EAPI Eina_Iterator *eolian_state_aliases_by_file_get(const Eolian_State *state, const char *file_name);
+EAPI Eina_Iterator *eolian_unit_enums_get(const Eolian_Unit *unit);
/*
- * @brief Get an iterator to all named structs contained in a file.
- *
- * @param[in] state The state.
- * @param[in] file_name The file name.
+ * @brief A helper function to get an object in a state by name.
*
- * Thanks to internal caching, this is an O(1) operation.
+ * @see eolian_unit_object_by_name_get
*
* @ingroup Eolian
*/
-EAPI Eina_Iterator *eolian_state_structs_by_file_get(const Eolian_State *state, const char *file_name);
+static inline const Eolian_Object *
+eolian_state_object_by_name_get(const Eolian_State *state, const char *name)
+{
+ return eolian_unit_object_by_name_get(EOLIAN_UNIT(state), name);
+}
/*
- * @brief Get an iterator to all enums contained in a file.
+ * @brief Get a list of objects from a file.
+ *
+ * The list follows declaration order in the file. Only objects declared
+ * directly within the file can be retrieved, i.e. classes, typedecls and
+ * variables.
*
* @param[in] state The state.
* @param[in] file_name The file name.
*
- * Thanks to internal caching, this is an O(1) operation.
- *
* @ingroup Eolian
*/
-EAPI Eina_Iterator *eolian_state_enums_by_file_get(const Eolian_State *state, const char *file_name);
+EAPI Eina_Iterator *eolian_state_objects_by_file_get(const Eolian_State *state, const char *file_name);
/*
- * @brief Get an iterator to all aliases in the Eolian database.
+ * @brief A helper function to get all objects in a state.
*
- * @param[in] state The state.
- *
- * Thanks to internal caching, this is an O(1) operation.
+ * @see eolian_unit_objects_get
*
* @ingroup Eolian
*/
-EAPI Eina_Iterator *eolian_state_aliases_get(const Eolian_State *state);
+static inline Eina_Iterator *
+eolian_state_objects_get(const Eolian_State *state)
+{
+ return eolian_unit_objects_get(EOLIAN_UNIT(state));
+}
/*
- * @brief Get an iterator to all structs in the Eolian database.
- *
- * @param[in] state The state.
+ * @brief A helper function to get a class in a state by name.
*
- * Thanks to internal caching, this is an O(1) operation.
+ * @see eolian_unit_class_by_name_get
*
* @ingroup Eolian
*/
-EAPI Eina_Iterator *eolian_state_structs_get(const Eolian_State *state);
+static inline const Eolian_Class *
+eolian_state_class_by_name_get(const Eolian_State *state, const char *class_name)
+{
+ return eolian_unit_class_by_name_get(EOLIAN_UNIT(state), class_name);
+}
/*
- * @brief Get an iterator to all enums in the Eolian database.
+ * @brief Get a class within a state by file name (class_name.eo).
*
* @param[in] state The state.
- *
- * Thanks to internal caching, this is an O(1) operation.
+ * @param[in] file_name The full name of the class.
*
* @ingroup Eolian
*/
-EAPI Eina_Iterator *eolian_state_enums_get(const Eolian_State *state);
+EAPI const Eolian_Class *eolian_state_class_by_file_get(const Eolian_State *state, const char *file_name);
/*
- * @brief Get the children (dependencies) of a unit.
+ * @brief A helper function to get all classes in a state.
*
- * The iterator is obviously again to `const Eolian_Unit *`.
- *
- * @param[in] unit The unit.
+ * @see eolian_unit_classes_get
*
* @ingroup Eolian
*/
-EAPI Eina_Iterator *eolian_unit_children_get(const Eolian_Unit *unit);
+static inline Eina_Iterator *
+eolian_state_classes_get(const Eolian_State *state)
+{
+ return eolian_unit_classes_get(EOLIAN_UNIT(state));
+}
/*
- * @brief Get the file name a unit is associated with.
- *
- * This will be `NULL` if not associated with a file (like the master unit
- * within `Eolian_State`).
+ * @brief A helper function to get a global in a state by name.
*
- * @param[in] unit The unit.
+ * @see eolian_unit_global_by_name_get
*
* @ingroup Eolian
*/
-EAPI const char *eolian_unit_file_get(const Eolian_Unit *unit);
+static inline const Eolian_Variable *
+eolian_state_global_by_name_get(const Eolian_State *state, const char *name)
+{
+ return eolian_unit_global_by_name_get(EOLIAN_UNIT(state), name);
+}
/*
- * @brief Get an object in a unit by name.
- *
- * Only objects declared directly within the file can be retrieved, i.e.
- * classes, typedecls and variables.
+ * @brief A helper function to get a constant in a state by name.
*
- * @param[in] unit The unit.
- * @param[in] name The fully namespaced object name.
+ * @see eolian_unit_constant_by_name_get
*
* @ingroup Eolian
*/
-EAPI const Eolian_Object *eolian_unit_object_by_name_get(const Eolian_Unit *unit, const char *name);
+static inline const Eolian_Variable *
+eolian_state_constant_by_name_get(const Eolian_State *state, const char *name)
+{
+ return eolian_unit_constant_by_name_get(EOLIAN_UNIT(state), name);
+}
/*
- * @brief Get all objects in the unit.
+ * @brief Get an iterator to all global variables contained in a file.
*
- * The order is not necessarily the declaration order. Only objects declared
- * directly within the file can be retrieved, i.e. classes, typedecls and
- * variables.
+ * @param[in] state The state.
+ * @param[in] file_name The file name.
*
- * @param[in] unit The unit.
+ * Thanks to internal caching, this is an O(1) operation.
*
* @ingroup Eolian
*/
-EAPI Eina_Iterator *eolian_unit_objects_get(const Eolian_Unit *unit);
+EAPI Eina_Iterator *eolian_state_globals_by_file_get(const Eolian_State *state, const char *file_name);
/*
- * @brief Get a class within a unit by name.
+ * @brief Get an iterator to all constant variables contained in a file.
*
- * @param[in] unit The unit.
- * @param[in] class_name The full name of the class.
+ * @param[in] state The state.
+ * @param[in] file_name The file name.
+ * @return the iterator or NULL
+ *
+ * Thanks to internal caching, this is an O(1) operation.
*
* @ingroup Eolian
*/
-EAPI const Eolian_Class *eolian_unit_class_by_name_get(const Eolian_Unit *unit, const char *class_name);
+EAPI Eina_Iterator *eolian_state_constants_by_file_get(const Eolian_State *state, const char *file_name);
/*
- * @brief Get an iterator to all the classes stored into a unit.
+ * @brief A helper function to get all globals in a state.
*
- * @param[in] unit The Eolian unit.
+ * @see eolian_unit_globals_get
*
* @ingroup Eolian
*/
-EAPI Eina_Iterator *eolian_unit_classes_get(const Eolian_Unit *unit);
+static inline Eina_Iterator *
+eolian_state_globals_get(const Eolian_State *state)
+{
+ return eolian_unit_globals_get(EOLIAN_UNIT(state));
+}
/*
- * @brief Get a global variable in a unit by name.
+ * @brief A helper function to get all constants in a state.
*
- * @param[in] unit The unit.
- * @param[in] name the name of the variable
+ * @see eolian_unit_constants_get
*
* @ingroup Eolian
*/
-EAPI const Eolian_Variable *eolian_unit_global_by_name_get(const Eolian_Unit *unit, const char *name);
+static inline Eina_Iterator *
+eolian_state_constants_get(const Eolian_State *state)
+{
+ return eolian_unit_constants_get(EOLIAN_UNIT(state));
+}
/*
- * @brief Get a constant variable in a unit by name.
+ * @brief A helper function to get an alias in a state by name.
*
- * @param[in] unit The unit.
- * @param[in] name the name of the variable
+ * @see eolian_unit_alias_by_name_get
*
* @ingroup Eolian
*/
-EAPI const Eolian_Variable *eolian_unit_constant_by_name_get(const Eolian_Unit *unit, const char *name);
+static inline const Eolian_Typedecl *
+eolian_state_alias_by_name_get(const Eolian_State *state, const char *name)
+{
+ return eolian_unit_alias_by_name_get(EOLIAN_UNIT(state), name);
+}
/*
- * @brief Get an iterator to all constant variables in the Eolian database.
+ * @brief A helper function to get a struct in a state by name.
*
- * @return the iterator or NULL
- *
- * Thanks to internal caching, this is an O(1) operation.
+ * @see eolian_unit_struct_by_name_get
*
* @ingroup Eolian
*/
-EAPI Eina_Iterator *eolian_unit_constants_get(const Eolian_Unit *unit);
+static inline const Eolian_Typedecl *
+eolian_state_struct_by_name_get(const Eolian_State *state, const char *name)
+{
+ return eolian_unit_struct_by_name_get(EOLIAN_UNIT(state), name);
+}
/*
- * @brief Get an iterator to all global variables in the Eolian database.
+ * @brief A helper function to get an enum in a state by name.
*
- * @return the iterator or NULL
- *
- * Thanks to internal caching, this is an O(1) operation.
+ * @see eolian_unit_enum_by_name_get
*
* @ingroup Eolian
*/
-EAPI Eina_Iterator *eolian_unit_globals_get(const Eolian_Unit *unit);
+static inline const Eolian_Typedecl *
+eolian_state_enum_by_name_get(const Eolian_State *state, const char *name)
+{
+ return eolian_unit_enum_by_name_get(EOLIAN_UNIT(state), name);
+}
/*
- * @brief Get an alias type declaration within a unit by name.
+ * @brief Get an iterator to all aliases contained in a file.
*
- * @param[in] unit The unit.
- * @param[in] name The name of the alias.
+ * @param[in] state The state.
+ * @param[in] file_name The file name.
+ *
+ * Thanks to internal caching, this is an O(1) operation.
*
* @ingroup Eolian
*/
-EAPI const Eolian_Typedecl *eolian_unit_alias_by_name_get(const Eolian_Unit *unit, const char *name);
+EAPI Eina_Iterator *eolian_state_aliases_by_file_get(const Eolian_State *state, const char *file_name);
/*
- * @brief Get a struct declaration within a unit by name.
+ * @brief Get an iterator to all named structs contained in a file.
*
- * @param[in] unit The unit.
- * @param[in] name The name of the alias.
+ * @param[in] state The state.
+ * @param[in] file_name The file name.
+ *
+ * Thanks to internal caching, this is an O(1) operation.
*
* @ingroup Eolian
*/
-EAPI const Eolian_Typedecl *eolian_unit_struct_by_name_get(const Eolian_Unit *unit, const char *name);
+EAPI Eina_Iterator *eolian_state_structs_by_file_get(const Eolian_State *state, const char *file_name);
/*
- * @brief Get an enum declaration within a unit by name.
+ * @brief Get an iterator to all enums contained in a file.
*
- * @param[in] unit The unit.
- * @param[in] name The name of the alias.
+ * @param[in] state The state.
+ * @param[in] file_name The file name.
+ *
+ * Thanks to internal caching, this is an O(1) operation.
*
* @ingroup Eolian
*/
-EAPI const Eolian_Typedecl *eolian_unit_enum_by_name_get(const Eolian_Unit *unit, const char *name);
+EAPI Eina_Iterator *eolian_state_enums_by_file_get(const Eolian_State *state, const char *file_name);
/*
- * @brief Get an iterator to all aliases in the Eolian database.
+ * @brief A helper function to get all aliases in a state.
*
- * @param[in] unit The unit.
- *
- * Thanks to internal caching, this is an O(1) operation.
+ * @see eolian_unit_aliases_get
*
* @ingroup Eolian
*/
-EAPI Eina_Iterator *eolian_unit_aliases_get(const Eolian_Unit *unit);
+static inline Eina_Iterator *
+eolian_state_aliases_get(const Eolian_State *state)
+{
+ return eolian_unit_aliases_get(EOLIAN_UNIT(state));
+}
/*
- * @brief Get an iterator to all structs in the Eolian database.
+ * @brief A helper function to get all structs in a state.
*
- * @param[in] unit The unit.
- *
- * Thanks to internal caching, this is an O(1) operation.
+ * @see eolian_unit_structs_get
*
* @ingroup Eolian
*/
-EAPI Eina_Iterator *eolian_unit_structs_get(const Eolian_Unit *unit);
+static inline Eina_Iterator *
+eolian_state_structs_get(const Eolian_State *state)
+{
+ return eolian_unit_structs_get(EOLIAN_UNIT(state));
+}
/*
- * @brief Get an iterator to all enums in the Eolian database.
- *
- * @param[in] unit The unit.
+ * @brief A helper function to get all enums in a state.
*
- * Thanks to internal caching, this is an O(1) operation.
+ * @see eolian_unit_enums_get
*
* @ingroup Eolian
*/
-EAPI Eina_Iterator *eolian_unit_enums_get(const Eolian_Unit *unit);
+static inline Eina_Iterator *
+eolian_state_enums_get(const Eolian_State *state)
+{
+ return eolian_unit_enums_get(EOLIAN_UNIT(state));
+}
/*
* @brief A helper function to get the full name of a class.
diff --git a/src/lib/eolian/eolian_database.c b/src/lib/eolian/eolian_database.c
index 9cb4759cd1..1a8b9ab402 100644
--- a/src/lib/eolian/eolian_database.c
+++ b/src/lib/eolian/eolian_database.c
@@ -884,12 +884,6 @@ eolian_state_units_get(const Eolian_State *state)
return eina_hash_iterator_data_new(state->units);
}
-EAPI const Eolian_Object *
-eolian_state_object_by_name_get(const Eolian_State *state, const char *name)
-{
- return eolian_unit_object_by_name_get((Eolian_Unit *)state, name);
-}
-
EAPI Eina_Iterator *
eolian_state_objects_by_file_get(const Eolian_State *state, const char *file_name)
{
@@ -901,18 +895,6 @@ eolian_state_objects_by_file_get(const Eolian_State *state, const char *file_nam
return eina_list_iterator_new(l);
}
-EAPI Eina_Iterator *
-eolian_state_objects_get(const Eolian_State *state)
-{
- return eolian_unit_objects_get((Eolian_Unit *)state);
-}
-
-EAPI const Eolian_Class *
-eolian_state_class_by_name_get(const Eolian_State *state, const char *class_name)
-{
- return eolian_unit_class_by_name_get((Eolian_Unit *)state, class_name);
-}
-
EAPI const Eolian_Class *
eolian_state_class_by_file_get(const Eolian_State *state, const char *file_name)
{
@@ -924,24 +906,6 @@ eolian_state_class_by_file_get(const Eolian_State *state, const char *file_name)
}
EAPI Eina_Iterator *
-eolian_state_classes_get(const Eolian_State *state)
-{
- return eolian_unit_classes_get((Eolian_Unit *)state);
-}
-
-EAPI const Eolian_Variable *
-eolian_state_global_by_name_get(const Eolian_State *state, const char *name)
-{
- return eolian_unit_global_by_name_get((Eolian_Unit *)state, name);
-}
-
-EAPI const Eolian_Variable *
-eolian_state_constant_by_name_get(const Eolian_State *state, const char *name)
-{
- return eolian_unit_constant_by_name_get((Eolian_Unit *)state, name);
-}
-
-EAPI Eina_Iterator *
eolian_state_globals_by_file_get(const Eolian_State *state, const char *file_name)
{
if (!state) return NULL;
@@ -964,36 +928,6 @@ eolian_state_constants_by_file_get(const Eolian_State *state, const char *file_n
}
EAPI Eina_Iterator *
-eolian_state_constants_get(const Eolian_State *state)
-{
- return eolian_unit_constants_get((Eolian_Unit *)state);
-}
-
-EAPI Eina_Iterator *
-eolian_state_globals_get(const Eolian_State *state)
-{
- return eolian_unit_globals_get((Eolian_Unit *)state);
-}
-
-EAPI const Eolian_Typedecl *
-eolian_state_alias_by_name_get(const Eolian_State *state, const char *name)
-{
- return eolian_unit_alias_by_name_get((Eolian_Unit *)state, name);
-}
-
-EAPI const Eolian_Typedecl *
-eolian_state_struct_by_name_get(const Eolian_State *state, const char *name)
-{
- return eolian_unit_struct_by_name_get((Eolian_Unit *)state, name);
-}
-
-EAPI const Eolian_Typedecl *
-eolian_state_enum_by_name_get(const Eolian_State *state, const char *name)
-{
- return eolian_unit_enum_by_name_get((Eolian_Unit *)state, name);
-}
-
-EAPI Eina_Iterator *
eolian_state_aliases_by_file_get(const Eolian_State *state, const char *file_name)
{
if (!state) return NULL;
@@ -1027,24 +961,6 @@ eolian_state_enums_by_file_get(const Eolian_State *state, const char *file_name)
}
EAPI Eina_Iterator *
-eolian_state_aliases_get(const Eolian_State *state)
-{
- return eolian_unit_aliases_get((Eolian_Unit *)state);
-}
-
-EAPI Eina_Iterator *
-eolian_state_structs_get(const Eolian_State *state)
-{
- return eolian_unit_structs_get((Eolian_Unit *)state);
-}
-
-EAPI Eina_Iterator *
-eolian_state_enums_get(const Eolian_State *state)
-{
- return eolian_unit_enums_get((Eolian_Unit *)state);
-}
-
-EAPI Eina_Iterator *
eolian_unit_children_get(const Eolian_Unit *unit)
{
if (!unit) return NULL;