summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Kolesa <d.kolesa@samsung.com>2019-05-26 17:25:15 +0200
committerDaniel Kolesa <d.kolesa@samsung.com>2019-05-26 17:25:15 +0200
commitd0fed247bbb18933b3d5c086126ac0f7b8d05e76 (patch)
tree875995d0b38022dcad4fac08a4d454254a6648bc
parent38d7d33354ce4d13d70f707498c267b120bf2e5a (diff)
eolian: remove param @nonull
This has been deprecated for a while and is not strictly necessary - as a part of an effort to stabilize Eolian, remove this. Eolian will eventually gain support for versioning and use a reversed behavior (i.e. no NULL by default), but the API it wlll use for that will be very different. Features can always be added, it's much harder to drop them. @feature
-rw-r--r--src/bin/eolian/headers.c5
-rw-r--r--src/bindings/luajit/eolian.lua5
-rw-r--r--src/lib/ecore_con/efl_net_dialer.eo2
-rw-r--r--src/lib/ecore_con/efl_net_ip_address.eo8
-rw-r--r--src/lib/ecore_con/efl_net_server.eo2
-rw-r--r--src/lib/ecore_con/efl_net_server_udp.eo4
-rw-r--r--src/lib/ecore_con/efl_net_socket_udp.eo6
-rw-r--r--src/lib/ector/ector_surface.eo2
-rw-r--r--src/lib/edje/efl_layout_group.eo2
-rw-r--r--src/lib/efl/interfaces/efl_file_save.eo6
-rw-r--r--src/lib/efl/interfaces/efl_gfx_stack.eo4
-rw-r--r--src/lib/efl/interfaces/efl_io_reader.eo2
-rw-r--r--src/lib/efl/interfaces/efl_io_writer.eo2
-rw-r--r--src/lib/elementary/efl_access_text.eo8
-rw-r--r--src/lib/elementary/efl_ui_focus_manager.eo4
-rw-r--r--src/lib/elementary/efl_ui_focus_manager_calc.eo22
-rw-r--r--src/lib/elementary/elm_code_syntax.c2
-rw-r--r--src/lib/eo/efl_object.eo4
-rw-r--r--src/lib/eolian/Eolian.h10
-rw-r--r--src/lib/eolian/database_function_parameter_api.c7
-rw-r--r--src/lib/eolian/eo_lexer.h10
-rw-r--r--src/lib/eolian/eo_parser.c7
-rw-r--r--src/lib/eolian/eolian_database.h1
-rw-r--r--src/lib/evas/canvas/efl_canvas_group.eo2
-rw-r--r--src/lib/evas/canvas/efl_canvas_object.eo6
-rw-r--r--src/lib/evas/canvas/efl_canvas_proxy.eo2
-rw-r--r--src/scripts/pyolian/eolian.py4
-rw-r--r--src/scripts/pyolian/eolian_lib.py4
-rwxr-xr-xsrc/scripts/pyolian/test_eolian.py1
-rw-r--r--src/tests/eolian/data/function_as_argument.eo6
-rw-r--r--src/tests/eolian/data/function_as_argument_impl_ref.c6
-rw-r--r--src/tests/eolian/data/function_as_argument_ref.c5
-rw-r--r--src/tests/eolian/data/function_as_argument_ref.h2
33 files changed, 56 insertions, 107 deletions
diff --git a/src/bin/eolian/headers.c b/src/bin/eolian/headers.c
index 63f38feaa5..9da3d74d49 100644
--- a/src/bin/eolian/headers.c
+++ b/src/bin/eolian/headers.c
@@ -51,6 +51,8 @@ eo_gen_params(Eina_Iterator *itr, Eina_Strbuf *buf,
51 eina_strbuf_append(buf, ", "); 51 eina_strbuf_append(buf, ", ");
52 *nidx += _gen_param(buf, pr, ftype, &rpid); 52 *nidx += _gen_param(buf, pr, ftype, &rpid);
53 53
54 /* Keep the logic for when there's a better way to emit NONNULL */
55#if 0
54 if (!eolian_parameter_is_nonull(pr) || !flagbuf) 56 if (!eolian_parameter_is_nonull(pr) || !flagbuf)
55 continue; 57 continue;
56 58
@@ -61,6 +63,9 @@ eo_gen_params(Eina_Iterator *itr, Eina_Strbuf *buf,
61 } 63 }
62 else 64 else
63 eina_strbuf_append_printf(*flagbuf, ", %d", *nidx - rpid); 65 eina_strbuf_append_printf(*flagbuf, ", %d", *nidx - rpid);
66#else
67 (void)flagbuf;
68#endif
64 } 69 }
65 eina_iterator_free(itr); 70 eina_iterator_free(itr);
66} 71}
diff --git a/src/bindings/luajit/eolian.lua b/src/bindings/luajit/eolian.lua
index 34da82c27b..48f5027542 100644
--- a/src/bindings/luajit/eolian.lua
+++ b/src/bindings/luajit/eolian.lua
@@ -369,7 +369,6 @@ ffi.cdef [[
369 const Eolian_Type *eolian_parameter_type_get(const Eolian_Function_Parameter *param); 369 const Eolian_Type *eolian_parameter_type_get(const Eolian_Function_Parameter *param);
370 const Eolian_Expression *eolian_parameter_default_value_get(const Eolian_Function_Parameter *param); 370 const Eolian_Expression *eolian_parameter_default_value_get(const Eolian_Function_Parameter *param);
371 const Eolian_Documentation *eolian_parameter_documentation_get(const Eolian_Function_Parameter *param); 371 const Eolian_Documentation *eolian_parameter_documentation_get(const Eolian_Function_Parameter *param);
372 Eina_Bool eolian_parameter_is_nonull(const Eolian_Function_Parameter *param_desc);
373 Eina_Bool eolian_parameter_is_optional(const Eolian_Function_Parameter *param_desc); 372 Eina_Bool eolian_parameter_is_optional(const Eolian_Function_Parameter *param_desc);
374 const Eolian_Type *eolian_function_return_type_get(const Eolian_Function *function_id, Eolian_Function_Type ftype); 373 const Eolian_Type *eolian_function_return_type_get(const Eolian_Function *function_id, Eolian_Function_Type ftype);
375 const Eolian_Expression *eolian_function_return_default_value_get(const Eolian_Function *foo_id, Eolian_Function_Type ftype); 374 const Eolian_Expression *eolian_function_return_default_value_get(const Eolian_Function *foo_id, Eolian_Function_Type ftype);
@@ -1263,10 +1262,6 @@ ffi.metatype("Eolian_Function_Parameter", {
1263 return v 1262 return v
1264 end, 1263 end,
1265 1264
1266 is_nonull = function(self)
1267 return eolian.eolian_parameter_is_nonull(self) ~= 0
1268 end,
1269
1270 is_optional = function(self) 1265 is_optional = function(self)
1271 return eolian.eolian_parameter_is_optional(self) ~= 0 1266 return eolian.eolian_parameter_is_optional(self) ~= 0
1272 end 1267 end
diff --git a/src/lib/ecore_con/efl_net_dialer.eo b/src/lib/ecore_con/efl_net_dialer.eo
index fce38973f7..47685e1434 100644
--- a/src/lib/ecore_con/efl_net_dialer.eo
+++ b/src/lib/ecore_con/efl_net_dialer.eo
@@ -29,7 +29,7 @@ interface @beta Efl.Net.Dialer extends Efl.Net.Socket {
29 dispatched. 29 dispatched.
30 ]] 30 ]]
31 params { 31 params {
32 address: string @nonull; [[Remote address]] 32 address: string; [[Remote address]]
33 } 33 }
34 return: Eina.Error; [[0 on success, error code otherwise]] 34 return: Eina.Error; [[0 on success, error code otherwise]]
35 } 35 }
diff --git a/src/lib/ecore_con/efl_net_ip_address.eo b/src/lib/ecore_con/efl_net_ip_address.eo
index 8e0370a201..effdf47274 100644
--- a/src/lib/ecore_con/efl_net_ip_address.eo
+++ b/src/lib/ecore_con/efl_net_ip_address.eo
@@ -59,7 +59,7 @@ class @beta Efl.Net.Ip_Address extends Efl.Object {
59 use @.create. To create from a string use @.parse. 59 use @.create. To create from a string use @.parse.
60 ]] 60 ]]
61 params { 61 params {
62 sockaddr: const(void_ptr) @nonull; [[The pointer to struct sockaddr-compatible handle as per <netinet/in.h>.]] 62 sockaddr: const(void_ptr); [[The pointer to struct sockaddr-compatible handle as per <netinet/in.h>.]]
63 } 63 }
64 return: Efl.Net.Ip_Address @owned; [[Newly created object or $NULL if parameter was invalid.]] 64 return: Efl.Net.Ip_Address @owned; [[Newly created object or $NULL if parameter was invalid.]]
65 } 65 }
@@ -104,7 +104,7 @@ class @beta Efl.Net.Ip_Address extends Efl.Object {
104 and port. 104 and port.
105 ]] 105 ]]
106 params { 106 params {
107 address: string @nonull; [[The address, such as enlightenment.org:http or enlightenment.org (port=0)]] 107 address: string; [[The address, such as enlightenment.org:http or enlightenment.org (port=0)]]
108 family: int @optional; [[Preferred family. AF_UNSPEC or 0 for both, otherwise one of AF_INET or AF_INET6]] 108 family: int @optional; [[Preferred family. AF_UNSPEC or 0 for both, otherwise one of AF_INET or AF_INET6]]
109 flags: int @optional; [[Flags to use with getaddrinfo(). If 0, default flags are used (AI_V4MAPPED | AI_ADDRCONFIG, if these exist in your system).]] 109 flags: int @optional; [[Flags to use with getaddrinfo(). If 0, default flags are used (AI_V4MAPPED | AI_ADDRCONFIG, if these exist in your system).]]
110 } 110 }
@@ -123,7 +123,7 @@ class @beta Efl.Net.Ip_Address extends Efl.Object {
123 ]] 123 ]]
124 get { } 124 get { }
125 values { 125 values {
126 str: string @nonull; [[Numeric address as string]] 126 str: string; [[Numeric address as string]]
127 } 127 }
128 } 128 }
129 129
@@ -167,7 +167,7 @@ class @beta Efl.Net.Ip_Address extends Efl.Object {
167 May only be set once. Afterwards the object does not change. 167 May only be set once. Afterwards the object does not change.
168 ]] 168 ]]
169 values { 169 values {
170 sockaddr: const(void_ptr) @nonull; [[Sockaddr struct. As usual with struct sockaddr, the first field, struct sockaddr::sa_family, defines the rest of the structure and how the whole structure must be interpreted. If AF_INET is struct sockaddr_in, AF_INET6 is struct sockaddr_in6.]] 170 sockaddr: const(void_ptr); [[Sockaddr struct. As usual with struct sockaddr, the first field, struct sockaddr::sa_family, defines the rest of the structure and how the whole structure must be interpreted. If AF_INET is struct sockaddr_in, AF_INET6 is struct sockaddr_in6.]]
171 } 171 }
172 } 172 }
173 173
diff --git a/src/lib/ecore_con/efl_net_server.eo b/src/lib/ecore_con/efl_net_server.eo
index 72b0bb25d9..8241bf6822 100644
--- a/src/lib/ecore_con/efl_net_server.eo
+++ b/src/lib/ecore_con/efl_net_server.eo
@@ -43,7 +43,7 @@ interface @beta Efl.Net.Server {
43 dispatched. 43 dispatched.
44 ]] 44 ]]
45 params { 45 params {
46 address: string @nonull; [[Address to run server on]] 46 address: string; [[Address to run server on]]
47 } 47 }
48 return: Eina.Error; [[$0 on success, error code otherwise]] 48 return: Eina.Error; [[$0 on success, error code otherwise]]
49 } 49 }
diff --git a/src/lib/ecore_con/efl_net_server_udp.eo b/src/lib/ecore_con/efl_net_server_udp.eo
index 3532a7bcb7..edb9471696 100644
--- a/src/lib/ecore_con/efl_net_server_udp.eo
+++ b/src/lib/ecore_con/efl_net_server_udp.eo
@@ -36,7 +36,7 @@ class @beta Efl.Net.Server_Udp extends Efl.Net.Server_Ip {
36 ff02::1@1 - use loopback interface (idx=1) 36 ff02::1@1 - use loopback interface (idx=1)
37 ]] 37 ]]
38 params { 38 params {
39 address: string @nonull; [[Multicast group address]] 39 address: string; [[Multicast group address]]
40 } 40 }
41 return: Eina.Error; [[0 on success, error code otherwise]] 41 return: Eina.Error; [[0 on success, error code otherwise]]
42 } 42 }
@@ -47,7 +47,7 @@ class @beta Efl.Net.Server_Udp extends Efl.Net.Server_Ip {
47 This reverses the effect of @.multicast_join. 47 This reverses the effect of @.multicast_join.
48 ]] 48 ]]
49 params { 49 params {
50 address: string @nonull; [[Multicast group address]] 50 address: string; [[Multicast group address]]
51 } 51 }
52 return: Eina.Error; [[0 on success, error code otherwise]] 52 return: Eina.Error; [[0 on success, error code otherwise]]
53 } 53 }
diff --git a/src/lib/ecore_con/efl_net_socket_udp.eo b/src/lib/ecore_con/efl_net_socket_udp.eo
index 2e5ed25350..561473b478 100644
--- a/src/lib/ecore_con/efl_net_socket_udp.eo
+++ b/src/lib/ecore_con/efl_net_socket_udp.eo
@@ -87,7 +87,7 @@ class @beta Efl.Net.Socket_Udp extends Efl.Net.Socket_Fd {
87 ff02::1@1 - use loopback interface (idx=1) 87 ff02::1@1 - use loopback interface (idx=1)
88 ]] 88 ]]
89 params { 89 params {
90 address: string @nonull; [[Multicast address to join]] 90 address: string; [[Multicast address to join]]
91 } 91 }
92 return: Eina.Error; [[$0 on success, error code otherwise]] 92 return: Eina.Error; [[$0 on success, error code otherwise]]
93 } 93 }
@@ -98,7 +98,7 @@ class @beta Efl.Net.Socket_Udp extends Efl.Net.Socket_Fd {
98 This reverses the effect of @.multicast_join. 98 This reverses the effect of @.multicast_join.
99 ]] 99 ]]
100 params { 100 params {
101 address: string @nonull; [[Multicast address to leave]] 101 address: string; [[Multicast address to leave]]
102 } 102 }
103 return: Eina.Error; [[$0 on success, error code otherwise]] 103 return: Eina.Error; [[$0 on success, error code otherwise]]
104 } 104 }
@@ -159,7 +159,7 @@ class @beta Efl.Net.Socket_Udp extends Efl.Net.Socket_Fd {
159 return: Eina.Error; [[$0 on success, error code otherwise]] 159 return: Eina.Error; [[$0 on success, error code otherwise]]
160 } 160 }
161 values { 161 values {
162 address: string @nonull; [[Address to bind to]] 162 address: string; [[Address to bind to]]
163 } 163 }
164 } 164 }
165 165
diff --git a/src/lib/ector/ector_surface.eo b/src/lib/ector/ector_surface.eo
index f29cf070fa..0dcfff28ac 100644
--- a/src/lib/ector/ector_surface.eo
+++ b/src/lib/ector/ector_surface.eo
@@ -18,7 +18,7 @@ mixin @beta Ector.Surface extends Ector.Buffer
18 [[Create a new renderer factory for the given type]] 18 [[Create a new renderer factory for the given type]]
19 return: Efl.Object; [[Renderer factory object]] /* FIXME: Should be a more restricted type, only here for cyclic. */ 19 return: Efl.Object; [[Renderer factory object]] /* FIXME: Should be a more restricted type, only here for cyclic. */
20 params { 20 params {
21 @in type: const(Efl.Class) @nonull; [[Efl class]] /* FIXME: Should probably be a more restricted type */ 21 @in type: const(Efl.Class); [[Efl class]] /* FIXME: Should probably be a more restricted type */
22 } 22 }
23 } 23 }
24 } 24 }
diff --git a/src/lib/edje/efl_layout_group.eo b/src/lib/edje/efl_layout_group.eo
index 78592ab988..d6de69e168 100644
--- a/src/lib/edje/efl_layout_group.eo
+++ b/src/lib/edje/efl_layout_group.eo
@@ -113,7 +113,7 @@ interface Efl.Layout.Group
113 ]] 113 ]]
114 get { [[Returns $true if the part exists in the EDC group.]] } 114 get { [[Returns $true if the part exists in the EDC group.]] }
115 keys { 115 keys {
116 part: string @nonull; [[The part name to check.]] 116 part: string; [[The part name to check.]]
117 } 117 }
118 values { 118 values {
119 exists: bool; [[$true if the part exists, $false otherwise.]] 119 exists: bool; [[$true if the part exists, $false otherwise.]]
diff --git a/src/lib/efl/interfaces/efl_file_save.eo b/src/lib/efl/interfaces/efl_file_save.eo
index e9a72ec262..5f8274dd54 100644
--- a/src/lib/efl/interfaces/efl_file_save.eo
+++ b/src/lib/efl/interfaces/efl_file_save.eo
@@ -31,10 +31,10 @@ interface Efl.File_Save {
31 "quality=100 compress=9". 31 "quality=100 compress=9".
32 ]] 32 ]]
33 params { 33 params {
34 @in file: string @nonull; [[The filename to be used to save the image (extension 34 @in file: string; [[The filename to be used to save the image (extension
35 obligatory).]] 35 obligatory).]]
36 @in key: string; [[The image key in the file (if an Eet one), or $null, 36 @in key: string; [[The image key in the file (if an Eet one), or $null,
37 otherwise.]] 37 otherwise.]]
38 @in info: const(ptr(Efl.File_Save_Info)); [[The flags to be used ($null for defaults).]] 38 @in info: const(ptr(Efl.File_Save_Info)); [[The flags to be used ($null for defaults).]]
39 } 39 }
40 return: bool; [[$true on success, $false otherwise]] 40 return: bool; [[$true on success, $false otherwise]]
diff --git a/src/lib/efl/interfaces/efl_gfx_stack.eo b/src/lib/efl/interfaces/efl_gfx_stack.eo
index ea3ce848ac..cb1307c772 100644
--- a/src/lib/efl/interfaces/efl_gfx_stack.eo
+++ b/src/lib/efl/interfaces/efl_gfx_stack.eo
@@ -84,7 +84,7 @@ interface Efl.Gfx.Stack
84 See also @.layer.get(), @.layer.set() and @.stack_below()]] 84 See also @.layer.get(), @.layer.set() and @.stack_below()]]
85 85
86 params { 86 params {
87 @in below: Efl.Gfx.Stack @nonull; [[The object below which to stack]] 87 @in below: Efl.Gfx.Stack; [[The object below which to stack]]
88 } 88 }
89 } 89 }
90 raise_to_top { 90 raise_to_top {
@@ -118,7 +118,7 @@ interface Efl.Gfx.Stack
118 See also @.layer.get(), @.layer.set() and @.stack_below()]] 118 See also @.layer.get(), @.layer.set() and @.stack_below()]]
119 119
120 params { 120 params {
121 @in above: Efl.Gfx.Stack @nonull; [[The object above which to stack]] 121 @in above: Efl.Gfx.Stack; [[The object above which to stack]]
122 } 122 }
123 } 123 }
124 lower_to_bottom { 124 lower_to_bottom {
diff --git a/src/lib/efl/interfaces/efl_io_reader.eo b/src/lib/efl/interfaces/efl_io_reader.eo
index 873b11eda6..2e166031a9 100644
--- a/src/lib/efl/interfaces/efl_io_reader.eo
+++ b/src/lib/efl/interfaces/efl_io_reader.eo
@@ -29,7 +29,7 @@ interface Efl.Io.Reader {
29 You can understand this method as read(2) libc function. 29 You can understand this method as read(2) libc function.
30 ]] 30 ]]
31 params { 31 params {
32 @inout rw_slice: Eina.Rw_Slice @nonull; [[Provides a pre-allocated memory to be filled up to rw_slice.len. It will be populated and the length will be set to the actually used amount of bytes, which can be smaller than the request.]] 32 @inout rw_slice: Eina.Rw_Slice; [[Provides a pre-allocated memory to be filled up to rw_slice.len. It will be populated and the length will be set to the actually used amount of bytes, which can be smaller than the request.]]
33 } 33 }
34 return: Eina.Error; [[0 on succeed, a mapping of errno otherwise]] 34 return: Eina.Error; [[0 on succeed, a mapping of errno otherwise]]
35 } 35 }
diff --git a/src/lib/efl/interfaces/efl_io_writer.eo b/src/lib/efl/interfaces/efl_io_writer.eo
index bfff7242b9..471b6a0d60 100644
--- a/src/lib/efl/interfaces/efl_io_writer.eo
+++ b/src/lib/efl/interfaces/efl_io_writer.eo
@@ -29,7 +29,7 @@ interface Efl.Io.Writer {
29 You can understand this method as write(2) libc function. 29 You can understand this method as write(2) libc function.
30 ]] 30 ]]
31 params { 31 params {
32 @inout slice: Eina.Slice @nonull; [[Provides a pre-populated memory to be used up to slice.len. The returned slice will be adapted as length will be set to the actually used amount of bytes, which can be smaller than the request.]] 32 @inout slice: Eina.Slice; [[Provides a pre-populated memory to be used up to slice.len. The returned slice will be adapted as length will be set to the actually used amount of bytes, which can be smaller than the request.]]
33 @out remaining: Eina.Slice @optional; [[Convenience to output the remaining parts of slice that was not written. If the full slice was written, this will be a slice of zero-length.]] 33 @out remaining: Eina.Slice @optional; [[Convenience to output the remaining parts of slice that was not written. If the full slice was written, this will be a slice of zero-length.]]
34 } 34 }
35 return: Eina.Error; [[0 on succeed, a mapping of errno otherwise]] 35 return: Eina.Error; [[0 on succeed, a mapping of errno otherwise]]
diff --git a/src/lib/elementary/efl_access_text.eo b/src/lib/elementary/efl_access_text.eo
index 0d42c02c7b..9511419986 100644
--- a/src/lib/elementary/efl_access_text.eo
+++ b/src/lib/elementary/efl_access_text.eo
@@ -64,7 +64,7 @@ interface @beta Efl.Access.Text
64 } 64 }
65 keys { 65 keys {
66 granularity: Efl.Access.Text_Granularity; [[Text granularity]] 66 granularity: Efl.Access.Text_Granularity; [[Text granularity]]
67 start_offset: ptr(int) @nonull; [[Offset indicating start of string according to given granularity. -1 in case of error.]] 67 start_offset: ptr(int); [[Offset indicating start of string according to given granularity. -1 in case of error.]]
68 end_offset: ptr(int); [[Offset indicating end of string according to given granularity. -1 in case of error.]] 68 end_offset: ptr(int); [[Offset indicating end of string according to given granularity. -1 in case of error.]]
69 } 69 }
70 values { 70 values {
@@ -101,8 +101,8 @@ interface @beta Efl.Access.Text
101 return: bool; [[$true if attribute name is set, $false otherwise]] 101 return: bool; [[$true if attribute name is set, $false otherwise]]
102 } 102 }
103 keys { 103 keys {
104 name: string @nonull; [[Text attribute name]] 104 name: string; [[Text attribute name]]
105 start_offset: ptr(int) @nonull; [[Position in text from which given attribute is set.]] 105 start_offset: ptr(int); [[Position in text from which given attribute is set.]]
106 end_offset: ptr(int); [[Position in text to which given attribute is set.]] 106 end_offset: ptr(int); [[Position in text to which given attribute is set.]]
107 } 107 }
108 values { 108 values {
@@ -114,7 +114,7 @@ interface @beta Efl.Access.Text
114 [[Gets list of all text attributes.]] 114 [[Gets list of all text attributes.]]
115 } 115 }
116 keys { 116 keys {
117 start_offset: ptr(int) @nonull; [[Start offset]] 117 start_offset: ptr(int); [[Start offset]]
118 end_offset: ptr(int); [[End offset]] 118 end_offset: ptr(int); [[End offset]]
119 } 119 }
120 values { 120 values {
diff --git a/src/lib/elementary/efl_ui_focus_manager.eo b/src/lib/elementary/efl_ui_focus_manager.eo
index 7d1a510642..fbc78884f0 100644
--- a/src/lib/elementary/efl_ui_focus_manager.eo
+++ b/src/lib/elementary/efl_ui_focus_manager.eo
@@ -69,7 +69,7 @@ interface Efl.Ui.Focus.Manager {
69 ]] 69 ]]
70 70
71 values { 71 values {
72 focus : Efl.Ui.Focus.Object @nonull; [[Currently focused element.]] 72 focus : Efl.Ui.Focus.Object; [[Currently focused element.]]
73 } 73 }
74 } 74 }
75 @property redirect { 75 @property redirect {
@@ -121,7 +121,7 @@ interface Efl.Ui.Focus.Manager {
121 get {} 121 get {}
122 122
123 values { 123 values {
124 root : Efl.Ui.Focus.Object @nonull; [[Will be registered into 124 root : Efl.Ui.Focus.Object; [[Will be registered into
125 this manager object.]] 125 this manager object.]]
126 } 126 }
127 } 127 }
diff --git a/src/lib/elementary/efl_ui_focus_manager_calc.eo b/src/lib/elementary/efl_ui_focus_manager_calc.eo
index 7f1974139b..d21b925559 100644
--- a/src/lib/elementary/efl_ui_focus_manager_calc.eo
+++ b/src/lib/elementary/efl_ui_focus_manager_calc.eo
@@ -15,9 +15,9 @@ class @beta Efl.Ui.Focus.Manager_Calc extends Efl.Object implements Efl.Ui.Focus
15 $child gets focused. 15 $child gets focused.
16 ]] 16 ]]
17 params { 17 params {
18 child : Efl.Ui.Focus.Object @nonull; [[The object to register]] 18 child : Efl.Ui.Focus.Object; [[The object to register]]
19 parent : Efl.Ui.Focus.Object @nonull; [[The parent to use in 19 parent : Efl.Ui.Focus.Object; [[The parent to use in
20 the logical tree]] 20 the logical tree]]
21 redirect : Efl.Ui.Focus.Manager; [[The redirect manager to set 21 redirect : Efl.Ui.Focus.Manager; [[The redirect manager to set
22 once this child is focused can be NULL for no redirect]] 22 once this child is focused can be NULL for no redirect]]
23 } 23 }
@@ -30,9 +30,9 @@ class @beta Efl.Ui.Focus.Manager_Calc extends Efl.Object implements Efl.Ui.Focus
30 of the items that are. 30 of the items that are.
31 ]] 31 ]]
32 params { 32 params {
33 child : Efl.Ui.Focus.Object @nonull; [[The object to register]] 33 child : Efl.Ui.Focus.Object; [[The object to register]]
34 parent : Efl.Ui.Focus.Object @nonull; [[The parent to use in 34 parent : Efl.Ui.Focus.Object; [[The parent to use in
35 the logical tree]] 35 the logical tree]]
36 redirect : Efl.Ui.Focus.Manager; [[The redirect manager to set 36 redirect : Efl.Ui.Focus.Manager; [[The redirect manager to set
37 once this child is focused can be $null for no redirect]] 37 once this child is focused can be $null for no redirect]]
38 } 38 }
@@ -45,7 +45,7 @@ class @beta Efl.Ui.Focus.Manager_Calc extends Efl.Object implements Efl.Ui.Focus
45 in the redirect property. Set redirect to $null if nothing should happen. 45 in the redirect property. Set redirect to $null if nothing should happen.
46 ]] 46 ]]
47 params { 47 params {
48 child : Efl.Ui.Focus.Object @nonull; [[The child to update]] 48 child : Efl.Ui.Focus.Object; [[The child to update]]
49 redirect : Efl.Ui.Focus.Manager; [[Once $child is focused this 49 redirect : Efl.Ui.Focus.Manager; [[Once $child is focused this
50 element will be set as redirect]] 50 element will be set as redirect]]
51 } 51 }
@@ -54,8 +54,8 @@ class @beta Efl.Ui.Focus.Manager_Calc extends Efl.Object implements Efl.Ui.Focus
54 update_parent { 54 update_parent {
55 [[Set a new logical parent for the given child.]] 55 [[Set a new logical parent for the given child.]]
56 params { 56 params {
57 child : Efl.Ui.Focus.Object @nonull; [[The child to update]] 57 child : Efl.Ui.Focus.Object; [[The child to update]]
58 parent : Efl.Ui.Focus.Object @nonull; [[The parent which now 58 parent : Efl.Ui.Focus.Object; [[The parent which now
59 will be the logical parent of child]] 59 will be the logical parent of child]]
60 } 60 }
61 return : bool; [[$true if successful, $false otherwise]] 61 return : bool; [[$true if successful, $false otherwise]]
@@ -63,7 +63,7 @@ class @beta Efl.Ui.Focus.Manager_Calc extends Efl.Object implements Efl.Ui.Focus
63 update_children { 63 update_children {
64 [[Give the list of children a different order.]] 64 [[Give the list of children a different order.]]
65 params { 65 params {
66 parent : Efl.Ui.Focus.Object @nonull; [[the parent to update]] 66 parent : Efl.Ui.Focus.Object; [[the parent to update]]
67 children : list<Efl.Ui.Focus.Object> @owned; [[the list with the new order]] 67 children : list<Efl.Ui.Focus.Object> @owned; [[the list with the new order]]
68 } 68 }
69 return : bool; [[$true if successful, $false otherwise]] 69 return : bool; [[$true if successful, $false otherwise]]
@@ -74,7 +74,7 @@ class @beta Efl.Ui.Focus.Manager_Calc extends Efl.Object implements Efl.Ui.Focus
74 Children from the list which are not true children are ignored. 74 Children from the list which are not true children are ignored.
75 ]] 75 ]]
76 params { 76 params {
77 parent : Efl.Ui.Focus.Object @nonull; [[the parent to update]] 77 parent : Efl.Ui.Focus.Object; [[the parent to update]]
78 children : list<Efl.Ui.Focus.Object> @owned; [[the order of items]] 78 children : list<Efl.Ui.Focus.Object> @owned; [[the order of items]]
79 } 79 }
80 } 80 }
diff --git a/src/lib/elementary/elm_code_syntax.c b/src/lib/elementary/elm_code_syntax.c
index 369aa12bda..4c28426e95 100644
--- a/src/lib/elementary/elm_code_syntax.c
+++ b/src/lib/elementary/elm_code_syntax.c
@@ -100,7 +100,7 @@ static Elm_Code_Syntax _elm_code_syntax_eo =
100 "abstract", "class", "data", "mixin", "import", "interface", "type", "const", "var", \ 100 "abstract", "class", "data", "mixin", "import", "interface", "type", "const", "var", \
101 "own", "free", "struct", "enum", "@extern", "@free", "@auto", "@empty", \ 101 "own", "free", "struct", "enum", "@extern", "@free", "@auto", "@empty", \
102 "@private", "@protected", "@beta", "@hot", "@const", "@class", "@pure_virtual", \ 102 "@private", "@protected", "@beta", "@hot", "@const", "@class", "@pure_virtual", \
103 "@property", "@nonull", "@nullable", "@optional", "@in", "@out", "@inout", "@warn_unused", \ 103 "@property", "@nullable", "@optional", "@in", "@out", "@inout", "@warn_unused", \
104 "eo_prefix", "legacy_prefix", "methods", "events", "params", "return", "legacy", \ 104 "eo_prefix", "legacy_prefix", "methods", "events", "params", "return", "legacy", \
105 "implements", "constructors", "get", "set", "keys", "values", "true", "false", "null"} 105 "implements", "constructors", "get", "set", "keys", "values", "true", "false", "null"}
106}; 106};
diff --git a/src/lib/eo/efl_object.eo b/src/lib/eo/efl_object.eo
index 84a5558677..163c9357e9 100644
--- a/src/lib/eo/efl_object.eo
+++ b/src/lib/eo/efl_object.eo
@@ -336,14 +336,14 @@ abstract Efl.Object
336 the priority. As a shortcut @Efl.Callback_Priority_Before, 336 the priority. As a shortcut @Efl.Callback_Priority_Before,
337 @Efl.Callback_Priority_Default and @Efl.Callback_Priority_After can be used. See 337 @Efl.Callback_Priority_Default and @Efl.Callback_Priority_After can be used. See
338 @Efl.Callback_Priority for more details.]] 338 @Efl.Callback_Priority for more details.]]
339 @in source: Efl.Object @nonull; [[The object which emits the initial event]] 339 @in source: Efl.Object; [[The object which emits the initial event]]
340 } 340 }
341 } 341 }
342 event_callback_forwarder_del { 342 event_callback_forwarder_del {
343 [[Remove an event callback forwarder for a specified event and object.]] 343 [[Remove an event callback forwarder for a specified event and object.]]
344 params { 344 params {
345 @cref desc: Efl.Event_Description; [[The description of the event to listen to]] 345 @cref desc: Efl.Event_Description; [[The description of the event to listen to]]
346 @in new_obj: Efl.Object @nonull; [[The object to emit events from]] 346 @in new_obj: Efl.Object; [[The object to emit events from]]
347 } 347 }
348 } 348 }
349 children_iterator_new { 349 children_iterator_new {
diff --git a/src/lib/eolian/Eolian.h b/src/lib/eolian/Eolian.h
index 2f5346eb7b..331a2d35f6 100644
--- a/src/lib/eolian/Eolian.h
+++ b/src/lib/eolian/Eolian.h
@@ -1782,16 +1782,6 @@ eolian_parameter_name_get(const Eolian_Function_Parameter *param)
1782EAPI const Eolian_Documentation *eolian_parameter_documentation_get(const Eolian_Function_Parameter *param); 1782EAPI const Eolian_Documentation *eolian_parameter_documentation_get(const Eolian_Function_Parameter *param);
1783 1783
1784/* 1784/*
1785 * @brief Indicates if a parameter cannot be NULL.
1786 *
1787 * @param[in] param_desc parameter handle
1788 * @return EINA_TRUE if cannot be NULL, EINA_FALSE otherwise
1789 *
1790 * @ingroup Eolian
1791 */
1792EAPI Eina_Bool eolian_parameter_is_nonull(const Eolian_Function_Parameter *param_desc);
1793
1794/*
1795 * @brief Indicates if a parameter is optional. 1785 * @brief Indicates if a parameter is optional.
1796 * 1786 *
1797 * @param[in] param_desc parameter handle 1787 * @param[in] param_desc parameter handle
diff --git a/src/lib/eolian/database_function_parameter_api.c b/src/lib/eolian/database_function_parameter_api.c
index 265c98ee1c..6b1f6a7201 100644
--- a/src/lib/eolian/database_function_parameter_api.c
+++ b/src/lib/eolian/database_function_parameter_api.c
@@ -34,13 +34,6 @@ eolian_parameter_documentation_get(const Eolian_Function_Parameter *param)
34} 34}
35 35
36EAPI Eina_Bool 36EAPI Eina_Bool
37eolian_parameter_is_nonull(const Eolian_Function_Parameter *param)
38{
39 EINA_SAFETY_ON_NULL_RETURN_VAL(param, EINA_FALSE);
40 return param->nonull;
41}
42
43EAPI Eina_Bool
44eolian_parameter_is_optional(const Eolian_Function_Parameter *param) 37eolian_parameter_is_optional(const Eolian_Function_Parameter *param)
45{ 38{
46 EINA_SAFETY_ON_NULL_RETURN_VAL(param, EINA_FALSE); 39 EINA_SAFETY_ON_NULL_RETURN_VAL(param, EINA_FALSE);
diff --git a/src/lib/eolian/eo_lexer.h b/src/lib/eolian/eo_lexer.h
index cc8fc9ce8b..0a38166073 100644
--- a/src/lib/eolian/eo_lexer.h
+++ b/src/lib/eolian/eo_lexer.h
@@ -33,11 +33,11 @@ enum Tokens
33 KW(keys), KW(legacy), KW(methods), KW(mixin), KW(params), \ 33 KW(keys), KW(legacy), KW(methods), KW(mixin), KW(params), \
34 KW(parse), KW(parts), KW(ptr), KW(set), KW(type), KW(values), KW(var), KW(requires), \ 34 KW(parse), KW(parts), KW(ptr), KW(set), KW(type), KW(values), KW(var), KW(requires), \
35 \ 35 \
36 KWAT(auto), KWAT(beta), KWAT(class), KWAT(const), KWAT(cref), KWAT(empty), \ 36 KWAT(auto), KWAT(beta), KWAT(c_name), KWAT(class), KWAT(const), KWAT(cref), \
37 KWAT(extern), KWAT(free), KWAT(hot), KWAT(in), KWAT(inout), KWAT(nonull), \ 37 KWAT(empty), KWAT(extern), KWAT(free), KWAT(hot), KWAT(in), KWAT(inout), \
38 KWAT(nullable), KWAT(optional), KWAT(out), KWAT(owned), KWAT(private), \ 38 KWAT(nullable), KWAT(optional), KWAT(out), KWAT(owned), \
39 KWAT(property), KWAT(protected), KWAT(restart), KWAT(pure_virtual), \ 39 KWAT(private), KWAT(property), KWAT(protected), KWAT(restart), \
40 KWAT(warn_unused), \ 40 KWAT(pure_virtual), KWAT(warn_unused), \
41 \ 41 \
42 KW(byte), KW(ubyte), KW(char), KW(short), KW(ushort), KW(int), KW(uint), \ 42 KW(byte), KW(ubyte), KW(char), KW(short), KW(ushort), KW(int), KW(uint), \
43 KW(long), KW(ulong), KW(llong), KW(ullong), \ 43 KW(long), KW(ulong), KW(llong), KW(ullong), \
diff --git a/src/lib/eolian/eo_parser.c b/src/lib/eolian/eo_parser.c
index 3a75555fce..3c9e61df5c 100644
--- a/src/lib/eolian/eo_parser.c
+++ b/src/lib/eolian/eo_parser.c
@@ -906,7 +906,7 @@ static void
906parse_param(Eo_Lexer *ls, Eina_List **params, Eina_Bool allow_inout, 906parse_param(Eo_Lexer *ls, Eina_List **params, Eina_Bool allow_inout,
907 Eina_Bool is_vals) 907 Eina_Bool is_vals)
908{ 908{
909 Eina_Bool has_nonull = EINA_FALSE, has_optional = EINA_FALSE, 909 Eina_Bool has_optional = EINA_FALSE,
910 has_owned = EINA_FALSE; 910 has_owned = EINA_FALSE;
911 Eina_Bool cref = (ls->t.kw == KW_at_cref); 911 Eina_Bool cref = (ls->t.kw == KW_at_cref);
912 Eolian_Function_Parameter *par = calloc(1, sizeof(Eolian_Function_Parameter)); 912 Eolian_Function_Parameter *par = calloc(1, sizeof(Eolian_Function_Parameter));
@@ -955,11 +955,6 @@ parse_param(Eo_Lexer *ls, Eina_List **params, Eina_Bool allow_inout,
955 } 955 }
956 for (;;) switch (ls->t.kw) 956 for (;;) switch (ls->t.kw)
957 { 957 {
958 case KW_at_nonull:
959 CASE_LOCK(ls, nonull, "nonull qualifier")
960 par->nonull = EINA_TRUE;
961 eo_lexer_get(ls);
962 break;
963 case KW_at_optional: 958 case KW_at_optional:
964 CASE_LOCK(ls, optional, "optional qualifier"); 959 CASE_LOCK(ls, optional, "optional qualifier");
965 par->optional = EINA_TRUE; 960 par->optional = EINA_TRUE;
diff --git a/src/lib/eolian/eolian_database.h b/src/lib/eolian/eolian_database.h
index f51f4269c9..03a8cbb29e 100644
--- a/src/lib/eolian/eolian_database.h
+++ b/src/lib/eolian/eolian_database.h
@@ -251,7 +251,6 @@ struct _Eolian_Function_Parameter
251 Eolian_Expression *value; 251 Eolian_Expression *value;
252 Eolian_Documentation *doc; 252 Eolian_Documentation *doc;
253 Eolian_Parameter_Dir param_dir; 253 Eolian_Parameter_Dir param_dir;
254 Eina_Bool nonull :1; /* True if this argument cannot be NULL - deprecated */
255 Eina_Bool optional :1; /* True if this argument is optional */ 254 Eina_Bool optional :1; /* True if this argument is optional */
256}; 255};
257 256
diff --git a/src/lib/evas/canvas/efl_canvas_group.eo b/src/lib/evas/canvas/efl_canvas_group.eo
index 503b2177f8..858277e164 100644
--- a/src/lib/evas/canvas/efl_canvas_group.eo
+++ b/src/lib/evas/canvas/efl_canvas_group.eo
@@ -77,7 +77,7 @@ class Efl.Canvas.Group extends Efl.Canvas.Object
77 See also @.group_member_is. 77 See also @.group_member_is.
78 ]] 78 ]]
79 params { 79 params {
80 @in sub_obj: Efl.Canvas.Object @nonull; [[The member object.]] 80 @in sub_obj: Efl.Canvas.Object; [[The member object.]]
81 } 81 }
82 } 82 }
83 group_member_remove { 83 group_member_remove {
diff --git a/src/lib/evas/canvas/efl_canvas_object.eo b/src/lib/evas/canvas/efl_canvas_object.eo
index 6cd64ea713..9fa27dc28a 100644
--- a/src/lib/evas/canvas/efl_canvas_object.eo
+++ b/src/lib/evas/canvas/efl_canvas_object.eo
@@ -135,7 +135,7 @@ abstract Efl.Canvas.Object extends Efl.Loop_Consumer implements Efl.Gfx.Entity,
135 ]] 135 ]]
136 } 136 }
137 values { 137 values {
138 clipper: Efl.Canvas.Object @nonull; [[The object to clip $obj by.]] 138 clipper: Efl.Canvas.Object; [[The object to clip $obj by.]]
139 } 139 }
140 } 140 }
141 @property repeat_events { 141 @property repeat_events {
@@ -413,7 +413,7 @@ abstract Efl.Canvas.Object extends Efl.Loop_Consumer implements Efl.Gfx.Entity,
413 ]] 413 ]]
414 return: bool @warn_unused; [[$true if the call succeeded, $false otherwise.]] 414 return: bool @warn_unused; [[$true if the call succeeded, $false otherwise.]]
415 params { 415 params {
416 @in keyname: string @nonull; [[The key to request events for.]] 416 @in keyname: string; [[The key to request events for.]]
417 @in modifiers: Efl.Input.Modifier; [[A combination of modifier 417 @in modifiers: Efl.Input.Modifier; [[A combination of modifier
418 keys that must be present to trigger the event.]] 418 keys that must be present to trigger the event.]]
419 @in not_modifiers: Efl.Input.Modifier; [[A combination of modifier 419 @in not_modifiers: Efl.Input.Modifier; [[A combination of modifier
@@ -432,7 +432,7 @@ abstract Efl.Canvas.Object extends Efl.Loop_Consumer implements Efl.Gfx.Entity,
432 and the legacy API evas_focus_get. 432 and the legacy API evas_focus_get.
433 ]] 433 ]]
434 params { 434 params {
435 @in keyname: string @nonull; [[The key the grab is set for.]] 435 @in keyname: string; [[The key the grab is set for.]]
436 @in modifiers: Efl.Input.Modifier; [[A mask of modifiers that must be 436 @in modifiers: Efl.Input.Modifier; [[A mask of modifiers that must be
437 present to trigger the event.]] 437 present to trigger the event.]]
438 @in not_modifiers: Efl.Input.Modifier; [[A mask of modifiers that must 438 @in not_modifiers: Efl.Input.Modifier; [[A mask of modifiers that must
diff --git a/src/lib/evas/canvas/efl_canvas_proxy.eo b/src/lib/evas/canvas/efl_canvas_proxy.eo
index f13b07a5c0..edf54a7f0b 100644
--- a/src/lib/evas/canvas/efl_canvas_proxy.eo
+++ b/src/lib/evas/canvas/efl_canvas_proxy.eo
@@ -30,7 +30,7 @@ class @beta Efl.Canvas.Proxy extends Efl.Canvas.Image_Internal
30 } 30 }
31 get {} 31 get {}
32 values { 32 values {
33 src: Efl.Canvas.Object @nonull; [[Source object to use for the proxy.]] 33 src: Efl.Canvas.Object; [[Source object to use for the proxy.]]
34 } 34 }
35 } 35 }
36 @property source_clip { 36 @property source_clip {
diff --git a/src/scripts/pyolian/eolian.py b/src/scripts/pyolian/eolian.py
index bd92075565..216c94ed8a 100644
--- a/src/scripts/pyolian/eolian.py
+++ b/src/scripts/pyolian/eolian.py
@@ -975,10 +975,6 @@ class Function_Parameter(Object):
975 return Documentation(c_doc) if c_doc else None 975 return Documentation(c_doc) if c_doc else None
976 976
977 @cached_property 977 @cached_property
978 def is_nonull(self):
979 return bool(lib.eolian_parameter_is_nonull(self))
980
981 @cached_property
982 def is_optional(self): 978 def is_optional(self):
983 return bool(lib.eolian_parameter_is_optional(self)) 979 return bool(lib.eolian_parameter_is_optional(self))
984 980
diff --git a/src/scripts/pyolian/eolian_lib.py b/src/scripts/pyolian/eolian_lib.py
index 4fe2dc54fb..c278442c75 100644
--- a/src/scripts/pyolian/eolian_lib.py
+++ b/src/scripts/pyolian/eolian_lib.py
@@ -399,10 +399,6 @@ lib.eolian_parameter_default_value_get.restype = c_void_p
399lib.eolian_parameter_documentation_get.argtypes = (c_void_p,) 399lib.eolian_parameter_documentation_get.argtypes = (c_void_p,)
400lib.eolian_parameter_documentation_get.restype = c_void_p 400lib.eolian_parameter_documentation_get.restype = c_void_p
401 401
402# EAPI Eina_Bool eolian_parameter_is_nonull(const Eolian_Function_Parameter *param_desc);
403lib.eolian_parameter_is_nonull.argtypes = (c_void_p,)
404lib.eolian_parameter_is_nonull.restype = c_bool
405
406# EAPI Eina_Bool eolian_parameter_is_optional(const Eolian_Function_Parameter *param_desc); 402# EAPI Eina_Bool eolian_parameter_is_optional(const Eolian_Function_Parameter *param_desc);
407lib.eolian_parameter_is_optional.argtypes = (c_void_p,) 403lib.eolian_parameter_is_optional.argtypes = (c_void_p,)
408lib.eolian_parameter_is_optional.restype = c_bool 404lib.eolian_parameter_is_optional.restype = c_bool
diff --git a/src/scripts/pyolian/test_eolian.py b/src/scripts/pyolian/test_eolian.py
index 2a59349386..df7740bc19 100755
--- a/src/scripts/pyolian/test_eolian.py
+++ b/src/scripts/pyolian/test_eolian.py
@@ -380,7 +380,6 @@ class TestEolianFunction(unittest.TestCase):
380 self.assertEqual(p.direction, eolian.Eolian_Parameter_Dir.IN) 380 self.assertEqual(p.direction, eolian.Eolian_Parameter_Dir.IN)
381 self.assertEqual(p.name, 'add') 381 self.assertEqual(p.name, 'add')
382 self.assertIsNone(p.default_value) 382 self.assertIsNone(p.default_value)
383 self.assertFalse(p.is_nonull) # TODO is correct ?? 'add' can be null?
384 self.assertFalse(p.is_optional) 383 self.assertFalse(p.is_optional)
385 self.assertEqual(p.type.name, 'double') 384 self.assertEqual(p.type.name, 'double')
386 self.assertIsInstance(p.documentation, eolian.Documentation) 385 self.assertIsInstance(p.documentation, eolian.Documentation)
diff --git a/src/tests/eolian/data/function_as_argument.eo b/src/tests/eolian/data/function_as_argument.eo
index 5a14e8679e..68c709d1a0 100644
--- a/src/tests/eolian/data/function_as_argument.eo
+++ b/src/tests/eolian/data/function_as_argument.eo
@@ -8,12 +8,6 @@ class Function_As_Argument {
8 } 8 }
9 } 9 }
10 10
11 set_nonull_cb {
12 params {
13 cb: VoidFunc @nonull;
14 }
15 }
16
17 call_cb { 11 call_cb {
18 params { 12 params {
19 a: int; 13 a: int;
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 aef6721a55..64b7a33981 100644
--- a/src/tests/eolian/data/function_as_argument_impl_ref.c
+++ b/src/tests/eolian/data/function_as_argument_impl_ref.c
@@ -13,12 +13,6 @@ _function_as_argument_set_cb(Eo *obj, Function_As_Argument_Data *pd, void *cb_da
13 13
14} 14}
15 15
16EOLIAN static void
17_function_as_argument_set_nonull_cb(Eo *obj, Function_As_Argument_Data *pd, void *cb_data, VoidFunc cb, Eina_Free_Cb cb_free_cb)
18{
19
20}
21
22EOLIAN static char * 16EOLIAN static char *
23_function_as_argument_call_cb(Eo *obj, Function_As_Argument_Data *pd, int a, double b) 17_function_as_argument_call_cb(Eo *obj, Function_As_Argument_Data *pd, int a, double b)
24{ 18{
diff --git a/src/tests/eolian/data/function_as_argument_ref.c b/src/tests/eolian/data/function_as_argument_ref.c
index 0c00260e09..6d3a70d402 100644
--- a/src/tests/eolian/data/function_as_argument_ref.c
+++ b/src/tests/eolian/data/function_as_argument_ref.c
@@ -3,10 +3,6 @@ void _function_as_argument_set_cb(Eo *obj, Function_As_Argument_Data *pd, void *
3 3
4EOAPI EFL_VOID_FUNC_BODYV(function_as_argument_set_cb, EFL_FUNC_CALL(cb_data, cb, cb_free_cb), void *cb_data, SimpleFunc cb, Eina_Free_Cb cb_free_cb); 4EOAPI EFL_VOID_FUNC_BODYV(function_as_argument_set_cb, EFL_FUNC_CALL(cb_data, cb, cb_free_cb), void *cb_data, SimpleFunc cb, Eina_Free_Cb cb_free_cb);
5 5
6void _function_as_argument_set_nonull_cb(Eo *obj, Function_As_Argument_Data *pd, void *cb_data, VoidFunc cb, Eina_Free_Cb cb_free_cb);
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);
9
10char *_function_as_argument_call_cb(Eo *obj, Function_As_Argument_Data *pd, int a, double b); 6char *_function_as_argument_call_cb(Eo *obj, Function_As_Argument_Data *pd, int a, double b);
11 7
12EOAPI EFL_FUNC_BODYV(function_as_argument_call_cb, char *, NULL, EFL_FUNC_CALL(a, b), int a, double b); 8EOAPI EFL_FUNC_BODYV(function_as_argument_call_cb, char *, NULL, EFL_FUNC_CALL(a, b), int a, double b);
@@ -24,7 +20,6 @@ _function_as_argument_class_initializer(Efl_Class *klass)
24 20
25 EFL_OPS_DEFINE(ops, 21 EFL_OPS_DEFINE(ops,
26 EFL_OBJECT_OP_FUNC(function_as_argument_set_cb, _function_as_argument_set_cb), 22 EFL_OBJECT_OP_FUNC(function_as_argument_set_cb, _function_as_argument_set_cb),
27 EFL_OBJECT_OP_FUNC(function_as_argument_set_nonull_cb, _function_as_argument_set_nonull_cb),
28 EFL_OBJECT_OP_FUNC(function_as_argument_call_cb, _function_as_argument_call_cb), 23 EFL_OBJECT_OP_FUNC(function_as_argument_call_cb, _function_as_argument_call_cb),
29 FUNCTION_AS_ARGUMENT_EXTRA_OPS 24 FUNCTION_AS_ARGUMENT_EXTRA_OPS
30 ); 25 );
diff --git a/src/tests/eolian/data/function_as_argument_ref.h b/src/tests/eolian/data/function_as_argument_ref.h
index 61179c5346..7ab0479a9f 100644
--- a/src/tests/eolian/data/function_as_argument_ref.h
+++ b/src/tests/eolian/data/function_as_argument_ref.h
@@ -19,8 +19,6 @@ EWAPI const Efl_Class *function_as_argument_class_get(void);
19 19
20EOAPI void function_as_argument_set_cb(Eo *obj, void *cb_data, SimpleFunc cb, Eina_Free_Cb cb_free_cb); 20EOAPI void function_as_argument_set_cb(Eo *obj, void *cb_data, SimpleFunc cb, Eina_Free_Cb cb_free_cb);
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);
23
24EOAPI char *function_as_argument_call_cb(Eo *obj, int a, double b); 22EOAPI char *function_as_argument_call_cb(Eo *obj, int a, double b);
25 23
26#endif 24#endif