Skip to content

Fix type path for cluster fields. Allows nested clusters #489

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.

Sign up for GitHub

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 1 commit into from
Feb 4, 2021
Merged

Fix type path for cluster fields. Allows nested clusters #489

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 9 additions & 10 deletions src/generate/peripheral.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -633,7 +633,7 @@ fn expand_cluster(

match cluster {
Cluster::Single(info) => cluster_expanded.push(RegisterBlockField {
field: convert_svd_cluster(cluster)?,
field: convert_svd_cluster(cluster, name)?,
description: info.description.as_ref().unwrap_or(&info.name).into(),
offset: info.address_offset,
size: cluster_size,
Expand All @@ -653,7 +653,7 @@ fn expand_cluster(

if array_convertible {
cluster_expanded.push(RegisterBlockField {
field: convert_svd_cluster(&cluster)?,
field: convert_svd_cluster(&cluster, name)?,
description: info.description.as_ref().unwrap_or(&info.name).into(),
offset: info.address_offset,
size: cluster_size * array_info.dim,
Expand Down Expand Up @@ -855,7 +855,7 @@ fn expand_svd_cluster(
let mut out = vec![];

match &cluster {
Cluster::Single(_info) => out.push(convert_svd_cluster(cluster)?),
Cluster::Single(_info) => out.push(convert_svd_cluster(cluster, name)?),
Cluster::Array(info, array_info) => {
let indices = array_info
.dim_index
Expand Down Expand Up @@ -884,14 +884,13 @@ fn expand_svd_cluster(
}

/// Convert a parsed `Cluster` into its `Field` equivalent
fn convert_svd_cluster(cluster: &Cluster) -> Result<syn::Field, syn::Error> {
fn convert_svd_cluster(cluster: &Cluster, name: Option<&str>) -> Result<syn::Field, syn::Error> {
Ok(match cluster {
Cluster::Single(info) => new_syn_field(
&info.name.to_sanitized_snake_case(),
syn::Type::Path(parse_str::<syn::TypePath>(
&info.name.to_sanitized_upper_case(),
)?),
),
Cluster::Single(info) => {
let ty_name = util::replace_suffix(&info.name, "");
let ty = name_to_ty(&ty_name, name)?;
new_syn_field(&info.name.to_sanitized_snake_case(), ty)
}
Cluster::Array(info, array_info) => {
let name = util::replace_suffix(&info.name, "");

Expand Down