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

eolian: string(share) is always const, allow in events out of box

This commit is contained in:
Daniel Kolesa 2019-09-20 17:46:56 +02:00
parent 718f3cd495
commit 7cbd08ee8c
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -606,6 +606,7 @@ _validate_event(Validate_State *vals, Eolian_Event *event, Eina_Hash *nhash)
_eo_parser_log(&tp->base, "pointers not allowed in events");
return _reset_stable(vals, was_stable, EINA_FALSE);
}
int kwid = eo_lexer_keyword_str_to_id(tp->base.name);
/* require containers to be const for now...
*
* this is FIXME, and decision wasn't reached before 1.22
@ -613,10 +614,17 @@ _validate_event(Validate_State *vals, Eolian_Event *event, Eina_Hash *nhash)
*/
if (database_type_is_ownable(tp->base.unit, tp, EINA_FALSE))
{
if (!tp->is_const)
switch (kwid)
{
_eo_parser_log(&tp->base, "event container types must be const");
return _reset_stable(vals, was_stable, EINA_FALSE);
case KW_string:
case KW_stringshare:
break;
default:
if (!tp->is_const)
{
_eo_parser_log(&tp->base, "event container types must be const");
return _reset_stable(vals, was_stable, EINA_FALSE);
}
}
}
else if (tp->is_const)
@ -624,7 +632,6 @@ _validate_event(Validate_State *vals, Eolian_Event *event, Eina_Hash *nhash)
_eo_parser_log(&tp->base, "event value types cannot be const");
return _reset_stable(vals, was_stable, EINA_FALSE);
}
int kwid = eo_lexer_keyword_str_to_id(tp->base.name);
/* containers are allowed but not iterators/lists */
if (kwid == KW_iterator || kwid == KW_list)
{