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

eolian: add (for now disabled) inherit validity checks 

Somehow I cannot enable this right now because we have issues with existing
eo files that need to be resolved first.
This commit is contained in:
Daniel Kolesa 2016-06-14 14:09:13 +01:00
parent 2e052d5694
commit 70d2866662
1 changed files with 39 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,3 +1,5 @@
#include <assert.h>
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
@ -1817,7 +1819,8 @@ parse_class_body(Eo_Lexer *ls, Eolian_Class_Type type)
}
static void
_inherit_dep(Eo_Lexer *ls, Eina_Strbuf *buf)
_inherit_dep(Eo_Lexer *ls, Eina_Strbuf *buf, Eina_Bool check_inherit,
Eolian_Class_Type type)
{
const char *fname, *iname;
char *fnm;
@ -1846,6 +1849,39 @@ _inherit_dep(Eo_Lexer *ls, Eina_Strbuf *buf)
eo_lexer_syntax_error(ls, ebuf);
}
_parse_dep(ls, fname, iname);
const Eolian_Class *dep = eolian_class_get_by_name(iname);
assert(dep != NULL);
if (check_inherit) switch (type)
{
case EOLIAN_CLASS_REGULAR:
case EOLIAN_CLASS_ABSTRACT:
#if 0
if (dep->type != EOLIAN_CLASS_REGULAR && dep->type != EOLIAN_CLASS_ABSTRACT)
{
char ebuf[PATH_MAX];
eo_lexer_context_restore(ls);
snprintf(ebuf, sizeof(ebuf), "regular classes ('%s') cannot inherit from non-regular classes ('%s')",
ls->tmp.kls->full_name, iname);
eo_lexer_syntax_error(ls, ebuf);
}
#endif
break;
case EOLIAN_CLASS_MIXIN:
case EOLIAN_CLASS_INTERFACE:
#if 0
if (dep->type != EOLIAN_CLASS_MIXIN && dep->type != EOLIAN_CLASS_INTERFACE)
{
char ebuf[PATH_MAX];
eo_lexer_context_restore(ls);
snprintf(ebuf, sizeof(ebuf), "non-regular classes ('%s') cannot inherit from regular classes ('%s')",
ls->tmp.kls->full_name, iname);
eo_lexer_syntax_error(ls, ebuf);
}
#endif
break;
default:
break;
}
ls->tmp.kls->inherits = eina_list_append(ls->tmp.kls->inherits,
eina_stringshare_add(iname));
eo_lexer_context_pop(ls);
@ -1895,9 +1931,9 @@ parse_class(Eo_Lexer *ls, Eolian_Class_Type type)
if (ls->t.token != ')')
{
Eina_Strbuf *ibuf = push_strbuf(ls);
_inherit_dep(ls, ibuf);
_inherit_dep(ls, ibuf, EINA_TRUE, type);
while (test_next(ls, ','))
_inherit_dep(ls, ibuf);
_inherit_dep(ls, ibuf, EINA_FALSE, type);
pop_strbuf(ls);
}
check_match(ls, ')', '(', line, col);