deserialize dimIndex string

Author: burrbull

svd-parser/src/dimelement.rs

@@ -1,4 +1,3 @@
-use super::types::DimIndex;
 use super::*;
 use crate::svd::{DimArrayIndex, DimElement, EnumeratedValue};
 
@@ -44,3 +43,16 @@ impl Parse for DimArrayIndex {
         })
     }
 }
+
+struct DimIndex;
+
+impl Parse for DimIndex {
+    type Object = Vec<String>;
+    type Error = SVDErrorAt;
+    type Config = Config;
+
+    fn parse(tree: &Node, _config: &Self::Config) -> Result<Vec<String>, Self::Error> {
+        DimElement::parse_indexes(tree.get_text()?)
+            .ok_or_else(|| SVDError::DimIndexParse.at(tree.id()))
+    }
+}

svd-parser/src/types.rs

@@ -3,7 +3,7 @@
 
 use roxmltree::Node;
 
-use super::{Config, ElementExt, Parse, SVDError, SVDErrorAt};
+use super::{ElementExt, Parse, SVDError, SVDErrorAt};
 
 impl Parse for u32 {
     type Object = u32;
@@ -84,32 +84,3 @@ impl Parse for BoolParse {
         }
     }
 }
-
-pub struct DimIndex;
-
-impl Parse for DimIndex {
-    type Object = Vec<String>;
-    type Error = SVDErrorAt;
-    type Config = Config;
-
-    fn parse(tree: &Node, _config: &Self::Config) -> Result<Vec<String>, Self::Error> {
-        let text = tree.get_text()?;
-        if text.contains('-') {
-            let mut parts = text.splitn(2, '-');
-            let start = parts
-                .next()
-                .ok_or_else(|| SVDError::DimIndexParse.at(tree.id()))?
-                .parse::<u32>()
-                .map_err(|e| SVDError::from(e).at(tree.id()))?;
-            let end = parts
-                .next()
-                .ok_or_else(|| SVDError::DimIndexParse.at(tree.id()))?
-                .parse::<u32>()
-                .map_err(|e| SVDError::from(e).at(tree.id()))?;
-
-            Ok((start..=end).map(|i| i.to_string()).collect())
-        } else {
-            Ok(text.split(',').map(|s| s.to_string()).collect())
-        }
-    }
-}

svd-rs/src/dimelement.rs

@@ -21,7 +21,10 @@ pub struct DimElement {
     /// By default, <dimIndex> is a value starting with 0
     #[cfg_attr(
         feature = "serde",
-        serde(default, skip_serializing_if = "Option::is_none")
+        serde(
+            deserialize_with = "ser_de::deserialize_dim_index",
+            skip_serializing_if = "Option::is_none"
+        )
     )]
     pub dim_index: Option<Vec<String>>,
 
@@ -137,6 +140,19 @@ impl DimElement {
     pub fn builder() -> DimElementBuilder {
         DimElementBuilder::default()
     }
+
+    /// Get array of indexes from string
+    pub fn parse_indexes(text: &str) -> Option<Vec<String>> {
+        if text.contains('-') {
+            let mut parts = text.splitn(2, '-');
+            let start = parts.next()?.parse::<u32>().ok()?;
+            let end = parts.next()?.parse::<u32>().ok()?;
+
+            Some((start..=end).map(|i| i.to_string()).collect())
+        } else {
+            Some(text.split(',').map(|s| s.to_string()).collect())
+        }
+    }
     /// Try to represent [`DimElement`] as range of integer indexes
     pub fn indexes_as_range(&self) -> Option<RangeInclusive<u32>> {
         let mut integers = Vec::with_capacity(self.dim as usize);
@@ -223,3 +239,29 @@ impl<'a> Iterator for Indexes<'a> {
         }
     }
 }
+
+#[cfg(feature = "serde")]
+mod ser_de {
+    use super::*;
+    use serde::{de, Deserialize, Deserializer};
+    #[derive(serde::Serialize, serde::Deserialize)]
+    #[serde(untagged)]
+    enum DimIndex {
+        Array(Vec<String>),
+        String(String),
+    }
+
+    pub fn deserialize_dim_index<'de, D>(deserializer: D) -> Result<Option<Vec<String>>, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        Ok(match Option::<DimIndex>::deserialize(deserializer)? {
+            None => None,
+            Some(DimIndex::Array(a)) => Some(a),
+            Some(DimIndex::String(s)) => Some(
+                DimElement::parse_indexes(&s)
+                    .ok_or_else(|| de::Error::custom("Failed to deserialize dimIndex"))?,
+            ),
+        })
+    }
+}