summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Kolesa <d.kolesa@osg.samsung.com>2015-05-29 12:03:57 +0100
committerDaniel Kolesa <d.kolesa@osg.samsung.com>2015-05-29 12:03:57 +0100
commit1a48c31f81d9ecbe4128f855c841306b0f38ec08 (patch)
tree213c95b724c3e94bde58bd9f8facd6a5ad457dbf
parent3c27a05c4f37968a70aa6fbf65f1eb53aef58353 (diff)
eolian: "generic_value" builtin type
Diffstat (limited to '')
-rw-r--r--src/lib/efl/interfaces/efl_model_base.eo2
-rw-r--r--src/lib/eo/eina_types.eot1
-rw-r--r--src/lib/eo/eo_base.eo2
-rw-r--r--src/lib/eolian/eo_lexer.c5
-rw-r--r--src/lib/eolian/eo_lexer.h2
5 files changed, 7 insertions, 5 deletions
diff --git a/src/lib/efl/interfaces/efl_model_base.eo b/src/lib/efl/interfaces/efl_model_base.eo
index 8ba6c5ae45..dbda997c45 100644
--- a/src/lib/efl/interfaces/efl_model_base.eo
+++ b/src/lib/efl/interfaces/efl_model_base.eo
@@ -111,7 +111,7 @@ interface Efl.Model.Base ()
111 property: const(char)*; /*@ Property name */ 111 property: const(char)*; /*@ Property name */
112 } 112 }
113 values { 113 values {
114 value: const(Eina_Value)*; /*@ New value */ 114 value: const(generic_value)*; /*@ New value */
115 } 115 }
116 } 116 }
117 @property children_slice { 117 @property children_slice {
diff --git a/src/lib/eo/eina_types.eot b/src/lib/eo/eina_types.eot
index 691c6d8219..eef43fbc06 100644
--- a/src/lib/eo/eina_types.eot
+++ b/src/lib/eo/eina_types.eot
@@ -1,3 +1,2 @@
1/* FIXME: Move to Eina when we decide they are handled properly. */ 1/* FIXME: Move to Eina when we decide they are handled properly. */
2type @extern Eina_Stringshare: const(char) *; 2type @extern Eina_Stringshare: const(char) *;
3type @extern Eina_Value: void *;
diff --git a/src/lib/eo/eo_base.eo b/src/lib/eo/eo_base.eo
index 3e1f781a30..546a61d375 100644
--- a/src/lib/eo/eo_base.eo
+++ b/src/lib/eo/eo_base.eo
@@ -26,7 +26,7 @@ struct Eo.Dbg_Info {
26 * The structure for the debug info used by Eo. 26 * The structure for the debug info used by Eo.
27 */ 27 */
28 name: Eina_Stringshare *; /*@< The name of the part (stringshare). */ 28 name: Eina_Stringshare *; /*@< The name of the part (stringshare). */
29 value: Eina_Value; /*@< The value. */ 29 value: generic_value; /*@< The value. */
30} 30}
31 31
32 32
diff --git a/src/lib/eolian/eo_lexer.c b/src/lib/eolian/eo_lexer.c
index 9f69c7f410..7b79d23cad 100644
--- a/src/lib/eolian/eo_lexer.c
+++ b/src/lib/eolian/eo_lexer.c
@@ -72,7 +72,10 @@ static const char * const ctypes[] =
72 72
73 "void", 73 "void",
74 74
75 "Eina_Accessor", "Eina_Array", "Eina_Iterator", "Eina_Hash", "Eina_List" 75 "Eina_Accessor", "Eina_Array", "Eina_Iterator", "Eina_Hash", "Eina_List",
76 "Eina_Value",
77
78 "Eo_Event_Cb"
76}; 79};
77 80
78#undef KW 81#undef KW
diff --git a/src/lib/eolian/eo_lexer.h b/src/lib/eolian/eo_lexer.h
index 3812d47753..aea3a1c839 100644
--- a/src/lib/eolian/eo_lexer.h
+++ b/src/lib/eolian/eo_lexer.h
@@ -50,7 +50,7 @@ enum Tokens
50 \ 50 \
51 KW(void), \ 51 KW(void), \
52 \ 52 \
53 KW(accessor), KW(array), KW(iterator), KW(hash), KW(list), \ 53 KW(accessor), KW(array), KW(iterator), KW(hash), KW(list), KW(generic_value), \
54 \ 54 \
55 KW(__builtin_event_cb), \ 55 KW(__builtin_event_cb), \
56 \ 56 \