diff options
| author | Daniel Kolesa <d.kolesa@samsung.com> | 2019-09-26 16:26:10 +0200 |
|---|---|---|
| committer | Daniel Kolesa <d.kolesa@samsung.com> | 2019-09-26 16:47:21 +0200 |
| commit | 7e10d96d27c207a005e872a5d6ec786759dd83ea (patch) | |
| tree | d35093b6851b61840d3dddc7f4b52033155f6d0f /src/lib | |
| parent | f5a4fd89d9935fd77afab7bad446477d101e35da (diff) | |
| download | efl-7e10d96d27c207a005e872a5d6ec786759dd83ea.tar.gz | |
eolian: move EOLIAN_TYPE_BUILTIN_HASH into beta section
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/eolian/Eolian.h | 4 | ||||
| -rw-r--r-- | src/lib/eolian/eo_lexer.c | 4 | ||||
| -rw-r--r-- | src/lib/eolian/eo_lexer.h | 3 | ||||
| -rw-r--r-- | src/lib/eolian/eo_parser.c | 2 |
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 EOLIAN_TYPE_BUILTIN_ARRAY, EOLIAN_TYPE_BUILTIN_FUTURE, EOLIAN_TYPE_BUILTIN_ITERATOR, - EOLIAN_TYPE_BUILTIN_HASH, /* FIXME: beta */ EOLIAN_TYPE_BUILTIN_LIST, EOLIAN_TYPE_BUILTIN_ANY_VALUE, @@ -348,7 +347,8 @@ typedef enum EOLIAN_TYPE_BUILTIN_STRINGSHARE, EOLIAN_TYPE_BUILTIN_STRBUF, -#ifdef EOLIAN_BETA_API_SUPPORT +#ifdef EFL_BETA_API_SUPPORT + EOLIAN_TYPE_BUILTIN_HASH, EOLIAN_TYPE_BUILTIN_VOID_PTR #endif } 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[] = "void", "Eina_Accessor *", "Eina_Array *", "Eina_Future *", "Eina_Iterator *", - "Eina_Hash *", "Eina_List *", + "Eina_List *", "Eina_Value", "Eina_Value *", "Eina_Binbuf *", "Efl_Event *", "char *", "const char *", "Eina_Stringshare *", "Eina_Strbuf *", + "Eina_Hash *", "void *", - "Eina_Free_Cb", "function", }; 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 \ KW(void), \ \ - KW(accessor), KW(array), KW(future), KW(iterator), KW(hash), KW(list), \ + KW(accessor), KW(array), KW(future), KW(iterator), KW(list), \ KW(any_value), KW(any_value_ref), KW(binbuf), KW(event), \ KW(mstring), KW(string), KW(stringshare), KW(strbuf), \ \ + KW(hash), \ KW(void_ptr), \ KW(function), \ 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) def->base.c_name = eina_stringshare_ref(def->base.name); eo_lexer_get(ls); if ((tpid >= KW_accessor && tpid <= KW_list) || - (tpid >= KW_slice && tpid <= KW_rw_slice)) + (tpid >= KW_slice && tpid <= KW_rw_slice) || (tpid == KW_hash)) { int bline = ls->line_number, bcol = ls->column; check_next(ls, '<'); |