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

eolian: move terminated_array typecheck to validate pass

This commit is contained in:
Daniel Kolesa 2017-09-08 14:43:19 +02:00
parent a0adca9cb9
commit 2a9be1f5be
2 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/lib/eolian/database_validate.c
View File

@ -127,6 +127,20 @@ _validate_typedecl(const Eolian_Typedecl *tp)
return EINA_TRUE;
}
static Eina_Bool
_type_is_terminatable(const Eolian_Type *tp)
{
if (database_type_is_ownable(tp))
return EINA_TRUE;
if (tp->type == EOLIAN_TYPE_REGULAR)
{
int kwid = eo_lexer_keyword_str_to_id(tp->name);
/* don't include bool, it only has 2 values so it's useless */
return (kwid >= KW_byte && kwid < KW_bool);
}
return EINA_FALSE;
}
static Eina_Bool
_validate_type(const Eolian_Type *tp)
{
@ -160,8 +174,16 @@ _validate_type(const Eolian_Type *tp)
}
return _validate_typedecl(tpp);
}
case EOLIAN_TYPE_STATIC_ARRAY:
case EOLIAN_TYPE_TERMINATED_ARRAY:
if (!_type_is_terminatable(tp->base_type))
{
snprintf(buf, sizeof(buf),
"invalid base type '%s' for terminated array",
tp->base_type->full_name);
return _type_error(tp, buf);
}
return _validate_type(tp->base_type);
case EOLIAN_TYPE_STATIC_ARRAY:
return _validate_type(tp->base_type);
case EOLIAN_TYPE_CLASS:
{

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

@ -684,20 +684,6 @@ _parse_dep(Eo_Lexer *ls, const char *fname, const char *name)
}
}
static Eina_Bool
_type_is_terminatable(Eolian_Type *tp)
{
if (database_type_is_ownable(tp))
return EINA_TRUE;
if (tp->type == EOLIAN_TYPE_REGULAR)
{
int kwid = eo_lexer_keyword_str_to_id(tp->name);
/* don't include bool, it only has 2 values so it's useless */
return (kwid >= KW_byte && kwid < KW_bool);
}
return EINA_FALSE;
}
static Eolian_Type *
parse_type_void(Eo_Lexer *ls, Eina_Bool allow_ref, Eina_Bool allow_sarray)
{
@ -814,14 +800,7 @@ parse_type_void(Eo_Lexer *ls, Eina_Bool allow_ref, Eina_Bool allow_sarray)
def->type = EOLIAN_TYPE_TERMINATED_ARRAY;
eo_lexer_get(ls);
check_next(ls, '<');
eo_lexer_context_push(ls);
def->base_type = parse_type(ls, EINA_FALSE, EINA_FALSE);
if (!_type_is_terminatable(def->base_type))
{
eo_lexer_context_restore(ls);
eo_lexer_syntax_error(ls, "terminatable type expected");
}
eo_lexer_context_pop(ls);
pop_type(ls);
check_next(ls, '>');
}