summaryrefslogtreecommitdiff
path: root/src/tests/eolian/data
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/tests/eolian/data
parentc559380f7f3c495e8661db4cc4b2a0b5f70ed29c (diff)
eolian: correctness fixes in tests and eo files
Diffstat (limited to 'src/tests/eolian/data')
-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
16 files changed, 22 insertions, 22 deletions
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}