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

eolian: move EOLIAN_TYPE_BUILTIN_HASH into beta section

This commit is contained in:
Daniel Kolesa 2019-09-26 16:26:10 +02:00
parent f5a4fd89d9
commit 7e10d96d27
6 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/bindings/luajit/eolian.lua
View File

@ -157,7 +157,6 @@ ffi.cdef [[
EOLIAN_TYPE_BUILTIN_ARRAY, EOLIAN_TYPE_BUILTIN_ARRAY,
EOLIAN_TYPE_BUILTIN_FUTURE, EOLIAN_TYPE_BUILTIN_FUTURE,
EOLIAN_TYPE_BUILTIN_ITERATOR, EOLIAN_TYPE_BUILTIN_ITERATOR,
EOLIAN_TYPE_BUILTIN_HASH,
EOLIAN_TYPE_BUILTIN_LIST, EOLIAN_TYPE_BUILTIN_LIST,
EOLIAN_TYPE_BUILTIN_ANY_VALUE, EOLIAN_TYPE_BUILTIN_ANY_VALUE,
@ -169,6 +168,7 @@ ffi.cdef [[
EOLIAN_TYPE_BUILTIN_STRINGSHARE, EOLIAN_TYPE_BUILTIN_STRINGSHARE,
EOLIAN_TYPE_BUILTIN_STRBUF, EOLIAN_TYPE_BUILTIN_STRBUF,
EOLIAN_TYPE_BUILTIN_HASH,
EOLIAN_TYPE_BUILTIN_VOID_PTR EOLIAN_TYPE_BUILTIN_VOID_PTR
} Eolian_Type_Builtin_Type; } Eolian_Type_Builtin_Type;
@ -932,18 +932,18 @@ M.type_builtin_type = {
ARRAY = 35, ARRAY = 35,
FUTURE = 36, FUTURE = 36,
ITERATOR = 37, ITERATOR = 37,
HASH = 38, LIST = 38,
LIST = 39,
ANY_VALUE = 40, ANY_VALUE = 39,
ANY_VALUE_REF = 41, ANY_VALUE_REF = 40,
BINBUF = 42, BINBUF = 41,
EVENT = 43, EVENT = 42,
MSTRING = 44, MSTRING = 43,
STRING = 45, STRING = 44,
STRINGSHARE = 46, STRINGSHARE = 45,
STRBUF = 47, STRBUF = 46,
HASH = 47,
VOID_PTR = 48 VOID_PTR = 48
} }

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

@ -336,7 +336,6 @@ typedef enum
EOLIAN_TYPE_BUILTIN_ARRAY, EOLIAN_TYPE_BUILTIN_ARRAY,
EOLIAN_TYPE_BUILTIN_FUTURE, EOLIAN_TYPE_BUILTIN_FUTURE,
EOLIAN_TYPE_BUILTIN_ITERATOR, EOLIAN_TYPE_BUILTIN_ITERATOR,
EOLIAN_TYPE_BUILTIN_HASH, /* FIXME: beta */
EOLIAN_TYPE_BUILTIN_LIST, EOLIAN_TYPE_BUILTIN_LIST,
EOLIAN_TYPE_BUILTIN_ANY_VALUE, EOLIAN_TYPE_BUILTIN_ANY_VALUE,
@ -348,7 +347,8 @@ typedef enum
EOLIAN_TYPE_BUILTIN_STRINGSHARE, EOLIAN_TYPE_BUILTIN_STRINGSHARE,
EOLIAN_TYPE_BUILTIN_STRBUF, EOLIAN_TYPE_BUILTIN_STRBUF,
#ifdef EOLIAN_BETA_API_SUPPORT #ifdef EFL_BETA_API_SUPPORT
EOLIAN_TYPE_BUILTIN_HASH,
EOLIAN_TYPE_BUILTIN_VOID_PTR EOLIAN_TYPE_BUILTIN_VOID_PTR
#endif #endif
} Eolian_Type_Builtin_Type; } Eolian_Type_Builtin_Type;

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

@ -76,13 +76,13 @@ static const char * const ctypes[] =
"void", "void",
"Eina_Accessor *", "Eina_Array *", "Eina_Future *", "Eina_Iterator *", "Eina_Accessor *", "Eina_Array *", "Eina_Future *", "Eina_Iterator *",
"Eina_Hash *", "Eina_List *", "Eina_List *",
"Eina_Value", "Eina_Value *", "Eina_Binbuf *", "Efl_Event *", "Eina_Value", "Eina_Value *", "Eina_Binbuf *", "Efl_Event *",
"char *", "const char *", "Eina_Stringshare *", "Eina_Strbuf *", "char *", "const char *", "Eina_Stringshare *", "Eina_Strbuf *",
"Eina_Hash *",
"void *", "void *",
"Eina_Free_Cb",
"function", "function",
}; };

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

@ -59,10 +59,11 @@ enum Tokens
\ \
KW(void), \ 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(any_value), KW(any_value_ref), KW(binbuf), KW(event), \
KW(mstring), KW(string), KW(stringshare), KW(strbuf), \ KW(mstring), KW(string), KW(stringshare), KW(strbuf), \
\ \
KW(hash), \
KW(void_ptr), \ KW(void_ptr), \
KW(function), \ KW(function), \
KW(__undefined_type), \ KW(__undefined_type), \

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

@ -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); def->base.c_name = eina_stringshare_ref(def->base.name);
eo_lexer_get(ls); eo_lexer_get(ls);
if ((tpid >= KW_accessor && tpid <= KW_list) || 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; int bline = ls->line_number, bcol = ls->column;
check_next(ls, '<'); check_next(ls, '<');

21
src/scripts/pyolian/eolian.py
View File

@ -126,21 +126,20 @@ class Eolian_Type_Builtin_Type(IntEnum):
ARRAY = 35 ARRAY = 35
FUTURE = 36 FUTURE = 36
ITERATOR = 37 ITERATOR = 37
HASH = 38 LIST = 38
LIST = 39
ANY_VALUE = 40 ANY_VALUE = 39
ANY_VALUE_REF = 41 ANY_VALUE_REF = 40
BINBUF = 42 BINBUF = 41
EVENT = 43 EVENT = 42
MSTRING = 44 MSTRING = 43
STRING = 45 STRING = 44
STRINGSHARE = 46 STRINGSHARE = 45
STRBUF = 47 STRBUF = 46
HASH = 47
VOID_PTR = 48 VOID_PTR = 48
FREE_CB = 49
class Eolian_Expression_Type(IntEnum): class Eolian_Expression_Type(IntEnum):
UNKNOWN = 0 UNKNOWN = 0