summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorDaniel Kolesa <d.kolesa@osg.samsung.com>2017-09-15 17:48:28 +0200
committerDaniel Kolesa <d.kolesa@osg.samsung.com>2017-09-15 17:48:28 +0200
commit1afd3c215fe5e8933a5ccf0a49aa2fee41043286 (patch)
treeb4e3f24a9e9d6c5ae3ef4ff4aa2acf3ffe48d5fe /src/lib
parentc559380f7f3c495e8661db4cc4b2a0b5f70ed29c (diff)
eolian: correctness fixes in tests and eo files
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/efl/interfaces/efl_types.eot2
-rw-r--r--src/lib/elementary/efl_config_global.eo2
-rw-r--r--src/lib/elementary/elm_web.eo3
-rw-r--r--src/lib/eolian/database_type.c7
-rw-r--r--src/lib/eolian/eo_lexer.c2
5 files changed, 11 insertions, 5 deletions
diff --git a/src/lib/efl/interfaces/efl_types.eot b/src/lib/efl/interfaces/efl_types.eot
index 4d5535ca10..f515a92ddb 100644
--- a/src/lib/efl/interfaces/efl_types.eot
+++ b/src/lib/efl/interfaces/efl_types.eot
@@ -43,5 +43,5 @@ struct Efl.Observable.Tuple
43{ 43{
44 [[This type describes an observable touple]] 44 [[This type describes an observable touple]]
45 key: string; [[Touple key]] 45 key: string; [[Touple key]]
46 data: free(own(iterator<Efl.Observer>), eina_iterator_free); [[Touple data]] 46 data: iterator<Efl.Observer> @owned; [[Touple data]]
47} 47}
diff --git a/src/lib/elementary/efl_config_global.eo b/src/lib/elementary/efl_config_global.eo
index a28f3fe020..99ba68eb2b 100644
--- a/src/lib/elementary/efl_config_global.eo
+++ b/src/lib/elementary/efl_config_global.eo
@@ -66,7 +66,7 @@ class Efl.Config.Global (Efl.Object, Efl.Config)
66 is_user: bool; [[$true to lookup for a user profile or $false for 66 is_user: bool; [[$true to lookup for a user profile or $false for
67 a system one.]] 67 a system one.]]
68 } 68 }
69 return: string @owned; [[Directory of the profile, free after use.]] 69 return: stringshare @owned; [[Directory of the profile, free after use.]]
70 } 70 }
71 profile_derived_add @protected { 71 profile_derived_add @protected {
72 [[Add a new profile of the given name to be derived from the current 72 [[Add a new profile of the given name to be derived from the current
diff --git a/src/lib/elementary/elm_web.eo b/src/lib/elementary/elm_web.eo
index f00b64cb3a..f1c8e986ec 100644
--- a/src/lib/elementary/elm_web.eo
+++ b/src/lib/elementary/elm_web.eo
@@ -339,7 +339,8 @@ class Elm.Web (Elm.Widget)
339 The string returned must be freed by the user when it's done 339 The string returned must be freed by the user when it's done
340 with it. 340 with it.
341 ]] 341 ]]
342 return: string @owned @warn_unused; [[A newly allocated string, or 342 /* FIXME: const doesn't belong here */
343 return: const(string) @owned @warn_unused; [[A newly allocated string, or
343 $null if nothing is selected 344 $null if nothing is selected
344 or an error occurred.]] 345 or an error occurred.]]
345 } 346 }
diff --git a/src/lib/eolian/database_type.c b/src/lib/eolian/database_type.c
index a05fa25fa5..d9a8f17661 100644
--- a/src/lib/eolian/database_type.c
+++ b/src/lib/eolian/database_type.c
@@ -146,7 +146,12 @@ database_type_to_str(const Eolian_Type *tp, Eina_Strbuf *buf, const char *name,
146 } 146 }
147 int kw = eo_lexer_keyword_str_to_id(tp->name); 147 int kw = eo_lexer_keyword_str_to_id(tp->name);
148 if (kw && eo_lexer_is_type_keyword(kw)) 148 if (kw && eo_lexer_is_type_keyword(kw))
149 eina_strbuf_append(buf, eo_lexer_get_c_type(kw)); 149 {
150 /* FIXME: deal with aliased strings? */
151 if ((kw == KW_string) && !tp->owned)
152 eina_strbuf_append(buf, "const ");
153 eina_strbuf_append(buf, eo_lexer_get_c_type(kw));
154 }
150 else 155 else
151 eina_strbuf_append(buf, tp->name); 156 eina_strbuf_append(buf, tp->name);
152 } 157 }
diff --git a/src/lib/eolian/eo_lexer.c b/src/lib/eolian/eo_lexer.c
index 044315cc98..caae8dd9bb 100644
--- a/src/lib/eolian/eo_lexer.c
+++ b/src/lib/eolian/eo_lexer.c
@@ -75,7 +75,7 @@ static const char * const ctypes[] =
75 75
76 "Eina_Accessor", "Eina_Array", "Eina_Iterator", "Eina_Hash", "Eina_List", 76 "Eina_Accessor", "Eina_Array", "Eina_Iterator", "Eina_Hash", "Eina_List",
77 "Efl_Future", 77 "Efl_Future",
78 "Eina_Value", "const char *", "Eina_Stringshare *", 78 "Eina_Value", "char *", "Eina_Stringshare *",
79 79
80 "void *", 80 "void *",
81 81