q66 pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=70ee11af84bf81a16eefdf577ce4e4ecb62dcdef
commit 70ee11af84bf81a16eefdf577ce4e4ecb62dcdef Author: Daniel Kolesa <[email protected]> Date: Wed Nov 8 16:46:14 2017 +0100 eolian: enable cyclic imports of eo files --- src/lib/eolian/eo_parser.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/src/lib/eolian/eo_parser.c b/src/lib/eolian/eo_parser.c index db8878a5c7..a231e722e1 100644 --- a/src/lib/eolian/eo_parser.c +++ b/src/lib/eolian/eo_parser.c @@ -2176,21 +2176,7 @@ parse_unit(Eo_Lexer *ls, Eina_Bool eot) } else is_eo = EINA_TRUE; } - if (eina_hash_find(_parsingeos, found)) - { - pop_strbuf(ls); - snprintf(errbuf, sizeof(errbuf), - "cyclic import '%s'", ls->t.value.s); - eo_lexer_syntax_error(ls, errbuf); - } - pop_strbuf(ls); - if (!eo_parser_database_fill(found, !is_eo, NULL)) - { - pop_strbuf(ls); - snprintf(errbuf, sizeof(errbuf), - "error while parsing import '%s'", ls->t.value.s); - eo_lexer_syntax_error(ls, errbuf); - } + eina_hash_set(_defereos, eina_strbuf_string_get(buf), found); pop_strbuf(ls); eo_lexer_get(ls); check_next(ls, ';'); --
