summaryrefslogtreecommitdiff
path: root/src/lib/eolian
diff options
context:
space:
mode:
authorDaniel Kolesa <d.kolesa@samsung.com>2019-09-26 16:26:10 +0200
committerDaniel Kolesa <d.kolesa@samsung.com>2019-09-26 16:47:21 +0200
commit7e10d96d27c207a005e872a5d6ec786759dd83ea (patch)
treed35093b6851b61840d3dddc7f4b52033155f6d0f /src/lib/eolian
parentf5a4fd89d9935fd77afab7bad446477d101e35da (diff)
eolian: move EOLIAN_TYPE_BUILTIN_HASH into beta section
Diffstat (limited to 'src/lib/eolian')
-rw-r--r--src/lib/eolian/Eolian.h4
-rw-r--r--src/lib/eolian/eo_lexer.c4
-rw-r--r--src/lib/eolian/eo_lexer.h3
-rw-r--r--src/lib/eolian/eo_parser.c2
4 files changed, 7 insertions, 6 deletions
diff --git a/src/lib/eolian/Eolian.h b/src/lib/eolian/Eolian.h
index 33e571c491..311ea9016a 100644
--- a/src/lib/eolian/Eolian.h
+++ b/src/lib/eolian/Eolian.h
@@ -336,7 +336,6 @@ typedef enum
336 EOLIAN_TYPE_BUILTIN_ARRAY, 336 EOLIAN_TYPE_BUILTIN_ARRAY,
337 EOLIAN_TYPE_BUILTIN_FUTURE, 337 EOLIAN_TYPE_BUILTIN_FUTURE,
338 EOLIAN_TYPE_BUILTIN_ITERATOR, 338 EOLIAN_TYPE_BUILTIN_ITERATOR,
339 EOLIAN_TYPE_BUILTIN_HASH, /* FIXME: beta */
340 EOLIAN_TYPE_BUILTIN_LIST, 339 EOLIAN_TYPE_BUILTIN_LIST,
341 340
342 EOLIAN_TYPE_BUILTIN_ANY_VALUE, 341 EOLIAN_TYPE_BUILTIN_ANY_VALUE,
@@ -348,7 +347,8 @@ typedef enum
348 EOLIAN_TYPE_BUILTIN_STRINGSHARE, 347 EOLIAN_TYPE_BUILTIN_STRINGSHARE,
349 EOLIAN_TYPE_BUILTIN_STRBUF, 348 EOLIAN_TYPE_BUILTIN_STRBUF,
350 349
351#ifdef EOLIAN_BETA_API_SUPPORT 350#ifdef EFL_BETA_API_SUPPORT
351 EOLIAN_TYPE_BUILTIN_HASH,
352 EOLIAN_TYPE_BUILTIN_VOID_PTR 352 EOLIAN_TYPE_BUILTIN_VOID_PTR
353#endif 353#endif
354} Eolian_Type_Builtin_Type; 354} Eolian_Type_Builtin_Type;
diff --git a/src/lib/eolian/eo_lexer.c b/src/lib/eolian/eo_lexer.c
index 165c8340f2..ed165ee793 100644
--- a/src/lib/eolian/eo_lexer.c
+++ b/src/lib/eolian/eo_lexer.c
@@ -76,13 +76,13 @@ static const char * const ctypes[] =
76 "void", 76 "void",
77 77
78 "Eina_Accessor *", "Eina_Array *", "Eina_Future *", "Eina_Iterator *", 78 "Eina_Accessor *", "Eina_Array *", "Eina_Future *", "Eina_Iterator *",
79 "Eina_Hash *", "Eina_List *", 79 "Eina_List *",
80 "Eina_Value", "Eina_Value *", "Eina_Binbuf *", "Efl_Event *", 80 "Eina_Value", "Eina_Value *", "Eina_Binbuf *", "Efl_Event *",
81 "char *", "const char *", "Eina_Stringshare *", "Eina_Strbuf *", 81 "char *", "const char *", "Eina_Stringshare *", "Eina_Strbuf *",
82 82
83 "Eina_Hash *",
83 "void *", 84 "void *",
84 85
85 "Eina_Free_Cb",
86 "function", 86 "function",
87}; 87};
88 88
diff --git a/src/lib/eolian/eo_lexer.h b/src/lib/eolian/eo_lexer.h
index 706acb028e..e7f61a7a21 100644
--- a/src/lib/eolian/eo_lexer.h
+++ b/src/lib/eolian/eo_lexer.h
@@ -59,10 +59,11 @@ enum Tokens
59 \ 59 \
60 KW(void), \ 60 KW(void), \
61 \ 61 \
62 KW(accessor), KW(array), KW(future), KW(iterator), KW(hash), KW(list), \ 62 KW(accessor), KW(array), KW(future), KW(iterator), KW(list), \
63 KW(any_value), KW(any_value_ref), KW(binbuf), KW(event), \ 63 KW(any_value), KW(any_value_ref), KW(binbuf), KW(event), \
64 KW(mstring), KW(string), KW(stringshare), KW(strbuf), \ 64 KW(mstring), KW(string), KW(stringshare), KW(strbuf), \
65 \ 65 \
66 KW(hash), \
66 KW(void_ptr), \ 67 KW(void_ptr), \
67 KW(function), \ 68 KW(function), \
68 KW(__undefined_type), \ 69 KW(__undefined_type), \
diff --git a/src/lib/eolian/eo_parser.c b/src/lib/eolian/eo_parser.c
index 72f5ad2f27..a721e73b37 100644
--- a/src/lib/eolian/eo_parser.c
+++ b/src/lib/eolian/eo_parser.c
@@ -765,7 +765,7 @@ parse_type_void(Eo_Lexer *ls, Eina_Bool allow_ptr, Eina_Bool allow_const)
765 def->base.c_name = eina_stringshare_ref(def->base.name); 765 def->base.c_name = eina_stringshare_ref(def->base.name);
766 eo_lexer_get(ls); 766 eo_lexer_get(ls);
767 if ((tpid >= KW_accessor && tpid <= KW_list) || 767 if ((tpid >= KW_accessor && tpid <= KW_list) ||
768 (tpid >= KW_slice && tpid <= KW_rw_slice)) 768 (tpid >= KW_slice && tpid <= KW_rw_slice) || (tpid == KW_hash))
769 { 769 {
770 int bline = ls->line_number, bcol = ls->column; 770 int bline = ls->line_number, bcol = ls->column;
771 check_next(ls, '<'); 771 check_next(ls, '<');