q66 pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=058a3c314cdf069b41708ce7516e49c637e31d42
commit 058a3c314cdf069b41708ce7516e49c637e31d42 Author: Daniel Kolesa <[email protected]> Date: Mon Jul 21 16:57:45 2014 +0100 eolian: rename _types to _aliases --- src/lib/eolian/Eolian.h | 4 ++-- src/lib/eolian/database_print.c | 4 ++-- src/lib/eolian/database_type.c | 6 +++--- src/lib/eolian/database_type_api.c | 12 ++++++------ src/lib/eolian/eo_parser.c | 2 +- src/lib/eolian/eolian_database.c | 6 +++--- src/lib/eolian/eolian_database.h | 2 +- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/lib/eolian/Eolian.h b/src/lib/eolian/Eolian.h index 3138432..e4d72f1 100644 --- a/src/lib/eolian/Eolian.h +++ b/src/lib/eolian/Eolian.h @@ -897,10 +897,10 @@ EAPI Eina_Stringshare *eolian_type_file_get(const Eolian_Type *tp); EAPI const Eolian_Type *eolian_type_return_type_get(const Eolian_Type *tp); /* - * @brief Get the base type of a function type. + * @brief Get the base type of a pointer or alias type. * * @param[in] tp the type. - * @return the base type when @c tp is an EOLIAN_TYPE_POINTER, NULL otherwise. + * @return the base type when @c tp is a pointer or alias, NULL otherwise. * * @ingroup Eolian */ diff --git a/src/lib/eolian/database_print.c b/src/lib/eolian/database_print.c index fbf7370..afbee3c 100644 --- a/src/lib/eolian/database_print.c +++ b/src/lib/eolian/database_print.c @@ -296,11 +296,11 @@ EAPI Eina_Bool eolian_show_typedef(const char *alias) { if (!alias) - eina_hash_foreach(_types, (Eina_Hash_Foreach)_typedef_cb, NULL); + eina_hash_foreach(_aliases, (Eina_Hash_Foreach)_typedef_cb, NULL); else { Eina_Stringshare *shr = eina_stringshare_add(alias); - Eolian_Type *tp = eina_hash_find(_types, shr); + Eolian_Type *tp = eina_hash_find(_aliases, shr); eina_stringshare_del(shr); if (!tp) return EINA_FALSE; _typedef_cb(NULL, alias, tp, NULL); diff --git a/src/lib/eolian/database_type.c b/src/lib/eolian/database_type.c index 4d8008e..60353df 100644 --- a/src/lib/eolian/database_type.c +++ b/src/lib/eolian/database_type.c @@ -31,15 +31,15 @@ database_type_del(Eolian_Type *tp) Eina_Bool database_type_add(Eolian_Type *def) { - if (!_types) return EINA_FALSE; - eina_hash_set(_types, def->full_name, def); + if (!_aliases) return EINA_FALSE; + eina_hash_set(_aliases, def->full_name, def); return EINA_TRUE; } Eina_Bool database_struct_add(Eolian_Type *tp) { if (!_structs) return EINA_FALSE; - eina_hash_set(_structs, tp->name, tp); + eina_hash_set(_structs, tp->full_name, tp); return EINA_TRUE; } diff --git a/src/lib/eolian/database_type_api.c b/src/lib/eolian/database_type_api.c index 51e52e4..1b386e8 100644 --- a/src/lib/eolian/database_type_api.c +++ b/src/lib/eolian/database_type_api.c @@ -5,9 +5,9 @@ EAPI const Eolian_Type * eolian_type_find_by_alias(const char *alias) { - if (!_types) return NULL; + if (!_aliases) return NULL; Eina_Stringshare *shr = eina_stringshare_add(alias); - Eolian_Type *def = eina_hash_find(_types, shr); + Eolian_Type *def = eina_hash_find(_aliases, shr); eina_stringshare_del(shr); return def ? def->base_type : NULL; } @@ -15,9 +15,9 @@ eolian_type_find_by_alias(const char *alias) EAPI Eina_Bool eolian_typedef_is_extern(const char *alias) { - if (!_types) return EINA_FALSE; + if (!_aliases) return EINA_FALSE; Eina_Stringshare *shr = eina_stringshare_add(alias); - Eolian_Type *def = eina_hash_find(_types, shr); + Eolian_Type *def = eina_hash_find(_aliases, shr); eina_stringshare_del(shr); return def ? def->is_extern : EINA_FALSE; } @@ -25,9 +25,9 @@ eolian_typedef_is_extern(const char *alias) EAPI Eina_Stringshare * eolian_typedef_file_get(const char *alias) { - if (!_types) return EINA_FALSE; + if (!_aliases) return EINA_FALSE; Eina_Stringshare *shr = eina_stringshare_add(alias); - Eolian_Type *def = eina_hash_find(_types, shr); + Eolian_Type *def = eina_hash_find(_aliases, shr); eina_stringshare_del(shr); return def ? eina_stringshare_ref(def->file) : NULL; } diff --git a/src/lib/eolian/eo_parser.c b/src/lib/eolian/eo_parser.c index 98b834a..bb9a77d 100644 --- a/src/lib/eolian/eo_parser.c +++ b/src/lib/eolian/eo_parser.c @@ -478,7 +478,7 @@ parse_typedef(Eo_Lexer *ls) parse_name(ls, buf); _fill_type_name(def, eina_stringshare_add(eina_strbuf_string_get(buf))); /* todo: store info about the previous definition and mention it here */ - if (eina_hash_find(_types, eina_strbuf_string_get(buf))) + if (eina_hash_find(_aliases, eina_strbuf_string_get(buf))) { ls->line_number = line; ls->column = col; diff --git a/src/lib/eolian/eolian_database.c b/src/lib/eolian/eolian_database.c index 687c07e..081e5fc 100644 --- a/src/lib/eolian/eolian_database.c +++ b/src/lib/eolian/eolian_database.c @@ -3,7 +3,7 @@ #include "eolian_database.h" Eina_List *_classes = NULL; -Eina_Hash *_types = NULL; +Eina_Hash *_aliases = NULL; Eina_Hash *_structs = NULL; Eina_Hash *_filenames = NULL; Eina_Hash *_tfilenames = NULL; @@ -15,7 +15,7 @@ database_init() { if (_database_init_count > 0) return ++_database_init_count; eina_init(); - _types = eina_hash_stringshared_new(EINA_FREE_CB(database_type_del)); + _aliases = eina_hash_stringshared_new(EINA_FREE_CB(database_type_del)); _structs = eina_hash_stringshared_new(EINA_FREE_CB(database_type_del)); _filenames = eina_hash_string_small_new(free); _tfilenames = eina_hash_string_small_new(free); @@ -37,7 +37,7 @@ database_shutdown() Eolian_Class *class; EINA_LIST_FREE(_classes, class) database_class_del(class); - eina_hash_free(_types); + eina_hash_free(_aliases); eina_hash_free(_structs); eina_hash_free(_filenames); eina_hash_free(_tfilenames); diff --git a/src/lib/eolian/eolian_database.h b/src/lib/eolian/eolian_database.h index 4fa0836..13c5125 100644 --- a/src/lib/eolian/eolian_database.h +++ b/src/lib/eolian/eolian_database.h @@ -40,7 +40,7 @@ extern Eina_Prefix *_eolian_prefix; #define EOLIAN_PROP_SET_RETURN_COMMENT "property_set_return_comment" extern Eina_List *_classes; -extern Eina_Hash *_types; +extern Eina_Hash *_aliases; extern Eina_Hash *_structs; extern Eina_Hash *_filenames; /* Hash: filename without extension -> full path */ extern Eina_Hash *_tfilenames; --
