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

eolian: remove obsolete code dealing with multiple classes per file

This commit is contained in:
Daniel Kolesa 2015-05-22 16:46:07 +01:00
parent 9bbc224f96
commit b339313e4b
5 changed files with 11 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/lib/eolian/database_fill.c
View File

@ -235,20 +235,15 @@ eo_parser_database_fill(const char *filename, Eina_Bool eot)
if (eot) goto done;
if (!eina_list_count(ls->tmp.classes))
if (!(cl = ls->tmp.kls))
{
fprintf(stderr, "eolian: no classes for file '%s'\n", filename);
fprintf(stderr, "eolian: no class for file '%s'\n", filename);
goto error;
}
ls->tmp.kls = NULL;
while (ls->tmp.classes)
{
cl = eina_list_data_get(ls->tmp.classes);
if (!_db_fill_class(cl))
goto error;
ls->tmp.classes = eina_list_remove_list(ls->tmp.classes,
ls->tmp.classes);
}
if (!_db_fill_class(cl))
goto error;
done:
if (eot)

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

@ -677,7 +677,6 @@ _temps_free(Eo_Lexer_Temps *tmp)
{
Eina_Strbuf *buf;
Eolian_Type *tp;
Eolian_Class *cl;
const char *s;
if (tmp->kls)
@ -697,9 +696,6 @@ _temps_free(Eo_Lexer_Temps *tmp)
EINA_LIST_FREE(tmp->strs, s)
if (s) eina_stringshare_del(s);
EINA_LIST_FREE(tmp->classes, cl)
database_class_del(cl);
}
void

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

@ -98,7 +98,6 @@ typedef struct _Eo_Lexer_Temps
{
Eolian_Class *kls;
Eolian_Variable *var;
Eina_List *classes;
Eina_List *str_bufs;
Eina_List *type_defs;
Eina_List *expr_defs;

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

@ -1942,8 +1942,6 @@ parse_unit(Eo_Lexer *ls, Eina_Bool eot)
return EINA_FALSE;
found_class:
database_decl_add(ls->tmp.kls->full_name, EOLIAN_DECL_CLASS, ls->tmp.kls);
ls->tmp.classes = eina_list_append(ls->tmp.classes, ls->tmp.kls);
ls->tmp.kls = NULL;
return EINA_TRUE;
}

15
src/lib/eolian/eolian_database.c
View File

@ -228,20 +228,17 @@ eolian_eo_file_parse(const char *filepath)
Eolian_Constructor *ctor;
if (!class)
{
const char *full_filepath = eina_hash_find(_filenames, bfilename);
if (!full_filepath) full_filepath = filepath;
if (!eo_parser_database_fill(full_filepath, EINA_FALSE))
if (!eo_parser_database_fill(filepath, EINA_FALSE))
{
free(bfiledup);
goto error;
}
class = eolian_class_get_by_file(bfilename);
if (!class)
{
fprintf(stderr, "eolian: no class for file '%s'\n", bfilename);
free(bfiledup);
goto error;
}
}
else
{
free(bfiledup);
return EINA_TRUE;
}
free(bfiledup);
itr = eolian_class_implements_get(class);