summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Kolesa <d.kolesa@osg.samsung.com>2017-11-08 16:46:14 +0100
committerDaniel Kolesa <d.kolesa@osg.samsung.com>2017-11-08 16:46:14 +0100
commit70ee11af84bf81a16eefdf577ce4e4ecb62dcdef (patch)
treefc7dcfe8577c4448935e05f183480acf3cc3437d
parent5c2611d93a58bff942e49202053cad3e0090540d (diff)
eolian: enable cyclic imports of eo files
-rw-r--r--src/lib/eolian/eo_parser.c16
1 files changed, 1 insertions, 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)
2176 } 2176 }
2177 else is_eo = EINA_TRUE; 2177 else is_eo = EINA_TRUE;
2178 } 2178 }
2179 if (eina_hash_find(_parsingeos, found)) 2179 eina_hash_set(_defereos, eina_strbuf_string_get(buf), found);
2180 {
2181 pop_strbuf(ls);
2182 snprintf(errbuf, sizeof(errbuf),
2183 "cyclic import '%s'", ls->t.value.s);
2184 eo_lexer_syntax_error(ls, errbuf);
2185 }
2186 pop_strbuf(ls);
2187 if (!eo_parser_database_fill(found, !is_eo, NULL))
2188 {
2189 pop_strbuf(ls);
2190 snprintf(errbuf, sizeof(errbuf),
2191 "error while parsing import '%s'", ls->t.value.s);
2192 eo_lexer_syntax_error(ls, errbuf);
2193 }
2194 pop_strbuf(ls); 2180 pop_strbuf(ls);
2195 eo_lexer_get(ls); 2181 eo_lexer_get(ls);
2196 check_next(ls, ';'); 2182 check_next(ls, ';');