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

eolian: remove old support for Efl_Future.

This commit is contained in:
Cedric BAIL 2018-04-30 15:21:58 -07:00
parent e8e6fe1d8d
commit 042de32421
5 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/eolian/Eolian.h
View File

@ -326,8 +326,6 @@ typedef enum
EOLIAN_TYPE_BUILTIN_INARRAY, EOLIAN_TYPE_BUILTIN_INARRAY,
EOLIAN_TYPE_BUILTIN_INLIST, EOLIAN_TYPE_BUILTIN_INLIST,
EOLIAN_TYPE_BUILTIN_FUTURE,
EOLIAN_TYPE_BUILTIN_ANY_VALUE, EOLIAN_TYPE_BUILTIN_ANY_VALUE,
EOLIAN_TYPE_BUILTIN_ANY_VALUE_PTR, EOLIAN_TYPE_BUILTIN_ANY_VALUE_PTR,

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

@ -185,9 +185,7 @@ static const char * const eo_complex_frees[] =
{ {
"eina_accessor_free", "eina_array_free", "eina_accessor_free", "eina_array_free",
"eina_iterator_free", "eina_hash_free", "eina_iterator_free", "eina_hash_free",
"eina_list_free", "eina_inarray_free", "eina_inlist_free", "eina_list_free", "eina_inarray_free", "eina_inlist_free"
"efl_del" /* future */
}; };
static const char *eo_obj_free = "efl_del"; static const char *eo_obj_free = "efl_del";

1
src/lib/eolian/eo_lexer.c
View File

@ -74,7 +74,6 @@ static const char * const ctypes[] =
"Eina_Accessor *", "Eina_Array *", "Eina_Iterator *", "Eina_Hash *", "Eina_Accessor *", "Eina_Array *", "Eina_Iterator *", "Eina_Hash *",
"Eina_List *", "Eina_Inarray *", "Eina_Inlist *", "Eina_List *", "Eina_Inarray *", "Eina_Inlist *",
"Efl_Future *",
"Eina_Value", "Eina_Value *", "Eina_Value", "Eina_Value *",
"char *", "const char *", "Eina_Stringshare *", "Eina_Strbuf *", "char *", "const char *", "Eina_Stringshare *", "Eina_Strbuf *",

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

@ -52,7 +52,6 @@ enum Tokens
KW(void), \ KW(void), \
\ \
KW(accessor), KW(array), KW(iterator), KW(hash), KW(list), KW(inarray), KW(inlist), \ KW(accessor), KW(array), KW(iterator), KW(hash), KW(list), KW(inarray), KW(inlist), \
KW(future), \
KW(any_value), KW(any_value_ptr), \ KW(any_value), KW(any_value_ptr), \
KW(mstring), KW(string), KW(stringshare), KW(strbuf), \ KW(mstring), KW(string), KW(stringshare), KW(strbuf), \
\ \

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

@ -714,14 +714,11 @@ parse_type_void(Eo_Lexer *ls)
def->btype = ls->t.kw - KW_byte + 1; def->btype = ls->t.kw - KW_byte + 1;
def->base.name = eina_stringshare_ref(ls->t.value.s); def->base.name = eina_stringshare_ref(ls->t.value.s);
eo_lexer_get(ls); eo_lexer_get(ls);
if (tpid >= KW_accessor && tpid <= KW_future) if (tpid >= KW_accessor && tpid <= KW_inlist)
{ {
int bline = ls->line_number, bcol = ls->column; int bline = ls->line_number, bcol = ls->column;
check_next(ls, '<'); check_next(ls, '<');
if (tpid == KW_future) def->base_type = eo_lexer_type_release(ls, parse_type(ls));
def->base_type = eo_lexer_type_release(ls, parse_type_void(ls));
else
def->base_type = eo_lexer_type_release(ls, parse_type(ls));
if ((def->base_type->owned = (ls->t.kw == KW_at_owned))) if ((def->base_type->owned = (ls->t.kw == KW_at_owned)))
eo_lexer_get(ls); eo_lexer_get(ls);
if (tpid == KW_hash) if (tpid == KW_hash)
@ -732,11 +729,6 @@ parse_type_void(Eo_Lexer *ls)
if ((def->base_type->next_type->owned = (ls->t.kw == KW_at_owned))) if ((def->base_type->next_type->owned = (ls->t.kw == KW_at_owned)))
eo_lexer_get(ls); eo_lexer_get(ls);
} }
else if((tpid == KW_future) && test_next(ls, ','))
{
def->base_type->next_type =
eo_lexer_type_release(ls, parse_type_void(ls));
}
check_match(ls, '>', '<', bline, bcol); check_match(ls, '>', '<', bline, bcol);
} }
} }