Skip to content
Open
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 .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
[._]*.sw[a-p]
*.org
*.rs.bk
target
target
.DS_Store
38 changes: 38 additions & 0 deletions src/transform/map_enum_variants.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
//! Simple transform for enum variant names
//!
//! This is useful when an SVD contains enum variants with purely numeric identifiers.
//! It is not meant to be used to apply inflection, that's what the `Sanitize` transform is for.

use std::collections::BTreeMap;

use serde::{Deserialize, Serialize};

use super::common::*;
use crate::ir::*;

#[derive(Debug, Serialize, Deserialize)]
pub struct MapEnumVariants {
#[serde(rename = "enum")]
pub enumm: RegexSet,
#[serde(default)]
pub variants: BTreeMap<String, String>,
#[serde(default)]
pub descriptions: BTreeMap<String, String>,
}

impl MapEnumVariants {
pub fn run(&self, ir: &mut IR) -> anyhow::Result<()> {
for id in match_all(ir.enums.keys().cloned(), &self.enumm) {
let e = ir.enums.get_mut(&id).unwrap();
for variant in e.variants.iter_mut() {
if let Some(new_description) = self.descriptions.get(&variant.name) {
variant.description = Some(new_description.clone());
}
if let Some(new_name) = self.variants.get(&variant.name) {
variant.name = new_name.clone();
}
}
}
Ok(())
}
}
1 change: 1 addition & 0 deletions src/transform/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -271,4 +271,5 @@ transforms!(
rename_interrupts::RenameInterrupts,
rename_peripherals::RenamePeripherals,
clean_descriptions::CleanDescriptions,
map_enum_variants::MapEnumVariants,
);
51 changes: 51 additions & 0 deletions tests/map_enum_variants.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
use chiptool::{ir::IR, transform::map_enum_variants::MapEnumVariants};

#[test]
fn duplicate_ir_enums_should_be_updated() -> Result<(), Box<dyn std::error::Error>> {
let input_yaml = r#"
block/BLOCK:
items:
- name: register
byte_offset: 0
bit_size: 32
fieldset: regs::Fieldset
fieldset/regs::Fieldset:
fields:
- name: reserved
bit_offset: 0
bit_size: 3
enum: vals::Enumm
enum/vals::Enumm:
bit_size: 3
variants:
- { name: VariantOne, value: 0b001 }
- { name: VariantTwo, value: 0b010 }
- { name: VariantThree, value: 0b011 }
"#;

let transform_yaml = r#"
!MapEnumVariants
enum: vals::Enumm
variants:
VariantOne: _1
VariantTwo: _2
VariantThree: _3
"#;

let mut ir: IR = serde_yaml::from_slice(input_yaml.as_bytes())?;

let transform = serde_yaml::from_slice::<MapEnumVariants>(transform_yaml.as_bytes())?;
transform.run(&mut ir)?;

let enumm = ir.enums.get("vals::Enumm").expect("Enum not found");

let variant_names = enumm
.variants
.iter()
.map(|field| &field.name)
.collect::<Vec<_>>();

assert_eq!(variant_names, &["_1", "_2", "_3"]);

Ok(())
}