Skip to content

add serde big array support (fixed #327) #328

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Aug 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion rosidl_generator_rs/resource/Cargo.toml.em
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,14 @@ edition = "2021"
[dependencies]
rosidl_runtime_rs = "0.3"
serde = { version = "1", optional = true, features = ["derive"] }
serde-big-array = { version = "0.5.1", optional = true }
@[for dep in dependency_packages]@
@(dep) = "*"
@[end for]@

[features]
@{
serde_features = ["dep:serde", "rosidl_runtime_rs/serde"]
serde_features = ["dep:serde", "dep:serde-big-array", "rosidl_runtime_rs/serde"]
for dep in dependency_packages:
serde_features.append("{}/serde".format(dep))
}@
Expand Down
2 changes: 2 additions & 0 deletions rosidl_generator_rs/resource/msg.rs.em
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ TEMPLATE(
package_name=package_name, interface_path=interface_path,
msg_specs=msg_specs,
get_rs_name=get_rs_name, get_rmw_rs_type=get_rmw_rs_type,
pre_field_serde=pre_field_serde,
get_idiomatic_rs_type=get_idiomatic_rs_type,
constant_value_to_rs=constant_value_to_rs)
}@
Expand All @@ -16,6 +17,7 @@ TEMPLATE(
package_name=package_name, interface_path=interface_path,
msg_specs=msg_specs,
get_rs_name=get_rs_name, get_rmw_rs_type=get_rmw_rs_type,
pre_field_serde=pre_field_serde,
get_idiomatic_rs_type=get_idiomatic_rs_type,
constant_value_to_rs=constant_value_to_rs)
}@
2 changes: 1 addition & 1 deletion rosidl_generator_rs/resource/msg_idiomatic.rs.em
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ type_name = msg_spec.structure.namespaced_type.name
#[derive(Clone, Debug, PartialEq, PartialOrd)]
pub struct @(type_name) {
@[for member in msg_spec.structure.members]@
pub @(get_rs_name(member.name)): @(get_idiomatic_rs_type(member.type)),
@(pre_field_serde(member.type))pub @(get_rs_name(member.name)): @(get_idiomatic_rs_type(member.type)),
@[end for]@
}

Expand Down
2 changes: 1 addition & 1 deletion rosidl_generator_rs/resource/msg_rmw.rs.em
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ extern "C" {
#[derive(Clone, Debug, PartialEq, PartialOrd)]
pub struct @(type_name) {
@[for member in msg_spec.structure.members]@
pub @(get_rs_name(member.name)): @(get_rmw_rs_type(member.type)),
@(pre_field_serde(member.type))pub @(get_rs_name(member.name)): @(get_rmw_rs_type(member.type)),
@[end for]@
}

Expand Down
2 changes: 2 additions & 0 deletions rosidl_generator_rs/resource/srv.rs.em
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ TEMPLATE(
package_name=package_name, interface_path=interface_path,
msg_specs=req_res_specs,
get_rs_name=get_rs_name, get_rmw_rs_type=get_rmw_rs_type,
pre_field_serde=pre_field_serde,
get_idiomatic_rs_type=get_idiomatic_rs_type,
constant_value_to_rs=constant_value_to_rs)
}@
Expand Down Expand Up @@ -49,6 +50,7 @@ TEMPLATE(
package_name=package_name, interface_path=interface_path,
msg_specs=req_res_specs,
get_rs_name=get_rs_name, get_rmw_rs_type=get_rmw_rs_type,
pre_field_serde=pre_field_serde,
get_idiomatic_rs_type=get_idiomatic_rs_type,
constant_value_to_rs=constant_value_to_rs)
}@
Expand Down
9 changes: 9 additions & 0 deletions rosidl_generator_rs/rosidl_generator_rs/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ def generate_rs(generator_arguments_file, typesupport_impls):
'Services template file %s not found' % template_file

data = {
'pre_field_serde': pre_field_serde,
'get_rmw_rs_type': make_get_rmw_rs_type(args['package_name']),
'get_rs_name': get_rs_name,
'get_idiomatic_rs_type': make_get_idiomatic_rs_type(args['package_name']),
Expand Down Expand Up @@ -274,6 +275,14 @@ def constant_value_to_rs(type_, value):
# - BoundedSequence
# - UnboundedSequence


def pre_field_serde(type_):
if isinstance(type_, Array) and type_.size > 32:
return '#[cfg_attr(feature = "serde", serde(with = "serde_big_array::BigArray"))]\n '
else:
return ''


def make_get_idiomatic_rs_type(package_name):
get_rmw_rs_type = make_get_rmw_rs_type(package_name)
def get_idiomatic_rs_type(type_):
Expand Down