summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2016-11-07 11:41:40 -0800
committerCedric BAIL <cedric@osg.samsung.com>2016-11-07 13:43:11 -0800
commit144ef9dad3e8f32e8dd12d88d8f0db486452e13e (patch)
tree0240736d4e3295bed806d25e8127a8d127d5723b
parent8a3e745e1ac1f2dd3e115ea94ed35b0fba107b2c (diff)
eolian: remove Eina_Promise.
-rw-r--r--src/lib/eolian/eo_lexer.c2
-rw-r--r--src/lib/eolian/eo_lexer.h2
-rw-r--r--src/lib/eolian/eo_parser.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/eolian/eo_lexer.c b/src/lib/eolian/eo_lexer.c
index 9b7fe5a388..49b23a7cfe 100644
--- a/src/lib/eolian/eo_lexer.c
+++ b/src/lib/eolian/eo_lexer.c
@@ -75,7 +75,7 @@ static const char * const ctypes[] =
75 NULL, NULL, /* array types */ 75 NULL, NULL, /* array types */
76 76
77 "Eina_Accessor", "Eina_Array", "Eina_Iterator", "Eina_Hash", "Eina_List", 77 "Eina_Accessor", "Eina_Array", "Eina_Iterator", "Eina_Hash", "Eina_List",
78 "Eina_Promise", "Efl_Future", 78 "Efl_Future",
79 "Eina_Value", "const char *", "Eina_Stringshare *", 79 "Eina_Value", "const char *", "Eina_Stringshare *",
80 80
81 "void *", 81 "void *",
diff --git a/src/lib/eolian/eo_lexer.h b/src/lib/eolian/eo_lexer.h
index eeb6f7d4ad..051852cb92 100644
--- a/src/lib/eolian/eo_lexer.h
+++ b/src/lib/eolian/eo_lexer.h
@@ -53,7 +53,7 @@ enum Tokens
53 KW(static_array), KW(terminated_array), \ 53 KW(static_array), KW(terminated_array), \
54 \ 54 \
55 KW(accessor), KW(array), KW(iterator), KW(hash), KW(list), \ 55 KW(accessor), KW(array), KW(iterator), KW(hash), KW(list), \
56 KW(promise), KW(future), \ 56 KW(future), \
57 KW(generic_value), KW(string), KW(stringshare), \ 57 KW(generic_value), KW(string), KW(stringshare), \
58 \ 58 \
59 KW(void_ptr), \ 59 KW(void_ptr), \
diff --git a/src/lib/eolian/eo_parser.c b/src/lib/eolian/eo_parser.c
index c7c0a1624a..4fd22e16d9 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)
900 def->base_type->next_type = parse_type(ls, EINA_FALSE, EINA_FALSE); 900 def->base_type->next_type = parse_type(ls, EINA_FALSE, EINA_FALSE);
901 pop_type(ls); 901 pop_type(ls);
902 } 902 }
903 else if((tpid == KW_promise || tpid == KW_future) && test_next(ls, ',')) 903 else if((tpid == KW_future) && test_next(ls, ','))
904 { 904 {
905 def->base_type->next_type = parse_type(ls, EINA_FALSE, EINA_FALSE); 905 def->base_type->next_type = parse_type(ls, EINA_FALSE, EINA_FALSE);
906 pop_type(ls); 906 pop_type(ls);