Skip to content

Handle overrides in element group derivation #293

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

Open
scootermon wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Handle overrides in element group derivation #293

Show file tree
Hide file tree
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
2 changes: 2 additions & 0 deletions svd-rs/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased]

- Allow overriding `dimElementGroup` fields when deriving.

## [v0.14.12] - 2025-03-11

- Bump MSRV to 1.70.0
Expand Down
25 changes: 23 additions & 2 deletions svd-rs/src/derive_from.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//! Implementations of DeriveFrom, setting non-explicit fields.
use crate::{
ClusterInfo, EnumeratedValues, FieldInfo, MaybeArray, PeripheralInfo, RegisterInfo,
ClusterInfo, DimElement, EnumeratedValues, FieldInfo, MaybeArray, PeripheralInfo, RegisterInfo,
RegisterProperties,
};

Expand Down Expand Up @@ -110,6 +110,24 @@ impl DeriveFrom for FieldInfo {
}
}

impl DeriveFrom for DimElement {
fn derive_from(&self, other: &Self) -> Self {
let Self {
dim: _, // mandatory
dim_increment: _, // mandatory
dim_index,
dim_name,
dim_array_index,
} = other;

let mut derived = self.clone();
derived.dim_index = derived.dim_index.or_else(|| dim_index.clone());
derived.dim_name = derived.dim_name.or_else(|| dim_name.clone());
derived.dim_array_index = derived.dim_array_index.or_else(|| dim_array_index.clone());
Comment on lines +124 to +126
Copy link
Member

@burrbull burrbull Jan 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
derived.dim_index = derived.dim_index.or_else(|| dim_index.clone());
derived.dim_name = derived.dim_name.or_else(|| dim_name.clone());
derived.dim_array_index = derived.dim_array_index.or_else(|| dim_array_index.clone());
derived.dim_index = derived.dim_index.or_else(|| {
dim_index
.as_ref()
.and_then(|di| (*dim == derived.dim).then(|| di.clone()))
});
derived.dim_name = derived.dim_name.or_else(|| dim_name.clone());
derived.dim_array_index = derived.dim_array_index.or_else(|| {
dim_array_index
.as_ref()
.and_then(|dai| (*dim == derived.dim).then(|| dai.clone()))
});

We should derive dim_index only when same size.

derived
}
}

impl<T> DeriveFrom for MaybeArray<T>
where
T: DeriveFrom + crate::Name,
Expand All @@ -128,9 +146,12 @@ where
Self::Single(info.derive_from(other_info))
}
}
(Self::Array(info, dim), Self::Single(other_info) | Self::Array(other_info, _)) => {
(Self::Array(info, dim), Self::Single(other_info)) => {
Self::Array(info.derive_from(other_info), dim.clone())
}
(Self::Array(info, dim), Self::Array(other_info, other_dim)) => {
Self::Array(info.derive_from(other_info), dim.derive_from(other_dim))
}
}
}
}