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

eolian: parsing of new @owned syntax for complex types

This commit is contained in:
Daniel Kolesa 2017-09-15 16:24:46 +02:00
parent 4c4c641c4b
commit 792855a1fa
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -517,8 +517,7 @@ parse_struct(Eo_Lexer *ls, const char *name, Eina_Bool is_extern,
fdef->type = tp;
fdef->name = eina_stringshare_ref(fname);
pop_type(ls);
fdef->owned = (ls->t.kw == KW_at_owned);
if (fdef->owned)
if ((fdef->owned = (ls->t.kw == KW_at_owned)))
eo_lexer_get(ls);
check_next(ls, ';');
FILL_DOC(ls, fdef, doc);
@ -827,11 +826,15 @@ parse_type_void(Eo_Lexer *ls, Eina_Bool allow_ref, Eina_Bool allow_sarray)
else
def->base_type = parse_type(ls, EINA_FALSE, EINA_FALSE);
pop_type(ls);
if ((def->base_type->owned = (ls->t.kw == KW_at_owned)))
eo_lexer_get(ls);
if (tpid == KW_hash)
{
check_next(ls, ',');
def->base_type->next_type = parse_type(ls, EINA_FALSE, EINA_FALSE);
pop_type(ls);
if ((def->base_type->next_type->owned = (ls->t.kw == KW_at_owned)))
eo_lexer_get(ls);
}
else if((tpid == KW_future) && test_next(ls, ','))
{

1
src/lib/eolian/eolian_database.h
View File

@ -169,6 +169,7 @@ struct _Eolian_Type
Eina_Bool is_const :1;
Eina_Bool is_own :1;
Eina_Bool is_ptr :1;
Eina_Bool owned :1;
};
struct _Eolian_Typedecl