kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

eolian: make sure dtors are always run correctly

This commit is contained in:
Daniel Kolesa 2018-03-15 16:34:08 +01:00
parent df83efcef9
commit edc73c4c4c
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/lib/eolian/eo_lexer.c
View File

@ -1142,6 +1142,7 @@ eo_lexer_dtor_pop(Eo_Lexer *ls)
{
Eo_Lexer_Dtor *dt = eina_list_data_get(ls->dtors);
ls->dtors = eina_list_remove_list(ls->dtors, ls->dtors);
dt->free_cb(dt->data);
free(dt);
}

21
src/lib/eolian/eo_parser.c
View File

@ -436,8 +436,11 @@ parse_struct(Eo_Lexer *ls, const char *name, Eina_Bool is_extern,
def->base.name = name;
def->type = EOLIAN_TYPEDECL_STRUCT;
def->fields = eina_hash_string_small_new(EINA_FREE_CB(_struct_field_free));
def->freefunc = freefunc;
eo_lexer_dtor_pop(ls);
if (freefunc)
{
def->freefunc = eina_stringshare_ref(freefunc);
eo_lexer_dtor_pop(ls);
}
check_next(ls, '{');
FILL_DOC(ls, def, doc);
while (ls->t.token != '}')
@ -779,8 +782,11 @@ parse_typedef(Eo_Lexer *ls)
Eina_Strbuf *buf;
eo_lexer_get(ls);
parse_struct_attrs(ls, EINA_FALSE, &has_extern, &freefunc);
def->freefunc = freefunc;
eo_lexer_dtor_pop(ls);
if (freefunc)
{
def->freefunc = eina_stringshare_ref(freefunc);
eo_lexer_dtor_pop(ls);
}
def->type = EOLIAN_TYPEDECL_ALIAS;
def->is_extern = has_extern;
buf = eina_strbuf_new();
@ -2141,8 +2147,11 @@ parse_unit(Eo_Lexer *ls, Eina_Bool eot)
Eolian_Typedecl *def = eo_lexer_typedecl_new(ls);
def->is_extern = has_extern;
def->type = EOLIAN_TYPEDECL_STRUCT_OPAQUE;
def->freefunc = freefunc;
eo_lexer_dtor_pop(ls);
if (freefunc)
{
def->freefunc = eina_stringshare_ref(freefunc);
eo_lexer_dtor_pop(ls);
}
def->base.name = name;
eo_lexer_get(ls);
FILL_DOC(ls, def, doc);