From 7e10d96d27c207a005e872a5d6ec786759dd83ea Mon Sep 17 00:00:00 2001
From: Daniel Kolesa <d.kolesa@samsung.com>
Date: Thu, 26 Sep 2019 16:26:10 +0200
Subject: [PATCH] eolian: move EOLIAN_TYPE_BUILTIN_HASH into beta section

---
 src/bindings/luajit/eolian.lua | 22 +++++++++++-----------
 src/lib/eolian/Eolian.h        |  4 ++--
 src/lib/eolian/eo_lexer.c      |  4 ++--
 src/lib/eolian/eo_lexer.h      |  3 ++-
 src/lib/eolian/eo_parser.c     |  2 +-
 src/scripts/pyolian/eolian.py  | 21 ++++++++++-----------
 6 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/src/bindings/luajit/eolian.lua b/src/bindings/luajit/eolian.lua
index 8671fc5c2a..1c2f6e38b4 100644
--- a/src/bindings/luajit/eolian.lua
+++ b/src/bindings/luajit/eolian.lua
@@ -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
 }
 
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, '<');
diff --git a/src/scripts/pyolian/eolian.py b/src/scripts/pyolian/eolian.py
index 23ebd22c66..04d2dcb8a9 100644
--- a/src/scripts/pyolian/eolian.py
+++ b/src/scripts/pyolian/eolian.py
@@ -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