summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/tests/eolian_cxx/complex.eo36
-rw-r--r--src/tests/eolian_cxx/name1_name2_type_generation.eo38
-rw-r--r--src/tests/eolian_js/constructor_method_class.eo4
-rw-r--r--src/tests/eolian_js/test_object.eo4
4 files changed, 41 insertions, 41 deletions
diff --git a/src/tests/eolian_cxx/complex.eo b/src/tests/eolian_cxx/complex.eo
index b9fa6acc44..df1c337b08 100644
--- a/src/tests/eolian_cxx/complex.eo
+++ b/src/tests/eolian_cxx/complex.eo
@@ -20,17 +20,17 @@ class Complex (Efl.Object)
20 } 20 }
21 incontcontown { 21 incontcontown {
22 params { 22 params {
23 l: own(list<list<int>>); 23 l: list<list<int>> @owned;
24 } 24 }
25 } 25 }
26 incontowncontown { 26 incontowncontown {
27 params { 27 params {
28 l: own(list<own(list<int>)>); 28 l: list<list<int> @owned> @owned;
29 } 29 }
30 } 30 }
31 incontowncont { 31 incontowncont {
32 params { 32 params {
33 l: list<own(list<int>)>; 33 l: list<list<int> @owned>;
34 } 34 }
35 } 35 }
36 instringcont { 36 instringcont {
@@ -40,12 +40,12 @@ class Complex (Efl.Object)
40 } 40 }
41 instringowncont { 41 instringowncont {
42 params { 42 params {
43 l: list<own(string)>; 43 l: list<string @owned>;
44 } 44 }
45 } 45 }
46 instringcontown { 46 instringcontown {
47 params { 47 params {
48 l: own(list<string>); 48 l: list<string> @owned;
49 } 49 }
50 } 50 }
51 inarray { 51 inarray {
@@ -55,7 +55,7 @@ class Complex (Efl.Object)
55 } 55 }
56 inarrayown { 56 inarrayown {
57 params { 57 params {
58 l: own(array<int>); 58 l: array<int> @owned;
59 } 59 }
60 } 60 }
61 inhash { 61 inhash {
@@ -65,7 +65,7 @@ class Complex (Efl.Object)
65 } 65 }
66 inhashown { 66 inhashown {
67 params { 67 params {
68 l: own(hash<int, int>); 68 l: hash<int, int> @owned;
69 } 69 }
70 } 70 }
71 initerator { 71 initerator {
@@ -75,7 +75,7 @@ class Complex (Efl.Object)
75 } 75 }
76 initeratorown { 76 initeratorown {
77 params { 77 params {
78 l: own(iterator<int>); 78 l: iterator<int> @owned;
79 } 79 }
80 } 80 }
81 inaccessor { 81 inaccessor {
@@ -85,7 +85,7 @@ class Complex (Efl.Object)
85 } 85 }
86 inaccessorown { 86 inaccessorown {
87 params { 87 params {
88 l: own(accessor<int>); 88 l: accessor<int> @owned;
89 } 89 }
90 } 90 }
91 // out 91 // out
@@ -101,17 +101,17 @@ class Complex (Efl.Object)
101 } 101 }
102 outcontcontown { 102 outcontcontown {
103 params { 103 params {
104 @out l: own(list<list<int>>); 104 @out l: list<list<int>> @owned;
105 } 105 }
106 } 106 }
107 outcontowncontown { 107 outcontowncontown {
108 params { 108 params {
109 @out l: own(list<own(list<int>)>); 109 @out l: list<list<int> @owned> @owned;
110 } 110 }
111 } 111 }
112 outcontowncont { 112 outcontowncont {
113 params { 113 params {
114 @out l: list<own(list<int>)>; 114 @out l: list<list<int> @owned>;
115 } 115 }
116 } 116 }
117 outstringcont { 117 outstringcont {
@@ -121,12 +121,12 @@ class Complex (Efl.Object)
121 } 121 }
122 outstringowncont { 122 outstringowncont {
123 params { 123 params {
124 @out l: list<own(string)>; 124 @out l: list<string @owned>;
125 } 125 }
126 } 126 }
127 outstringcontown { 127 outstringcontown {
128 params { 128 params {
129 @out l: own(list<string>); 129 @out l: list<string> @owned;
130 } 130 }
131 } 131 }
132 outarray { 132 outarray {
@@ -136,7 +136,7 @@ class Complex (Efl.Object)
136 } 136 }
137 outarrayown { 137 outarrayown {
138 params { 138 params {
139 @out l: own(array<int>); 139 @out l: array<int> @owned;
140 } 140 }
141 } 141 }
142 outhash { 142 outhash {
@@ -146,7 +146,7 @@ class Complex (Efl.Object)
146 } 146 }
147 outhashown { 147 outhashown {
148 params { 148 params {
149 @out l: own(hash<int, int>); 149 @out l: hash<int, int> @owned;
150 } 150 }
151 } 151 }
152 outiterator { 152 outiterator {
@@ -156,7 +156,7 @@ class Complex (Efl.Object)
156 } 156 }
157 outiteratorown { 157 outiteratorown {
158 params { 158 params {
159 @out l: own(iterator<int>); 159 @out l: iterator<int> @owned;
160 } 160 }
161 } 161 }
162 outaccessor { 162 outaccessor {
@@ -166,7 +166,7 @@ class Complex (Efl.Object)
166 } 166 }
167 outaccessorown { 167 outaccessorown {
168 params { 168 params {
169 @out l: own(accessor<int>); 169 @out l: accessor<int> @owned;
170 } 170 }
171 } 171 }
172 // 172 //
diff --git a/src/tests/eolian_cxx/name1_name2_type_generation.eo b/src/tests/eolian_cxx/name1_name2_type_generation.eo
index 7da1c887af..833a54059b 100644
--- a/src/tests/eolian_cxx/name1_name2_type_generation.eo
+++ b/src/tests/eolian_cxx/name1_name2_type_generation.eo
@@ -10,12 +10,12 @@ class Name1.Name2.Type_Generation (Efl.Object)
10 } 10 }
11 inrefintown { 11 inrefintown {
12 params { 12 params {
13 @in v: own(ptr(int)); 13 @in v: ptr(int) @owned;
14 } 14 }
15 } 15 }
16 inrefintownfree { 16 inrefintownfree {
17 params { 17 params {
18 @in v: free(own(ptr(int)), free); 18 @in v: free(ptr(int), free) @owned;
19 } 19 }
20 } 20 }
21 // in void ptr 21 // in void ptr
@@ -36,12 +36,12 @@ class Name1.Name2.Type_Generation (Efl.Object)
36 } 36 }
37 inintptrown { 37 inintptrown {
38 params { 38 params {
39 @in v: own(ptr(int)); 39 @in v: ptr(int) @owned;
40 } 40 }
41 } 41 }
42 inintptrownfree { 42 inintptrownfree {
43 params { 43 params {
44 @in v: free(own(ptr(int)), free); 44 @in v: free(ptr(int), free) @owned;
45 } 45 }
46 } 46 }
47 instring { 47 instring {
@@ -56,12 +56,12 @@ class Name1.Name2.Type_Generation (Efl.Object)
56 } 56 }
57 instringown { 57 instringown {
58 params { 58 params {
59 @in v: own(string); 59 @in v: string @owned;
60 } 60 }
61 } 61 }
62 instringptrown { 62 instringptrown {
63 params { 63 params {
64 @in v: own(ptr(string)); 64 @in v: ptr(string) @owned;
65 } 65 }
66 } 66 }
67 instringshare { 67 instringshare {
@@ -71,7 +71,7 @@ class Name1.Name2.Type_Generation (Efl.Object)
71 } 71 }
72 instringshareown { 72 instringshareown {
73 params { 73 params {
74 @in v: own(stringshare); 74 @in v: stringshare @owned;
75 } 75 }
76 } 76 }
77 // return 77 // return
@@ -88,11 +88,11 @@ class Name1.Name2.Type_Generation (Efl.Object)
88 return: ptr(int); 88 return: ptr(int);
89 } 89 }
90 returnintptrown { 90 returnintptrown {
91 return: own(ptr(int)); 91 return: ptr(int) @owned;
92 } 92 }
93 returnintptrownfree { 93 returnintptrownfree {
94 params { 94 params {
95 @in v: free(own(ptr(int)), free); 95 @in v: free(ptr(int), free) @owned;
96 } 96 }
97 } 97 }
98 returnstring { 98 returnstring {
@@ -102,16 +102,16 @@ class Name1.Name2.Type_Generation (Efl.Object)
102 return: ptr(string); 102 return: ptr(string);
103 } 103 }
104 returnstringown { 104 returnstringown {
105 return: own(string); 105 return: string @owned;
106 } 106 }
107 returnstringownptr { 107 returnstringownptr {
108 return: own(ptr(string)); 108 return: ptr(string) @owned;
109 } 109 }
110 returnstringshare { 110 returnstringshare {
111 return: stringshare; 111 return: stringshare;
112 } 112 }
113 returnstringshareown { 113 returnstringshareown {
114 return: own(stringshare); 114 return: stringshare @owned;
115 } 115 }
116 // out 116 // out
117 outvoidptr { 117 outvoidptr {
@@ -131,12 +131,12 @@ class Name1.Name2.Type_Generation (Efl.Object)
131 } 131 }
132 outintptrown { 132 outintptrown {
133 params { 133 params {
134 @out v: own(ptr(int)); 134 @out v: ptr(int) @owned;
135 } 135 }
136 } 136 }
137 outintptrownfree { 137 outintptrownfree {
138 params { 138 params {
139 @out v: free(own(ptr(int)), free); 139 @out v: free(ptr(int), free) @owned;
140 } 140 }
141 } 141 }
142 outstringshare { 142 outstringshare {
@@ -146,7 +146,7 @@ class Name1.Name2.Type_Generation (Efl.Object)
146 } 146 }
147 outstringshareown { 147 outstringshareown {
148 params { 148 params {
149 @out v: own(stringshare); 149 @out v: stringshare @owned;
150 } 150 }
151 } 151 }
152 // classname 152 // classname
@@ -182,12 +182,12 @@ class Name1.Name2.Type_Generation (Efl.Object)
182 } 182 }
183 optionalinintptrown { 183 optionalinintptrown {
184 params { 184 params {
185 @in v: own(ptr(int)) @optional; 185 @in v: ptr(int) @owned @optional;
186 } 186 }
187 } 187 }
188 optionalinintptrownfree { 188 optionalinintptrownfree {
189 params { 189 params {
190 @in v: free(own(ptr(int)), free) @optional; 190 @in v: free(ptr(int), free) @owned @optional;
191 } 191 }
192 } 192 }
193 optionaloutvoidptr { 193 optionaloutvoidptr {
@@ -207,12 +207,12 @@ class Name1.Name2.Type_Generation (Efl.Object)
207 } 207 }
208 optionaloutintptrown { 208 optionaloutintptrown {
209 params { 209 params {
210 @out v: own(ptr(int)) @optional; 210 @out v: ptr(int) @owned @optional;
211 } 211 }
212 } 212 }
213 optionaloutintptrownfree { 213 optionaloutintptrownfree {
214 params { 214 params {
215 @out v: free(own(ptr(int)), free) @optional; 215 @out v: free(ptr(int), free) @owned @optional;
216 } 216 }
217 } 217 }
218 optionalinclassname { 218 optionalinclassname {
diff --git a/src/tests/eolian_js/constructor_method_class.eo b/src/tests/eolian_js/constructor_method_class.eo
index 034a9ebea6..ed77e85d70 100644
--- a/src/tests/eolian_js/constructor_method_class.eo
+++ b/src/tests/eolian_js/constructor_method_class.eo
@@ -41,10 +41,10 @@ class Constructor_Method_Class (Efl.Object)
41 } 41 }
42 classoutmethod1 { 42 classoutmethod1 {
43 params { @in one: int; @in two: double; } 43 params { @in one: int; @in two: double; }
44 return: free(own(Constructor_Method_Class), eo_unref) @warn_unused; 44 return: free(Constructor_Method_Class, eo_unref) @owned @warn_unused;
45 } 45 }
46 classoutmethod2 { 46 classoutmethod2 {
47 params { @in one: int; @in two: double; @out out_class: own(Constructor_Method_Class); } 47 params { @in one: int; @in two: double; @out out_class: Constructor_Method_Class @owned; }
48 } 48 }
49 } 49 }
50 implements { 50 implements {
diff --git a/src/tests/eolian_js/test_object.eo b/src/tests/eolian_js/test_object.eo
index 98f444786d..447ba2d970 100644
--- a/src/tests/eolian_js/test_object.eo
+++ b/src/tests/eolian_js/test_object.eo
@@ -104,7 +104,7 @@ class Test.Object (Efl.Object) {
104 } 104 }
105 method_array_with_42_check { 105 method_array_with_42_check {
106 [[ tests parameters ]] 106 [[ tests parameters ]]
107 return: free(own(array<int>), eina_array_free) @warn_unused; 107 return: array<int> @owned @warn_unused;
108 } 108 }
109 method_array_in_array_out_check { 109 method_array_in_array_out_check {
110 [[ tests parameters ]] 110 [[ tests parameters ]]
@@ -157,7 +157,7 @@ class Test.Object (Efl.Object) {
157 } 157 }
158 method_list_with_42_check { 158 method_list_with_42_check {
159 [[ tests parameters ]] 159 [[ tests parameters ]]
160 return: free(own(list<int>), eina_list_free) @warn_unused; 160 return: list<int> @owned @warn_unused;
161 } 161 }
162 method_list_in_list_out_check { 162 method_list_in_list_out_check {
163 [[ tests parameters ]] 163 [[ tests parameters ]]