parse array

Author: burrbull

svd-parser/src/array.rs

@@ -0,0 +1,30 @@
+use super::*;
+use svd_rs::{DimElement, Name, SingleArray};
+
+pub fn parse_array<T>(tag: &str, tree: &Node, config: &Config) -> Result<SingleArray<T>, SVDErrorAt>
+where
+    T: Parse<Object = T, Error = SVDErrorAt, Config = Config> + Name,
+{
+    if !tree.has_tag_name(tag) {
+        return Err(SVDError::NotExpectedTag(tag.into()).at(tree.id()));
+    }
+
+    let info = T::parse(tree, config)?;
+
+    if tree.get_child("dimIncrement").is_some() {
+        let array_info = DimElement::parse(tree, config)?;
+        check_has_placeholder(info.name(), tag).map_err(|e| e.at(tree.id()))?;
+        if let Some(indexes) = &array_info.dim_index {
+            if array_info.dim as usize != indexes.len() {
+                return Err(SVDError::IncorrectDimIndexesCount(
+                    array_info.dim as usize,
+                    indexes.len(),
+                )
+                .at(tree.id()));
+            }
+        }
+        Ok(SingleArray::Array(info, array_info))
+    } else {
+        Ok(SingleArray::Single(info))
+    }
+}

svd-parser/src/cluster.rs

@@ -1,33 +1,12 @@
 use super::*;
-use crate::svd::{Cluster, ClusterInfo, DimElement};
+use crate::svd::Cluster;
 
 impl Parse for Cluster {
     type Object = Self;
     type Error = SVDErrorAt;
     type Config = Config;
 
     fn parse(tree: &Node, config: &Self::Config) -> Result<Self, Self::Error> {
-        if !tree.has_tag_name("cluster") {
-            return Err(SVDError::NotExpectedTag("cluster".to_string()).at(tree.id()));
-        }
-
-        let info = ClusterInfo::parse(tree, config)?;
-
-        if tree.get_child("dimIncrement").is_some() {
-            let array_info = DimElement::parse(tree, config)?;
-            check_has_placeholder(&info.name, "cluster").map_err(|e| e.at(tree.id()))?;
-            if let Some(indexes) = &array_info.dim_index {
-                if array_info.dim as usize != indexes.len() {
-                    return Err(SVDError::IncorrectDimIndexesCount(
-                        array_info.dim as usize,
-                        indexes.len(),
-                    )
-                    .at(tree.id()));
-                }
-            }
-            Ok(info.array(array_info))
-        } else {
-            Ok(info.single())
-        }
+        parse_array("cluster", tree, config)
     }
 }

svd-parser/src/field.rs

@@ -1,34 +1,12 @@
 use super::*;
-use crate::svd::{DimElement, Field, FieldInfo};
-use crate::{elementext::ElementExt, Config};
+use crate::svd::Field;
 
 impl Parse for Field {
     type Object = Self;
     type Error = SVDErrorAt;
     type Config = Config;
 
     fn parse(tree: &Node, config: &Self::Config) -> Result<Self, Self::Error> {
-        if !tree.has_tag_name("field") {
-            return Err(SVDError::NotExpectedTag("field".to_string()).at(tree.id()));
-        }
-
-        let info = FieldInfo::parse(tree, config)?;
-
-        if tree.get_child("dimIncrement").is_some() {
-            let array_info = DimElement::parse(tree, config)?;
-            check_has_placeholder(&info.name, "field").map_err(|e| e.at(tree.id()))?;
-            if let Some(indexes) = &array_info.dim_index {
-                if array_info.dim as usize != indexes.len() {
-                    return Err(SVDError::IncorrectDimIndexesCount(
-                        array_info.dim as usize,
-                        indexes.len(),
-                    )
-                    .at(tree.id()));
-                }
-            }
-            Ok(info.array(array_info))
-        } else {
-            Ok(info.single())
-        }
+        parse_array("field", tree, config)
     }
 }

svd-parser/src/lib.rs

@@ -146,6 +146,9 @@ fn trim_utf8_bom(s: &str) -> &str {
     }
 }
 
+mod array;
+use array::parse_array;
+
 mod access;
 mod addressblock;
 mod bitrange;

svd-parser/src/peripheral.rs

@@ -1,34 +1,12 @@
 use super::*;
-use crate::elementext::ElementExt;
-use crate::svd::{DimElement, Peripheral, PeripheralInfo};
+use crate::svd::Peripheral;
 
 impl Parse for Peripheral {
     type Object = Self;
     type Error = SVDErrorAt;
     type Config = Config;
 
     fn parse(tree: &Node, config: &Self::Config) -> Result<Self, Self::Error> {
-        if !tree.has_tag_name("peripheral") {
-            return Err(SVDError::NotExpectedTag("peripheral".to_string()).at(tree.id()));
-        }
-
-        let info = PeripheralInfo::parse(tree, config)?;
-
-        if tree.get_child("dimIncrement").is_some() {
-            let array_info = DimElement::parse(tree, config)?;
-            check_has_placeholder(&info.name, "peripheral").map_err(|e| e.at(tree.id()))?;
-            if let Some(indexes) = &array_info.dim_index {
-                if array_info.dim as usize != indexes.len() {
-                    return Err(SVDError::IncorrectDimIndexesCount(
-                        array_info.dim as usize,
-                        indexes.len(),
-                    )
-                    .at(tree.id()));
-                }
-            }
-            Ok(info.array(array_info))
-        } else {
-            Ok(info.single())
-        }
+        parse_array("peripheral", tree, config)
     }
 }

svd-parser/src/register.rs

@@ -1,34 +1,12 @@
 use super::*;
-use crate::elementext::ElementExt;
-use crate::svd::{DimElement, Register, RegisterInfo};
+use crate::svd::Register;
 
 impl Parse for Register {
     type Object = Self;
     type Error = SVDErrorAt;
     type Config = Config;
 
     fn parse(tree: &Node, config: &Self::Config) -> Result<Self, Self::Error> {
-        if !tree.has_tag_name("register") {
-            return Err(SVDError::NotExpectedTag("register".to_string()).at(tree.id()));
-        }
-
-        let info = RegisterInfo::parse(tree, config)?;
-
-        if tree.get_child("dimIncrement").is_some() {
-            let array_info = DimElement::parse(tree, config)?;
-            check_has_placeholder(&info.name, "register").map_err(|e| e.at(tree.id()))?;
-            if let Some(indexes) = &array_info.dim_index {
-                if array_info.dim as usize != indexes.len() {
-                    return Err(SVDError::IncorrectDimIndexesCount(
-                        array_info.dim as usize,
-                        indexes.len(),
-                    )
-                    .at(tree.id()));
-                }
-            }
-            Ok(info.array(array_info))
-        } else {
-            Ok(info.single())
-        }
+        parse_array("register", tree, config)
     }
 }