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

eolian: cleanup

This commit is contained in:
Daniel Kolesa 2014-06-18 16:36:29 +01:00
parent 9d48e256dc
commit b39b37d732
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1160,7 +1160,6 @@ eo_parser_walk(Eo_Lexer *ls)
Eina_Bool Eina_Bool
eo_parser_database_fill(const char *filename) eo_parser_database_fill(const char *filename)
{ {
Eina_Bool ret = EINA_FALSE;
const char *s; const char *s;
Eina_List *k, *l, *m; Eina_List *k, *l, *m;
@ -1177,18 +1176,23 @@ eo_parser_database_fill(const char *filename)
if (!ls) if (!ls)
{ {
ERR("unable to create lexer"); ERR("unable to create lexer");
goto end; return EINA_FALSE;
} }
/* read first token */ /* read first token */
eo_lexer_get(ls); eo_lexer_get(ls);
if (!eo_parser_walk(ls)) goto end; if (!eo_parser_walk(ls))
{
eo_lexer_free(ls);
return EINA_FALSE;
}
if (!ls->classes) if (!ls->classes)
{ {
ERR("No classes for file %s", filename); ERR("No classes for file %s", filename);
goto end; eo_lexer_free(ls);
return EINA_FALSE;
} }
EINA_LIST_FOREACH(ls->classes, k, kls) EINA_LIST_FOREACH(ls->classes, k, kls)
@ -1344,7 +1348,8 @@ eo_parser_database_fill(const char *filename)
if (!foo_id) if (!foo_id)
{ {
ERR("Error - %s not known in class %s", impl_name + 9, eolian_class_name_get(class)); ERR("Error - %s not known in class %s", impl_name + 9, eolian_class_name_get(class));
goto end; eo_lexer_free(ls);
return EINA_FALSE;
} }
database_function_set_as_virtual_pure(foo_id, ftype); database_function_set_as_virtual_pure(foo_id, ftype);
continue; continue;
@ -1366,8 +1371,6 @@ eo_parser_database_fill(const char *filename)
database_type_add(type_def->alias, type_def->type); database_type_add(type_def->alias, type_def->type);
} }
ret = EINA_TRUE; eo_lexer_free(ls);
end: return EINA_TRUE;
if (ls) eo_lexer_free(ls);
return ret;
} }