summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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
-rw-r--r--src/tests/eolian/data/complex_type.eo8
-rw-r--r--src/tests/eolian/data/decl.eo2
-rw-r--r--src/tests/eolian/data/enum.eo2
-rw-r--r--src/tests/eolian/data/extern.eo2
-rw-r--r--src/tests/eolian/data/free_func.eo2
-rw-r--r--src/tests/eolian/data/function_as_argument.eo2
-rw-r--r--src/tests/eolian/data/function_as_argument_impl_ref.c2
-rw-r--r--src/tests/eolian/data/function_as_argument_ref.c4
-rw-r--r--src/tests/eolian/data/function_as_argument_ref.h2
-rw-r--r--src/tests/eolian/data/function_types.eot2
-rw-r--r--src/tests/eolian/data/function_types_ref.h2
-rw-r--r--src/tests/eolian/data/object_impl.eo4
-rw-r--r--src/tests/eolian/data/object_impl_add.eo2
-rw-r--r--src/tests/eolian/data/struct.eo2
-rw-r--r--src/tests/eolian/data/typedef.eo4
-rw-r--r--src/tests/eolian/data/var.eo2
-rw-r--r--src/tests/eolian/eolian_parsing.c34
22 files changed, 50 insertions, 44 deletions
diff --git a/src/lib/efl/interfaces/efl_types.eot b/src/lib/efl/interfaces/efl_types.eot
index 4d5535c..f515a92 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 a28f3fe..99ba68e 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 f00b64c..f1c8e98 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 a05fa25..d9a8f17 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 044315c..caae8dd 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
diff --git a/src/tests/eolian/data/complex_type.eo b/src/tests/eolian/data/complex_type.eo
index 8aac116..2976125 100644
--- a/src/tests/eolian/data/complex_type.eo
+++ b/src/tests/eolian/data/complex_type.eo
@@ -2,19 +2,19 @@ class Complex_Type {
2 methods { 2 methods {
3 @property a { 3 @property a {
4 set { 4 set {
5 return: own(list<array<own(ptr(Eo))> >); 5 return: list<array<ptr(Eo) @owned> > @owned;
6 } 6 }
7 get { 7 get {
8 } 8 }
9 values { 9 values {
10 value: own(list<int>); 10 value: list<int> @owned;
11 } 11 }
12 } 12 }
13 foo { 13 foo {
14 params { 14 params {
15 buf: own(ptr(char)); 15 buf: string @owned;
16 } 16 }
17 return: own(list<stringshare>); [[comment for method return]] 17 return: list<stringshare> @owned; [[comment for method return]]
18 } 18 }
19 } 19 }
20} 20}
diff --git a/src/tests/eolian/data/decl.eo b/src/tests/eolian/data/decl.eo
index 3492de0..de1ed88 100644
--- a/src/tests/eolian/data/decl.eo
+++ b/src/tests/eolian/data/decl.eo
@@ -16,7 +16,7 @@ class Decl {
16 params { 16 params {
17 idx: int; 17 idx: int;
18 } 18 }
19 return: own(ptr(char)); 19 return: string @owned;
20 } 20 }
21 } 21 }
22} 22}
diff --git a/src/tests/eolian/data/enum.eo b/src/tests/eolian/data/enum.eo
index 3b426e3..4275b24 100644
--- a/src/tests/eolian/data/enum.eo
+++ b/src/tests/eolian/data/enum.eo
@@ -39,7 +39,7 @@ class Enum {
39 params { 39 params {
40 idx: int; 40 idx: int;
41 } 41 }
42 return: own(ptr(char)); 42 return: string @owned;
43 } 43 }
44 } 44 }
45} 45}
diff --git a/src/tests/eolian/data/extern.eo b/src/tests/eolian/data/extern.eo
index e8ee006..d59caa2 100644
--- a/src/tests/eolian/data/extern.eo
+++ b/src/tests/eolian/data/extern.eo
@@ -22,7 +22,7 @@ class Extern {
22 params { 22 params {
23 idx: int; 23 idx: int;
24 } 24 }
25 return: own(ptr(char)); 25 return: string @owned;
26 } 26 }
27 } 27 }
28} 28}
diff --git a/src/tests/eolian/data/free_func.eo b/src/tests/eolian/data/free_func.eo
index 5c10b24..5e77e5c 100644
--- a/src/tests/eolian/data/free_func.eo
+++ b/src/tests/eolian/data/free_func.eo
@@ -24,7 +24,7 @@ class Free_Func {
24 params { 24 params {
25 idx: int; 25 idx: int;
26 } 26 }
27 return: own(ptr(char)); 27 return: string @owned;
28 } 28 }
29 } 29 }
30} 30}
diff --git a/src/tests/eolian/data/function_as_argument.eo b/src/tests/eolian/data/function_as_argument.eo
index 2eb2cc2..4c27253 100644
--- a/src/tests/eolian/data/function_as_argument.eo
+++ b/src/tests/eolian/data/function_as_argument.eo
@@ -19,7 +19,7 @@ class Function_As_Argument {
19 a: int; 19 a: int;
20 b: double; 20 b: double;
21 } 21 }
22 return: own(string); 22 return: string @owned;
23 } 23 }
24 } 24 }
25} 25}
diff --git a/src/tests/eolian/data/function_as_argument_impl_ref.c b/src/tests/eolian/data/function_as_argument_impl_ref.c
index 7e8a89e..aef6721 100644
--- a/src/tests/eolian/data/function_as_argument_impl_ref.c
+++ b/src/tests/eolian/data/function_as_argument_impl_ref.c
@@ -19,7 +19,7 @@ _function_as_argument_set_nonull_cb(Eo *obj, Function_As_Argument_Data *pd, void
19 19
20} 20}
21 21
22EOLIAN static const char * 22EOLIAN static char *
23_function_as_argument_call_cb(Eo *obj, Function_As_Argument_Data *pd, int a, double b) 23_function_as_argument_call_cb(Eo *obj, Function_As_Argument_Data *pd, int a, double b)
24{ 24{
25 25
diff --git a/src/tests/eolian/data/function_as_argument_ref.c b/src/tests/eolian/data/function_as_argument_ref.c
index 742f8d8..f73c426 100644
--- a/src/tests/eolian/data/function_as_argument_ref.c
+++ b/src/tests/eolian/data/function_as_argument_ref.c
@@ -7,9 +7,9 @@ void _function_as_argument_set_nonull_cb(Eo *obj, Function_As_Argument_Data *pd,
7 7
8EOAPI EFL_VOID_FUNC_BODYV(function_as_argument_set_nonull_cb, EFL_FUNC_CALL(cb_data, cb, cb_free_cb), void *cb_data, VoidFunc cb, Eina_Free_Cb cb_free_cb); 8EOAPI EFL_VOID_FUNC_BODYV(function_as_argument_set_nonull_cb, EFL_FUNC_CALL(cb_data, cb, cb_free_cb), void *cb_data, VoidFunc cb, Eina_Free_Cb cb_free_cb);
9 9
10const char *_function_as_argument_call_cb(Eo *obj, Function_As_Argument_Data *pd, int a, double b); 10char *_function_as_argument_call_cb(Eo *obj, Function_As_Argument_Data *pd, int a, double b);
11 11
12EOAPI EFL_FUNC_BODYV(function_as_argument_call_cb, const char *, NULL, EFL_FUNC_CALL(a, b), int a, double b); 12EOAPI EFL_FUNC_BODYV(function_as_argument_call_cb, char *, NULL, EFL_FUNC_CALL(a, b), int a, double b);
13 13
14static Eina_Bool 14static Eina_Bool
15_function_as_argument_class_initializer(Efl_Class *klass) 15_function_as_argument_class_initializer(Efl_Class *klass)
diff --git a/src/tests/eolian/data/function_as_argument_ref.h b/src/tests/eolian/data/function_as_argument_ref.h
index 5eff241..16af428 100644
--- a/src/tests/eolian/data/function_as_argument_ref.h
+++ b/src/tests/eolian/data/function_as_argument_ref.h
@@ -21,6 +21,6 @@ EOAPI void function_as_argument_set_cb(Eo *obj, void *cb_data, SimpleFunc cb, Ei
21 21
22EOAPI void function_as_argument_set_nonull_cb(Eo *obj, void *cb_data, VoidFunc cb, Eina_Free_Cb cb_free_cb) EINA_ARG_NONNULL(3); 22EOAPI void function_as_argument_set_nonull_cb(Eo *obj, void *cb_data, VoidFunc cb, Eina_Free_Cb cb_free_cb) EINA_ARG_NONNULL(3);
23 23
24EOAPI const char *function_as_argument_call_cb(Eo *obj, int a, double b); 24EOAPI char *function_as_argument_call_cb(Eo *obj, int a, double b);
25 25
26#endif 26#endif
diff --git a/src/tests/eolian/data/function_types.eot b/src/tests/eolian/data/function_types.eot
index 5f06790..5eae0e2 100644
--- a/src/tests/eolian/data/function_types.eot
+++ b/src/tests/eolian/data/function_types.eot
@@ -16,7 +16,7 @@ function SimpleFunc {
16function ComplexFunc { 16function ComplexFunc {
17 params { 17 params {
18 @in c: string; 18 @in c: string;
19 @out d: own(string); 19 @out d: string @owned;
20 } 20 }
21 return: double; 21 return: double;
22}; 22};
diff --git a/src/tests/eolian/data/function_types_ref.h b/src/tests/eolian/data/function_types_ref.h
index fe7c57d..dcb8af2 100644
--- a/src/tests/eolian/data/function_types_ref.h
+++ b/src/tests/eolian/data/function_types_ref.h
@@ -8,7 +8,7 @@ typedef void (*VoidFunc)(void *data);
8 8
9typedef const char * (*SimpleFunc)(void *data, int a, double b); 9typedef const char * (*SimpleFunc)(void *data, int a, double b);
10 10
11typedef double (*ComplexFunc)(void *data, const char *c, const char **d); 11typedef double (*ComplexFunc)(void *data, const char *c, char **d);
12 12
13typedef void (*FuncAsArgFunc)(void *data, void *cb_data, VoidFunc cb, Eina_Free_Cb cb_free_cb, void *another_cb_data, SimpleFunc another_cb, Eina_Free_Cb another_cb_free_cb); 13typedef void (*FuncAsArgFunc)(void *data, void *cb_data, VoidFunc cb, Eina_Free_Cb cb_free_cb, void *another_cb_data, SimpleFunc another_cb, Eina_Free_Cb another_cb_free_cb);
14 14
diff --git a/src/tests/eolian/data/object_impl.eo b/src/tests/eolian/data/object_impl.eo
index 97906ab..7eb4f36 100644
--- a/src/tests/eolian/data/object_impl.eo
+++ b/src/tests/eolian/data/object_impl.eo
@@ -13,7 +13,7 @@ class Object_Impl (Base) {
13 part: string; 13 part: string;
14 } 14 }
15 values { 15 values {
16 value: own(list<int>); 16 value: list<int> @owned;
17 } 17 }
18 } 18 }
19 @property b { 19 @property b {
@@ -23,7 +23,7 @@ class Object_Impl (Base) {
23 /* set as virtual pure - no implementation expected */ 23 /* set as virtual pure - no implementation expected */
24 } 24 }
25 values { 25 values {
26 value: own(list<int>); 26 value: list<int> @owned;
27 } 27 }
28 } 28 }
29 constructor_1 { 29 constructor_1 {
diff --git a/src/tests/eolian/data/object_impl_add.eo b/src/tests/eolian/data/object_impl_add.eo
index e0f24e4..3fa5892 100644
--- a/src/tests/eolian/data/object_impl_add.eo
+++ b/src/tests/eolian/data/object_impl_add.eo
@@ -9,7 +9,7 @@ class Object_Impl_Add (Base) {
9 /* set as virtual pure - no implementation expected */ 9 /* set as virtual pure - no implementation expected */
10 } 10 }
11 values { 11 values {
12 value: own(list<int>); 12 value: list<int> @owned;
13 } 13 }
14 } 14 }
15 } 15 }
diff --git a/src/tests/eolian/data/struct.eo b/src/tests/eolian/data/struct.eo
index 679ff5f..cb8981d 100644
--- a/src/tests/eolian/data/struct.eo
+++ b/src/tests/eolian/data/struct.eo
@@ -23,7 +23,7 @@ class Struct {
23 params { 23 params {
24 idx: int; 24 idx: int;
25 } 25 }
26 return: own(ptr(char)); 26 return: string @owned;
27 } 27 }
28 bar { 28 bar {
29 return: ptr(Named); 29 return: ptr(Named);
diff --git a/src/tests/eolian/data/typedef.eo b/src/tests/eolian/data/typedef.eo
index 3e60100..59a33cb 100644
--- a/src/tests/eolian/data/typedef.eo
+++ b/src/tests/eolian/data/typedef.eo
@@ -1,5 +1,5 @@
1type Evas.Coord: int; /* Simple type definition */ 1type Evas.Coord: int; /* Simple type definition */
2type List_Objects: own(list<ptr(Eo)>); /* A little more complex */ 2type List_Objects: list<ptr(Eo)>; /* A little more complex */
3 3
4type Evas.Coord2: Evas.Coord; 4type Evas.Coord2: Evas.Coord;
5type Evas.Coord3: Evas.Coord2; 5type Evas.Coord3: Evas.Coord2;
@@ -33,7 +33,7 @@ class Typedef {
33 params { 33 params {
34 idx: int; 34 idx: int;
35 } 35 }
36 return: own(ptr(char)); 36 return: string @owned;
37 } 37 }
38 } 38 }
39} 39}
diff --git a/src/tests/eolian/data/var.eo b/src/tests/eolian/data/var.eo
index 93fcacc..6605d30 100644
--- a/src/tests/eolian/data/var.eo
+++ b/src/tests/eolian/data/var.eo
@@ -16,7 +16,7 @@ class Var {
16 params { 16 params {
17 idx: int; 17 idx: int;
18 } 18 }
19 return: own(ptr(char)); 19 return: string @owned;
20 } 20 }
21 } 21 }
22} 22}
diff --git a/src/tests/eolian/eolian_parsing.c b/src/tests/eolian/eolian_parsing.c
index 0b55cf1..79fdb64 100644
--- a/src/tests/eolian/eolian_parsing.c
+++ b/src/tests/eolian/eolian_parsing.c
@@ -338,7 +338,7 @@ START_TEST(eolian_typedef)
338 eina_stringshare_del(type_name); 338 eina_stringshare_del(type_name);
339 fail_if(!(type = eolian_typedecl_base_type_get(tdl))); 339 fail_if(!(type = eolian_typedecl_base_type_get(tdl)));
340 fail_if(!(type_name = eolian_type_name_get(type))); 340 fail_if(!(type_name = eolian_type_name_get(type)));
341 fail_if(eolian_type_is_own(type)); 341 fail_if(eolian_type_is_owned(type));
342 fail_if(eolian_type_is_const(type)); 342 fail_if(eolian_type_is_const(type));
343 fail_if(eolian_type_base_type_get(type)); 343 fail_if(eolian_type_base_type_get(type));
344 fail_if(strcmp(type_name, "int")); 344 fail_if(strcmp(type_name, "int"));
@@ -358,14 +358,14 @@ START_TEST(eolian_typedef)
358 fail_if(strcmp(type_name, "List_Objects")); 358 fail_if(strcmp(type_name, "List_Objects"));
359 fail_if(!(type = eolian_typedecl_base_type_get(tdl))); 359 fail_if(!(type = eolian_typedecl_base_type_get(tdl)));
360 fail_if(!(type_name = eolian_type_c_type_get(type, EOLIAN_C_TYPE_DEFAULT))); 360 fail_if(!(type_name = eolian_type_c_type_get(type, EOLIAN_C_TYPE_DEFAULT)));
361 fail_if(!eolian_type_is_own(type)); 361 fail_if(eolian_type_is_owned(type));
362 fail_if(strcmp(type_name, "Eina_List *")); 362 fail_if(strcmp(type_name, "Eina_List *"));
363 eina_stringshare_del(type_name); 363 eina_stringshare_del(type_name);
364 fail_if(!(type = eolian_type_base_type_get(type))); 364 fail_if(!(type = eolian_type_base_type_get(type)));
365 fail_if(!!eolian_type_next_type_get(type)); 365 fail_if(!!eolian_type_next_type_get(type));
366 fail_if(!(type_name = eolian_type_c_type_get(type, EOLIAN_C_TYPE_DEFAULT))); 366 fail_if(!(type_name = eolian_type_c_type_get(type, EOLIAN_C_TYPE_DEFAULT)));
367 fail_if(strcmp(type_name, "Eo *")); 367 fail_if(strcmp(type_name, "Eo *"));
368 fail_if(eolian_type_is_own(type)); 368 fail_if(eolian_type_is_owned(type));
369 eina_stringshare_del(type_name); 369 eina_stringshare_del(type_name);
370 370
371 /* List */ 371 /* List */
@@ -411,19 +411,19 @@ START_TEST(eolian_complex_type)
411 fail_if(!(fid = eolian_class_function_get_by_name(class, "a", EOLIAN_PROPERTY))); 411 fail_if(!(fid = eolian_class_function_get_by_name(class, "a", EOLIAN_PROPERTY)));
412 fail_if(!(type = eolian_function_return_type_get(fid, EOLIAN_PROP_SET))); 412 fail_if(!(type = eolian_function_return_type_get(fid, EOLIAN_PROP_SET)));
413 fail_if(!(type_name = eolian_type_c_type_get(type, EOLIAN_C_TYPE_RETURN))); 413 fail_if(!(type_name = eolian_type_c_type_get(type, EOLIAN_C_TYPE_RETURN)));
414 fail_if(!eolian_type_is_own(type)); 414 fail_if(!eolian_type_is_owned(type));
415 fail_if(strcmp(type_name, "Eina_List *")); 415 fail_if(strcmp(type_name, "Eina_List *"));
416 eina_stringshare_del(type_name); 416 eina_stringshare_del(type_name);
417 fail_if(!(type = eolian_type_base_type_get(type))); 417 fail_if(!(type = eolian_type_base_type_get(type)));
418 fail_if(!!eolian_type_next_type_get(type)); 418 fail_if(!!eolian_type_next_type_get(type));
419 fail_if(!(type_name = eolian_type_c_type_get(type, EOLIAN_C_TYPE_DEFAULT))); 419 fail_if(!(type_name = eolian_type_c_type_get(type, EOLIAN_C_TYPE_DEFAULT)));
420 fail_if(eolian_type_is_own(type)); 420 fail_if(eolian_type_is_owned(type));
421 fail_if(strcmp(type_name, "Eina_Array *")); 421 fail_if(strcmp(type_name, "Eina_Array *"));
422 eina_stringshare_del(type_name); 422 eina_stringshare_del(type_name);
423 fail_if(!(type = eolian_type_base_type_get(type))); 423 fail_if(!(type = eolian_type_base_type_get(type)));
424 fail_if(!!eolian_type_next_type_get(type)); 424 fail_if(!!eolian_type_next_type_get(type));
425 fail_if(!(type_name = eolian_type_c_type_get(type, EOLIAN_C_TYPE_DEFAULT))); 425 fail_if(!(type_name = eolian_type_c_type_get(type, EOLIAN_C_TYPE_DEFAULT)));
426 fail_if(!eolian_type_is_own(type)); 426 fail_if(!eolian_type_is_owned(type));
427 fail_if(strcmp(type_name, "Eo *")); 427 fail_if(strcmp(type_name, "Eo *"));
428 eina_stringshare_del(type_name); 428 eina_stringshare_del(type_name);
429 /* Properties parameter type */ 429 /* Properties parameter type */
@@ -434,13 +434,13 @@ START_TEST(eolian_complex_type)
434 fail_if(strcmp(eolian_parameter_name_get(param), "value")); 434 fail_if(strcmp(eolian_parameter_name_get(param), "value"));
435 fail_if(!(type = eolian_parameter_type_get(param))); 435 fail_if(!(type = eolian_parameter_type_get(param)));
436 fail_if(!(type_name = eolian_type_c_type_get(type, EOLIAN_C_TYPE_PARAM))); 436 fail_if(!(type_name = eolian_type_c_type_get(type, EOLIAN_C_TYPE_PARAM)));
437 fail_if(!eolian_type_is_own(type)); 437 fail_if(!eolian_type_is_owned(type));
438 fail_if(strcmp(type_name, "Eina_List *")); 438 fail_if(strcmp(type_name, "Eina_List *"));
439 eina_stringshare_del(type_name); 439 eina_stringshare_del(type_name);
440 fail_if(!(type = eolian_type_base_type_get(type))); 440 fail_if(!(type = eolian_type_base_type_get(type)));
441 fail_if(!!eolian_type_next_type_get(type)); 441 fail_if(!!eolian_type_next_type_get(type));
442 fail_if(!(type_name = eolian_type_c_type_get(type, EOLIAN_C_TYPE_DEFAULT))); 442 fail_if(!(type_name = eolian_type_c_type_get(type, EOLIAN_C_TYPE_DEFAULT)));
443 fail_if(eolian_type_is_own(type)); 443 fail_if(eolian_type_is_owned(type));
444 fail_if(strcmp(type_name, "int")); 444 fail_if(strcmp(type_name, "int"));
445 eina_stringshare_del(type_name); 445 eina_stringshare_del(type_name);
446 446
@@ -448,13 +448,13 @@ START_TEST(eolian_complex_type)
448 fail_if(!(fid = eolian_class_function_get_by_name(class, "foo", EOLIAN_METHOD))); 448 fail_if(!(fid = eolian_class_function_get_by_name(class, "foo", EOLIAN_METHOD)));
449 fail_if(!(type = eolian_function_return_type_get(fid, EOLIAN_METHOD))); 449 fail_if(!(type = eolian_function_return_type_get(fid, EOLIAN_METHOD)));
450 fail_if(!(type_name = eolian_type_c_type_get(type, EOLIAN_C_TYPE_RETURN))); 450 fail_if(!(type_name = eolian_type_c_type_get(type, EOLIAN_C_TYPE_RETURN)));
451 fail_if(!eolian_type_is_own(type)); 451 fail_if(!eolian_type_is_owned(type));
452 fail_if(strcmp(type_name, "Eina_List *")); 452 fail_if(strcmp(type_name, "Eina_List *"));
453 eina_stringshare_del(type_name); 453 eina_stringshare_del(type_name);
454 fail_if(!(type = eolian_type_base_type_get(type))); 454 fail_if(!(type = eolian_type_base_type_get(type)));
455 fail_if(!!eolian_type_next_type_get(type)); 455 fail_if(!!eolian_type_next_type_get(type));
456 fail_if(!(type_name = eolian_type_c_type_get(type, EOLIAN_C_TYPE_DEFAULT))); 456 fail_if(!(type_name = eolian_type_c_type_get(type, EOLIAN_C_TYPE_DEFAULT)));
457 fail_if(eolian_type_is_own(type)); 457 fail_if(eolian_type_is_owned(type));
458 fail_if(strcmp(type_name, "Eina_Stringshare *")); 458 fail_if(strcmp(type_name, "Eina_Stringshare *"));
459 eina_stringshare_del(type_name); 459 eina_stringshare_del(type_name);
460 /* Methods parameter type */ 460 /* Methods parameter type */
@@ -465,7 +465,7 @@ START_TEST(eolian_complex_type)
465 fail_if(strcmp(eolian_parameter_name_get(param), "buf")); 465 fail_if(strcmp(eolian_parameter_name_get(param), "buf"));
466 fail_if(!(type = eolian_parameter_type_get(param))); 466 fail_if(!(type = eolian_parameter_type_get(param)));
467 fail_if(!(type_name = eolian_type_c_type_get(type, EOLIAN_C_TYPE_PARAM))); 467 fail_if(!(type_name = eolian_type_c_type_get(type, EOLIAN_C_TYPE_PARAM)));
468 fail_if(!eolian_type_is_own(type)); 468 fail_if(!eolian_type_is_owned(type));
469 fail_if(strcmp(type_name, "char *")); 469 fail_if(strcmp(type_name, "char *"));
470 eina_stringshare_del(type_name); 470 eina_stringshare_del(type_name);
471 471
@@ -1458,7 +1458,7 @@ START_TEST(eolian_function_types)
1458 fail_if(strcmp(eolian_parameter_name_get(param), "c")); 1458 fail_if(strcmp(eolian_parameter_name_get(param), "c"));
1459 fail_if(!(type = eolian_parameter_type_get(param))); 1459 fail_if(!(type = eolian_parameter_type_get(param)));
1460 fail_if(eolian_parameter_direction_get(param) != EOLIAN_IN_PARAM); 1460 fail_if(eolian_parameter_direction_get(param) != EOLIAN_IN_PARAM);
1461 fail_if(eolian_type_is_own(type)); 1461 fail_if(eolian_type_is_owned(type));
1462 fail_if(!(type_name = eolian_type_c_type_get(type, EOLIAN_C_TYPE_PARAM))); 1462 fail_if(!(type_name = eolian_type_c_type_get(type, EOLIAN_C_TYPE_PARAM)));
1463 fail_if(strcmp(type_name, "const char *")); 1463 fail_if(strcmp(type_name, "const char *"));
1464 1464
@@ -1467,9 +1467,9 @@ START_TEST(eolian_function_types)
1467 fail_if(strcmp(eolian_parameter_name_get(param), "d")); 1467 fail_if(strcmp(eolian_parameter_name_get(param), "d"));
1468 fail_if(eolian_parameter_direction_get(param) != EOLIAN_OUT_PARAM); 1468 fail_if(eolian_parameter_direction_get(param) != EOLIAN_OUT_PARAM);
1469 fail_if(!(type = eolian_parameter_type_get(param))); 1469 fail_if(!(type = eolian_parameter_type_get(param)));
1470 fail_if(!eolian_type_is_own(type)); 1470 fail_if(!eolian_type_is_owned(type));
1471 fail_if(!(type_name = eolian_type_c_type_get(type, EOLIAN_C_TYPE_PARAM))); 1471 fail_if(!(type_name = eolian_type_c_type_get(type, EOLIAN_C_TYPE_PARAM)));
1472 fail_if(strcmp(type_name, "const char *")); 1472 fail_if(strcmp(type_name, "char *"));
1473 1473
1474 fail_if(eina_iterator_next(iter, &dummy)); 1474 fail_if(eina_iterator_next(iter, &dummy));
1475 1475
@@ -1488,7 +1488,7 @@ START_TEST(eolian_function_types)
1488 fail_if(strcmp(eolian_parameter_name_get(param), "cb")); 1488 fail_if(strcmp(eolian_parameter_name_get(param), "cb"));
1489 fail_if(!(type = eolian_parameter_type_get(param))); 1489 fail_if(!(type = eolian_parameter_type_get(param)));
1490 fail_if(eolian_parameter_direction_get(param) != EOLIAN_IN_PARAM); 1490 fail_if(eolian_parameter_direction_get(param) != EOLIAN_IN_PARAM);
1491 fail_if(eolian_type_is_own(type)); 1491 fail_if(eolian_type_is_owned(type));
1492 fail_if(!(type_name = eolian_type_name_get(type))); 1492 fail_if(!(type_name = eolian_type_name_get(type)));
1493 fail_if(strcmp(type_name, "VoidFunc")); 1493 fail_if(strcmp(type_name, "VoidFunc"));
1494 fail_if(!(arg_decl = eolian_type_typedecl_get(type))); 1494 fail_if(!(arg_decl = eolian_type_typedecl_get(type)));
@@ -1498,7 +1498,7 @@ START_TEST(eolian_function_types)
1498 fail_if(strcmp(eolian_parameter_name_get(param), "another_cb")); 1498 fail_if(strcmp(eolian_parameter_name_get(param), "another_cb"));
1499 fail_if(eolian_parameter_direction_get(param) != EOLIAN_IN_PARAM); 1499 fail_if(eolian_parameter_direction_get(param) != EOLIAN_IN_PARAM);
1500 fail_if(!(type = eolian_parameter_type_get(param))); 1500 fail_if(!(type = eolian_parameter_type_get(param)));
1501 fail_if(eolian_type_is_own(type)); 1501 fail_if(eolian_type_is_owned(type));
1502 fail_if(eolian_type_type_get(type) != EOLIAN_TYPE_REGULAR); 1502 fail_if(eolian_type_type_get(type) != EOLIAN_TYPE_REGULAR);
1503 fail_if(!(type_name = eolian_type_name_get(type))); 1503 fail_if(!(type_name = eolian_type_name_get(type)));
1504 fail_if(strcmp(type_name, "SimpleFunc")); 1504 fail_if(strcmp(type_name, "SimpleFunc"));
@@ -1539,7 +1539,7 @@ START_TEST(eolian_function_as_arguments)
1539 fail_if(strcmp(eolian_parameter_name_get(param), "cb")); 1539 fail_if(strcmp(eolian_parameter_name_get(param), "cb"));
1540 fail_if(!(type = eolian_parameter_type_get(param))); 1540 fail_if(!(type = eolian_parameter_type_get(param)));
1541 fail_if(eolian_parameter_direction_get(param) != EOLIAN_IN_PARAM); 1541 fail_if(eolian_parameter_direction_get(param) != EOLIAN_IN_PARAM);
1542 fail_if(eolian_type_is_own(type)); 1542 fail_if(eolian_type_is_owned(type));
1543 fail_if(!(type_name = eolian_type_name_get(type))); 1543 fail_if(!(type_name = eolian_type_name_get(type)));
1544 fail_if(strcmp(type_name, "SimpleFunc")); 1544 fail_if(strcmp(type_name, "SimpleFunc"));
1545 fail_if(!(arg_decl = eolian_type_typedecl_get(type))); 1545 fail_if(!(arg_decl = eolian_type_typedecl_get(type)));