lauromoura pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=f203c164d8de0012a0e1a3dc6622be68d1d4bf85
commit f203c164d8de0012a0e1a3dc6622be68d1d4bf85
Author: Lauro Moura <lauromo...@expertisesolutions.com.br>
Date: Fri Nov 29 10:48:09 2019 -0300
eo files: Avoid container<ptr(value_type)> usage.
Summary:
Value types are already assumed to be stored by pointer (e.g.
`int val = *(node->data);`)
This commit just changes the current usage of the `ptr` modifier in the
ptr, not affecting the parser.
Reviewers: q66, segfaultxavi, bu5hm4n, felipealmeida
Reviewed By: q66
Subscribers: cedric, #reviewers, #committers, brunobelo
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D10769
---
src/lib/ecore/efl_boolean_model.eo | 2 +-
src/lib/ecore_con/efl_net_control_manager.eo | 2 +-
src/lib/ecore_con/efl_net_dialer_http.eo | 6 +++---
src/lib/ecore_con/efl_net_dialer_websocket.eo | 2 +-
src/lib/ector/ector_renderer.eo | 2 +-
src/lib/ector/gl/ector_gl_surface.eo | 2 +-
src/lib/efl/interfaces/efl_observable.eo | 2 +-
src/lib/eio/efl_io_manager.eo | 2 +-
src/lib/eldbus/eldbus_model_arguments.eo | 2 +-
src/lib/eldbus/eldbus_types.eot | 4 ++--
src/lib/elementary/efl_access_action.eo | 2 +-
src/lib/elementary/efl_access_object.eo | 4 ++--
src/lib/elementary/efl_access_text.eo | 6 +++---
src/tests/eolian_js/test_object.eo | 2 +-
14 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/src/lib/ecore/efl_boolean_model.eo
b/src/lib/ecore/efl_boolean_model.eo
index fa5b1405c0..8222e301df 100644
--- a/src/lib/ecore/efl_boolean_model.eo
+++ b/src/lib/ecore/efl_boolean_model.eo
@@ -25,7 +25,7 @@ class @beta Efl.Boolean_Model extends Efl.Composite_Model
@in name: string; [[The name of the property to examine.]]
@in request: bool; [[The value to look for.]]
}
- return: iterator<ptr(uint64)> @move; [[The iterator that is valid
until any change is made on the model.]]
+ return: iterator<uint64> @move; [[The iterator that is valid until
any change is made on the model.]]
}
}
implements {
diff --git a/src/lib/ecore_con/efl_net_control_manager.eo
b/src/lib/ecore_con/efl_net_control_manager.eo
index 4d7d232c7e..3c84235bf7 100644
--- a/src/lib/ecore_con/efl_net_control_manager.eo
+++ b/src/lib/ecore_con/efl_net_control_manager.eo
@@ -36,7 +36,7 @@ struct @beta Efl.Net.Control.Agent_Request_Input {
access_point: Efl.Net.Control.Access_Point; [[The access point which
triggered this request.]]
fields: Efl.Net.Control.Agent_Request_Input_Field; [[Bitwise OR of fields
present in this request.]]
passphrase_type: string; [[Extra detail for the passphrase field, such as
wep, psk, response (IEEE802.X GTC/OTP), string...]]
- informational: list<ptr(Efl.Net.Control.Agent_Request_Input_Information)>;
[[Such as the previous passphrase, VPN host]]
+ informational: list<Efl.Net.Control.Agent_Request_Input_Information>;
[[Such as the previous passphrase, VPN host]]
}
struct @beta Efl.Net.Control.Agent_Error {
diff --git a/src/lib/ecore_con/efl_net_dialer_http.eo
b/src/lib/ecore_con/efl_net_dialer_http.eo
index 59701a3a13..00bff4131b 100644
--- a/src/lib/ecore_con/efl_net_dialer_http.eo
+++ b/src/lib/ecore_con/efl_net_dialer_http.eo
@@ -187,7 +187,7 @@ class @beta Efl.Net.Dialer_Http extends Efl.Loop_Consumer
implements Efl.Net.Dia
request_headers_get {
[[Returns an iterator to the key-value pairs for request headers]]
- return: iterator<ptr(Efl.Net.Http.Header)> @move @no_unused;
[[Iterator for request headers]]
+ return: iterator<Efl.Net.Http.Header> @move @no_unused; [[Iterator
for request headers]]
}
@property request_content_length {
@@ -250,7 +250,7 @@ class @beta Efl.Net.Dialer_Http extends Efl.Loop_Consumer
implements Efl.Net.Dia
This will be usable after the "headers,done" event is dispatched.
]]
- return: iterator<ptr(Efl.Net.Http.Header)> @move @no_unused;
[[Iterator for response headers]]
+ return: iterator<Efl.Net.Http.Header> @move @no_unused; [[Iterator
for response headers]]
}
response_headers_all_get {
@@ -275,7 +275,7 @@ class @beta Efl.Net.Dialer_Http extends Efl.Loop_Consumer
implements Efl.Net.Dia
This will be usable after the "headers,done" event is dispatched.
]]
- return: iterator<ptr(Efl.Net.Http.Header)> @move @no_unused;
[[Iterator for all response headers]]
+ return: iterator<Efl.Net.Http.Header> @move @no_unused; [[Iterator
for all response headers]]
}
response_headers_clear {
diff --git a/src/lib/ecore_con/efl_net_dialer_websocket.eo
b/src/lib/ecore_con/efl_net_dialer_websocket.eo
index 4bd96a5b7f..612f504d46 100644
--- a/src/lib/ecore_con/efl_net_dialer_websocket.eo
+++ b/src/lib/ecore_con/efl_net_dialer_websocket.eo
@@ -260,7 +260,7 @@ class @beta Efl.Net.Dialer_Websocket extends
Efl.Loop_Consumer implements Efl.Ne
request_headers_get {
[[Returns an iterator to the key-value pairs for request headers]]
- return: iterator<ptr(Efl.Net.Http.Header)> @move @no_unused;
[[Iterator to key value pairs]]
+ return: iterator<Efl.Net.Http.Header> @move @no_unused; [[Iterator
to key value pairs]]
}
@property cookie_jar {
diff --git a/src/lib/ector/ector_renderer.eo b/src/lib/ector/ector_renderer.eo
index 74d0f8bd43..d37f785103 100644
--- a/src/lib/ector/ector_renderer.eo
+++ b/src/lib/ector/ector_renderer.eo
@@ -92,7 +92,7 @@ abstract @beta Ector.Renderer extends Efl.Object
return: bool; [[$true on success, $false otherwise]]
params {
@in op: Efl.Gfx.Render_Op; [[Renderer operation]]
- @in clips: array<ptr(Eina.Rect)>; [[Array of @Eina.Rect clip]]
+ @in clips: array<Eina.Rect>; [[Array of @Eina.Rect clip]]
@in mul_col: uint; [[Premultiplied color]]
}
}
diff --git a/src/lib/ector/gl/ector_gl_surface.eo
b/src/lib/ector/gl/ector_gl_surface.eo
index 62aefb4291..4f02576d9b 100644
--- a/src/lib/ector/gl/ector_gl_surface.eo
+++ b/src/lib/ector/gl/ector_gl_surface.eo
@@ -27,7 +27,7 @@ class @beta Ector.GL.Surface extends Ector.GL.Buffer
implements Ector.Surface
return: bool; [[$true on success, $false otherwise]]
params {
@in op: Efl.Gfx.Render_Op; [[Render operation]]
- @in clips: array<ptr(Eina.Rect)>; [[Array of @Eina.Rect clip]]
+ @in clips: array<Eina.Rect>; [[Array of @Eina.Rect clip]]
}
}
}
diff --git a/src/lib/efl/interfaces/efl_observable.eo
b/src/lib/efl/interfaces/efl_observable.eo
index 40deba9e8b..d551f6fd91 100644
--- a/src/lib/efl/interfaces/efl_observable.eo
+++ b/src/lib/efl/interfaces/efl_observable.eo
@@ -57,7 +57,7 @@ class @beta Efl.Observable extends Efl.Object {
iterator_tuple_new {
[[Return a new iterator associated to this observable.
]]
- return: iterator<ptr(Efl.Observable_Tuple)> @move; [[Iterator for
observer]]
+ return: iterator<Efl.Observable_Tuple> @move; [[Iterator for
observer]]
}
}
implements {
diff --git a/src/lib/eio/efl_io_manager.eo b/src/lib/eio/efl_io_manager.eo
index b88d7f8155..9149595d3b 100644
--- a/src/lib/eio/efl_io_manager.eo
+++ b/src/lib/eio/efl_io_manager.eo
@@ -17,7 +17,7 @@ function @beta EflIoPath {
function @beta EflIoDirectInfo {
[[EflIoDirectInfo function]]
params {
- @in entries: array<ptr(Eina.File_Direct_Info)>; [[Accessor to an array of
info.]]
+ @in entries: array<Eina.File_Direct_Info>; [[Accessor to an array of
info.]]
}
};
diff --git a/src/lib/eldbus/eldbus_model_arguments.eo
b/src/lib/eldbus/eldbus_model_arguments.eo
index 15129041b1..66f414dfc3 100644
--- a/src/lib/eldbus/eldbus_model_arguments.eo
+++ b/src/lib/eldbus/eldbus_model_arguments.eo
@@ -11,7 +11,7 @@ class @beta Eldbus.Model.Arguments extends Eldbus.Model {
params {
@in proxy: ptr(Eldbus.Proxy); [[Eldbus proxy]]
@in name: string; [[Name]]
- @in arguments:
const(list<ptr(Eldbus.Introspection.Argument)>); [[The introspected arguments]]
+ @in arguments: const(list<Eldbus.Introspection.Argument>);
[[The introspected arguments]]
}
}
@property arg_name {
diff --git a/src/lib/eldbus/eldbus_types.eot b/src/lib/eldbus/eldbus_types.eot
index a4a5babd2c..82687b2496 100644
--- a/src/lib/eldbus/eldbus_types.eot
+++ b/src/lib/eldbus/eldbus_types.eot
@@ -86,6 +86,6 @@ struct @beta @extern Eldbus.Introspection.Signal
{
[[DBus Signal]]
name: stringshare; [[Signal name]]
- arguments: list<ptr(Eldbus.Introspection.Argument)>; [[List with signal
arguments]]
- annotations: list<ptr(Eldbus.Introspection.Annotation)>; [[List with
signal annotations]]
+ arguments: list<Eldbus.Introspection.Argument>; [[List with signal
arguments]]
+ annotations: list<Eldbus.Introspection.Annotation>; [[List with signal
annotations]]
}
diff --git a/src/lib/elementary/efl_access_action.eo
b/src/lib/elementary/efl_access_action.eo
index 8f70f0efb1..c292624ecd 100644
--- a/src/lib/elementary/efl_access_action.eo
+++ b/src/lib/elementary/efl_access_action.eo
@@ -47,7 +47,7 @@ mixin @beta Efl.Access.Action
get @pure_virtual {
}
values {
- actions: list<ptr(Efl.Access.Action_Data)> @move;
+ actions: list<Efl.Access.Action_Data> @move;
[[Contains statically allocated strings.]]
}
}
diff --git a/src/lib/elementary/efl_access_object.eo
b/src/lib/elementary/efl_access_object.eo
index fc16ea2194..f3e70dee40 100644
--- a/src/lib/elementary/efl_access_object.eo
+++ b/src/lib/elementary/efl_access_object.eo
@@ -263,7 +263,7 @@ mixin @beta Efl.Access.Object requires Efl.Object
}
relations_get @protected @beta @const {
[[Gets an all relations between accessible object and other
accessible objects.]]
- return: iterator<ptr(Efl.Access.Relation)> @move; [[Accessible
relation set]]
+ return: iterator<Efl.Access.Relation> @move; [[Accessible relation
set]]
}
@property role @beta {
[[The role of the object in accessibility domain.]]
@@ -296,7 +296,7 @@ mixin @beta Efl.Access.Object requires Efl.Object
get {
}
values {
- attributes: list<ptr(Efl.Access.Attribute) @move> @move; [[List of
object attributes.
+ attributes: list<Efl.Access.Attribute> @move; [[List of object
attributes.
Must
be freed by the user]]
}
}
diff --git a/src/lib/elementary/efl_access_text.eo
b/src/lib/elementary/efl_access_text.eo
index 0fe97c4a32..fe76de5b6e 100644
--- a/src/lib/elementary/efl_access_text.eo
+++ b/src/lib/elementary/efl_access_text.eo
@@ -121,7 +121,7 @@ interface @beta Efl.Access.Text
end_offset: ptr(int); [[End offset]]
}
values {
- attributes: list<ptr(Efl.Access.Text_Attribute) @move> @move;
[[List of text attributes]]
+ attributes: list<Efl.Access.Text_Attribute> @move; [[List of text
attributes]]
}
}
@property default_attributes @protected @beta {
@@ -129,7 +129,7 @@ interface @beta Efl.Access.Text
get {
}
values {
- attributes: list<ptr(Efl.Access.Text_Attribute) @move> @move;
[[List of default attributes]]
+ attributes: list<Efl.Access.Text_Attribute> @move; [[List of
default attributes]]
}
}
@property character_extents @protected @beta {
@@ -180,7 +180,7 @@ interface @beta Efl.Access.Text
yclip: Efl.Access.Text_Clip_Type; [[yclip]]
}
values {
- ranges: list<ptr(Efl.Access.Text_Range) @move> @move; [[List of
ranges]]
+ ranges: list<Efl.Access.Text_Range> @move; [[List of ranges]]
}
}
@property range_extents @protected @beta {
diff --git a/src/tests/eolian_js/test_object.eo
b/src/tests/eolian_js/test_object.eo
index 1fc462398c..21bc5b8311 100644
--- a/src/tests/eolian_js/test_object.eo
+++ b/src/tests/eolian_js/test_object.eo
@@ -317,7 +317,7 @@ class Test.Object extends Efl.Object {
return: list<array<int> >;
}
method_list_with_opaque_elements_check {
- return: const(list<ptr(Elm.Calendar.Mark)>);
+ return: const(list<Elm.Calendar.Mark>);
}
method_in_enum_return_enum_check {
params { e: Test.Enum_Ex; }
--
