cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=144ef9dad3e8f32e8dd12d88d8f0db486452e13e
commit 144ef9dad3e8f32e8dd12d88d8f0db486452e13e Author: Cedric BAIL <ced...@osg.samsung.com> Date: Mon Nov 7 11:41:40 2016 -0800 eolian: remove Eina_Promise. --- src/lib/eolian/eo_lexer.c | 2 +- src/lib/eolian/eo_lexer.h | 2 +- src/lib/eolian/eo_parser.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/eolian/eo_lexer.c b/src/lib/eolian/eo_lexer.c index 9b7fe5a..49b23a7 100644 --- a/src/lib/eolian/eo_lexer.c +++ b/src/lib/eolian/eo_lexer.c @@ -75,7 +75,7 @@ static const char * const ctypes[] = NULL, NULL, /* array types */ "Eina_Accessor", "Eina_Array", "Eina_Iterator", "Eina_Hash", "Eina_List", - "Eina_Promise", "Efl_Future", + "Efl_Future", "Eina_Value", "const char *", "Eina_Stringshare *", "void *", diff --git a/src/lib/eolian/eo_lexer.h b/src/lib/eolian/eo_lexer.h index eeb6f7d..051852c 100644 --- a/src/lib/eolian/eo_lexer.h +++ b/src/lib/eolian/eo_lexer.h @@ -53,7 +53,7 @@ enum Tokens KW(static_array), KW(terminated_array), \ \ KW(accessor), KW(array), KW(iterator), KW(hash), KW(list), \ - KW(promise), KW(future), \ + KW(future), \ KW(generic_value), KW(string), KW(stringshare), \ \ KW(void_ptr), \ diff --git a/src/lib/eolian/eo_parser.c b/src/lib/eolian/eo_parser.c index c7c0a16..4fd22e1 100644 --- a/src/lib/eolian/eo_parser.c +++ b/src/lib/eolian/eo_parser.c @@ -900,7 +900,7 @@ parse_type_void(Eo_Lexer *ls, Eina_Bool allow_ref, Eina_Bool allow_sarray) def->base_type->next_type = parse_type(ls, EINA_FALSE, EINA_FALSE); pop_type(ls); } - else if((tpid == KW_promise || tpid == KW_future) && test_next(ls, ',')) + else if((tpid == KW_future) && test_next(ls, ',')) { def->base_type->next_type = parse_type(ls, EINA_FALSE, EINA_FALSE); pop_type(ls); --