forked from enlightenment/efl
eolian: move EOLIAN_TYPE_BUILTIN_HASH into beta section
This commit is contained in:
parent
f5a4fd89d9
commit
7e10d96d27
|
@ -157,7 +157,6 @@ ffi.cdef [[
|
|||
EOLIAN_TYPE_BUILTIN_ARRAY,
|
||||
EOLIAN_TYPE_BUILTIN_FUTURE,
|
||||
EOLIAN_TYPE_BUILTIN_ITERATOR,
|
||||
EOLIAN_TYPE_BUILTIN_HASH,
|
||||
EOLIAN_TYPE_BUILTIN_LIST,
|
||||
|
||||
EOLIAN_TYPE_BUILTIN_ANY_VALUE,
|
||||
|
@ -169,6 +168,7 @@ ffi.cdef [[
|
|||
EOLIAN_TYPE_BUILTIN_STRINGSHARE,
|
||||
EOLIAN_TYPE_BUILTIN_STRBUF,
|
||||
|
||||
EOLIAN_TYPE_BUILTIN_HASH,
|
||||
EOLIAN_TYPE_BUILTIN_VOID_PTR
|
||||
} Eolian_Type_Builtin_Type;
|
||||
|
||||
|
@ -932,18 +932,18 @@ M.type_builtin_type = {
|
|||
ARRAY = 35,
|
||||
FUTURE = 36,
|
||||
ITERATOR = 37,
|
||||
HASH = 38,
|
||||
LIST = 39,
|
||||
LIST = 38,
|
||||
|
||||
ANY_VALUE = 40,
|
||||
ANY_VALUE_REF = 41,
|
||||
BINBUF = 42,
|
||||
EVENT = 43,
|
||||
MSTRING = 44,
|
||||
STRING = 45,
|
||||
STRINGSHARE = 46,
|
||||
STRBUF = 47,
|
||||
ANY_VALUE = 39,
|
||||
ANY_VALUE_REF = 40,
|
||||
BINBUF = 41,
|
||||
EVENT = 42,
|
||||
MSTRING = 43,
|
||||
STRING = 44,
|
||||
STRINGSHARE = 45,
|
||||
STRBUF = 46,
|
||||
|
||||
HASH = 47,
|
||||
VOID_PTR = 48
|
||||
}
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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",
|
||||
};
|
||||
|
||||
|
|
|
@ -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), \
|
||||
|
|
|
@ -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, '<');
|
||||
|
|
|
@ -126,21 +126,20 @@ class Eolian_Type_Builtin_Type(IntEnum):
|
|||
ARRAY = 35
|
||||
FUTURE = 36
|
||||
ITERATOR = 37
|
||||
HASH = 38
|
||||
LIST = 39
|
||||
LIST = 38
|
||||
|
||||
ANY_VALUE = 40
|
||||
ANY_VALUE_REF = 41
|
||||
BINBUF = 42
|
||||
EVENT = 43
|
||||
ANY_VALUE = 39
|
||||
ANY_VALUE_REF = 40
|
||||
BINBUF = 41
|
||||
EVENT = 42
|
||||
|
||||
MSTRING = 44
|
||||
STRING = 45
|
||||
STRINGSHARE = 46
|
||||
STRBUF = 47
|
||||
MSTRING = 43
|
||||
STRING = 44
|
||||
STRINGSHARE = 45
|
||||
STRBUF = 46
|
||||
|
||||
HASH = 47
|
||||
VOID_PTR = 48
|
||||
FREE_CB = 49
|
||||
|
||||
class Eolian_Expression_Type(IntEnum):
|
||||
UNKNOWN = 0
|
||||
|
|
Loading…
Reference in New Issue