Skip to content

sort-fields flag #967

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

Draft
burrbull wants to merge 1 commit into
base: master
Choose a base branch
from
+31 −1
Draft

sort-fields flag #967

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
14 changes: 14 additions & 0 deletions src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ pub struct Config {
pub ident_formats: IdentFormats,
pub ident_formats_theme: Option<IdentFormatsTheme>,
pub field_names_for_enums: bool,
pub sort_fields: SortDir,
pub base_address_shift: u64,
/// Path to YAML file with chip-specific settings
pub settings_file: Option<PathBuf>,
Expand Down Expand Up @@ -347,6 +348,19 @@ pub enum IdentFormatsTheme {
Legacy,
}

#[cfg_attr(
feature = "serde",
derive(serde::Deserialize),
serde(rename_all = "lowercase")
)]
#[derive(Clone, Copy, Debug, PartialEq, Eq, Default)]
pub enum SortDir {
#[default]
Direct,
Reverse,
None,
}

#[cfg_attr(feature = "serde", derive(serde::Deserialize), serde(default))]
#[derive(Clone, PartialEq, Eq, Debug, Default)]
#[non_exhaustive]
Expand Down
10 changes: 9 additions & 1 deletion src/generate/register.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,7 +628,15 @@ pub fn fields(
let can_read = access.can_read();
let can_write = access.can_write();

fields.sort_by_key(|f| f.bit_offset());
match config.sort_fields {
crate::config::SortDir::Direct => {
fields.sort_by_key(|f| f.bit_offset());
}
crate::config::SortDir::Reverse => {
fields.sort_by_key(|f| -(f.bit_offset() as i32));
}
crate::config::SortDir::None => {}
}

// Hack for #625
let mut enum_derives = HashSet::new();
Expand Down
8 changes: 8 additions & 0 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,14 @@ Allowed cases are `unchanged` (''), `pascal` ('p'), `constant` ('c') and `snake`
.action(ArgAction::SetTrue)
.help("Use field name for enumerations even when enumeratedValues has a name"),
)
.arg(
Arg::new("sort_fields")
.long("sort-fields")
.alias("sort_fields")
.help("Sort fields direct or reverse by offset")
.action(ArgAction::Set)
.value_name("DIRECTION"),
)
.arg(
Arg::new("max_cluster_size")
.long("max-cluster-size")
Expand Down
Loading