eolian: clean up some temporary hashes

This commit is contained in:
Daniel Kolesa 2016-03-01 15:13:12 +00:00
parent c3a33653f3
commit 1f58ccb49f
4 changed files with 9 additions and 27 deletions

View File

@ -98,9 +98,7 @@ database_type_add(Eolian_Type *def)
def->decl->type = EOLIAN_TYPEDECL_ALIAS;
eina_hash_set(_aliases, def->full_name, def);
eina_hash_set(_aliasesf, def->base.file, eina_list_append
((Eina_List*)eina_hash_find(_aliasesf, def->base.file), def));
eina_hash_set(_aliasesd, def->base.file, eina_list_append
((Eina_List*)eina_hash_find(_aliasesd, def->base.file), def->decl));
((Eina_List*)eina_hash_find(_aliasesf, def->base.file), def->decl));
database_decl_add(def->full_name, EOLIAN_DECL_ALIAS, def->base.file, def->decl);
}
@ -112,9 +110,7 @@ database_struct_add(Eolian_Type *tp)
: EOLIAN_TYPEDECL_STRUCT;
eina_hash_set(_structs, tp->full_name, tp);
eina_hash_set(_structsf, tp->base.file, eina_list_append
((Eina_List*)eina_hash_find(_structsf, tp->base.file), tp));
eina_hash_set(_structsd, tp->base.file, eina_list_append
((Eina_List*)eina_hash_find(_structsd, tp->base.file), tp->decl));
((Eina_List*)eina_hash_find(_structsf, tp->base.file), tp->decl));
database_decl_add(tp->full_name, EOLIAN_DECL_STRUCT, tp->base.file, tp->decl);
}
@ -125,9 +121,7 @@ database_enum_add(Eolian_Type *tp)
tp->decl->type = EOLIAN_TYPEDECL_ENUM;
eina_hash_set(_enums, tp->full_name, tp);
eina_hash_set(_enumsf, tp->base.file, eina_list_append
((Eina_List*)eina_hash_find(_enumsf, tp->base.file), tp));
eina_hash_set(_enumsd, tp->base.file, eina_list_append
((Eina_List*)eina_hash_find(_enumsd, tp->base.file), tp->decl));
((Eina_List*)eina_hash_find(_enumsf, tp->base.file), tp->decl));
database_decl_add(tp->full_name, EOLIAN_DECL_ENUM, tp->base.file, tp->decl);
}

View File

@ -42,9 +42,9 @@ eolian_typedecl_enum_get_by_name(const char *name)
EAPI Eina_Iterator *
eolian_typedecl_aliases_get_by_file(const char *fname)
{
if (!_aliasesd) return NULL;
if (!_aliasesf) return NULL;
Eina_Stringshare *shr = eina_stringshare_add(fname);
Eina_List *l = eina_hash_find(_aliasesd, shr);
Eina_List *l = eina_hash_find(_aliasesf, shr);
eina_stringshare_del(shr);
if (!l) return NULL;
return eina_list_iterator_new(l);
@ -53,9 +53,9 @@ eolian_typedecl_aliases_get_by_file(const char *fname)
EAPI Eina_Iterator *
eolian_typedecl_structs_get_by_file(const char *fname)
{
if (!_structsd) return NULL;
if (!_structsf) return NULL;
Eina_Stringshare *shr = eina_stringshare_add(fname);
Eina_List *l = eina_hash_find(_structsd, shr);
Eina_List *l = eina_hash_find(_structsf, shr);
eina_stringshare_del(shr);
if (!l) return NULL;
return eina_list_iterator_new(l);
@ -64,9 +64,9 @@ eolian_typedecl_structs_get_by_file(const char *fname)
EAPI Eina_Iterator *
eolian_typedecl_enums_get_by_file(const char *fname)
{
if (!_enumsd) return NULL;
if (!_enumsf) return NULL;
Eina_Stringshare *shr = eina_stringshare_add(fname);
Eina_List *l = eina_hash_find(_enumsd, shr);
Eina_List *l = eina_hash_find(_enumsf, shr);
eina_stringshare_del(shr);
if (!l) return NULL;
return eina_list_iterator_new(l);

View File

@ -17,9 +17,6 @@ Eina_Hash *_classesf = NULL;
Eina_Hash *_aliasesf = NULL;
Eina_Hash *_structsf = NULL;
Eina_Hash *_enumsf = NULL;
Eina_Hash *_aliasesd = NULL;
Eina_Hash *_structsd = NULL;
Eina_Hash *_enumsd = NULL;
Eina_Hash *_globalsf = NULL;
Eina_Hash *_constantsf = NULL;
Eina_Hash *_filenames = NULL;
@ -57,9 +54,6 @@ database_init()
_enumsf = eina_hash_stringshared_new(_hashlist_free);
_globalsf = eina_hash_stringshared_new(_hashlist_free);
_constantsf = eina_hash_stringshared_new(_hashlist_free);
_aliasesd = eina_hash_stringshared_new(_hashlist_free);
_structsd = eina_hash_stringshared_new(_hashlist_free);
_enumsd = eina_hash_stringshared_new(_hashlist_free);
_filenames = eina_hash_string_small_new(free);
_tfilenames = eina_hash_string_small_new(free);
_decls = eina_hash_stringshared_new(free);
@ -94,9 +88,6 @@ database_shutdown()
eina_hash_free(_enumsf ); _enumsf = NULL;
eina_hash_free(_globalsf ); _globalsf = NULL;
eina_hash_free(_constantsf); _constantsf = NULL;
eina_hash_free(_aliasesd ); _aliasesd = NULL;
eina_hash_free(_structsd ); _structsd = NULL;
eina_hash_free(_enumsd ); _enumsd = NULL;
eina_hash_free(_filenames ); _filenames = NULL;
eina_hash_free(_tfilenames); _tfilenames = NULL;
eina_hash_free(_decls ); _decls = NULL;

View File

@ -41,9 +41,6 @@ extern Eina_Hash *_classesf;
extern Eina_Hash *_aliasesf;
extern Eina_Hash *_structsf;
extern Eina_Hash *_enumsf;
extern Eina_Hash *_aliasesd;
extern Eina_Hash *_structsd;
extern Eina_Hash *_enumsd;
extern Eina_Hash *_globalsf;
extern Eina_Hash *_constantsf;
extern Eina_Hash *_filenames; /* Hash: filename without extension -> full path */