custom names for arrays

Author: burrbull

svd-rs/CHANGELOG.md

@@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 - Bump MSRV to 1.58.0
 
+- `array::names` returns custom names if specified
+
 ## [v0.14.2] - 2023-04-04
 
 - Add support of `a-Z` for `dimIndex`

svd-rs/src/array.rs

@@ -53,8 +53,18 @@ where
 /// Return list of names of instances in array
 pub fn names<'a, T: Name>(info: &'a T, dim: &'a DimElement) -> impl Iterator<Item = String> + 'a {
     let name = info.name();
-    dim.indexes()
-        .map(move |i| name.replace("[%s]", &i).replace("%s", &i))
+    dim.indexes().map(move |i| {
+        dim.dim_array_index
+            .as_ref()
+            .map(|dai| {
+                dai.values
+                    .iter()
+                    .find(|e| e.value.map(|v| v.to_string().as_str() == i.deref()) == Some(true))
+            })
+            .flatten()
+            .map(|n| n.name.clone())
+            .unwrap_or_else(|| name.replace("[%s]", &i).replace("%s", &i))
+    })
 }
 
 #[cfg(feature = "serde")]